Merge pull request 'Move local timeline before federated timeline' (#1070) from timeline-order into main

Reviewed-on: Plume/Plume#1070
2 years ago · 156a875f02
parent b9ea83a602 c1c606bc86
commit 156a875f02
2 changed files with 3 additions and 1 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -11,6 +11,8 @@
 ### Changed

 - Bump Rust to nightly 2022-01-26 (#1015)
+- Remove "Latest articles" timeline (#1069)
+- Change order of timeline tabs (#1069, #1070)

 ### Fixed

--- a/plume-models/src/timeline/mod.rs
+++ b/plume-models/src/timeline/mod.rs
@ -91,7 +91,7 @@ impl Timeline {
                        if t1.user_id.is_some() && t2.user_id.is_none() {
                            Ordering::Less
                        } else {
-                            Ordering::Equal
+                            t1.id.cmp(&t2.id)
                        }
                    });
                    timelines