aboutsummaryrefslogtreecommitdiff
path: root/server/src/logic
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/logic')
-rw-r--r--server/src/logic/stream.rs6
-rw-r--r--server/src/logic/userdata.rs3
2 files changed, 4 insertions, 5 deletions
diff --git a/server/src/logic/stream.rs b/server/src/logic/stream.rs
index 89589c7..c21edaa 100644
--- a/server/src/logic/stream.rs
+++ b/server/src/logic/stream.rs
@@ -3,11 +3,11 @@
which is licensed under the GNU Affero General Public License (version 3); see /COPYING.
Copyright (C) 2025 metamuffin <metamuffin.org>
*/
-use crate::{database::Database, helper::A, ui::error::MyError};
+use crate::{helper::A, ui::error::MyError};
use anyhow::{anyhow, Result};
-use jellybase::assetfed::AssetInner;
use jellycommon::{stream::StreamSpec, TrackSource};
-use jellylogic::session::Session;
+use jellyimport::asset_token::AssetInner;
+use jellylogic::{session::Session, Database};
use jellystream::SMediaInfo;
use log::{info, warn};
use rocket::{
diff --git a/server/src/logic/userdata.rs b/server/src/logic/userdata.rs
index 25d3893..ac3cb83 100644
--- a/server/src/logic/userdata.rs
+++ b/server/src/logic/userdata.rs
@@ -4,13 +4,12 @@
Copyright (C) 2025 metamuffin <metamuffin.org>
*/
use crate::{helper::A, ui::error::MyResult};
-use jellybase::database::Database;
use jellycommon::{
routes::u_node_id,
user::{NodeUserData, WatchedState},
NodeID,
};
-use jellylogic::session::Session;
+use jellylogic::{session::Session, Database};
use rocket::{
form::Form, get, post, response::Redirect, serde::json::Json, FromForm, FromFormField, State,
UriDisplayQuery,