From 70b5bee00fb2a75eca37a222efa0c625d8f512f9 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Thu, 5 May 2022 16:48:51 +0900
Subject: [PATCH] Move My feed first in timelines

---
 plume-models/src/timeline/mod.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plume-models/src/timeline/mod.rs b/plume-models/src/timeline/mod.rs
index d6b2a59d..8f80310c 100644
--- a/plume-models/src/timeline/mod.rs
+++ b/plume-models/src/timeline/mod.rs
@@ -6,6 +6,7 @@ use crate::{
     Connection, Error, Result,
 };
 use diesel::{self, BoolExpressionMethods, ExpressionMethods, QueryDsl, RunQueryDsl};
+use std::cmp::Ordering;
 use std::ops::Deref;
 
 pub(crate) mod query;
@@ -85,6 +86,16 @@ impl Timeline {
                         .or(timeline_definition::user_id.is_null()),
                 )
                 .load::<Self>(conn)
+                .map(|mut timelines| {
+                    timelines.sort_by(|t1, t2| {
+                        if t1.user_id.is_some() && t2.user_id.is_none() {
+                            Ordering::Less
+                        } else {
+                            Ordering::Equal
+                        }
+                    });
+                    timelines
+                })
                 .map_err(Error::from)
         } else {
             timeline_definition::table