Merge remote-tracking branch 'origin/main' into ap07

2022-05-07 11:15:04 +09:00
parent e8dc0942e5 c32acb2fcf
commit cfed02bbcf
3 changed files with 10 additions and 2 deletions
@@ -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