Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / routes / src / images.rs

diff --git a/crates/routes/src/images.rs b/crates/routes/src/images.rs
index 6e839e214792401554d7246e8894d0c053d265c3..b79a38ffdc86d82ec673419dfec0fc1cf0dc9902 100644 (file)
--- a/crates/routes/src/images.rs
+++ b/crates/routes/src/images.rs
@@ -11,7 +11,7 @@ use actix_web::{
   HttpResponse,
 };
 use futures::stream::{Stream, StreamExt};
-use lemmy_api_common::{utils::get_local_user_view_from_jwt, LemmyContext};
+use lemmy_api_common::{context::LemmyContext, utils::local_user_view_from_jwt};
 use lemmy_db_schema::source::local_site::LocalSite;
 use lemmy_utils::{claims::Claims, rate_limit::RateLimitCell, REQWEST_TIMEOUT};
 use reqwest::Body;
@@ -129,14 +129,14 @@ async fn full_res(
   context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse, Error> {
   // block access to images if instance is private and unauthorized, public
-  let local_site = LocalSite::read(context.pool())
+  let local_site = LocalSite::read(&mut context.pool())
     .await
     .map_err(error::ErrorBadRequest)?;
   if local_site.private_instance {
     let jwt = req
       .cookie("jwt")
       .expect("No auth header for picture access");
-    if get_local_user_view_from_jwt(jwt.value(), context.pool(), context.secret())
+    if local_user_view_from_jwt(jwt.value(), &context)
       .await
       .is_err()
     {
@@ -158,7 +158,7 @@ async fn full_res(
     let mut url = format!("{}image/process.{}?src={}", pictrs_config.url, format, name,);
 
     if let Some(size) = params.thumbnail {
-      url = format!("{}&thumbnail={}", url, size,);
+      url = format!("{url}&thumbnail={size}",);
     }
     url
   };