From f62c7f2a8cc143454779dc99334ca9fc80ddabd5 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 29 Apr 2025 11:10:21 +0200 Subject: still just moving code around --- server/src/logic/userdata.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'server/src/logic/userdata.rs') diff --git a/server/src/logic/userdata.rs b/server/src/logic/userdata.rs index 64a136f..8da6be9 100644 --- a/server/src/logic/userdata.rs +++ b/server/src/logic/userdata.rs @@ -3,19 +3,17 @@ which is licensed under the GNU Affero General Public License (version 3); see /COPYING. Copyright (C) 2025 metamuffin */ -use crate::{ui::error::MyResult, ui::node::rocket_uri_macro_r_library_node}; +use crate::ui::error::MyResult; use jellybase::database::Database; use jellycommon::{ - user::{NodeUserData, WatchedState}, - NodeID, + routes::u_node_id, user::{NodeUserData, WatchedState}, NodeID }; +use jellylogic::session::Session; use rocket::{ form::Form, get, post, response::Redirect, serde::json::Json, FromForm, FromFormField, State, UriDisplayQuery, }; -use super::session::Session; - #[derive(Debug, FromFormField, UriDisplayQuery)] pub enum UrlWatchedState { None, @@ -51,7 +49,7 @@ pub async fn r_node_userdata_watched( }; Ok(()) })?; - Ok(Redirect::found(rocket::uri!(r_library_node(id)))) + Ok(Redirect::found(u_node_id(id))) } #[derive(FromForm)] @@ -72,7 +70,7 @@ pub async fn r_node_userdata_rating( udata.rating = form.rating; Ok(()) })?; - Ok(Redirect::found(rocket::uri!(r_library_node(id)))) + Ok(Redirect::found(u_node_id(id))) } #[post("/n//progress?")] -- cgit v1.2.3-70-g09d2