LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-12-23 11:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker/dev/docker-compose.yml
View file

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

2
docker/prod/docker-compose.yml
View file

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

7
src/routes/images.rs
View file

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