diff options
| author | metamuffin <metamuffin@disroot.org> | 2026-02-28 01:08:17 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2026-02-28 01:08:17 +0100 |
| commit | 2a5d882fac63f8572ee95f85447b180f5b17f57a (patch) | |
| tree | 9fa6a7be720a27373bb35ae91041540d459b6ec7 | |
| parent | 4841c08da8afa3e42c354fbc325ce56b6f997079 (diff) | |
| download | jellything-2a5d882fac63f8572ee95f85447b180f5b17f57a.tar jellything-2a5d882fac63f8572ee95f85447b180f5b17f57a.tar.bz2 jellything-2a5d882fac63f8572ee95f85447b180f5b17f57a.tar.zst | |
fix cont token check in value sort
| -rw-r--r-- | database/src/kv/index.rs | 3 | ||||
| -rw-r--r-- | server/src/ui/items.rs | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/database/src/kv/index.rs b/database/src/kv/index.rs index ba5784b..dd2471b 100644 --- a/database/src/kv/index.rs +++ b/database/src/kv/index.rs @@ -129,9 +129,6 @@ pub fn iter_index<'a>( assert!(value_sort.offset.is_none(), "TODO"); let mut start = prefix.clone(); if let Some(resume) = resume { - if resume.len() != 8 { - bail!("invalid resume length") - } start.extend(resume); start = inc_key(start); } diff --git a/server/src/ui/items.rs b/server/src/ui/items.rs index 6071bcc..bd4b759 100644 --- a/server/src/ui/items.rs +++ b/server/src/ui/items.rs @@ -11,7 +11,7 @@ use jellycommon::{ jellyobject::{EMPTY, Path}, *, }; -use jellydb::{Filter, Query}; +use jellydb::{Filter, MultiBehaviour, Query, Sort, SortOrder, ValueSort}; use jellyui::components::items::Items; use rocket::{get, response::content::RawHtml}; use std::borrow::Cow; @@ -28,7 +28,16 @@ pub fn r_items(ri: RequestInfo, cont: Option<&str>) -> MyResult<RawHtml<String>> ri.state.database.transaction(&mut |txn| { let rows = txn .query(Query { - filter: Filter::Match(Path(vec![NO_KIND.0]), KIND_CHANNEL.into()), + filter: Filter::All(vec![ + Filter::Match(Path(vec![NO_KIND.0]), KIND_VIDEO.into()), + Filter::Match(Path(vec![NO_VISIBILITY.0]), VISI_VISIBLE.into()), + ]), + sort: Sort::Value(ValueSort { + path: Path(vec![NO_RELEASEDATE.0]), + multi: MultiBehaviour::First, + order: SortOrder::Descending, + offset: None, + }), continuation: cont_in.clone(), ..Default::default() })? |