External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(home): "use catalog" button didn't work for some addresses

Browse Source
This commit is contained in:
Tom (plebeius.eth)
2024-08-29 12:51:22 +02:00
parent 068c30a322
commit 5c846fcdc8
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/home/boards-box/boards-box.tsx
+7 -6
View File
@@ -9,11 +9,10 @@ import { nsfwTags } from '../home';
import BoxModal from '../box-modal'; import BoxModal from '../box-modal';
import useIsSubplebbitOffline from '../../../hooks/use-is-subplebbit-offline'; import useIsSubplebbitOffline from '../../../hooks/use-is-subplebbit-offline';
const Board = ({ subplebbit, subplebbits }: { subplebbit: Subplebbit; subplebbits: any }) => { const Board = ({ subplebbit, subplebbits, useCatalog }: { subplebbit: Subplebbit; subplebbits: any; useCatalog?: boolean }) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { address, title, tags } = subplebbit || {}; const { address, title, tags } = subplebbit || {};
const nsfwTag = tags.find((tag: string) => nsfwTags.includes(tag)); const nsfwTag = tags.find((tag: string) => nsfwTags.includes(tag));
const { useCatalog } = useHomeFiltersStore();
const boardLink = useCatalog ? `/p/${address}/catalog` : `/p/${address}`; const boardLink = useCatalog ? `/p/${address}/catalog` : `/p/${address}`;
@@ -37,6 +36,8 @@ const BoardsBox = ({ multisub, subplebbits }: { multisub: Subplebbit[]; subplebb
const accountSubplebbitAddresses = Object.keys(accountSubplebbits); const accountSubplebbitAddresses = Object.keys(accountSubplebbits);
const { showNsfwBoardsOnly, showWorksafeBoardsOnly } = useHomeFiltersStore(); const { showNsfwBoardsOnly, showWorksafeBoardsOnly } = useHomeFiltersStore();
const { useCatalog } = useHomeFiltersStore();
const filterSubs = (subs: Subplebbit[], includeTags: string[], excludeTags: string[] = []) => const filterSubs = (subs: Subplebbit[], includeTags: string[], excludeTags: string[] = []) =>
subs.filter((sub) => includeTags.every((tag) => sub.tags?.includes(tag)) && excludeTags.every((tag) => !sub.tags?.includes(tag))); subs.filter((sub) => includeTags.every((tag) => sub.tags?.includes(tag)) && excludeTags.every((tag) => !sub.tags?.includes(tag)));
@@ -72,10 +73,10 @@ const BoardsBox = ({ multisub, subplebbits }: { multisub: Subplebbit[]; subplebb
<h3>Multiboards</h3> <h3>Multiboards</h3>
<div className={styles.list}> <div className={styles.list}>
<div className={styles.subplebbit}> <div className={styles.subplebbit}>
<Link to='/p/all'>{multisubMetadata?.title || 'All'}</Link> <Link to={useCatalog ? '/p/all/catalog' : '/p/all'}>{multisubMetadata?.title || 'All'}</Link>
</div> </div>
<div className={styles.subplebbit}> <div className={styles.subplebbit}>
<Link to='/p/subscriptions'>Subscriptions</Link> <Link to={useCatalog ? '/p/subscriptions/catalog' : '/p/subscriptions'}>Subscriptions</Link>
</div> </div>
</div> </div>
{plebbitSubs.length > 0 && ( {plebbitSubs.length > 0 && (
@@ -139,7 +140,7 @@ const BoardsBox = ({ multisub, subplebbits }: { multisub: Subplebbit[]; subplebb
{subscriptions.length > 0 {subscriptions.length > 0
? subscriptions.map((address: string, index: number) => ( ? subscriptions.map((address: string, index: number) => (
<div className={styles.subplebbit} key={index}> <div className={styles.subplebbit} key={index}>
<Link to={`/p/${address}`}>p/{address && Plebbit.getShortAddress(address)}</Link> <Link to={useCatalog ? `/p/${address}/catalog` : `/p/${address}`}>p/{address && Plebbit.getShortAddress(address)}</Link>
</div> </div>
)) ))
: t('not_subscribed')} : t('not_subscribed')}
@@ -149,7 +150,7 @@ const BoardsBox = ({ multisub, subplebbits }: { multisub: Subplebbit[]; subplebb
{accountSubplebbitAddresses.length > 0 {accountSubplebbitAddresses.length > 0
? accountSubplebbitAddresses.map((address: string, index: number) => ( ? accountSubplebbitAddresses.map((address: string, index: number) => (
<div className={styles.subplebbit} key={index}> <div className={styles.subplebbit} key={index}>
<Link to={`/p/${address}`}>p/{address && Plebbit.getShortAddress(address)}</Link> <Link to={useCatalog ? `/p/${address}/catalog` : `/p/${address}`}>p/{address && Plebbit.getShortAddress(address)}</Link>
</div> </div>
)) ))
: t('not_moderating')} : t('not_moderating')}