From 4266964323d8804005be4f8b18c0caa7bea3a928 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 12:01:37 +0100
Subject: [PATCH 01/11] feat(sidebar): add desktop app banner

---
 src/components/sidebar/sidebar.module.css | 21 +++++++++++++++++++--
 src/components/sidebar/sidebar.tsx        | 13 ++++++++++++-
 src/themes.css                            |  2 ++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/src/components/sidebar/sidebar.module.css b/src/components/sidebar/sidebar.module.css
index 96cfa2f8..3729c946 100644
--- a/src/components/sidebar/sidebar.module.css
+++ b/src/components/sidebar/sidebar.module.css
@@ -258,7 +258,7 @@ a {
 }
 
 .footer {
-  font-family: arial, verdana, helvetica, sans-serif;
+  font: normal x-small verdana, arial, helvetica, sans-serif;
 }
 
 .footer ul {
@@ -286,11 +286,28 @@ a {
 }
 
 .version {
- margin: 14px 0 24px 0;
+ margin: 7px 0 24px 0;
  text-align: center;
  font-size: 10px;
 }
 
 .unstable a {
   color: var(--yellow);
+}
+
+.desktopAd {
+  margin-top: 10px;
+  padding: 5px 0 15px 0;
+}
+
+.desktopAdSubtitle {
+  font: normal x-small verdana, arial, helvetica, sans-serif;
+  font-size: 10px;
+  color: var(--gray-strong);
+}
+
+.desktopAdMascot img {
+  height: 40px;
+  margin: 5px 10px 0 0;
+  float: left;
 }
\ No newline at end of file
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 06c1d18e..1679f974 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -224,9 +224,20 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
             </a>
           </li>
         </ul>
+        <div className={styles.desktopAd}>
+          <a className={styles.desktopAdMascot} href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
+            <img src='icon.png' alt='seedit mascot' />
+          </a>
+          <span className={styles.desktopAdSubtitle}>
+            <br />
+            ...each community's data needs to be seeded!
+            <br />
+            ...seed it automatically with the desktop app.
+          </span>
+        </div>
         <div className={`${styles.version} ${commitRef ? styles.unstable : ''}`}>
           <a href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
-            seedit {commitRef ? 'development build ' + commitRef : window.electron && window.electron.isElectron ? 'desktop' : 'web'} v{version} - GPL 2.0
+            seedit {commitRef ? 'dev build (unstable) ' + commitRef : window.electron && window.electron.isElectron ? 'desktop' : 'web'} v{version} - GPL 2.0
           </a>
         </div>
       </div>
diff --git a/src/themes.css b/src/themes.css
index d2b628fb..36f95c1c 100644
--- a/src/themes.css
+++ b/src/themes.css
@@ -9,6 +9,7 @@
   --code-background: #fcfcfb;
   --code-border: #e6e6de;
   --red: red;
+  --gray-strong: dimgray;
   --gray-footer: #777;
   --gray-contrast: #888;
   --gray-overlay: #F7F7F7;
@@ -68,6 +69,7 @@
   --code-background: rgb(19, 19, 13);
   --code-border: rgb(52, 58, 60);
   --red: rgb(200, 0, 0);
+  --gray-strong: rgb(168, 160, 147);
   --gray-footer: rgb(158, 149, 136);
   --gray-contrast: #c7c7c7;
   --gray-overlay: #1f1f1f;

From e1e28b94909149ecd9ebd92e7241a93918f74cd7 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 12:25:13 +0100
Subject: [PATCH 02/11] feat: add mobile about page to home, p/all

---
 src/app.tsx                        |  3 +++
 src/components/header/header.tsx   | 10 +++++++---
 src/components/sidebar/sidebar.tsx |  5 +++--
 src/lib/utils/view-utils.ts        | 10 ++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 14f1b7ef..c7ff5e8d 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -80,6 +80,9 @@ function App() {
           </Route>
           <Route element={pagesLayout}>
             <Route path='/submit' element={<Submit />} />
+            <Route path='/about' element={<About />} />
+
+            <Route path='/p/all/about' element={<About />} />
 
             <Route path='/p/:subplebbitAddress/c/:commentCid' element={<Post />} />
             <Route path='/p/:subplebbitAddress/c/:commentCid/about' element={<About />} />
diff --git a/src/components/header/header.tsx b/src/components/header/header.tsx
index 1bf589a6..0addc432 100644
--- a/src/components/header/header.tsx
+++ b/src/components/header/header.tsx
@@ -7,10 +7,12 @@ import {
   getAboutLink,
   isAboutView,
   isAllView,
+  isAllAboutView,
   isAuthorView,
   isAuthorCommentsView,
   isAuthorSubmittedView,
   isProfileDownvotedView,
+  isHomeAboutView,
   isHomeView,
   isInboxView,
   isPendingView,
@@ -235,6 +237,7 @@ const HeaderTabs = () => {
   const location = useLocation();
   const isInAllView = isAllView(location.pathname);
   const isInAuthorView = isAuthorView(location.pathname);
+  const isInHomeAboutView = isHomeAboutView(location.pathname);
   const isInHomeView = isHomeView(location.pathname, params);
   const isInInboxView = isInboxView(location.pathname);
   const isInPendingView = isPendingView(location.pathname, params);
@@ -247,7 +250,7 @@ const HeaderTabs = () => {
 
   if (isInPostView) {
     return <CommentsButton />;
-  } else if (isInHomeView || (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView) || isInAllView) {
+  } else if (isInHomeView || isInHomeAboutView || (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView) || isInAllView) {
     return <SortItems />;
   } else if ((isInProfileView || isInAuthorView) && !isInPendingView) {
     return <AuthorHeaderTabs />;
@@ -321,6 +324,7 @@ const Header = () => {
 
   const isMobile = window.innerWidth < 768;
   const isInAboutView = isAboutView(location.pathname);
+  const isInAllAboutView = isAllAboutView(location.pathname);
   const isInAllView = isAllView(location.pathname);
   const isInAuthorView = isAuthorView(location.pathname);
   const isInHomeView = isHomeView(location.pathname, params);
@@ -343,7 +347,7 @@ const Header = () => {
     isInHomeView ||
     (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView && !isInPostView && !isInAboutView) ||
     (isInProfileView && !isInAboutView) ||
-    isInAllView ||
+    (isInAllView && !isInAllAboutView) ||
     (isInAuthorView && !isInAboutView);
   const logoSrc = isInSubplebbitView ? suggested?.avatarUrl : isInProfileView ? imageUrl : 'assets/logo/seedit.png';
   const logoIsAvatar = (isInSubplebbitView && suggested?.avatarUrl) || (isInProfileView && imageUrl);
@@ -385,7 +389,7 @@ const Header = () => {
         <div className={`${styles.tabs} ${hasFewTabs ? styles.fewTabs : ''}`}>
           <ul className={styles.tabMenu}>
             <HeaderTabs />
-            {(isInSubplebbitView || isInSubplebbitSubmitView || isInPostView) && <AboutButton />}
+            {(isInHomeView || isInAllView || isInAboutView || isInSubplebbitView || isInSubplebbitSubmitView || isInPostView) && <AboutButton />}
           </ul>
         </div>
       )}
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 1679f974..77cadbf2 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -5,7 +5,7 @@ import { useAccount, useBlock, Role, useSubplebbitStats, useAccountComment } fro
 import styles from './sidebar.module.css';
 import { getFormattedDate, getFormattedTimeDuration, getFormattedTimeAgo } from '../../lib/utils/time-utils';
 import { findSubplebbitCreator } from '../../lib/utils/user-utils';
-import { isAboutView, isAllView, isHomeView, isPendingView, isPostView, isSubplebbitSettingsView, isSubplebbitsView } from '../../lib/utils/view-utils';
+import { isAboutView, isAllView, isHomeAboutView, isHomeView, isPendingView, isPostView, isSubplebbitSettingsView, isSubplebbitsView } from '../../lib/utils/view-utils';
 import Markdown from '../markdown';
 import SearchBar from '../search-bar';
 import SubscribeButton from '../subscribe-button';
@@ -109,6 +109,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
   const params = useParams();
   const isInAboutView = isAboutView(location.pathname);
   const isInAllView = isAllView(location.pathname);
+  const isInHomeAboutView = isHomeAboutView(location.pathname);
   const isInHomeView = isHomeView(location.pathname, params);
   const isInPendingView = isPendingView(location.pathname, params);
   const isInPostView = isPostView(location.pathname, params);
@@ -158,7 +159,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
           <div className={styles.nub} />
         </div>
       </Link>
-      {!isInHomeView && !isInAllView && !isInPendingView && !isInSubplebbitsView && (
+      {!isInHomeView && !isInHomeAboutView && !isInAllView && !isInPendingView && !isInSubplebbitsView && (
         <div className={styles.titleBox}>
           <Link className={styles.title} to={`/p/${address}`}>
             {address}
diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts
index 1363125a..ca0c3967 100644
--- a/src/lib/utils/view-utils.ts
+++ b/src/lib/utils/view-utils.ts
@@ -21,6 +21,8 @@ export const getAboutLink = (pathname: string, params: ParamsType): string => {
     return '/profile/about';
   } else if (pathname.startsWith('/u/')) {
     return `/u/${params.authorAddress}/c/${params.commentCid}/about`;
+  } else if (pathname.startsWith('/p/all')) {
+    return '/p/all/about';
   } else {
     return '/about';
   }
@@ -34,6 +36,10 @@ export const isAllView = (pathname: string): boolean => {
   return pathname.startsWith('/p/all');
 };
 
+export const isAllAboutView = (pathname: string): boolean => {
+  return pathname === '/p/all/about';
+};
+
 export const isAuthorView = (pathname: string): boolean => {
   return pathname.startsWith('/u/');
 };
@@ -54,6 +60,10 @@ export const isHomeView = (pathname: string, params: ParamsType): boolean => {
   return pathname === '/' || sortTypes.includes(pathname) || (timeFilterNames.includes(params.timeFilterName as TimeFilterKey) && !pathname.startsWith('/p/all'));
 };
 
+export const isHomeAboutView = (pathname: string): boolean => {
+  return pathname === '/about';
+};
+
 export const isInboxView = (pathname: string): boolean => {
   return pathname.startsWith('/inbox');
 };

From 97c7b1c012d23d310c47f3fab5a8825c5733a7b3 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 13:20:22 +0100
Subject: [PATCH 03/11] Update sidebar.tsx

---
 src/components/sidebar/sidebar.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 77cadbf2..c52c647d 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -231,9 +231,9 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
           </a>
           <span className={styles.desktopAdSubtitle}>
             <br />
-            ...each community's data needs to be seeded!
+            ...each community's data needs to be seeded.
             <br />
-            ...seed it automatically with the desktop app.
+            ...use the desktop app to seed it automatically!
           </span>
         </div>
         <div className={`${styles.version} ${commitRef ? styles.unstable : ''}`}>

From feba4ed6857e9146fb47e9e87eb9a54f0f0eae22 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 13:34:49 +0100
Subject: [PATCH 04/11] Update sidebar.tsx

---
 src/components/sidebar/sidebar.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index c52c647d..743a9e45 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -119,7 +119,8 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
 
   const subplebbitCreator = findSubplebbitCreator(roles);
   const creatorAddress = subplebbitCreator === 'anonymous' ? 'anonymous' : `${getShortAddress(subplebbitCreator)}`;
-  const submitRoute = isInHomeView || isInAllView ? '/submit' : isInPendingView ? `/p/${pendingPost?.subplebbitAddress}/submit` : `/p/${address}/submit`;
+  const submitRoute =
+    isInHomeView || isInHomeAboutView || isInAllView ? '/submit' : isInPendingView ? `/p/${pendingPost?.subplebbitAddress}/submit` : `/p/${address}/submit`;
 
   const { blocked, unblock, block } = useBlock({ address });
 

From 90f9d3546c4fcd1d03fdcdcd3e8c5b7b26e13c35 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 13:48:18 +0100
Subject: [PATCH 05/11] fix(subplebbit): selecting the time filter would bug
 the header title and topbar

---
 src/lib/utils/view-utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts
index ca0c3967..d8d11b6d 100644
--- a/src/lib/utils/view-utils.ts
+++ b/src/lib/utils/view-utils.ts
@@ -57,7 +57,7 @@ export const isProfileDownvotedView = (pathname: string): boolean => {
 };
 
 export const isHomeView = (pathname: string, params: ParamsType): boolean => {
-  return pathname === '/' || sortTypes.includes(pathname) || (timeFilterNames.includes(params.timeFilterName as TimeFilterKey) && !pathname.startsWith('/p/all'));
+  return pathname === '/' || sortTypes.includes(pathname) || (timeFilterNames.includes(params.timeFilterName as TimeFilterKey) && !pathname.startsWith('/p/'));
 };
 
 export const isHomeAboutView = (pathname: string): boolean => {

From cf6f7d99470ff4b0f9154a4c5fe965cecf929fc8 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 15:07:18 +0100
Subject: [PATCH 06/11] feat(sidebar): version footer links to specific version
 changelog

---
 src/components/sidebar/sidebar.module.css | 2 +-
 src/components/sidebar/sidebar.tsx        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/sidebar/sidebar.module.css b/src/components/sidebar/sidebar.module.css
index 3729c946..0afc9422 100644
--- a/src/components/sidebar/sidebar.module.css
+++ b/src/components/sidebar/sidebar.module.css
@@ -306,7 +306,7 @@ a {
   color: var(--gray-strong);
 }
 
-.desktopAdMascot img {
+.desktopAdLogo img {
   height: 40px;
   margin: 5px 10px 0 0;
   float: left;
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 743a9e45..1778c9de 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -227,18 +227,18 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
           </li>
         </ul>
         <div className={styles.desktopAd}>
-          <a className={styles.desktopAdMascot} href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
+          <a className={styles.desktopAdLogo} href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
             <img src='icon.png' alt='seedit mascot' />
           </a>
           <span className={styles.desktopAdSubtitle}>
             <br />
-            ...each community's data needs to be seeded.
+            ...each community needs to be seeded.
             <br />
-            ...use the desktop app to seed it automatically!
+            ...the desktop app seeds automatically!
           </span>
         </div>
         <div className={`${styles.version} ${commitRef ? styles.unstable : ''}`}>
-          <a href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
+          <a href={`https://github.com/plebbit/seedit/releases/tag/v${version}`} target='_blank' rel='noopener noreferrer'>
             seedit {commitRef ? 'dev build (unstable) ' + commitRef : window.electron && window.electron.isElectron ? 'desktop' : 'web'} v{version} - GPL 2.0
           </a>
         </div>

From dbd2f348fbcf7009f6e0abacb7eb30423e32adf7 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 21:07:16 +0100
Subject: [PATCH 07/11] fix(topbar): subscriptions were showing in default sub
 list

---
 package.json                       |  6 +++---
 src/components/sidebar/sidebar.tsx |  2 +-
 src/components/topbar/topbar.tsx   | 10 +++++-----
 yarn.lock                          |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 2178f056..fe6750e3 100644
--- a/package.json
+++ b/package.json
@@ -27,12 +27,12 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-i18next": "13.2.2",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "9.0.1",
     "react-router-dom": "6.16.0",
     "react-scripts": "5.0.1",
     "react-virtuoso": "4.6.0",
-    "rehype-sanitize": "^6.0.0",
-    "remark-gfm": "^4.0.0",
+    "rehype-sanitize": "6.0.0",
+    "remark-gfm": "4.0.0",
     "tcp-port-used": "1.0.2",
     "typescript": "5.2.2",
     "zustand": "4.4.3"
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 1778c9de..ddc366d4 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -204,7 +204,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
       {roles && <ModeratorsList roles={roles} />}
       <div className={styles.footer}>
         <ul>
-          <li className={styles.footerTitle}>about</li>
+          <li className={styles.footerTitle}>{t('about')}</li>
           <li>
             <a href='https://plebbit.com' target='_blank' rel='noopener noreferrer'>
               plebbit
diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index dbcc7ed4..123d37b3 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useAccount } from '@plebbit/plebbit-react-hooks';
 import { getShortAddress } from '@plebbit/plebbit-js';
 import styles from './topbar.module.css';
-import { SubplebbitWithDisplay, useDefaultAndSubscriptionsSubplebbits } from '../../lib/utils/addresses-utils';
+import { SubplebbitWithDisplay, useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils';
 import useTimeFilter from '../../hooks/use-time-filter';
 import { isAllView, isHomeView, isSubplebbitView } from '../../lib/utils/view-utils';
 
@@ -12,7 +12,7 @@ const sortTypes = ['hot', 'new', 'active', 'controversialAll', 'topAll'];
 
 const TopBar = () => {
   const account = useAccount();
-  const subplebbitAddresses = useDefaultAndSubscriptionsSubplebbits();
+  const subplebbitAddresses = useDefaultSubplebbitAddresses();
   const { t } = useTranslation();
   const location = useLocation();
   const params = useParams();
@@ -155,11 +155,11 @@ const TopBar = () => {
               </Link>
             </li>
             <span className={styles.separator}> | </span>
-            {subplebbitAddresses?.map((subplebbit: SubplebbitWithDisplay, index) => (
+            {subplebbitAddresses?.map((address, index) => (
               <li key={index}>
                 {index !== 0 && <span className={styles.separator}>-</span>}
-                <Link to={`/p/${subplebbit.address}`} className={params.subplebbitAddress === subplebbit.address ? styles.selected : styles.choice}>
-                  {subplebbit.displayAddress}
+                <Link to={`/p/${address}`} className={params.subplebbitAddress === address ? styles.selected : styles.choice}>
+                  {address}
                 </Link>
               </li>
             ))}
diff --git a/yarn.lock b/yarn.lock
index 9b3165dd..bff2f365 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13248,7 +13248,7 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-markdown@^9.0.1:
+react-markdown@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-9.0.1.tgz#c05ddbff67fd3b3f839f8c648e6fb35d022397d1"
   integrity sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==
@@ -13567,7 +13567,7 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
-rehype-sanitize@^6.0.0:
+rehype-sanitize@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/rehype-sanitize/-/rehype-sanitize-6.0.0.tgz#16e95f4a67a69cbf0f79e113c8e0df48203db73c"
   integrity sha512-CsnhKNsyI8Tub6L4sm5ZFsme4puGfc6pYylvXo1AeqaGbjOYyzNv3qZPwvs0oMJ39eryyeOdmxwUIo94IpEhqg==
@@ -13580,7 +13580,7 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
-remark-gfm@^4.0.0:
+remark-gfm@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-4.0.0.tgz#aea777f0744701aa288b67d28c43565c7e8c35de"
   integrity sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==

From 16b0f39491317b8be501d5ad69eddffa6f2c63ee Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 21:59:56 +0100
Subject: [PATCH 08/11] feat(home): default time filter to 1 week to avoid
 showing old posts

---
 src/components/topbar/topbar.tsx | 21 +++++++++++----------
 src/views/home/home.tsx          |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index 123d37b3..4351262d 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useAccount } from '@plebbit/plebbit-react-hooks';
 import { getShortAddress } from '@plebbit/plebbit-js';
 import styles from './topbar.module.css';
-import { SubplebbitWithDisplay, useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils';
+import { useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils';
 import useTimeFilter from '../../hooks/use-time-filter';
 import { isAllView, isHomeView, isSubplebbitView } from '../../lib/utils/view-utils';
 
@@ -17,12 +17,13 @@ const TopBar = () => {
   const location = useLocation();
   const params = useParams();
   const { timeFilterNames } = useTimeFilter();
-  const selectedTimeFilterName = params.timeFilterName || timeFilterNames[5];
   const subscriptions = account?.subscriptions;
-  const isAll = isAllView(location.pathname);
-  const isHome = isHomeView(location.pathname, params);
-  const isSubplebbit = isSubplebbitView(location.pathname, params);
-  const homeButtonClass = isHome ? styles.selected : styles.choice;
+  const isinAllView = isAllView(location.pathname);
+  const isInHomeView = isHomeView(location.pathname, params);
+  const isInSubplebbitView = isSubplebbitView(location.pathname, params);
+  const homeButtonClass = isInHomeView ? styles.selected : styles.choice;
+
+  const selectedTimeFilterName = params.timeFilterName || (isInHomeView ? timeFilterNames[2] : timeFilterNames[5]);
 
   const [isSubsDropdownOpen, setIsSubsDropdownOpen] = useState(false);
   const toggleSubsDropdown = () => setIsSubsDropdownOpen(!isSubsDropdownOpen);
@@ -46,9 +47,9 @@ const TopBar = () => {
   const [selectedSortType, setSelectedSortType] = useState(params.sortType || '/hot');
 
   const getTimeFilterLink = (choice: string) => {
-    return isSubplebbit
+    return isInSubplebbitView
       ? `/p/${params.subplebbitAddress}/${selectedSortType}/${choice}`
-      : isAll
+      : isinAllView
       ? `p/all/${selectedSortType}/${choice}`
       : `/${selectedSortType}/${choice}`;
   };
@@ -125,7 +126,7 @@ const TopBar = () => {
           <span className={styles.selectedTitle}>{getSelectedSortLabel()}</span>
           <div className={`${styles.dropChoices} ${styles.sortsDropChoices} ${sortsDropdownClass}`} ref={sortsDropdownChoicesRef}>
             {sortTypes.map((choice, index) => (
-              <Link to={isSubplebbit ? `/p/${params.subplebbitAddress}/${choice}` : choice} key={index} className={styles.dropdownChoice}>
+              <Link to={isInSubplebbitView ? `/p/${params.subplebbitAddress}/${choice}` : choice} key={index} className={styles.dropdownChoice}>
                 {sortLabels[index]}
               </Link>
             ))}
@@ -150,7 +151,7 @@ const TopBar = () => {
             </li>
             <li>
               <span className={styles.separator}>-</span>
-              <Link to='/p/all' className={isAll ? styles.selected : styles.choice}>
+              <Link to='/p/all' className={isinAllView ? styles.selected : styles.choice}>
                 {t('all')}
               </Link>
             </li>
diff --git a/src/views/home/home.tsx b/src/views/home/home.tsx
index 777d2454..388f7f14 100644
--- a/src/views/home/home.tsx
+++ b/src/views/home/home.tsx
@@ -27,7 +27,7 @@ const Home = () => {
 
   const params = useParams<{ sortType?: string; timeFilterName?: string }>();
   const sortType = params?.sortType || 'hot';
-  const timeFilterName = (params.timeFilterName as TimeFilterKey) || 'all';
+  const timeFilterName = (params.timeFilterName as TimeFilterKey) || '1w';
   const { timeFilter } = useTimeFilter(sortType, timeFilterName);
 
   const { feed, hasMore, loadMore } = useFeed({

From 2578249e3049bbbf9d45bae176f2c7199a90625e Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Fri, 19 Jan 2024 12:12:44 +0100
Subject: [PATCH 09/11] feat(sidebar): add download links for the desktop
 client

---
 src/components/sidebar/sidebar.module.css | 17 +++++--
 src/components/sidebar/sidebar.tsx        | 59 ++++++++++++++++-------
 2 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/components/sidebar/sidebar.module.css b/src/components/sidebar/sidebar.module.css
index 0afc9422..d5080d14 100644
--- a/src/components/sidebar/sidebar.module.css
+++ b/src/components/sidebar/sidebar.module.css
@@ -262,7 +262,10 @@ a {
 }
 
 .footer ul {
-  text-align: left;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
   list-style: none;
 }
 
@@ -286,7 +289,7 @@ a {
 }
 
 .version {
- margin: 7px 0 24px 0;
+ margin: 20px 0 24px 0;
  text-align: center;
  font-size: 10px;
 }
@@ -296,13 +299,13 @@ a {
 }
 
 .desktopAd {
-  margin-top: 10px;
-  padding: 5px 0 15px 0;
+  padding: 0px 0 15px 0;
+  margin-top: -5px;
 }
 
 .desktopAdSubtitle {
   font: normal x-small verdana, arial, helvetica, sans-serif;
-  font-size: 10px;
+  font-size: 11px;
   color: var(--gray-strong);
 }
 
@@ -310,4 +313,8 @@ a {
   height: 40px;
   margin: 5px 10px 0 0;
   float: left;
+}
+
+.footerSecondTitle {
+  margin-top: 10px;
 }
\ No newline at end of file
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index ddc366d4..d8d69271 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -154,12 +154,6 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
           <div className={styles.nub} />
         </div>
       </Link>
-      <Link to='/communities/create' onClick={(e) => e.preventDefault()}>
-        <div className={styles.largeButton} onClick={alertCreateCommunity}>
-          {t('create_community')}
-          <div className={styles.nub} />
-        </div>
-      </Link>
       {!isInHomeView && !isInHomeAboutView && !isInAllView && !isInPendingView && !isInSubplebbitsView && (
         <div className={styles.titleBox}>
           <Link className={styles.title} to={`/p/${address}`}>
@@ -202,9 +196,26 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
       )}
       {isModerator && <ModerationTools address={address} />}
       {roles && <ModeratorsList roles={roles} />}
+      <Link to='/communities/create' onClick={(e) => e.preventDefault()}>
+        <div className={styles.largeButton} onClick={alertCreateCommunity}>
+          {t('create_community')}
+          <div className={styles.nub} />
+        </div>
+      </Link>
+      <div className={styles.desktopAd}>
+        <a className={styles.desktopAdLogo} href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
+          <img src='icon.png' alt='seedit mascot' />
+        </a>
+        <span className={styles.desktopAdSubtitle}>
+          <br />
+          ...each community needs to be seeded.
+          <br />
+          ...the desktop app seeds automatically!
+        </span>
+      </div>
       <div className={styles.footer}>
+        <div className={styles.footerTitle}>{t('about')}</div>
         <ul>
-          <li className={styles.footerTitle}>{t('about')}</li>
           <li>
             <a href='https://plebbit.com' target='_blank' rel='noopener noreferrer'>
               plebbit
@@ -226,17 +237,29 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
             </a>
           </li>
         </ul>
-        <div className={styles.desktopAd}>
-          <a className={styles.desktopAdLogo} href='https://github.com/plebbit/seedit/releases/latest' target='_blank' rel='noopener noreferrer'>
-            <img src='icon.png' alt='seedit mascot' />
-          </a>
-          <span className={styles.desktopAdSubtitle}>
-            <br />
-            ...each community needs to be seeded.
-            <br />
-            ...the desktop app seeds automatically!
-          </span>
-        </div>
+        <div className={`${styles.footerTitle} ${styles.footerSecondTitle}`}>apps & tools</div>
+        <ul>
+          <li>
+            <a href={`https://github.com/plebbit/seedit/releases/download/v${version}/seedit-${version}.AppImage`} target='_blank' rel='noopener noreferrer'>
+              download for linux
+            </a>
+          </li>
+          <li>
+            <a href={`https://github.com/plebbit/seedit/releases/download/v${version}/seedit.Portable.${version}.exe`} target='_blank' rel='noopener noreferrer'>
+              download for windows
+            </a>
+          </li>
+          <li>
+            <a href={`https://github.com/plebbit/seedit/releases/download/v${version}/seedit-${version}.dmg`} target='_blank' rel='noopener noreferrer'>
+              download for macOS
+            </a>
+          </li>
+          <li>
+            <a href={`https://github.com/plebbit/seedit/releases/latest`} target='_blank' rel='noopener noreferrer'>
+              download for android
+            </a>
+          </li>
+        </ul>
         <div className={`${styles.version} ${commitRef ? styles.unstable : ''}`}>
           <a href={`https://github.com/plebbit/seedit/releases/tag/v${version}`} target='_blank' rel='noopener noreferrer'>
             seedit {commitRef ? 'dev build (unstable) ' + commitRef : window.electron && window.electron.isElectron ? 'desktop' : 'web'} v{version} - GPL 2.0

From e59939375785e654c7bacefecc1ef3b44c031488 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Fri, 19 Jan 2024 13:07:31 +0100
Subject: [PATCH 10/11] fix(home): some text would be cut on mobile,
 padding-right was needed

---
 src/views/home/home.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home/home.module.css b/src/views/home/home.module.css
index d73210c4..d7808e00 100644
--- a/src/views/home/home.module.css
+++ b/src/views/home/home.module.css
@@ -8,7 +8,7 @@
 
 @media (max-width: 768px) {
   .content {
-    padding: 7px 0px 0px 0px;
+    padding: 7px 5px 0px 0px;
   }
 
   .sidebar {

From d2f924981e2cabf7800410dcb7ced4ce444fb50c Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Fri, 19 Jan 2024 17:26:19 +0100
Subject: [PATCH 11/11] feat(subplebbit settings): add challenges UI from API

---
 .../subplebbit-settings.module.css            |  15 ++
 .../subplebbit-settings.tsx                   | 141 +++++++++++++-----
 2 files changed, 116 insertions(+), 40 deletions(-)

diff --git a/src/views/subplebbit/subplebbit-settings/subplebbit-settings.module.css b/src/views/subplebbit/subplebbit-settings/subplebbit-settings.module.css
index fe81163f..8bbbbc9d 100644
--- a/src/views/subplebbit/subplebbit-settings/subplebbit-settings.module.css
+++ b/src/views/subplebbit/subplebbit-settings/subplebbit-settings.module.css
@@ -104,6 +104,21 @@
   margin-top: 5px;
 }
 
+.challengeOption {
+  font-size: 15px;
+  margin-top: 10px !important;
+}
+
+.challengeDescription {
+  margin: 5px 0 15px 0;
+  font-size: 15px;
+}
+
+.challengeOptionDescription {
+  margin: 5px 0;
+  font-size: 12px;
+}
+
 .moderator {
   font-size: 15px;
   color: var(--text);
diff --git a/src/views/subplebbit/subplebbit-settings/subplebbit-settings.tsx b/src/views/subplebbit/subplebbit-settings/subplebbit-settings.tsx
index a671ab08..1986cfb8 100644
--- a/src/views/subplebbit/subplebbit-settings/subplebbit-settings.tsx
+++ b/src/views/subplebbit/subplebbit-settings/subplebbit-settings.tsx
@@ -146,67 +146,128 @@ const Moderators = ({ roles }: { roles: RolesCollection | undefined }) => {
   );
 };
 
+const challenges = ['text-math', 'captcha-canvas-v3', 'fail', 'blacklist', 'question', 'evm-contract-call'];
+
 const Challenge = ({ challenge, selected, setSelected }: { challenge: string; selected: string; setSelected: (challenge: string) => void }) => {
   const { t } = useTranslation();
-  const [selectedChallenge, setSelectedChallenge] = useState('captcha');
+  const [selectedChallenge, setSelectedChallenge] = useState('none');
 
   return (
     <div className={styles.box}>
       <div className={styles.boxTitle}>{t('challenge')}</div>
       <div className={styles.boxSubtitle}>choose a challenge to prevent spam</div>
       <div className={`${styles.boxInput} ${styles.captchaSelect}`}>
-        <select defaultValue='captcha' onChange={(e) => setSelectedChallenge(e.target.value)}>
-          <option value='captcha'>captcha</option>
-          <option value='karma'>karma</option>
-          <option value='token'>token</option>
-          <option value='password'>password</option>
-          <option value='custom'>custom</option>
+        <select defaultValue='none' onChange={(e) => setSelectedChallenge(e.target.value)}>
+          {challenges.map((challenge) => (
+            <option key={challenge} value={challenge}>
+              {challenge}
+            </option>
+          ))}
           <option value='none'>none</option>
         </select>
-        {selectedChallenge === 'captcha' && (
+        {selectedChallenge === 'text-math' && (
           <>
-            <br />
-            <label>
-              <input type='checkbox' /> case sensitive
-            </label>
+            <div className={styles.challengeDescription}>Ask a plain text math question, insecure, use ONLY for testing.</div>
+            <div className={styles.challengeOption}>
+              Difficulty
+              <div className={styles.challengeOptionDescription}>The math difficulty of the challenge between 1-3.</div>
+              <input type='number' defaultValue={1} placeholder='1' />
+            </div>
           </>
         )}
-        {selectedChallenge === 'karma' && (
+        {selectedChallenge === 'captcha-canvas-v3' && (
           <>
-            <br />
-            <label>
-              Minimum karma: <input type='number' />
-            </label>
-          </>
-        )}
-        {selectedChallenge === 'token' && (
-          <>
-            <br />
-            <label>
-              Contract address (ERC20): <br />
-              <input type='text' />
-            </label>
-            <br />
-            <label>
-              Minumum balance: <br />
+            <div className={styles.challengeDescription}>make custom image captcha</div>
+            <div className={styles.challengeOption}>
+              Characters
+              <div className={styles.challengeOptionDescription}>Amount of characters of the captcha.</div>
               <input type='number' />
-            </label>
+            </div>
+            <div className={styles.challengeOption}>
+              Width
+              <div className={styles.challengeOptionDescription}>Height of the captcha.</div>
+              <input type='number' />
+            </div>
+            <div className={styles.challengeOption}>
+              Height
+              <div className={styles.challengeOptionDescription}>Width of the captcha.</div>
+              <input type='number' />
+            </div>
+            <div className={styles.challengeOption}>
+              Color
+              <div className={styles.challengeOptionDescription}>Color of the captcha.</div>
+              <input type='color' />
+            </div>
           </>
         )}
-        {selectedChallenge === 'password' && (
+        {selectedChallenge === 'fail' && (
           <>
-            <br />
-            <label>
-              Password (case sensitive): <input type='password' />
-            </label>
+            <div className={styles.challengeDescription}>A challenge that automatically fails with a custom error message.</div>
+            <div className={styles.challengeOption}>
+              Error
+              <div className={styles.challengeOptionDescription}>The error to display to the author.</div>
+              <input type='text' defaultValue="You're not allowed to publish." placeholder="You're not allowed to publish." />
+            </div>
           </>
         )}
-        {selectedChallenge === 'custom' && (
+        {selectedChallenge === 'blacklist' && (
           <>
-            <br />
-            <label>
-              Paste code: <textarea />
-            </label>
+            <div className={styles.challengeDescription}>Blacklist author addresses.</div>
+            <div className={styles.challengeOption}>
+              Blacklist
+              <div className={styles.challengeOptionDescription}>Comma separated list of author addresses to be blacklisted.</div>
+              <input type='text' placeholder='address1.eth,address2.eth,address3.eth' />
+            </div>
+            <div className={styles.challengeOption}>
+              Error
+              <div className={styles.challengeOptionDescription}>The error to display to the author.</div>
+              <input type='text' defaultValue="You're blacklisted." placeholder="You're blacklisted." />
+            </div>
+          </>
+        )}
+        {selectedChallenge === 'question' && (
+          <>
+            <div className={styles.challengeDescription}>Ask a question, like 'What is the password?'</div>
+            <div className={styles.challengeOption}>
+              Question
+              <div className={styles.challengeOptionDescription}>The question to answer.</div>
+              <input type='text' />
+            </div>
+            <div className={styles.challengeOption}>
+              Answer
+              <div className={styles.challengeOptionDescription}>The answer to the question.</div>
+              <input type='text' />
+            </div>
+          </>
+        )}
+        {selectedChallenge === 'evm-contract-call' && (
+          <>
+            <div className={styles.challengeDescription}>The response from an EVM contract call passes a condition, e.g. a token balance challenge.</div>
+            <div className={styles.challengeOption}>
+              chainTicker
+              <div className={styles.challengeOptionDescription}>The chain ticker</div>
+              <input type='text' placeholder='eth' defaultValue='eth' />
+            </div>
+            <div className={styles.challengeOption}>
+              Address
+              <div className={styles.challengeOptionDescription}>The contract address.</div>
+              <input type='text' placeholder='0x...' />
+            </div>
+            <div className={styles.challengeOption}>
+              ABI
+              <div className={styles.challengeOptionDescription}>The ABI of the contract method.</div>
+              <textarea placeholder='{"constant":true,"inputs":[{"internalType":"address","name":"account...' autoCorrect='off' autoComplete='off' spellCheck='false' />
+            </div>
+            <div className={styles.challengeOption}>
+              Condition
+              <div className={styles.challengeOptionDescription}>The condition the contract call response must pass.</div>
+              <textarea placeholder='>1000' autoCorrect='off' autoComplete='off' spellCheck='false' />
+            </div>
+            <div className={styles.challengeOption}>
+              Error
+              <div className={styles.challengeOptionDescription}>The error to display to the author.</div>
+              <input type='text' defaultValue="Contract call response doesn't pass condition." placeholder="Contract call response doesn't pass condition." />
+            </div>
           </>
         )}
         {selectedChallenge === 'none' && <span className={styles.noChallengeWarning}>Warning: vulnerable to spam attacks.</span>}