From: Ivo Barros <L3v3L@users.noreply.github.com>
Date: Tue, 20 Jun 2023 22:07:57 +0000 (+0100)
Subject: Merge branch 'main' into main
X-Git-Url: http://these/git/?a=commitdiff_plain;h=a07fc75972b3d7763a7122bbebd8924e4ac4344c;hp=94bc9092ee863a456c6f289e5c5a85472dfa5e5a;p=lemmy-ui.git

Merge branch 'main' into main
---

diff --git a/src/shared/components/common/sort-select.tsx b/src/shared/components/common/sort-select.tsx
index 7b27571..656a6c0 100644
--- a/src/shared/components/common/sort-select.tsx
+++ b/src/shared/components/common/sort-select.tsx
@@ -66,6 +66,9 @@ export class SortSelect extends Component<SortSelectProps, SortSelectState> {
           <option disabled aria-hidden="true">
             ─────
           </option>
+          <option value={"TopHour"}>{i18n.t("top_hour")}</option>
+          <option value={"TopSixHour"}>{i18n.t("top_six_hours")}</option>
+          <option value={"TopTwelveHour"}>{i18n.t("top_twelve_hours")}</option>
           <option value={"TopDay"}>{i18n.t("top_day")}</option>
           <option value={"TopWeek"}>{i18n.t("top_week")}</option>
           <option value={"TopMonth"}>{i18n.t("top_month")}</option>
diff --git a/src/shared/utils.ts b/src/shared/utils.ts
index 8b01e5b..8ecf36e 100644
--- a/src/shared/utils.ts
+++ b/src/shared/utils.ts
@@ -855,6 +855,9 @@ export function commentsToFlatNodes(comments: CommentView[]): CommentNodeI[] {
 export function convertCommentSortType(sort: SortType): CommentSortType {
   if (
     sort == "TopAll" ||
+    sort ==  "TopHour" ||
+    sort ==  "TopSixHour" ||
+    sort ==  "TopTwelveHour" ||
     sort == "TopDay" ||
     sort == "TopWeek" ||
     sort == "TopMonth" ||