aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Move local feed before federated feed for non-logged-in users' (#1072) from timeline-order into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1072
This commit is contained in:
KitaitiMakoto 2022-05-07 16:35:28 +00:00
commit d95549f58b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plume-models/src/timeline/mod.rs
View File

@ -86,16 +86,6 @@ impl Timeline {
.or(timeline_definition::user_id.is_null()), .or(timeline_definition::user_id.is_null()),
) )
.load::<Self>(conn) .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 {
t1.id.cmp(&t2.id)
}
});
timelines
})
.map_err(Error::from) .map_err(Error::from)
} else { } else {
timeline_definition::table timeline_definition::table
@ -103,6 +93,16 @@ impl Timeline {
.load::<Self>(conn) .load::<Self>(conn)
.map_err(Error::from) .map_err(Error::from)
} }
.map(|mut timelines| {
timelines.sort_by(|t1, t2| {
if t1.user_id.is_some() && t2.user_id.is_none() {
Ordering::Less
} else {
t1.id.cmp(&t2.id)
}
});
timelines
})
} }
pub fn new_for_user( pub fn new_for_user(