upgrade all deps (except image-rs)

10 files changed, 25 insertions, 25 deletions

diff --git a/server/src/main.rs b/server/src/main.rs
index d834481..2cc8b98 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -11,7 +11,7 @@ use crate::routes::ui::{account::hash_password, admin::log::enable_logging};
 use anyhow::Context;
 use database::DataAcid;
 use jellybase::{
-    database::{ReadableTable, Ser, T_USER},
+    database::{redb::ReadableTable, Ser, T_USER},
     federation::Federation,
     CONF, SECRETS,
 };
diff --git a/server/src/routes/ui/account/session/guard.rs b/server/src/routes/ui/account/session/guard.rs
index 39da4bc..9e0bbfe 100644
--- a/server/src/routes/ui/account/session/guard.rs
+++ b/server/src/routes/ui/account/session/guard.rs
@@ -6,7 +6,7 @@
 use super::{AdminSession, Session};
 use crate::{database::DataAcid, routes::ui::error::MyError};
 use anyhow::anyhow;
-use jellybase::database::{ReadableTable, T_USER};
+use jellybase::database::T_USER;
 use log::warn;
 use rocket::{
     async_trait,
diff --git a/server/src/routes/ui/account/settings.rs b/server/src/routes/ui/account/settings.rs
index 1b0de99..492e8ca 100644
--- a/server/src/routes/ui/account/settings.rs
+++ b/server/src/routes/ui/account/settings.rs
@@ -15,7 +15,7 @@ use crate::{
 };
 use anyhow::anyhow;
 use jellybase::{
-    database::{ReadableTable, Ser, T_USER},
+    database::{redb::ReadableTable, Ser, T_USER},
     permission::PermissionSetExt,
 };
 use jellycommon::user::{PlayerKind, Theme, UserPermission};
diff --git a/server/src/routes/ui/admin/mod.rs b/server/src/routes/ui/admin/mod.rs
index 6c206bd..55ac75d 100644
--- a/server/src/routes/ui/admin/mod.rs
+++ b/server/src/routes/ui/admin/mod.rs
@@ -22,7 +22,7 @@ use crate::{
 use anyhow::{anyhow, Context};
 use jellybase::{
     assetfed::AssetInner,
-    database::{ReadableTable, TableExt, T_INVITE, T_NODE},
+    database::{redb::ReadableTable, TableExt, T_INVITE, T_NODE},
     federation::Federation,
     CONF,
 };
diff --git a/server/src/routes/ui/admin/user.rs b/server/src/routes/ui/admin/user.rs
index 9a13580..e456894 100644
--- a/server/src/routes/ui/admin/user.rs
+++ b/server/src/routes/ui/admin/user.rs
@@ -13,7 +13,7 @@ use crate::{
     uri,
 };
 use anyhow::{anyhow, Context};
-use jellybase::database::{ReadableTable, Ser, TableExt, T_USER};
+use jellybase::database::{redb::ReadableTable, Ser, TableExt, T_USER};
 use jellycommon::user::{PermissionSet, UserPermission};
 use rocket::{form::Form, get, post, FromForm, FromFormField, State};
 
diff --git a/server/src/routes/ui/browser.rs b/server/src/routes/ui/browser.rs
index 11ce686..da17271 100644
--- a/server/src/routes/ui/browser.rs
+++ b/server/src/routes/ui/browser.rs
@@ -11,7 +11,7 @@ use super::{
     sort::{filter_and_sort_nodes, NodeFilterSort, NodeFilterSortForm, SortOrder, SortProperty},
 };
 use crate::{database::DataAcid, uri};
-use jellybase::database::{ReadableTable, T_NODE, T_USER_NODE};
+use jellybase::database::{redb::ReadableTable, T_NODE, T_USER_NODE};
 use rocket::{get, State};
 
 /// This function is a stub and only useful for use in the uri! macro.
diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs
index 02011fc..b8a132d 100644
--- a/server/src/routes/ui/error.rs
+++ b/server/src/routes/ui/error.rs
@@ -102,40 +102,40 @@ impl From<serde_json::Error> for MyError {
         MyError(anyhow::anyhow!("{err}"))
     }
 }
-impl From<jellybase::database::CommitError> for MyError {
-    fn from(err: jellybase::database::CommitError) -> Self {
+impl From<jellybase::database::redb::CommitError> for MyError {
+    fn from(err: jellybase::database::redb::CommitError) -> Self {
         MyError(anyhow::anyhow!("database oopsie during commit: {err}"))
     }
 }
-impl From<jellybase::database::CompactionError> for MyError {
-    fn from(err: jellybase::database::CompactionError) -> Self {
+impl From<jellybase::database::redb::CompactionError> for MyError {
+    fn from(err: jellybase::database::redb::CompactionError) -> Self {
         MyError(anyhow::anyhow!("database oopsie during compaction: {err}"))
     }
 }
-impl From<jellybase::database::DatabaseError> for MyError {
-    fn from(err: jellybase::database::DatabaseError) -> Self {
+impl From<jellybase::database::redb::DatabaseError> for MyError {
+    fn from(err: jellybase::database::redb::DatabaseError) -> Self {
         MyError(anyhow::anyhow!("generic database oopsie: {err}"))
     }
 }
-impl From<jellybase::database::SavepointError> for MyError {
-    fn from(err: jellybase::database::SavepointError) -> Self {
+impl From<jellybase::database::redb::SavepointError> for MyError {
+    fn from(err: jellybase::database::redb::SavepointError) -> Self {
         MyError(anyhow::anyhow!(
             "database oopsie during savepointing: {err}"
         ))
     }
 }
-impl From<jellybase::database::StorageError> for MyError {
-    fn from(err: jellybase::database::StorageError) -> Self {
+impl From<jellybase::database::redb::StorageError> for MyError {
+    fn from(err: jellybase::database::redb::StorageError) -> Self {
         MyError(anyhow::anyhow!("database oopsie, storage error: {err}"))
     }
 }
-impl From<jellybase::database::TableError> for MyError {
-    fn from(err: jellybase::database::TableError) -> Self {
+impl From<jellybase::database::redb::TableError> for MyError {
+    fn from(err: jellybase::database::redb::TableError) -> Self {
         MyError(anyhow::anyhow!("database oopsie, table error: {err}"))
     }
 }
-impl From<jellybase::database::TransactionError> for MyError {
-    fn from(err: jellybase::database::TransactionError) -> Self {
+impl From<jellybase::database::redb::TransactionError> for MyError {
+    fn from(err: jellybase::database::redb::TransactionError) -> Self {
         MyError(anyhow::anyhow!("database oopsie during transaction: {err}"))
     }
 }
diff --git a/server/src/routes/ui/home.rs b/server/src/routes/ui/home.rs
index 43e5af3..2fa9212 100644
--- a/server/src/routes/ui/home.rs
+++ b/server/src/routes/ui/home.rs
@@ -15,7 +15,7 @@ use crate::{
 use anyhow::Context;
 use chrono::{Datelike, Utc};
 use jellybase::{
-    database::{ReadableTable, TableExt, T_NODE, T_USER_NODE},
+    database::{redb::ReadableTable, TableExt, T_NODE, T_USER_NODE},
     CONF,
 };
 use jellycommon::{user::WatchedState, Rating};
diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index 043bf10..bd839fb 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -23,7 +23,7 @@ use crate::{
     uri,
 };
 use anyhow::{anyhow, Result};
-use chrono::NaiveDateTime;
+use chrono::DateTime;
 use jellybase::{
     database::{TableExt, T_NODE, T_NODE_EXTENDED, T_USER_NODE},
     permission::NodePermissionExt,
@@ -266,9 +266,9 @@ markup::define! {
             }
             @if let Some(d) = &node.release_date {
                 p { @if *full {
-                    @NaiveDateTime::from_timestamp_millis(*d).unwrap().and_utc().to_string()
+                    @DateTime::from_timestamp_millis(*d).unwrap().naive_utc().to_string()
                 } else {
-                    @NaiveDateTime::from_timestamp_millis(*d).unwrap().date().to_string()
+                    @DateTime::from_timestamp_millis(*d).unwrap().date_naive().to_string()
                 }}
             }
             @if !node.children.is_empty() {
diff --git a/server/src/routes/userdata.rs b/server/src/routes/userdata.rs
index 4eb412a..68fa384 100644
--- a/server/src/routes/userdata.rs
+++ b/server/src/routes/userdata.rs
@@ -7,7 +7,7 @@ use super::ui::{account::session::Session, error::MyResult, node::DatabaseNodeUs
 use crate::routes::ui::node::rocket_uri_macro_r_library_node;
 use anyhow::anyhow;
 use jellybase::{
-    database::{DataAcid, ReadableTable, Ser, TableExt, T_NODE, T_USER_NODE},
+    database::{redb::ReadableTable, DataAcid, Ser, TableExt, T_NODE, T_USER_NODE},
     permission::NodePermissionExt,
 };
 use jellycommon::user::{NodeUserData, WatchedState};