diff --git a/packages/app/src/Cache/CommunityLeadersStore.tsx b/packages/app/src/Cache/CommunityLeadersStore.tsx new file mode 100644 index 00000000..7e332a7f --- /dev/null +++ b/packages/app/src/Cache/CommunityLeadersStore.tsx @@ -0,0 +1,16 @@ +import {ExternalStore} from "@snort/shared"; + +class CommunityLeadersStore extends ExternalStore> { + #leaders: Array = []; + + setLeaders(arr: Array) { + this.#leaders = arr; + this.notifyChange(); + } + + takeSnapshot(): string[] { + return [...this.#leaders]; + } +} + +export const LeadersStore = new CommunityLeadersStore(); \ No newline at end of file diff --git a/packages/app/src/Cache/TextCache.tsx b/packages/app/src/Cache/TextCache.tsx new file mode 100644 index 00000000..310e3d16 --- /dev/null +++ b/packages/app/src/Cache/TextCache.tsx @@ -0,0 +1,6 @@ +import {ParsedFragment} from "@snort/system"; +import {LRUCache} from "typescript-lru-cache"; + +export const TextCache = new LRUCache>({ + maxSize: 1000 +}); \ No newline at end of file diff --git a/packages/app/src/Components/Feed/RootTabItems.tsx b/packages/app/src/Components/Feed/RootTabItems.tsx new file mode 100644 index 00000000..2d45e67c --- /dev/null +++ b/packages/app/src/Components/Feed/RootTabItems.tsx @@ -0,0 +1,114 @@ +import {ReactNode} from "react"; +import {FormattedMessage} from "react-intl"; + +import Icon from "@/Components/Icons/Icon"; +import {Newest} from "@/Utils/Login"; + +export type RootTab = + | "following" + | "followed-by-friends" + | "conversations" + | "trending-notes" + | "trending-people" + | "suggested" + | "tags" + | "global"; + +export function rootTabItems(base: string, pubKey: string | undefined, tags: Newest>) { + const menuItems = [ + { + tab: "following", + path: `${base}/notes`, + show: Boolean(pubKey), + element: ( + <> + + + + ), + }, + { + tab: "trending-notes", + path: `${base}/trending/notes`, + show: true, + element: ( + <> + + + + ), + }, + { + tab: "conversations", + path: `${base}/conversations`, + show: Boolean(pubKey), + element: ( + <> + + + + ), + }, + { + tab: "followed-by-friends", + path: `${base}/followed-by-friends`, + show: Boolean(pubKey), + element: ( + <> + + + + ), + }, + { + tab: "suggested", + path: `${base}/suggested`, + show: Boolean(pubKey), + element: ( + <> + + + + ), + }, + { + tab: "trending-hashtags", + path: `${base}/trending/hashtags`, + show: true, + element: ( + <> + + + + ), + }, + { + tab: "global", + path: `${base}/global`, + show: true, + element: ( + <> + + + + ), + }, + { + tab: "tags", + path: `${base}/topics`, + show: tags.item.length > 0, + element: ( + <> + + + + ), + }, + ] as Array<{ + tab: RootTab; + path: string; + show: boolean; + element: ReactNode; + }>; + return menuItems; +} \ No newline at end of file diff --git a/packages/app/src/Components/Feed/RootTabs.tsx b/packages/app/src/Components/Feed/RootTabs.tsx index 638ed440..7e778145 100644 --- a/packages/app/src/Components/Feed/RootTabs.tsx +++ b/packages/app/src/Components/Feed/RootTabs.tsx @@ -1,122 +1,12 @@ import "./RootTabs.css"; -import { Menu, MenuItem } from "@szhsin/react-menu"; -import { ReactNode, useEffect, useMemo, useState } from "react"; -import { FormattedMessage } from "react-intl"; -import { useLocation, useNavigate } from "react-router-dom"; +import {Menu, MenuItem} from "@szhsin/react-menu"; +import {useEffect, useMemo, useState} from "react"; +import {useLocation, useNavigate} from "react-router-dom"; +import {RootTab, rootTabItems} from "@/Components/Feed/RootTabItems"; import Icon from "@/Components/Icons/Icon"; import useLogin from "@/Hooks/useLogin"; -import { Newest } from "@/Utils/Login"; - -export type RootTab = - | "following" - | "followed-by-friends" - | "conversations" - | "trending-notes" - | "trending-people" - | "suggested" - | "tags" - | "global"; - -export function rootTabItems(base: string, pubKey: string | undefined, tags: Newest>) { - const menuItems = [ - { - tab: "following", - path: `${base}/notes`, - show: Boolean(pubKey), - element: ( - <> - - - - ), - }, - { - tab: "trending-notes", - path: `${base}/trending/notes`, - show: true, - element: ( - <> - - - - ), - }, - { - tab: "conversations", - path: `${base}/conversations`, - show: Boolean(pubKey), - element: ( - <> - - - - ), - }, - { - tab: "followed-by-friends", - path: `${base}/followed-by-friends`, - show: Boolean(pubKey), - element: ( - <> - - - - ), - }, - { - tab: "suggested", - path: `${base}/suggested`, - show: Boolean(pubKey), - element: ( - <> - - - - ), - }, - { - tab: "trending-hashtags", - path: `${base}/trending/hashtags`, - show: true, - element: ( - <> - - - - ), - }, - { - tab: "global", - path: `${base}/global`, - show: true, - element: ( - <> - - - - ), - }, - { - tab: "tags", - path: `${base}/topics`, - show: tags.item.length > 0, - element: ( - <> - - - - ), - }, - ] as Array<{ - tab: RootTab; - path: string; - show: boolean; - element: ReactNode; - }>; - return menuItems; -} export function RootTabs({ base = "/" }: { base: string }) { const navigate = useNavigate(); diff --git a/packages/app/src/Components/IntlProvider/IntlProvider.tsx b/packages/app/src/Components/IntlProvider/IntlProvider.tsx index d9be9b47..eb35a1db 100644 --- a/packages/app/src/Components/IntlProvider/IntlProvider.tsx +++ b/packages/app/src/Components/IntlProvider/IntlProvider.tsx @@ -1,7 +1,8 @@ import { ReactNode, useEffect, useState } from "react"; import { IntlProvider as ReactIntlProvider } from "react-intl"; -import { DefaultLocale, useLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import { DefaultLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import {useLocale} from "@/Components/IntlProvider/useLocale"; import enMessages from "@/translations/en.json"; const getMessages = (locale: string) => { diff --git a/packages/app/src/Components/IntlProvider/IntlProviderUtils.tsx b/packages/app/src/Components/IntlProvider/IntlProviderUtils.tsx index 35f0a07f..af878e97 100644 --- a/packages/app/src/Components/IntlProvider/IntlProviderUtils.tsx +++ b/packages/app/src/Components/IntlProvider/IntlProviderUtils.tsx @@ -1,37 +1,5 @@ -import { ExternalStore } from "@snort/shared"; -import { useSyncExternalStore } from "react"; - -import useLogin from "@/Hooks/useLogin"; - export const DefaultLocale = "en-US"; -class LangStore extends ExternalStore { - setLang(s: string) { - localStorage.setItem("lang", s); - this.notifyChange(); - } - - takeSnapshot() { - return localStorage.getItem("lang"); - } -} - -const LangOverride = new LangStore(); - -export function useLocale() { - const { language } = useLogin(s => ({ language: s.appData.item.preferences.language })); - const loggedOutLang = useSyncExternalStore( - c => LangOverride.hook(c), - () => LangOverride.snapshot(), - ); - const locale = language ?? loggedOutLang ?? getLocale(); - return { - locale, - lang: locale.toLowerCase().split(/[_-]+/)[0], - setOverride: (s: string) => LangOverride.setLang(s), - }; -} - export const getLocale = () => { return (navigator.languages && navigator.languages[0]) ?? navigator.language ?? DefaultLocale; }; diff --git a/packages/app/src/Components/IntlProvider/langStore.tsx b/packages/app/src/Components/IntlProvider/langStore.tsx new file mode 100644 index 00000000..466e2004 --- /dev/null +++ b/packages/app/src/Components/IntlProvider/langStore.tsx @@ -0,0 +1,14 @@ +import {ExternalStore} from "@snort/shared"; + +class LangStore extends ExternalStore { + setLang(s: string) { + localStorage.setItem("lang", s); + this.notifyChange(); + } + + takeSnapshot() { + return localStorage.getItem("lang"); + } +} + +export const LangOverride = new LangStore(); \ No newline at end of file diff --git a/packages/app/src/Components/IntlProvider/useLocale.tsx b/packages/app/src/Components/IntlProvider/useLocale.tsx new file mode 100644 index 00000000..fb9afaa5 --- /dev/null +++ b/packages/app/src/Components/IntlProvider/useLocale.tsx @@ -0,0 +1,19 @@ +import {useSyncExternalStore} from "react"; + +import {getLocale} from "@/Components/IntlProvider/IntlProviderUtils"; +import {LangOverride} from "@/Components/IntlProvider/langStore"; +import useLogin from "@/Hooks/useLogin"; + +export function useLocale() { + const {language} = useLogin(s => ({language: s.appData.item.preferences.language})); + const loggedOutLang = useSyncExternalStore( + c => LangOverride.hook(c), + () => LangOverride.snapshot(), + ); + const locale = language ?? loggedOutLang ?? getLocale(); + return { + locale, + lang: locale.toLowerCase().split(/[_-]+/)[0], + setOverride: (s: string) => LangOverride.setLang(s), + }; +} \ No newline at end of file diff --git a/packages/app/src/Components/Trending/TrendingHashtags.tsx b/packages/app/src/Components/Trending/TrendingHashtags.tsx index 811a2bfd..f1def20a 100644 --- a/packages/app/src/Components/Trending/TrendingHashtags.tsx +++ b/packages/app/src/Components/Trending/TrendingHashtags.tsx @@ -2,7 +2,7 @@ import classNames from "classnames"; import { ReactNode } from "react"; import { Link } from "react-router-dom"; -import { useLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import {useLocale} from "@/Components/IntlProvider/useLocale"; import PageSpinner from "@/Components/PageSpinner"; import NostrBandApi from "@/External/NostrBand"; import useCachedFetch from "@/Hooks/useCachedFetch"; diff --git a/packages/app/src/Components/Trending/TrendingPosts.tsx b/packages/app/src/Components/Trending/TrendingPosts.tsx index e2ef2e82..5cad43af 100644 --- a/packages/app/src/Components/Trending/TrendingPosts.tsx +++ b/packages/app/src/Components/Trending/TrendingPosts.tsx @@ -7,7 +7,7 @@ import { ErrorOrOffline } from "@/Components/ErrorOrOffline"; import Note from "@/Components/Event/EventComponent"; import { DisplayAs, DisplayAsSelector } from "@/Components/Feed/DisplayAsSelector"; import ImageGridItem from "@/Components/Feed/ImageGridItem"; -import { useLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import {useLocale} from "@/Components/IntlProvider/useLocale"; import PageSpinner from "@/Components/PageSpinner"; import { SpotlightThreadModal } from "@/Components/Spotlight/SpotlightThreadModal"; import ShortNote from "@/Components/Trending/ShortNote"; diff --git a/packages/app/src/Components/User/Nip05.tsx b/packages/app/src/Components/User/Nip05.tsx index 04fa94b4..749949fd 100644 --- a/packages/app/src/Components/User/Nip05.tsx +++ b/packages/app/src/Components/User/Nip05.tsx @@ -3,12 +3,12 @@ import "./Nip05.css"; import { HexKey } from "@snort/system"; import { useUserProfile } from "@snort/system-react"; -export function useIsVerified(pubkey?: HexKey, bypassCheck?: boolean) { +function useIsVerified(pubkey?: HexKey, bypassCheck?: boolean) { const profile = useUserProfile(pubkey); return { isVerified: bypassCheck || profile?.isNostrAddressValid }; } -export interface Nip05Params { +interface Nip05Params { nip05?: string; pubkey: HexKey; verifyNip?: boolean; diff --git a/packages/app/src/Hooks/useCommunityLeaders.tsx b/packages/app/src/Hooks/useCommunityLeaders.tsx index c84cea5c..356a01a3 100644 --- a/packages/app/src/Hooks/useCommunityLeaders.tsx +++ b/packages/app/src/Hooks/useCommunityLeaders.tsx @@ -1,23 +1,10 @@ -import { ExternalStore, unwrap } from "@snort/shared"; -import { EventKind, parseNostrLink } from "@snort/system"; -import { useEffect, useSyncExternalStore } from "react"; +import {unwrap} from "@snort/shared"; +import {EventKind, parseNostrLink} from "@snort/system"; +import {useEffect, useSyncExternalStore} from "react"; -import { useLinkList } from "./useLists"; +import {LeadersStore} from "@/Cache/CommunityLeadersStore"; -class CommunityLeadersStore extends ExternalStore> { - #leaders: Array = []; - - setLeaders(arr: Array) { - this.#leaders = arr; - this.notifyChange(); - } - - takeSnapshot(): string[] { - return [...this.#leaders]; - } -} - -const LeadersStore = new CommunityLeadersStore(); +import {useLinkList} from "./useLists"; export function useCommunityLeaders() { const link = parseNostrLink(unwrap(CONFIG.communityLeaders).list); diff --git a/packages/app/src/Hooks/useRates.tsx b/packages/app/src/Hooks/useRates.tsx index 74701226..b8427401 100644 --- a/packages/app/src/Hooks/useRates.tsx +++ b/packages/app/src/Hooks/useRates.tsx @@ -1,12 +1,10 @@ -import { bech32ToHex } from "@snort/shared"; -import { EventKind, RequestBuilder } from "@snort/system"; -import { useRequestBuilder } from "@snort/system-react"; -import { useMemo } from "react"; +import {bech32ToHex} from "@snort/shared"; +import {EventKind, RequestBuilder} from "@snort/system"; +import {useRequestBuilder} from "@snort/system-react"; +import {useMemo} from "react"; -import { getNewest } from "@/Utils"; - -// Snort backend publishes rates -const SnortPubkey = "npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"; +import {getNewest} from "@/Utils"; +import {SnortPubkey} from "@/Utils/Const"; export function useRates(symbol: string, leaveOpen = true) { const sub = useMemo(() => { diff --git a/packages/app/src/Hooks/useTextTransformCache.tsx b/packages/app/src/Hooks/useTextTransformCache.tsx index 4c562658..b920a27d 100644 --- a/packages/app/src/Hooks/useTextTransformCache.tsx +++ b/packages/app/src/Hooks/useTextTransformCache.tsx @@ -1,6 +1,6 @@ -import { ParsedFragment, transformText } from "@snort/system"; +import {transformText} from "@snort/system"; -const TextCache = new Map>(); +import {TextCache} from "@/Cache/TextCache"; export function transformTextCached(id: string, content: string, tags: Array>) { if (content.length > 0) { diff --git a/packages/app/src/Pages/Layout/Header.tsx b/packages/app/src/Pages/Layout/Header.tsx index e315c198..15f127e7 100644 --- a/packages/app/src/Pages/Layout/Header.tsx +++ b/packages/app/src/Pages/Layout/Header.tsx @@ -5,7 +5,8 @@ import React, { useCallback, useMemo } from "react"; import { FormattedMessage } from "react-intl"; import { useLocation, useNavigate } from "react-router-dom"; -import { rootTabItems, RootTabs } from "@/Components/Feed/RootTabs"; +import {rootTabItems} from "@/Components/Feed/RootTabItems"; +import { RootTabs } from "@/Components/Feed/RootTabs"; import Icon from "@/Components/Icons/Icon"; import DisplayName from "@/Components/User/DisplayName"; import useLogin from "@/Hooks/useLogin"; diff --git a/packages/app/src/Pages/onboarding/index.tsx b/packages/app/src/Pages/onboarding/index.tsx index f83d1d1e..d37cc98d 100644 --- a/packages/app/src/Pages/onboarding/index.tsx +++ b/packages/app/src/Pages/onboarding/index.tsx @@ -3,7 +3,8 @@ import "./index.css"; import { Outlet, RouteObject } from "react-router-dom"; import Icon from "@/Components/Icons/Icon"; -import { AllLanguageCodes, useLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import { AllLanguageCodes } from "@/Components/IntlProvider/IntlProviderUtils"; +import {useLocale} from "@/Components/IntlProvider/useLocale"; import { Discover } from "./discover"; import { Moderation } from "./moderation"; diff --git a/packages/app/src/Pages/settings/Preferences.tsx b/packages/app/src/Pages/settings/Preferences.tsx index b5d75d81..934aae65 100644 --- a/packages/app/src/Pages/settings/Preferences.tsx +++ b/packages/app/src/Pages/settings/Preferences.tsx @@ -2,7 +2,8 @@ import "./Preferences.css"; import { FormattedMessage, useIntl } from "react-intl"; -import { AllLanguageCodes, useLocale } from "@/Components/IntlProvider/IntlProviderUtils"; +import { AllLanguageCodes } from "@/Components/IntlProvider/IntlProviderUtils"; +import {useLocale} from "@/Components/IntlProvider/useLocale"; import useLogin from "@/Hooks/useLogin"; import { unwrap } from "@/Utils"; import { DefaultImgProxy } from "@/Utils/Const"; diff --git a/packages/app/src/Utils/Const.ts b/packages/app/src/Utils/Const.ts index 29e7192e..0f41dc0a 100644 --- a/packages/app/src/Utils/Const.ts +++ b/packages/app/src/Utils/Const.ts @@ -160,3 +160,8 @@ export const MaxUsernameLength = 100; * Max about length - profile/settings */ export const MaxAboutLength = 1000; + +/* + * Snort backend publishes rates + */ +export const SnortPubkey = "npub1sn0rtcjcf543gj4wsg7fa59s700d5ztys5ctj0g69g2x6802npjqhjjtws"; \ No newline at end of file