Merge branch 'master' into federation

1 files changed, 12 insertions, 8 deletions

diff --git a/server/src/routes/federation.rs b/server/src/routes/federation.rs
index 019a9a71..9667694a 100644
--- a/server/src/routes/federation.rs
+++ b/server/src/routes/federation.rs
@@ -5,6 +5,8 @@ use crate::apub;
 use crate::settings::Settings;
 use actix_web::web::Query;
 use actix_web::{web, HttpResponse};
+use diesel::r2d2::{ConnectionManager, Pool};
+use diesel::PgConnection;
 
 pub fn config(cfg: &mut web::ServiceConfig) {
   if Settings::get().federation_enabled {
@@ -25,14 +27,16 @@ pub fn config(cfg: &mut web::ServiceConfig) {
       // TODO: this is a very quick and dirty implementation for http api calls
       .route(
         "/api/v1/communities/list",
-        web::get().to(|query: Query<ListCommunities>| {
-          let res = Oper::new(UserOperation::ListCommunities, query.into_inner())
-            .perform()
-            .unwrap();
-          HttpResponse::Ok()
-            .content_type("application/json")
-            .body(serde_json::to_string(&res).unwrap())
-        }),
+        web::get().to(
+          |query: Query<ListCommunities>, db: web::Data<Pool<ConnectionManager<PgConnection>>>| {
+            let res = Oper::new(UserOperation::ListCommunities, query.into_inner())
+              .perform(&db.get().unwrap())
+              .unwrap();
+            HttpResponse::Ok()
+              .content_type("application/json")
+              .body(serde_json::to_string(&res).unwrap())
+          },
+        ),
       );
   }
 }