aboutsummaryrefslogtreecommitdiff
path: root/server/src/api.rs
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-04-29 17:06:23 +0200
committermetamuffin <metamuffin@disroot.org>2025-04-29 17:06:23 +0200
commit212a0f23bc894faf88e159560c113f504349cc05 (patch)
treeee2ff0ff3b185d1874eb0e8fc4b75f1badf659b8 /server/src/api.rs
parentf73aa32549743b2967160d38c1622199c41524a4 (diff)
downloadjellything-212a0f23bc894faf88e159560c113f504349cc05.tar
jellything-212a0f23bc894faf88e159560c113f504349cc05.tar.bz2
jellything-212a0f23bc894faf88e159560c113f504349cc05.tar.zst
comiles again but still many logic holes
Diffstat (limited to 'server/src/api.rs')
-rw-r--r--server/src/api.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/server/src/api.rs b/server/src/api.rs
index a9df1bd..fb5ee88 100644
--- a/server/src/api.rs
+++ b/server/src/api.rs
@@ -3,11 +3,14 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2025 metamuffin <metamuffin.org>
*/
-use super::ui::{account::login_logic, error::MyResult};
-use crate::database::Database;
+use super::ui::error::MyResult;
+use crate::{database::Database, helper::A};
use jellybase::assetfed::AssetInner;
use jellycommon::{user::CreateSessionParams, NodeID, Visibility};
-use jellylogic::session::{AdminSession, Session};
+use jellylogic::{
+ login::login_logic,
+ session::{AdminSession, Session},
+};
use rocket::{
get,
http::MediaType,
@@ -47,13 +50,13 @@ pub fn r_api_account_login(
}
#[get("/api/asset_token_raw/<token>")]
-pub fn r_api_asset_token_raw(_admin: AdminSession, token: &str) -> MyResult<Json<AssetInner>> {
+pub fn r_api_asset_token_raw(_admin: A<AdminSession>, token: &str) -> MyResult<Json<AssetInner>> {
Ok(Json(AssetInner::deser(token)?))
}
#[get("/api/nodes_modified?<since>")]
pub fn r_api_nodes_modified_since(
- _session: Session,
+ _session: A<Session>,
database: &State<Database>,
since: u64,
) -> MyResult<Json<Vec<NodeID>>> {