diff --git a/src/element/chat-message.tsx b/src/element/chat-message.tsx index f472c23..717eabe 100644 --- a/src/element/chat-message.tsx +++ b/src/element/chat-message.tsx @@ -65,7 +65,7 @@ export function ChatMessage({ inView?.isIntersecting ? ev.pubkey : undefined ); const shouldShowMuteButton = - ev.pubkey !== streamer && ev.pubkey != login?.pubkey; + ev.pubkey !== streamer && ev.pubkey !== login?.pubkey; const zapTarget = profile?.lud16 ?? profile?.lud06; const zaps = useMemo(() => { return reactions @@ -111,8 +111,8 @@ export function ChatMessage({ const pub = login?.publisher(); if (emoji.native) { reply = await pub?.react(ev, emoji.native || "+1"); - } else { - const e = getEmojiById(emoji.id!); + } else if (emoji.id) { + const e = getEmojiById(emoji.id); if (e) { reply = await pub?.generic((eb) => { return eb @@ -120,7 +120,7 @@ export function ChatMessage({ .content(`:${emoji.id}:`) .tag(["e", ev.id]) .tag(["p", ev.pubkey]) - .tag(["emoji", e.at(1)!, e.at(2)!]); + .tag(["emoji", e.at(1) as string, e.at(2) as string]); }); } } @@ -141,7 +141,7 @@ export function ChatMessage({ setShowEmojiPicker(!showEmojiPicker); } - async function muteUser(e: React.MouseEvent) { + function muteUser(e: React.MouseEvent) { e.stopPropagation(); mute(); } @@ -194,7 +194,10 @@ export function ChatMessage({
{isCustomEmojiReaction && emoji ? ( - + ) : ( {e} diff --git a/src/element/follow-button.tsx b/src/element/follow-button.tsx index b14123b..b861618 100644 --- a/src/element/follow-button.tsx +++ b/src/element/follow-button.tsx @@ -12,7 +12,11 @@ export function LoggedInFollowButton({ value: string; }) { const login = useLogin(); - const { tags, content, timestamp } = login!.follows; + if (!login) { + return null; + } + + const { tags, content, timestamp } = login.follows; const follows = tags.filter((t) => t.at(0) === tag); const isFollowing = follows.find((t) => t.at(1) === value); diff --git a/src/element/live-chat.tsx b/src/element/live-chat.tsx index fb917bd..d0414e8 100644 --- a/src/element/live-chat.tsx +++ b/src/element/live-chat.tsx @@ -96,7 +96,7 @@ export function LiveChat({ const login = useLogin(); useEffect(() => { const pubkeys = [ - ...new Set(feed.zaps.flatMap((a) => [a.pubkey, findTag(a, "p")!])), + ...new Set(feed.zaps.flatMap((a) => [a.pubkey, findTag(a, "p") ?? ""])), ]; System.ProfileLoader.TrackMetadata(pubkeys); return () => System.ProfileLoader.UntrackMetadata(pubkeys); diff --git a/src/element/new-stream.tsx b/src/element/new-stream.tsx index 38d87a4..7b81b0c 100644 --- a/src/element/new-stream.tsx +++ b/src/element/new-stream.tsx @@ -19,7 +19,7 @@ function NewStream({ ev, onFinish }: StreamEditorProps) { if (!currentProvider) { setCurrentProvider( ev !== undefined - ? providers.find((a) => a.name.toLowerCase() === "manual")! + ? providers.find((a) => a.name.toLowerCase() === "manual") : providers.at(0) ); } @@ -35,7 +35,11 @@ function NewStream({ ev, onFinish }: StreamEditorProps) { onFinish={(ex) => { currentProvider.updateStreamInfo(ex); if (!ev) { - if (findTag(ex, "content-warning") && __XXX_HOST && __XXX === false) { + if ( + findTag(ex, "content-warning") && + __XXX_HOST && + __XXX === false + ) { location.href = `${__XXX_HOST}/${eventLink(ex)}`; } else { navigate(`/${eventLink(ex)}`, { diff --git a/src/element/share-menu.tsx b/src/element/share-menu.tsx index f04aa4a..22b9463 100644 --- a/src/element/share-menu.tsx +++ b/src/element/share-menu.tsx @@ -18,7 +18,7 @@ export function ShareMenu({ ev }: { ev: NostrEvent }) { const naddr = encodeTLV( NostrPrefix.Address, - findTag(ev, "d")!, + findTag(ev, "d") ?? "", undefined, ev.kind, ev.pubkey diff --git a/src/element/stream-cards.tsx b/src/element/stream-cards.tsx index 16ea55e..0e978e1 100644 --- a/src/element/stream-cards.tsx +++ b/src/element/stream-cards.tsx @@ -100,7 +100,7 @@ function Card({ canEdit, ev, cards }: CardProps) { ); function findTagByIdentifier(d: string) { - return tags.find((t) => t.at(1)!.endsWith(`:${d}`)); + return tags.find((t) => (t.at(1) as string).endsWith(`:${d}`)); } const [dropStyle, dropRef] = useDrop( @@ -293,7 +293,9 @@ function EditCard({ card, cards }: EditCardProps) { async function onCancel() { const pub = login?.publisher(); if (pub) { - const newTags = tags.filter((t) => !t.at(1)!.endsWith(`:${identifier}`)); + const newTags = tags.filter( + (t) => !(t.at(1) as string).endsWith(`:${identifier}`) + ); const userCardsEv = await pub.generic((eb) => { eb.kind(USER_CARDS).content(""); for (const tag of newTags) { @@ -408,7 +410,7 @@ export function StreamCardEditor({ pubkey, tags }: StreamCardEditorProps) { <>
{cards.map((ev) => ( - + ))} {isEditing && }
@@ -433,7 +435,7 @@ export function ReadOnlyStreamCards({ host }: StreamCardsProps) { return (
{cards.map((ev) => ( - + ))}
); diff --git a/src/element/textarea.tsx b/src/element/textarea.tsx index eec8f44..de61945 100644 --- a/src/element/textarea.tsx +++ b/src/element/textarea.tsx @@ -50,14 +50,14 @@ interface TextareaProps { } export function Textarea({ emojis, ...props }: TextareaProps) { - const userDataProvider = async (token: string) => { + const userDataProvider = (token: string) => { const cache = System.ProfileLoader.Cache; if (cache instanceof UserProfileCache) { return cache.search(token); } }; - const emojiDataProvider = async (token: string) => { + const emojiDataProvider = (token: string) => { const results = emojis .map((t) => { return { diff --git a/src/hooks/cards.ts b/src/hooks/cards.ts index 582f809..1c651db 100644 --- a/src/hooks/cards.ts +++ b/src/hooks/cards.ts @@ -11,6 +11,7 @@ import { useRequestBuilder } from "@snort/system-react"; import { USER_CARDS, CARD } from "const"; import { findTag } from "utils"; import { System } from "index"; +import { getAddresses } from "utils"; export function useUserCards( pubkey: string, @@ -29,16 +30,7 @@ export function useUserCards( const subRelated = useMemo(() => { if (!pubkey) return null; - const splitted = related.map((t) => t.at(1)!.split(":")); - const authors = splitted - .map((s) => s.at(1)) - .filter((s) => s) - .map((s) => s as string); - const identifiers = splitted - .map((s) => s.at(2)) - .filter((s) => s) - .map((s) => s as string); - + const { authors, identifiers } = getAddresses(related); const rb = new RequestBuilder(`cards:${pubkey}`); rb.withOptions({ leaveOpen }) .withFilter() @@ -58,7 +50,8 @@ export function useUserCards( const cards = useMemo(() => { return related .map((t) => { - const [k, pubkey, identifier] = t.at(1)!.split(":"); + const ref = t.at(1) as string; + const [k, pubkey, identifier] = ref.split(":"); const kind = Number(k); return (data ?? []).find( (e) => @@ -104,15 +97,7 @@ export function useCards(pubkey: string, leaveOpen = false): TaggedRawEvent[] { const subRelated = useMemo(() => { if (!pubkey) return null; - const splitted = related.map((t) => t.at(1)!.split(":")); - const authors = splitted - .map((s) => s.at(1)) - .filter((s) => s) - .map((s) => s as string); - const identifiers = splitted - .map((s) => s.at(2)) - .filter((s) => s) - .map((s) => s as string); + const { authors, identifiers } = getAddresses(related); const rb = new RequestBuilder(`cards:${pubkey}`); rb.withOptions({ leaveOpen }) @@ -134,7 +119,8 @@ export function useCards(pubkey: string, leaveOpen = false): TaggedRawEvent[] { const cards = useMemo(() => { return related .map((t) => { - const [k, pubkey, identifier] = t.at(1)!.split(":"); + const ref = t.at(1) as string; + const [k, pubkey, identifier] = ref.split(":"); const kind = Number(k); return cardEvents.find( (e) => diff --git a/src/hooks/emoji.tsx b/src/hooks/emoji.tsx index 3d77faf..07c2d00 100644 --- a/src/hooks/emoji.tsx +++ b/src/hooks/emoji.tsx @@ -45,7 +45,11 @@ export function useUserEmojiPacks(pubkey?: string, userEmoji?: Tags) { const subRelated = useMemo(() => { if (!pubkey) return null; - const splitted = related.map((t) => t.at(1)!.split(":")); + const splitted = related + .map((t) => t.at(1)) + .filter((t) => t) + .map((t) => t as string) + .map((t) => t.split(":")); const authors = splitted .map((s) => s.at(1)) .filter((s) => s) diff --git a/src/hooks/goals.ts b/src/hooks/goals.ts index 0321b0e..91f9d30 100644 --- a/src/hooks/goals.ts +++ b/src/hooks/goals.ts @@ -43,7 +43,7 @@ export function useZapGoal(host: string, link: NostrLink, leaveOpen = false) { b.withFilter() .kinds([GOAL]) .authors([host]) - .tag("a", [`${link.kind}:${link.author!}:${link.id}`]); + .tag("a", [`${link.kind}:${link.author as string}:${link.id}`]); return b; }, [link, leaveOpen]); diff --git a/src/login.ts b/src/login.ts index dbb5b7a..455b68b 100644 --- a/src/login.ts +++ b/src/login.ts @@ -131,7 +131,7 @@ export function getPublisher(session: LoginSession) { } case LoginType.PrivateKey: { return new EventPublisher( - new PrivateKeySigner(session.privateKey!), + new PrivateKeySigner(session.privateKey as string), session.pubkey ); } diff --git a/src/pages/chat-popout.tsx b/src/pages/chat-popout.tsx index 392de5e..5139b7c 100644 --- a/src/pages/chat-popout.tsx +++ b/src/pages/chat-popout.tsx @@ -7,7 +7,7 @@ import { findTag } from "utils"; export function ChatPopout() { const params = useParams(); - const link = parseNostrLink(params.id!); + const link = parseNostrLink(params.id as string); const ev = useCurrentStreamFeed(link, true); const lnk = parseNostrLink( diff --git a/src/pages/profile-page.tsx b/src/pages/profile-page.tsx index b4ad6fd..ebc6aae 100644 --- a/src/pages/profile-page.tsx +++ b/src/pages/profile-page.tsx @@ -52,7 +52,7 @@ const defaultBanner = "https://void.cat/d/Hn1AdN5UKmceuDkgDW847q.webp"; export function ProfilePage() { const navigate = useNavigate(); const params = useParams(); - const link = parseNostrLink(params.npub!); + const link = parseNostrLink(params.npub as string); const placeholder = usePlaceholder(link.id); const profile = useUserProfile(System, link.id); const zapTarget = profile?.lud16 ?? profile?.lud06; diff --git a/src/pages/stream-page.tsx b/src/pages/stream-page.tsx index e34c154..2aa884e 100644 --- a/src/pages/stream-page.tsx +++ b/src/pages/stream-page.tsx @@ -114,7 +114,7 @@ export function StreamPage() { const params = useParams(); const location = useLocation(); const evPreload = getEventFromLocationState(location.state); - const link = parseNostrLink(params.id!); + const link = parseNostrLink(params.id as string); const ev = useCurrentStreamFeed(link, true, evPreload); const host = getHost(ev); const goal = useZapGoal(host, link, true); diff --git a/src/pages/tag.tsx b/src/pages/tag.tsx index fa86be4..8a50d4f 100644 --- a/src/pages/tag.tsx +++ b/src/pages/tag.tsx @@ -1,5 +1,5 @@ import "./tag.css"; -import { useParams } from "react-router-dom"; +import { useParams, Navigate } from "react-router-dom"; import { VideoTile } from "element/video-tile"; import { FollowTagButton } from "element/follow-button"; @@ -8,17 +8,22 @@ import { useStreamsFeed } from "hooks/live-streams"; export function TagPage() { const { tag } = useParams(); const { live } = useStreamsFeed(tag); - return ( -
-
-

#{tag}

- + + if (typeof tag === "string") { + return ( +
+
+

#{tag}

+ +
+
+ {live.map((e) => ( + + ))} +
-
- {live.map((e) => ( - - ))} -
-
- ); + ); + } + + return ; } diff --git a/src/providers/owncast.ts b/src/providers/owncast.ts index b828a65..58d6bc5 100644 --- a/src/providers/owncast.ts +++ b/src/providers/owncast.ts @@ -58,7 +58,7 @@ export class OwncastProvider implements StreamProvider { body?: unknown ): Promise { const rsp = await fetch(`${this.#url}${path}`, { - method: method, + method, body: body ? JSON.stringify(body) : undefined, headers: { "content-type": "application/json", diff --git a/src/providers/zsz.ts b/src/providers/zsz.ts index a84bcdc..2514901 100644 --- a/src/providers/zsz.ts +++ b/src/providers/zsz.ts @@ -103,7 +103,7 @@ export class Nip103StreamProvider implements StreamProvider { .tag(["method", method]); }); const rsp = await fetch(u, { - method: method, + method, body: body ? JSON.stringify(body) : undefined, headers: { "content-type": "application/json", diff --git a/src/utils.ts b/src/utils.ts index 331980c..94a0d25 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -109,7 +109,7 @@ export function getHost(ev?: NostrEvent) { ); } -export async function openFile(): Promise { +export function openFile(): Promise { return new Promise((resolve) => { const elm = document.createElement("input"); elm.type = "file"; @@ -141,3 +141,20 @@ export function getEventFromLocationState(state: unknown | undefined | null) { ? (state as NostrEvent) : undefined; } + +export function getAddresses(tags: Tags) { + const splitted = tags + .map((t) => t.at(1)) + .filter((t) => t) + .map((t) => t as string) + .map((t) => t.split(":")); + const authors = splitted + .map((s) => s.at(1)) + .filter((s) => s) + .map((s) => s as string); + const identifiers = splitted + .map((s) => s.at(2)) + .filter((s) => s) + .map((s) => s as string); + return { authors, identifiers }; +} diff --git a/src/wish/index.ts b/src/wish/index.ts index a9ef6f7..e43188e 100644 --- a/src/wish/index.ts +++ b/src/wish/index.ts @@ -503,7 +503,7 @@ export class WISH extends TypedEventTarget { }, }); const body = await resp.text(); - if (resp.status != 201) { + if (resp.status !== 201) { throw new Error(`Unexpected status code ${resp.status}: ${body}`); } @@ -611,7 +611,7 @@ export class WISH extends TypedEventTarget { throw new Error(`Unexpected status code ${resp.status}: ${body}`); } - async WithEndpoint(endpoint: string, trickle: boolean) { + WithEndpoint(endpoint: string, trickle: boolean) { if (endpoint === "") { throw new Error("Endpoint cannot be empty"); } @@ -637,7 +637,7 @@ export class WISH extends TypedEventTarget { method: "DELETE", mode: "cors", }); - if (resp.status != 200) { + if (resp.status !== 200) { const body = await resp.text(); throw new Error(`Unexpected status code ${resp.status}: ${body}`); }