diff options
author | metamuffin <metamuffin@disroot.org> | 2023-08-02 23:07:55 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2023-08-02 23:07:55 +0200 |
commit | 8e33fcdfbd9df042c0cfd8e9a2084993313961c9 (patch) | |
tree | 9b18183237177b6c2b7060140ed92e62581ab588 /server/src/routes/mod.rs | |
parent | c81d8bbfd46d53fba6e0086b5f859f8af8639f4a (diff) | |
download | jellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar jellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar.bz2 jellything-8e33fcdfbd9df042c0cfd8e9a2084993313961c9.tar.zst |
federated import works but relies on private data
Diffstat (limited to 'server/src/routes/mod.rs')
-rw-r--r-- | server/src/routes/mod.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/server/src/routes/mod.rs b/server/src/routes/mod.rs index be4d2cb..42eae1b 100644 --- a/server/src/routes/mod.rs +++ b/server/src/routes/mod.rs @@ -3,7 +3,7 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2023 metamuffin <metamuffin.org> */ -use crate::{database::Database, routes::ui::error::MyResult, CONF}; +use crate::{database::Database, federation::Federation, routes::ui::error::MyResult, CONF}; use api::{r_api_account_login, r_api_root, r_api_version}; use base64::Engine; use jellyremuxer::RemuxerContext; @@ -45,7 +45,11 @@ macro_rules! uri { }; } -pub fn build_rocket(remuxer: RemuxerContext, database: Database) -> Rocket<Build> { +pub fn build_rocket( + remuxer: RemuxerContext, + database: Database, + federation: Federation, +) -> Rocket<Build> { rocket::build() .configure(Config { secret_key: SecretKey::derive_from( @@ -61,6 +65,7 @@ pub fn build_rocket(remuxer: RemuxerContext, database: Database) -> Rocket<Build }) .manage(remuxer) .manage(database) + .manage(federation) .attach(AdHoc::on_response("set server header", |_req, res| { res.set_header(Header::new("server", "jellything")); Box::pin(async {}) |