diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 16 | ||||
| -rw-r--r-- | server/src/routes/ui/account/settings.rs | 4 | ||||
| -rw-r--r-- | server/src/routes/ui/sort.rs | 4 | 
3 files changed, 15 insertions, 9 deletions
| diff --git a/server/Cargo.toml b/server/Cargo.toml index 23c533b..da8603d 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -10,27 +10,27 @@ jellystream = { path = "../stream" }  jellyclient = { path = "../client" }  jellytranscoder = { path = "../transcoder" } -serde = { version = "1.0.188", features = ["derive"] } +serde = { version = "1.0.193", features = ["derive"] }  bincode = { version = "2.0.0-rc.3", features = ["serde", "derive"] } -serde_json = "1.0.107" +serde_json = "1.0.108"  log = { workspace = true }  anyhow = { workspace = true } -env_logger = "0.10.0" +env_logger = "0.10.1"  rand = "0.8.5" -base64 = "0.21.4" +base64 = "0.21.5"  chrono = { version = "0.4.31", features = ["serde"] } -vte = "0.12.0" +vte = "0.13.0"  argon2 = "0.5.2"  aes-gcm-siv = "0.11.1"  async-recursion = "1.0.5" -futures = "0.3.28" +futures = "0.3.29"  tokio = { workspace = true } -tokio-util = { version = "0.7.9", features = ["io", "io-util"] } +tokio-util = { version = "0.7.10", features = ["io", "io-util"] } -markup = "0.13.1" +markup = "0.15.0"  rocket = { workspace = true, features = ["secrets", "json"] }  [build-dependencies] diff --git a/server/src/routes/ui/account/settings.rs b/server/src/routes/ui/account/settings.rs index 90dcf37..625ae7f 100644 --- a/server/src/routes/ui/account/settings.rs +++ b/server/src/routes/ui/account/settings.rs @@ -15,6 +15,7 @@ use crate::{  };  use jellybase::permission::PermissionSetExt;  use jellycommon::user::{Theme, UserPermission}; +use markup::{Render, RenderAttributeValue};  use rocket::{      form::{self, validate::len, Contextual, Form},      get, @@ -79,7 +80,8 @@ fn settings_page(session: Session, flash: Option<MyResult<String>>) -> DynLayout  }  struct A(pub Theme); -impl markup::Render for A { +impl RenderAttributeValue for A {} +impl Render for A {      fn render(&self, writer: &mut impl std::fmt::Write) -> std::fmt::Result {          writer.write_fmt(format_args!("{}", &self.0 as &dyn UriDisplay<Query>))      } diff --git a/server/src/routes/ui/sort.rs b/server/src/routes/ui/sort.rs index 9428694..c7fbfc2 100644 --- a/server/src/routes/ui/sort.rs +++ b/server/src/routes/ui/sort.rs @@ -3,6 +3,7 @@ use jellycommon::{      user::{NodeUserData, WatchedState},      NodeKind, NodePublic, Rating,  }; +use markup::RenderAttributeValue;  use rocket::{      http::uri::fmt::{Query, UriDisplay},      FromForm, FromFormField, UriDisplayQuery, @@ -253,3 +254,6 @@ impl markup::Render for FilterProperty {          writer.write_fmt(format_args!("{}", self as &dyn UriDisplay<Query>))      }  } +impl RenderAttributeValue for SortOrder {} +impl RenderAttributeValue for FilterProperty {} +impl RenderAttributeValue for SortProperty {} | 
