+
diff --git a/src/components/version/index.ts b/src/components/version/index.ts
new file mode 100644
index 00000000..69de93ac
--- /dev/null
+++ b/src/components/version/index.ts
@@ -0,0 +1 @@
+export { default } from './version';
diff --git a/src/components/version/version.tsx b/src/components/version/version.tsx
new file mode 100644
index 00000000..9c80a133
--- /dev/null
+++ b/src/components/version/version.tsx
@@ -0,0 +1,18 @@
+import packageJson from '../../../package.json';
+
+const { version } = packageJson;
+const commitRef = process.env.REACT_APP_COMMIT_REF;
+
+const Version = () => {
+ return (
+
+ seedit v{commitRef ? '-dev' : version}
+
+ );
+};
+
+export default Version;
diff --git a/src/hooks/use-default-subplebbits.ts b/src/hooks/use-default-subplebbits.ts
index dc509f93..0905b99b 100644
--- a/src/hooks/use-default-subplebbits.ts
+++ b/src/hooks/use-default-subplebbits.ts
@@ -15,6 +15,7 @@ export interface MultisubSubplebbit {
tags?: string[];
features?: string[];
seeditAutoSubscribe?: boolean;
+ lowUptime?: boolean;
}
let cacheSubplebbits: MultisubSubplebbit[] | null = null;
@@ -34,14 +35,17 @@ export const useDefaultSubplebbits = () => {
'https://raw.githubusercontent.com/plebbit/temporary-default-subplebbits/master/multisub.json',
// { cache: 'no-cache' }
).then((res) => res.json());
- cacheSubplebbits = multisub.subplebbits;
+
+ const filteredSubplebbits = multisub.subplebbits.filter((sub: MultisubSubplebbit) => !sub.lowUptime);
+
+ cacheSubplebbits = filteredSubplebbits;
// Cache auto-subscribe addresses when we fetch subplebbits
- cacheAutoSubscribeAddresses = multisub.subplebbits
+ cacheAutoSubscribeAddresses = filteredSubplebbits
.filter((sub: MultisubSubplebbit) => sub.seeditAutoSubscribe && sub.address)
.map((sub: MultisubSubplebbit) => sub.address);
- setSubplebbits(multisub.subplebbits);
+ setSubplebbits(filteredSubplebbits);
} catch (e) {
console.warn(e);
}
@@ -51,6 +55,8 @@ export const useDefaultSubplebbits = () => {
return cacheSubplebbits || subplebbits;
};
+export const getAutoSubscribeAddresses = () => cacheAutoSubscribeAddresses || [];
+
export const useDefaultSubplebbitAddresses = () => {
const defaultSubplebbits = useDefaultSubplebbits();
const { hideAdultCommunities, hideGoreCommunities, hideAntiCommunities, hideVulgarCommunities } = useContentOptionsStore();
@@ -108,5 +114,3 @@ const getUniqueTags = (multisub: any) => {
export const useDefaultSubplebbitTags = (subplebbits: any) => {
return useMemo(() => getUniqueTags(subplebbits), [subplebbits]);
};
-
-export const getAutoSubscribeAddresses = () => cacheAutoSubscribeAddresses || [];
diff --git a/src/hooks/use-feed-state-string.ts b/src/hooks/use-feed-state-string.ts
deleted file mode 100644
index 1f41d9ce..00000000
--- a/src/hooks/use-feed-state-string.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useMemo } from 'react';
-import useStateString from './use-state-string';
-import { useSubplebbit, useSubplebbitsStates } from '@plebbit/plebbit-react-hooks';
-
-const clientHosts: { [key: string]: string } = {};
-
-const getClientHost = (clientUrl: string): string => {
- if (!clientHosts[clientUrl]) {
- try {
- clientHosts[clientUrl] = new URL(clientUrl).hostname || clientUrl;
- } catch (e) {
- clientHosts[clientUrl] = clientUrl;
- }
- }
- return clientHosts[clientUrl];
-};
-
-const useFeedStateString = (subplebbitAddresses?: string[]): string | undefined => {
- // single subplebbit feed state string
- const subplebbitAddress = subplebbitAddresses?.length === 1 ? subplebbitAddresses[0] : undefined;
- const subplebbit = useSubplebbit({ subplebbitAddress });
- const singleSubplebbitFeedStateString = useStateString(subplebbit);
-
- // multiple subplebbit feed state string
- const { states } = useSubplebbitsStates({ subplebbitAddresses });
-
- const multipleSubplebbitsFeedStateString = useMemo(() => {
- if (subplebbitAddress) {
- return;
- }
-
- // e.g. Resolving 2 addresses from infura.io, fetching 2 IPNS, 1 IPFS from cloudflare-ipfs.com, ipfs.io
- let stateString = '';
-
- if (states['resolving-address']) {
- const { subplebbitAddresses, clientUrls } = states['resolving-address'];
- if (subplebbitAddresses.length && clientUrls.length) {
- stateString += `resolving ${subplebbitAddresses.length} ${subplebbitAddresses.length === 1 ? 'address' : 'addresses'} from ${clientUrls
- .map(getClientHost)
- .join(', ')}`;
- }
- }
-
- // find all page client and sub addresses
- const pagesStatesClientHosts = new Set();
- const pagesStatesSubplebbitAddresses = new Set();
- for (const state in states) {
- if (state.match('page')) {
- states[state].clientUrls.forEach((clientUrl) => pagesStatesClientHosts.add(getClientHost(clientUrl)));
- states[state].subplebbitAddresses.forEach((subplebbitAddress) => pagesStatesSubplebbitAddresses.add(subplebbitAddress));
- }
- }
-
- if (states['fetching-ipns'] || states['fetching-ipfs'] || pagesStatesSubplebbitAddresses.size) {
- // separate 2 different states using ', '
- if (stateString) {
- stateString += ', ';
- }
-
- // find all client urls
- const clientHosts = new Set([...pagesStatesClientHosts]);
- states['fetching-ipns']?.clientUrls.forEach((clientUrl) => clientHosts.add(getClientHost(clientUrl)));
- states['fetching-ipfs']?.clientUrls.forEach((clientUrl) => clientHosts.add(getClientHost(clientUrl)));
-
- if (clientHosts.size) {
- stateString += 'fetching ';
- if (states['fetching-ipns']) {
- stateString += `${states['fetching-ipns'].subplebbitAddresses.length} IPNS`;
- }
- if (states['fetching-ipfs']) {
- if (states['fetching-ipns']) {
- stateString += ', ';
- }
- stateString += `${states['fetching-ipfs'].subplebbitAddresses.length} IPFS`;
- }
- if (pagesStatesSubplebbitAddresses.size) {
- if (states['fetching-ipns'] || states['fetching-ipfs']) {
- stateString += ', ';
- }
- stateString += `${pagesStatesSubplebbitAddresses.size} ${pagesStatesSubplebbitAddresses.size === 1 ? 'page' : 'pages'}`;
- }
- stateString += ` from ${[...clientHosts].join(', ')}`;
- }
- }
-
- // capitalize first letter
- stateString = stateString.charAt(0).toUpperCase() + stateString.slice(1);
-
- // if string is empty, return undefined instead
- return stateString === '' ? undefined : stateString;
- }, [states, subplebbitAddress]);
-
- if (singleSubplebbitFeedStateString) {
- return singleSubplebbitFeedStateString;
- }
- return multipleSubplebbitsFeedStateString;
-};
-
-export default useFeedStateString;
diff --git a/src/hooks/use-state-string.ts b/src/hooks/use-state-string.ts
index 8c7a6b2e..88aa00c7 100644
--- a/src/hooks/use-state-string.ts
+++ b/src/hooks/use-state-string.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { useClientsStates } from '@plebbit/plebbit-react-hooks';
+import { useClientsStates, useSubplebbit, useSubplebbitsStates } from '@plebbit/plebbit-react-hooks';
import { debounce } from 'lodash';
interface CommentOrSubplebbit {
@@ -59,7 +59,12 @@ const useStateString = (commentOrSubplebbit: CommentOrSubplebbit): string | unde
stateString = commentOrSubplebbit.updatingState;
}
if (stateString) {
- stateString = stateString.replaceAll('-', ' ').replace('ipfs', 'IPFS').replace('ipns', 'IPNS');
+ stateString = stateString
+ .replaceAll('-', ' ')
+ .replace('ipfs', 'post')
+ .replace('ipns', 'subplebbit')
+ .replace('fetching', 'downloading')
+ .replace('subplebbit subplebbit', 'community');
}
}
@@ -71,4 +76,85 @@ const useStateString = (commentOrSubplebbit: CommentOrSubplebbit): string | unde
}, [debouncedStates, commentOrSubplebbit]);
};
+export const useFeedStateString = (subplebbitAddresses?: string[]): string | undefined => {
+ // single subplebbit feed state string
+ const subplebbitAddress = subplebbitAddresses?.length === 1 ? subplebbitAddresses[0] : undefined;
+ const subplebbit = useSubplebbit({ subplebbitAddress });
+ const singleSubplebbitFeedStateString = useStateString(subplebbit);
+
+ // multiple subplebbit feed state string
+ const { states } = useSubplebbitsStates({ subplebbitAddresses });
+
+ const multipleSubplebbitsFeedStateString = useMemo(() => {
+ if (subplebbitAddress) {
+ return;
+ }
+
+ // e.g. Resolving 2 addresses from infura.io, fetching 2 IPNS, 1 IPFS from cloudflare-ipfs.com, ipfs.io
+ let stateString = '';
+
+ if (states['resolving-address']) {
+ const { subplebbitAddresses, clientUrls } = states['resolving-address'];
+ if (subplebbitAddresses.length && clientUrls.length) {
+ stateString += `resolving ${subplebbitAddresses.length} ${subplebbitAddresses.length === 1 ? 'address' : 'addresses'} from ${clientUrls
+ .map(getClientHost)
+ .join(', ')}`;
+ }
+ }
+
+ // find all page client and sub addresses
+ const pagesStatesClientHosts = new Set();
+ const pagesStatesSubplebbitAddresses = new Set();
+ for (const state in states) {
+ if (state.match('page')) {
+ states[state].clientUrls.forEach((clientUrl) => pagesStatesClientHosts.add(getClientHost(clientUrl)));
+ states[state].subplebbitAddresses.forEach((subplebbitAddress) => pagesStatesSubplebbitAddresses.add(subplebbitAddress));
+ }
+ }
+
+ if (states['fetching-ipns'] || states['fetching-ipfs'] || pagesStatesSubplebbitAddresses.size) {
+ // separate 2 different states using ', '
+ if (stateString) {
+ stateString += ', ';
+ }
+
+ // find all client urls
+ const clientHosts = new Set([...pagesStatesClientHosts]);
+ states['fetching-ipns']?.clientUrls.forEach((clientUrl) => clientHosts.add(getClientHost(clientUrl)));
+ states['fetching-ipfs']?.clientUrls.forEach((clientUrl) => clientHosts.add(getClientHost(clientUrl)));
+
+ if (clientHosts.size) {
+ stateString += 'downloading ';
+ if (states['fetching-ipns']) {
+ stateString += `${states['fetching-ipns'].subplebbitAddresses.length} communities`;
+ }
+ if (states['fetching-ipfs']) {
+ if (states['fetching-ipns']) {
+ stateString += ', ';
+ }
+ stateString += `${states['fetching-ipfs'].subplebbitAddresses.length} posts`;
+ }
+ if (pagesStatesSubplebbitAddresses.size) {
+ if (states['fetching-ipns'] || states['fetching-ipfs']) {
+ stateString += ', ';
+ }
+ stateString += `${pagesStatesSubplebbitAddresses.size} ${pagesStatesSubplebbitAddresses.size === 1 ? 'page' : 'pages'}`;
+ }
+ stateString += ` from ${[...clientHosts].join(', ')}`;
+ }
+ }
+
+ // capitalize first letter
+ stateString = stateString.charAt(0).toUpperCase() + stateString.slice(1);
+
+ // if string is empty, return undefined instead
+ return stateString === '' ? undefined : stateString;
+ }, [states, subplebbitAddress]);
+
+ if (singleSubplebbitFeedStateString) {
+ return singleSubplebbitFeedStateString;
+ }
+ return multipleSubplebbitsFeedStateString;
+};
+
export default useStateString;
diff --git a/src/views/author/author.module.css b/src/views/author/author.module.css
index d824ef35..5b27f046 100644
--- a/src/views/author/author.module.css
+++ b/src/views/author/author.module.css
@@ -6,6 +6,20 @@ div[data-viewport-type="window"] {
position: relative !important;
}
+.loadingString {
+ display: flex;
+ text-transform: lowercase;
+ font-size: 12px;
+ padding-left: 5px;
+ margin-top: 5px;
+}
+
+.noPosts {
+ color: var(--red);
+ font-size: 13px;
+ text-transform: lowercase;
+}
+
@media (max-width: 640px) {
.sidebarDesktop {
display: none;
diff --git a/src/views/author/author.tsx b/src/views/author/author.tsx
index 43df6ec8..8eb6fbd9 100644
--- a/src/views/author/author.tsx
+++ b/src/views/author/author.tsx
@@ -29,8 +29,14 @@ const Author = () => {
const replyComments = useMemo(() => authorComments?.filter((comment) => comment && comment.parentCid) || [], [authorComments]);
const postComments = useMemo(() => authorComments?.filter((comment) => comment && !comment.parentCid) || [], [authorComments]);
+ const loadingString = isInAuthorCommentsView ? t('loading_comments') : t('loading_posts');
+
const Footer = () => {
- return hasMore ?
: null;
+ return hasMore ? (
+
+
+
+ ) : null;
};
const virtuosoRef = useRef
(null);
@@ -76,7 +82,6 @@ const Author = () => {
- {authorComments?.length === 0 && !hasMore && {t('no_posts_found')}
}
{
restoreStateFrom={lastVirtuosoState}
initialScrollTop={lastVirtuosoState?.scrollTop}
/>
+ {virtuosoData?.length === 0 && !hasMore && {t('nothing_found')}
}