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

Revert "feat(board nav): don't list subplebbits that are offline"

Browse Source 
This reverts commit 1b755f9333.
This commit is contained in:
plebeius.eth
2024-04-18 17:14:49 +02:00
parent 6a55abc11c
commit 0a3d49ad83
1 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/board-nav/board-nav.tsx
+3 -32
View File
@@ -1,4 +1,3 @@
import { useMemo } from 'react';
import { Link, useLocation, useNavigate, useParams } from 'react-router-dom'; import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { Subplebbit } from '@plebbit/plebbit-react-hooks'; import { Subplebbit } from '@plebbit/plebbit-react-hooks';
@@ -14,25 +13,11 @@ const BoardNavDesktop = ({ subplebbits }: BoardNavProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const isInCatalogView = isCatalogView(useLocation().pathname, useParams()); const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
const sortedSubplebbits = useMemo(() => {
const oneHourAgo = Date.now() - 60 * 60 * 1000;
const retainedSubplebbits: (Subplebbit | undefined)[] = [];
subplebbits.forEach((sub: Subplebbit | undefined) => {
if (!sub || sub.updatedAt === undefined || sub.updatedAt * 1000 > oneHourAgo) {
// retain the position of loading, undefined, or online subplebbits
retainedSubplebbits.push(sub);
}
// don't include offline subs
});
return retainedSubplebbits;
}, [subplebbits]);
return ( return (
<div className={styles.boardNavDesktop}> <div className={styles.boardNavDesktop}>
<span className={styles.boardList}> <span className={styles.boardList}>
[ [
{sortedSubplebbits.map((subplebbit: any, index: number) => { {subplebbits.map((subplebbit: any, index: number) => {
const address = subplebbit?.address || ''; const address = subplebbit?.address || '';
const title = subplebbit?.title || ''; const title = subplebbit?.title || '';
return ( return (
@@ -41,7 +26,7 @@ const BoardNavDesktop = ({ subplebbits }: BoardNavProps) => {
<Link to={`/p/${address}${isInCatalogView ? '/catalog' : ''}`} title={title || ''}> <Link to={`/p/${address}${isInCatalogView ? '/catalog' : ''}`} title={title || ''}>
{address.includes('.') ? address : title || address.slice(0, 10).concat('...')} {address.includes('.') ? address : title || address.slice(0, 10).concat('...')}
</Link> </Link>
{index !== sortedSubplebbits.length - 1 ? ' /' : null} {index !== subplebbits.length - 1 ? ' /' : null}
</span> </span>
); );
})} })}
@@ -61,20 +46,6 @@ const BoardNavMobile = ({ subplebbits, currentSubplebbit }: BoardNavProps) => {
const currentSubplebbitIsInList = subplebbits.some((subplebbit: any) => subplebbit?.address === currentSubplebbit); const currentSubplebbitIsInList = subplebbits.some((subplebbit: any) => subplebbit?.address === currentSubplebbit);
const sortedSubplebbits = useMemo(() => {
const oneHourAgo = Date.now() - 60 * 60 * 1000;
const retainedSubplebbits: (Subplebbit | undefined)[] = [];
subplebbits.forEach((sub: Subplebbit | undefined) => {
if (!sub || sub.updatedAt === undefined || sub.updatedAt * 1000 > oneHourAgo) {
// retain the position of loading, undefined, or online subplebbits
retainedSubplebbits.push(sub);
}
// don't include offline subs
});
return retainedSubplebbits;
}, [subplebbits]);
const isInCatalogView = isCatalogView(useLocation().pathname, useParams()); const isInCatalogView = isCatalogView(useLocation().pathname, useParams());
const boardSelect = ( const boardSelect = (
@@ -82,7 +53,7 @@ const BoardNavMobile = ({ subplebbits, currentSubplebbit }: BoardNavProps) => {
{!currentSubplebbitIsInList && currentSubplebbit && <option value={currentSubplebbit}>{displaySubplebbitAddress}</option>} {!currentSubplebbitIsInList && currentSubplebbit && <option value={currentSubplebbit}>{displaySubplebbitAddress}</option>}
<option value='all'>{t('all')}</option> <option value='all'>{t('all')}</option>
<option value='subscriptions'>{t('subscriptions')}</option> <option value='subscriptions'>{t('subscriptions')}</option>
{sortedSubplebbits.map((subplebbit: any, index: number) => { {subplebbits.map((subplebbit: any, index: number) => {
const address = subplebbit?.address || ''; const address = subplebbit?.address || '';
const title = subplebbit?.title || ''; const title = subplebbit?.title || '';
const subplebbitAddress = address?.includes('.') ? address : title || address?.slice(0, 10).concat('...'); const subplebbitAddress = address?.includes('.') ? address : title || address?.slice(0, 10).concat('...');