From adb9fe5c2e58fd24b96dff915a4e0475fbf83e79 Mon Sep 17 00:00:00 2001 From: Kieran Date: Wed, 17 Jan 2024 15:48:30 +0000 Subject: [PATCH] chore: formatting --- package.json | 2 +- .../Event/Note/NoteFooter/FooterZapButton.tsx | 2 +- .../Event/Note/NoteFooter/LikeButton.tsx | 4 +-- .../src/Components/Feed/TimelineFollows.tsx | 8 +++-- .../Pages/Notifications/NotificationGroup.tsx | 27 +++++++++----- .../src/Pages/Notifications/Notifications.tsx | 8 ++--- packages/app/src/Pages/settings/Cache.tsx | 35 ++++++++----------- packages/app/src/lang.json | 15 ++++---- packages/app/src/translations/en.json | 5 ++- packages/worker-relay/src/interface.ts | 2 +- packages/worker-relay/src/types.ts | 2 +- 11 files changed, 56 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 8a7ecb0d..54a9d996 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "packages/*" ], "scripts": { - "build": "yarn workspace @snort/shared build && yarn workspace @snort/system build && yarn workspace @snort/system-web build && yarn workspace @snort/system-react build && yarn workspace @snort/app build", + "build": "yarn workspace @snort/shared build && yarn workspace @snort/worker-relay build && yarn workspace @snort/system build && yarn workspace @snort/system-web build && yarn workspace @snort/system-react build && yarn workspace @snort/app build", "start": "yarn build && yarn workspace @snort/app start", "test": "yarn build && yarn workspace @snort/app test && yarn workspace @snort/system test", "pre:commit": "yarn workspace @snort/app intl-extract && yarn workspace @snort/app intl-compile && yarn prettier --write .", diff --git a/packages/app/src/Components/Event/Note/NoteFooter/FooterZapButton.tsx b/packages/app/src/Components/Event/Note/NoteFooter/FooterZapButton.tsx index c2b1b68f..10ba1c1c 100644 --- a/packages/app/src/Components/Event/Note/NoteFooter/FooterZapButton.tsx +++ b/packages/app/src/Components/Event/Note/NoteFooter/FooterZapButton.tsx @@ -140,7 +140,7 @@ export const FooterZapButton = ({ ev, zaps, onClickZappers }: ZapIconProps) => { value={zapTotal} onClick={fastZap} /> - { })} /> + {})} /> {showZapModal && ( { - return ( - positiveReactions?.some(({ pubkey, content }) => normalizeReaction(content) === emoji && pubkey === publicKey) + return positiveReactions?.some( + ({ pubkey, content }) => normalizeReaction(content) === emoji && pubkey === publicKey, ); }; diff --git a/packages/app/src/Components/Feed/TimelineFollows.tsx b/packages/app/src/Components/Feed/TimelineFollows.tsx index 27369b2a..400bca99 100644 --- a/packages/app/src/Components/Feed/TimelineFollows.tsx +++ b/packages/app/src/Components/Feed/TimelineFollows.tsx @@ -121,9 +121,11 @@ const TimelineFollows = (props: TimelineFollowsProps) => { displayAs={displayAs} /> {sortedFeed.length > 0 && ( - { - setLimit(s => s + 20); - }} /> + { + setLimit(s => s + 20); + }} + /> )} ); diff --git a/packages/app/src/Pages/Notifications/NotificationGroup.tsx b/packages/app/src/Pages/Notifications/NotificationGroup.tsx index 4a542dd2..8fb74ea7 100644 --- a/packages/app/src/Pages/Notifications/NotificationGroup.tsx +++ b/packages/app/src/Pages/Notifications/NotificationGroup.tsx @@ -14,7 +14,13 @@ import { formatShort } from "@/Utils/Number"; import { notificationContext } from "./notificationContext"; import { NotificationContext } from "./Notifications"; -export function NotificationGroup({ evs, onClick }: { evs: Array; onClick?: (link: NostrLink) => void; }) { +export function NotificationGroup({ + evs, + onClick, +}: { + evs: Array; + onClick?: (link: NostrLink) => void; +}) { const { ref, inView } = useInView({ triggerOnce: true }); const { formatMessage } = useIntl(); const kind = evs[0].kind; @@ -30,7 +36,7 @@ export function NotificationGroup({ evs, onClick }: { evs: Array + }} + /> ); } case EventKind.Repost: { @@ -75,7 +82,8 @@ export function NotificationGroup({ evs, onClick }: { evs: Array + }} + /> ); } case EventKind.ZapReceipt: { @@ -86,7 +94,8 @@ export function NotificationGroup({ evs, onClick }: { evs: Array + }} + /> ); } } @@ -114,7 +123,8 @@ export function NotificationGroup({ evs, onClick }: { evs: Array + overrideUsername={v === "" ? formatMessage({ defaultMessage: "Anon", id: "bfvyfs" }) : undefined} + /> ))} {kind !== EventKind.TextNote && ( @@ -123,7 +133,7 @@ export function NotificationGroup({ evs, onClick }: { evs: Array )} @@ -136,7 +146,8 @@ export function NotificationGroup({ evs, onClick }: { evs: Array + }} + /> )} diff --git a/packages/app/src/Pages/Notifications/Notifications.tsx b/packages/app/src/Pages/Notifications/Notifications.tsx index ab038e32..9791c47a 100644 --- a/packages/app/src/Pages/Notifications/Notifications.tsx +++ b/packages/app/src/Pages/Notifications/Notifications.tsx @@ -44,8 +44,9 @@ export default function NotificationsPage({ onClick }: { onClick?: (link: NostrL const timeGrouped = useMemo(() => { return myNotifications.reduce((acc, v) => { - const key = `${timeKey(v)}:${notificationContext(v as TaggedNostrEvent)?.encode(CONFIG.eventLinkPrefix)}:${v.kind - }`; + const key = `${timeKey(v)}:${notificationContext(v as TaggedNostrEvent)?.encode(CONFIG.eventLinkPrefix)}:${ + v.kind + }`; if (acc.has(key)) { unwrap(acc.get(key)).push(v as TaggedNostrEvent); } else { @@ -64,8 +65,7 @@ export default function NotificationsPage({ onClick }: { onClick?: (link: NostrL )} {login.publicKey && - [...timeGrouped.entries()] - .map(([k, g]) => )} + [...timeGrouped.entries()].map(([k, g]) => )} {}} /> diff --git a/packages/app/src/Pages/settings/Cache.tsx b/packages/app/src/Pages/settings/Cache.tsx index 226aa604..e430b701 100644 --- a/packages/app/src/Pages/settings/Cache.tsx +++ b/packages/app/src/Pages/settings/Cache.tsx @@ -2,13 +2,7 @@ import { FeedCache } from "@snort/shared"; import { ReactNode, useEffect, useState, useSyncExternalStore } from "react"; import { FormattedMessage, FormattedNumber } from "react-intl"; -import { - Chats, - GiftsCache, - PaymentsCache, - RelayMetrics, - UserCache, -} from "@/Cache"; +import { Chats, GiftsCache, PaymentsCache, RelayMetrics, UserCache } from "@/Cache"; import AsyncButton from "@/Components/Button/AsyncButton"; import { Relay } from "@/system"; @@ -70,23 +64,22 @@ function RelayCacheStats() {
{Object.entries(counts).map(([k, v]) => { - return - , - k: k - }} - /> - + return ( + + , + k: k, + }} + /> + + ); })} -
- { - - }}> + {}}>
diff --git a/packages/app/src/lang.json b/packages/app/src/lang.json index 61ebdb32..b3a6e97d 100644 --- a/packages/app/src/lang.json +++ b/packages/app/src/lang.json @@ -597,6 +597,9 @@ "I1AoOu": { "defaultMessage": "Last post {time}" }, + "I97cCX": { + "defaultMessage": "{n} kind {k} events" + }, "IEwZvs": { "defaultMessage": "Are you sure you want to unpin this note?" }, @@ -1588,9 +1591,6 @@ "sfL/O+": { "defaultMessage": "Muted notes will not be shown" }, - "tGXF0Q": { - "defaultMessage": "Relay Lists" - }, "tOdNiY": { "defaultMessage": "Dark" }, @@ -1609,9 +1609,6 @@ "ttxS0b": { "defaultMessage": "Supporter Badge" }, - "u+LyXc": { - "defaultMessage": "Interactions" - }, "u/vOPu": { "defaultMessage": "Paid" }, @@ -1624,9 +1621,6 @@ "uCk8r+": { "defaultMessage": "Already have an account?" }, - "uKqSN+": { - "defaultMessage": "Follows Feed" - }, "uSV4Ti": { "defaultMessage": "Reposts need to be manually confirmed" }, @@ -1710,6 +1704,9 @@ "defaultMessage": "Unlock", "description": "Unlock wallet" }, + "xSoIUU": { + "defaultMessage": "Worker Relay" + }, "xaj9Ba": { "defaultMessage": "Provider" }, diff --git a/packages/app/src/translations/en.json b/packages/app/src/translations/en.json index 24bc45c9..0bcebc35 100644 --- a/packages/app/src/translations/en.json +++ b/packages/app/src/translations/en.json @@ -197,6 +197,7 @@ "HhcAVH": "You don't follow this person, click here to load media from {link}, or update your preferences to always load media from everybody.", "HqRNN8": "Support", "I1AoOu": "Last post {time}", + "I97cCX": "{n} kind {k} events", "IEwZvs": "Are you sure you want to unpin this note?", "IKKHqV": "Follows", "IOu4Xh": "You must be a {tier} subscriber to access {app} deck", @@ -524,19 +525,16 @@ "sUNhQE": "user", "sZQzjQ": "Failed to parse zap split: {input}", "sfL/O+": "Muted notes will not be shown", - "tGXF0Q": "Relay Lists", "tOdNiY": "Dark", "th5lxp": "Send note to a subset of your write relays", "thnRpU": "Getting NIP-05 verified can help:", "tj6kdX": "{sign} {amount} sats", "tjpYlr": "Relay Metrics", "ttxS0b": "Supporter Badge", - "u+LyXc": "Interactions", "u/vOPu": "Paid", "u4bHcR": "Check out the code here: {link}", "u9NoC1": "Name must be less than {limit} characters", "uCk8r+": "Already have an account?", - "uKqSN+": "Follows Feed", "uSV4Ti": "Reposts need to be manually confirmed", "uc0din": "Send sats splits to", "un1nGw": "{n} notes", @@ -564,6 +562,7 @@ "xIcAOU": "Votes by {type}", "xIoGG9": "Go to", "xQtL3v": "Unlock", + "xSoIUU": "Worker Relay", "xaj9Ba": "Provider", "xbVgIm": "Automatically load media", "xhQMeQ": "Expires", diff --git a/packages/worker-relay/src/interface.ts b/packages/worker-relay/src/interface.ts index a3d3e247..42b9e976 100644 --- a/packages/worker-relay/src/interface.ts +++ b/packages/worker-relay/src/interface.ts @@ -47,7 +47,7 @@ export class WorkerRelayInterface { async summary() { return await this.#workerRpc>("summary"); } - + #workerRpc(cmd: string, args?: T, timeout = 30_000) { const id = uuid(); const msg = { diff --git a/packages/worker-relay/src/types.ts b/packages/worker-relay/src/types.ts index 373f5a93..41531b49 100644 --- a/packages/worker-relay/src/types.ts +++ b/packages/worker-relay/src/types.ts @@ -30,4 +30,4 @@ export interface ReqFilter { export function unixNowMs() { return new Date().getTime(); -} \ No newline at end of file +}