summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDessalines <dessalines@users.noreply.github.com>2020-07-13 09:42:03 -0400
committerGitHub <noreply@github.com>2020-07-13 09:42:03 -0400
commita7c1c472fea9ff860b62ad25113cfed0f0d8e0bf (patch)
tree80398aa0d4577ba8a28eeda0cf61049a4adcdb31
parentf0357bc988e60d98cc566bd8faf680879abec536 (diff)
Fixing admin and mod sort order. Fixes #939 (#941)
-rw-r--r--server/lemmy_db/src/community_view.rs2
-rw-r--r--server/lemmy_db/src/user_view.rs5
2 files changed, 6 insertions, 1 deletions
diff --git a/server/lemmy_db/src/community_view.rs b/server/lemmy_db/src/community_view.rs
index b465ddab..5c6bd81a 100644
--- a/server/lemmy_db/src/community_view.rs
+++ b/server/lemmy_db/src/community_view.rs
@@ -299,6 +299,7 @@ impl CommunityModeratorView {
use super::community_view::community_moderator_view::dsl::*;
community_moderator_view
.filter(community_id.eq(from_community_id))
+ .order_by(published)
.load::<Self>(conn)
}
@@ -306,6 +307,7 @@ impl CommunityModeratorView {
use super::community_view::community_moderator_view::dsl::*;
community_moderator_view
.filter(user_id.eq(from_user_id))
+ .order_by(published)
.load::<Self>(conn)
}
}
diff --git a/server/lemmy_db/src/user_view.rs b/server/lemmy_db/src/user_view.rs
index 84feba38..f2ac4742 100644
--- a/server/lemmy_db/src/user_view.rs
+++ b/server/lemmy_db/src/user_view.rs
@@ -157,7 +157,10 @@ impl UserView {
pub fn admins(conn: &PgConnection) -> Result<Vec<Self>, Error> {
use super::user_view::user_fast::dsl::*;
- user_fast.filter(admin.eq(true)).load::<Self>(conn)
+ user_fast
+ .filter(admin.eq(true))
+ .order_by(published)
+ .load::<Self>(conn)
}
pub fn banned(conn: &PgConnection) -> Result<Vec<Self>, Error> {