Merge branch 'asonix/pict-rs-v2' of https://github.com/asonix/lemmy into asonix-asonix/pict-rs-v2

This commit is contained in:
Dessalines 2020-10-14 10:14:25 -05:00
commit 9bbacd38f4
3 changed files with 6 additions and 5 deletions

View File

@ -40,7 +40,7 @@ services:
restart: always
pictrs:
image: asonix/pictrs:v0.1.13-r0
image: asonix/pictrs:v0.2.2-r0
ports:
- "8537:8080"
user: 991:991

View File

@ -37,7 +37,7 @@ services:
- lemmy
pictrs:
image: asonix/pictrs:v0.1.13-r0
image: asonix/pictrs:v0.2.2-r0
ports:
- "127.0.0.1:8537:8080"
user: 991:991

View File

@ -63,7 +63,7 @@ async fn full_res(
client: web::Data<Client>,
) -> Result<HttpResponse, Error> {
let url = format!(
"{}/image/{}",
"{}/image/original/{}",
Settings::get().pictrs_url,
&filename.into_inner()
);
@ -78,10 +78,11 @@ async fn thumbnail(
let (size, file) = parts.into_inner();
let url = format!(
"{}/image/thumbnail{}/{}",
"{}/image/process.{}?src={}&thumbnail={}",
Settings::get().pictrs_url,
"jpg", // this can be changed to png or webp
&file,
size,
&file
);
image(url, req, client).await