From: Dessalines <tyhou13@gmx.com>
Date: Wed, 4 Mar 2020 16:46:34 +0000 (-0500)
Subject: Fixing post sorting by stickied on front end. Fixes #575
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7BmarkdownHelpUrl%7D?a=commitdiff_plain;h=fb355188487bcd1e4185b8a034f95560cc28946d;p=lemmy.git

Fixing post sorting by stickied on front end. Fixes #575
---

diff --git a/ui/src/components/post-listings.tsx b/ui/src/components/post-listings.tsx
index d61f624d..5e6acc0c 100644
--- a/ui/src/components/post-listings.tsx
+++ b/ui/src/components/post-listings.tsx
@@ -53,7 +53,7 @@ export class PostListings extends Component<PostListingsProps, any> {
     }
 
     if (this.props.sort !== undefined) {
-      postSort(out, this.props.sort);
+      postSort(out, this.props.sort, this.props.showCommunity == undefined);
     }
 
     return out;
diff --git a/ui/src/utils.ts b/ui/src/utils.ts
index d531a7ca..5987070c 100644
--- a/ui/src/utils.ts
+++ b/ui/src/utils.ts
@@ -729,7 +729,11 @@ function convertCommentSortType(sort: SortType): CommentSortType {
   }
 }
 
-export function postSort(posts: Array<Post>, sort: SortType) {
+export function postSort(
+  posts: Array<Post>,
+  sort: SortType,
+  communityType: boolean
+) {
   // First, put removed and deleted comments at the bottom, then do your other sorts
   if (
     sort == SortType.TopAll ||
@@ -740,13 +744,17 @@ export function postSort(posts: Array<Post>, sort: SortType) {
   ) {
     posts.sort(
       (a, b) =>
-        +a.removed - +b.removed || +a.deleted - +b.deleted || b.score - a.score
+        +a.removed - +b.removed ||
+        +a.deleted - +b.deleted ||
+        (communityType && +b.stickied - +a.stickied) ||
+        b.score - a.score
     );
   } else if (sort == SortType.New) {
     posts.sort(
       (a, b) =>
         +a.removed - +b.removed ||
         +a.deleted - +b.deleted ||
+        (communityType && +b.stickied - +a.stickied) ||
         b.published.localeCompare(a.published)
     );
   } else if (sort == SortType.Hot) {
@@ -754,6 +762,7 @@ export function postSort(posts: Array<Post>, sort: SortType) {
       (a, b) =>
         +a.removed - +b.removed ||
         +a.deleted - +b.deleted ||
+        (communityType && +b.stickied - +a.stickied) ||
         hotRankPost(b) - hotRankPost(a)
     );
   }