From 780f59f5174a3827621406e8c37e8f2f89251a51 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Fri, 1 Mar 2024 16:04:28 +0300
Subject: [PATCH] feed-comments-order-fix

---
 .../CommentDate/CommentDate.module.scss       |  3 +-
 src/components/Article/CommentsTree.tsx       | 26 +++++++--------
 src/components/Views/Author/Author.tsx        |  2 +-
 src/components/Views/Feed/Feed.tsx            | 32 ++++++-------------
 4 files changed, 24 insertions(+), 39 deletions(-)

diff --git a/src/components/Article/CommentDate/CommentDate.module.scss b/src/components/Article/CommentDate/CommentDate.module.scss
index 20410cce..b492cb84 100644
--- a/src/components/Article/CommentDate/CommentDate.module.scss
+++ b/src/components/Article/CommentDate/CommentDate.module.scss
@@ -2,7 +2,8 @@
   @include font-size(1.2rem);
 
   color: var(--secondary-color);
-  //align-self: center;
+
+  // align-self: center;
   display: flex;
   align-items: flex-start;
   justify-content: flex-start;
diff --git a/src/components/Article/CommentsTree.tsx b/src/components/Article/CommentsTree.tsx
index cf28fcfd..60054831 100644
--- a/src/components/Article/CommentsTree.tsx
+++ b/src/components/Article/CommentsTree.tsx
@@ -1,15 +1,15 @@
-import {clsx} from 'clsx'
-import {createMemo, createSignal, For, lazy, onMount, Show} from 'solid-js'
+import { clsx } from 'clsx'
+import { For, Show, createMemo, createSignal, lazy, onMount } from 'solid-js'
 
-import {useLocalize} from '../../context/localize'
-import {useReactions} from '../../context/reactions'
-import {useSession} from '../../context/session'
-import {Author, Reaction, ReactionKind, ReactionSort} from '../../graphql/schema/core.gen'
-import {byCreated, byStat} from '../../utils/sortby'
-import {Button} from '../_shared/Button'
-import {ShowIfAuthenticated} from '../_shared/ShowIfAuthenticated'
+import { useLocalize } from '../../context/localize'
+import { useReactions } from '../../context/reactions'
+import { useSession } from '../../context/session'
+import { Author, Reaction, ReactionKind, ReactionSort } from '../../graphql/schema/core.gen'
+import { byCreated, byStat } from '../../utils/sortby'
+import { Button } from '../_shared/Button'
+import { ShowIfAuthenticated } from '../_shared/ShowIfAuthenticated'
 
-import {Comment} from './Comment'
+import { Comment } from './Comment'
 
 import styles from './Article.module.scss'
 
@@ -95,11 +95,7 @@ export const CommentsTree = (props: Props) => {
           <ul class={clsx(styles.commentsViewSwitcher, 'view-switcher')}>
             <Show when={newReactions().length > 0}>
               <li classList={{ 'view-switcher__item--selected': onlyNew() }}>
-                <Button
-                  variant="light"
-                  value={t('New only')}
-                  onClick={() => setOnlyNew(!onlyNew())}
-                />
+                <Button variant="light" value={t('New only')} onClick={() => setOnlyNew(!onlyNew())} />
               </li>
             </Show>
             <li classList={{ 'view-switcher__item--selected': commentsOrder() === ReactionSort.Newest }}>
diff --git a/src/components/Views/Author/Author.tsx b/src/components/Views/Author/Author.tsx
index 352d8f6c..1649d92c 100644
--- a/src/components/Views/Author/Author.tsx
+++ b/src/components/Views/Author/Author.tsx
@@ -23,9 +23,9 @@ import { Row2 } from '../../Feed/Row2'
 import { Row3 } from '../../Feed/Row3'
 import { Loading } from '../../_shared/Loading'
 
+import { byCreated } from '../../../utils/sortby'
 import stylesArticle from '../../Article/Article.module.scss'
 import styles from './Author.module.scss'
-import {byCreated} from "../../../utils/sortby";
 
 type Props = {
   shouts: Shout[]
diff --git a/src/components/Views/Feed/Feed.tsx b/src/components/Views/Feed/Feed.tsx
index 2a886a10..aeee25b9 100644
--- a/src/components/Views/Feed/Feed.tsx
+++ b/src/components/Views/Feed/Feed.tsx
@@ -14,6 +14,7 @@ import { resetSortedArticles, useArticlesStore } from '../../../stores/zine/arti
 import { useTopAuthorsStore } from '../../../stores/zine/topAuthors'
 import { useTopicsStore } from '../../../stores/zine/topics'
 import { getImageUrl } from '../../../utils/getImageUrl'
+import { byCreated } from '../../../utils/sortby'
 import { CommentDate } from '../../Article/CommentDate'
 import { getShareUrl } from '../../Article/SharePopup'
 import { AuthorBadge } from '../../Author/AuthorBadge'
@@ -48,23 +49,11 @@ type VisibilityItem = {
 }
 
 type FeedSearchParams = {
-  by: 'publish_date' | 'likes_stat' | 'rating' | 'last_comment'
+  by: 'publish_date' | 'likes' | 'comments'
   period: FeedPeriod
   visibility: VisibilityMode
 }
 
-const getOrderBy = (by: FeedSearchParams['by']) => {
-  if (by === 'likes_stat' || by === 'rating') {
-    return 'likes_stat'
-  }
-
-  if (by === 'last_comment') {
-    return 'last_comment'
-  }
-
-  return ''
-}
-
 const getFromDate = (period: FeedPeriod): number => {
   const now = new Date()
   let d: Date = now
@@ -146,7 +135,7 @@ export const FeedView = (props: Props) => {
 
   const loadTopComments = async () => {
     const comments = await loadReactionsBy({ by: { comment: true }, limit: 50 })
-    setTopComments(comments)
+    setTopComments(comments.sort(byCreated).reverse())
   }
 
   onMount(() => {
@@ -178,9 +167,8 @@ export const FeedView = (props: Props) => {
       offset: sortedArticles().length,
     }
 
-    const orderBy = getOrderBy(searchParams().by)
-    if (orderBy) {
-      options.order_by = orderBy
+    if (searchParams()?.by) {
+      options.order_by = searchParams().by
     }
 
     const visibilityMode = searchParams().visibility
@@ -222,7 +210,7 @@ export const FeedView = (props: Props) => {
   const ogTitle = t('Feed')
 
   const [shareData, setShareData] = createSignal<Shout | undefined>()
-  const handleShare = (shared) => {
+  const handleShare = (shared: Shout | undefined) => {
     showModal('share')
     setShareData(shared)
   }
@@ -260,19 +248,19 @@ export const FeedView = (props: Props) => {
               {/*</li>*/}
               <li
                 class={clsx({
-                  'view-switcher__item--selected': searchParams().by === 'rating',
+                  'view-switcher__item--selected': searchParams().by === 'likes',
                 })}
               >
-                <span class="link" onClick={() => changeSearchParams({ by: 'rating' })}>
+                <span class="link" onClick={() => changeSearchParams({ by: 'likes' })}>
                   {t('Top rated')}
                 </span>
               </li>
               <li
                 class={clsx({
-                  'view-switcher__item--selected': searchParams().by === 'last_comment',
+                  'view-switcher__item--selected': searchParams().by === 'comments',
                 })}
               >
-                <span class="link" onClick={() => changeSearchParams({ by: 'last_comment' })}>
+                <span class="link" onClick={() => changeSearchParams({ by: 'comments' })}>
                   {t('Most commented')}
                 </span>
               </li>