From 8e33fcdfbd9df042c0cfd8e9a2084993313961c9 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Wed, 2 Aug 2023 23:07:55 +0200 Subject: federated import works but relies on private data --- server/src/routes/ui/account/admin.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'server/src/routes/ui/account/admin.rs') diff --git a/server/src/routes/ui/account/admin.rs b/server/src/routes/ui/account/admin.rs index 7124f4a..d0ad433 100644 --- a/server/src/routes/ui/account/admin.rs +++ b/server/src/routes/ui/account/admin.rs @@ -5,6 +5,7 @@ */ use crate::{ database::Database, + federation::Federation, import::import, routes::ui::{ account::session::Session, @@ -135,11 +136,12 @@ pub fn r_account_admin_remove_invite( pub async fn r_account_admin_import( session: Session, database: &State, + federation: &State, ) -> MyResult> { if !session.user.admin { Err(anyhow!("you not admin"))? } - let r = import(&database).await; + let r = import(&database, &federation).await; admin_dashboard( &database, Some(r.map_err(|e| e.into()).map(|_| "Import successful".into())), -- cgit v1.2.3-70-g09d2