From 9e3032ce893d538124e74e6f9b6ddeced4d71a54 Mon Sep 17 00:00:00 2001
From: Martti Malmi <sirius@iki.fi>
Date: Tue, 5 Dec 2023 20:49:16 +0200
Subject: [PATCH] show trending hashtags instead of notes in sidebar if not
 logged in

---
 packages/app/src/Pages/Layout/RightColumn.tsx | 35 +++++++++++++------
 packages/app/src/lang.json                    |  3 ++
 packages/app/src/translations/en.json         |  1 +
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/packages/app/src/Pages/Layout/RightColumn.tsx b/packages/app/src/Pages/Layout/RightColumn.tsx
index 64aed6af..dd710524 100644
--- a/packages/app/src/Pages/Layout/RightColumn.tsx
+++ b/packages/app/src/Pages/Layout/RightColumn.tsx
@@ -1,27 +1,40 @@
 import SearchBox from "@/Element/SearchBox";
 import TrendingNotes from "@/Element/Trending/TrendingPosts";
+import TrendingHashtags from "@/Element/Trending/TrendingHashtags";
 import { FormattedMessage } from "react-intl";
 import classNames from "classnames";
+import useLogin from "@/Hooks/useLogin";
 
 export default function RightColumn() {
+  const { pubkey } = useLogin(s => ({ pubkey: s.publicKey }));
   const hideRightColumnPaths = ["/login", "/new", "/messages", "/settings"];
   const show = !hideRightColumnPaths.some(path => location.pathname.startsWith(path));
+
+  const getTitleMessage = () => {
+    return pubkey ? (
+      <FormattedMessage defaultMessage="Trending notes" id="6k7xfM" />
+    ) : (
+      <FormattedMessage defaultMessage="Trending hashtags" id="CbM2hK" />
+    );
+  };
+
+  const getContent = () => {
+    return pubkey ? <TrendingNotes small={true} count={100} /> : <TrendingHashtags short={true} />;
+  };
+
   return (
     <div
-      className={classNames("flex-col hidden lg:w-1/3 sticky top-0 h-screen py-3 px-4 border-l border-border-color", {
-        "lg:flex": show,
-      })}>
+      className={classNames(
+        "text-secondary flex-col hidden lg:w-1/3 sticky top-0 h-screen py-3 px-4 border-l border-border-color",
+        {
+          "lg:flex": show,
+        },
+      )}>
       <div>
         <SearchBox />
       </div>
-      <div className="overflow-y-auto hide-scrollbar">
-        <div className="rounded-lg mt-8 text-gray-light">
-          <div className="font-bold text-lg">
-            <FormattedMessage defaultMessage="Trending notes" id="6k7xfM" />
-          </div>
-          <TrendingNotes small={true} count={100} />
-        </div>
-      </div>
+      <div className="font-bold text-lg mt-4 mb-2">{getTitleMessage()}</div>
+      <div className="overflow-y-auto hide-scrollbar flex-grow rounded-lg">{getContent()}</div>
     </div>
   );
 }
diff --git a/packages/app/src/lang.json b/packages/app/src/lang.json
index 63303228..76e635e4 100644
--- a/packages/app/src/lang.json
+++ b/packages/app/src/lang.json
@@ -386,6 +386,9 @@
   "CYkOCI": {
     "defaultMessage": "and {count} others you follow"
   },
+  "CbM2hK": {
+    "defaultMessage": "Trending hashtags"
+  },
   "CmZ9ls": {
     "defaultMessage": "{n} Muted"
   },
diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json
index a866f43b..56ac28d4 100644
--- a/packages/app/src/translations/en.json
+++ b/packages/app/src/translations/en.json
@@ -127,6 +127,7 @@
   "CHTbO3": "Failed to load invoice",
   "CVWeJ6": "Trending People",
   "CYkOCI": "and {count} others you follow",
+  "CbM2hK": "Trending hashtags",
   "CmZ9ls": "{n} Muted",
   "CsCUYo": "{n} sats",
   "Cu/K85": "Translated from {lang}",