From ad2685b70156a8ac809fce0b5ce11cff673fe6a8 Mon Sep 17 00:00:00 2001 From: verbiricha Date: Tue, 1 Aug 2023 14:23:25 +0200 Subject: [PATCH] fix: run prettier --- src/d.ts | 81 ++++---- src/element/chat-message.tsx | 4 +- src/element/copy.css | 14 +- src/element/copy.tsx | 21 ++- src/element/emoji-pack.tsx | 4 +- src/element/goal.css | 8 +- src/element/live-chat.tsx | 8 +- src/element/live-video-player.tsx | 56 ++++-- src/element/login-signup.css | 24 +-- src/element/login-signup.tsx | 258 +++++++++++++++----------- src/element/markdown.css | 5 +- src/element/new-goal.css | 6 +- src/element/new-stream.css | 45 +++-- src/element/new-stream.tsx | 60 ++++-- src/element/nostr-provider-dialog.tsx | 237 +++++++++++++---------- src/element/profile.css | 28 +-- src/element/send-zap.css | 40 ++-- src/element/send-zap.tsx | 6 +- src/element/spinner.tsx | 8 +- src/element/state-pill.css | 4 +- src/element/state-pill.tsx | 8 +- src/element/stream-cards.tsx | 6 +- src/element/stream-editor.css | 26 +-- src/element/stream-editor.tsx | 203 +++++++++++--------- src/element/stream-time.tsx | 36 ++-- src/element/textarea.css | 8 +- src/element/toggle.css | 2 +- src/element/video-tile.tsx | 2 +- src/element/write-message.tsx | 2 +- src/hooks/badges.ts | 14 +- src/hooks/cards.ts | 16 +- src/hooks/emoji.tsx | 6 +- src/hooks/event.ts | 4 +- src/hooks/goals.ts | 10 +- src/hooks/live-chat.tsx | 2 +- src/hooks/live-streams.ts | 4 +- src/hooks/login.ts | 6 +- src/hooks/profile.ts | 11 +- src/hooks/stream-provider.tsx | 7 +- src/index.css | 6 +- src/index.tsx | 4 +- src/login.ts | 2 +- src/number.ts | 2 +- src/pages/chat-popout.css | 2 +- src/pages/chat-popout.tsx | 12 +- src/pages/profile-page.css | 27 +-- src/pages/profile-page.tsx | 10 +- src/pages/providers/index.css | 38 ++-- src/pages/providers/index.tsx | 104 ++++++----- src/pages/providers/nostr.tsx | 140 +++++++------- src/pages/providers/owncast.tsx | 159 ++++++++-------- src/pages/root.css | 74 ++++---- src/pages/root.tsx | 2 +- src/pages/stream-page.tsx | 5 +- src/providers/index.ts | 4 +- src/providers/manual.ts | 48 ++--- src/providers/nip103.ts | 197 +++++++++++--------- src/providers/owncast.ts | 2 +- src/service-worker.ts | 15 +- src/utils.ts | 2 +- src/wish/index.ts | 2 +- 61 files changed, 1197 insertions(+), 950 deletions(-) diff --git a/src/d.ts b/src/d.ts index d3876b2..042f165 100644 --- a/src/d.ts +++ b/src/d.ts @@ -1,46 +1,45 @@ /// declare module "*.jpg" { - const value: unknown; - export default value; + const value: unknown; + export default value; +} + +declare module "*.svg" { + const value: unknown; + export default value; +} + +declare module "*.webp" { + const value: string; + export default value; +} + +declare module "*.png" { + const value: string; + export default value; +} + +declare module "*.css" { + const stylesheet: CSSStyleSheet; + export default stylesheet; +} + +declare module "translations/*.json" { + const value: Record; + export default value; +} + +declare module "light-bolt11-decoder" { + export function decode(pr?: string): ParsedInvoice; + + export interface ParsedInvoice { + paymentRequest: string; + sections: Section[]; } - - declare module "*.svg" { - const value: unknown; - export default value; + + export interface Section { + name: string; + value: string | Uint8Array | number | undefined; } - - declare module "*.webp" { - const value: string; - export default value; - } - - declare module "*.png" { - const value: string; - export default value; - } - - declare module "*.css" { - const stylesheet: CSSStyleSheet; - export default stylesheet; - } - - declare module "translations/*.json" { - const value: Record; - export default value; - } - - declare module "light-bolt11-decoder" { - export function decode(pr?: string): ParsedInvoice; - - export interface ParsedInvoice { - paymentRequest: string; - sections: Section[]; - } - - export interface Section { - name: string; - value: string | Uint8Array | number | undefined; - } - } - \ No newline at end of file +} diff --git a/src/element/chat-message.tsx b/src/element/chat-message.tsx index 5550336..6e752f1 100644 --- a/src/element/chat-message.tsx +++ b/src/element/chat-message.tsx @@ -55,7 +55,7 @@ export function ChatMessage({ const login = useLogin(); const profile = useUserProfile( System, - inView?.isIntersecting ? ev.pubkey : undefined, + inView?.isIntersecting ? ev.pubkey : undefined ); const zapTarget = profile?.lud16 ?? profile?.lud06; const zaps = useMemo(() => { @@ -79,7 +79,7 @@ export function ChatMessage({ }, [zaps, ev]); const hasZaps = totalZaps > 0; const awardedBadges = badges.filter( - (b) => b.awardees.has(ev.pubkey) && b.accepted.has(ev.pubkey), + (b) => b.awardees.has(ev.pubkey) && b.accepted.has(ev.pubkey) ); useOnClickOutside(ref, () => { diff --git a/src/element/copy.css b/src/element/copy.css index be437e1..0756c60 100644 --- a/src/element/copy.css +++ b/src/element/copy.css @@ -1,11 +1,11 @@ .copy { - display: flex; - cursor: pointer; - align-items: center; - gap: 8px; + display: flex; + cursor: pointer; + align-items: center; + gap: 8px; } .copy .body { - font-size: small; - color: white; -} \ No newline at end of file + font-size: small; + color: white; +} diff --git a/src/element/copy.tsx b/src/element/copy.tsx index 2ccc0ba..8ec7be6 100644 --- a/src/element/copy.tsx +++ b/src/element/copy.tsx @@ -10,13 +10,26 @@ export interface CopyProps { export default function Copy({ text, maxSize = 32, className }: CopyProps) { const { copy, copied } = useCopy(); const sliceLength = maxSize / 2; - const trimmed = text.length > maxSize ? `${text.slice(0, sliceLength)}...${text.slice(-sliceLength)}` : text; + const trimmed = + text.length > maxSize + ? `${text.slice(0, sliceLength)}...${text.slice(-sliceLength)}` + : text; return ( -
copy(text)}> +
copy(text)} + > {trimmed} - - {copied ? : } + + {copied ? ( + + ) : ( + + )}
); diff --git a/src/element/emoji-pack.tsx b/src/element/emoji-pack.tsx index b6dbca1..4c84aca 100644 --- a/src/element/emoji-pack.tsx +++ b/src/element/emoji-pack.tsx @@ -14,7 +14,7 @@ export function EmojiPack({ ev }: { ev: NostrEvent }) { const login = useLogin(); const name = findTag(ev, "d"); const isUsed = login?.emojis.find( - (e) => e.author === ev.pubkey && e.name === name, + (e) => e.author === ev.pubkey && e.name === name ); const emoji = ev.tags.filter((e) => e.at(0) === "emoji"); @@ -23,7 +23,7 @@ export function EmojiPack({ ev }: { ev: NostrEvent }) { if (isUsed) { newPacks = login?.emojis.filter( - (e) => e.author !== ev.pubkey && e.name !== name, + (e) => e.author !== ev.pubkey && e.name !== name ) ?? []; } else { newPacks = [...(login?.emojis ?? []), toEmojiPack(ev)]; diff --git a/src/element/goal.css b/src/element/goal.css index f0ae60a..e41cd97 100644 --- a/src/element/goal.css +++ b/src/element/goal.css @@ -29,7 +29,7 @@ } .goal .progress-indicator { - background-color: #FF8D2B; + background-color: #ff8d2b; width: 100%; height: 100%; transition: transform 660ms cubic-bezier(0.65, 0, 0.35, 1); @@ -63,13 +63,13 @@ } .goal .progress-container.finished .zap-circle { - background: #FF8D2B; + background: #ff8d2b; } .goal .goal-finished { - color: #FFFFFF; + color: #ffffff; } .goal .goal-unfinished { - color: #FFFFFF33; + color: #ffffff33; } diff --git a/src/element/live-chat.tsx b/src/element/live-chat.tsx index 1418eba..c4b26c0 100644 --- a/src/element/live-chat.tsx +++ b/src/element/live-chat.tsx @@ -115,7 +115,7 @@ export function LiveChat({ .filter((z) => z && z.valid); const events = useMemo(() => { return [...feed.messages, ...feed.zaps, ...awards].sort( - (a, b) => b.created_at - a.created_at, + (a, b) => b.created_at - a.created_at ); }, [feed.messages, feed.zaps, awards]); const streamer = getHost(ev); @@ -126,7 +126,7 @@ export function LiveChat({ findTag(ev, "d") ?? "", undefined, ev.kind, - ev.pubkey, + ev.pubkey ); } }, [ev]); @@ -146,7 +146,7 @@ export function LiveChat({ window.open( `/chat/${naddr}?chat=true`, "_blank", - "popup,width=400,height=800", + "popup,width=400,height=800" ) } /> @@ -182,7 +182,7 @@ export function LiveChat({ } case EventKind.ZapReceipt: { const zap = zaps.find( - (b) => b.id === a.id && b.receiver === streamer, + (b) => b.id === a.id && b.receiver === streamer ); if (zap) { return ; diff --git a/src/element/live-video-player.tsx b/src/element/live-video-player.tsx index ed867d8..0f13f0f 100644 --- a/src/element/live-video-player.tsx +++ b/src/element/live-video-player.tsx @@ -8,22 +8,19 @@ export enum VideoStatus { } export interface VideoPlayerProps { - stream?: string, status?: string, poster?: string + stream?: string; + status?: string; + poster?: string; } -export function LiveVideoPlayer( - props: VideoPlayerProps -) { +export function LiveVideoPlayer(props: VideoPlayerProps) { const video = useRef(null); const streamCached = useMemo(() => props.stream, [props.stream]); const [status, setStatus] = useState(); const [src, setSrc] = useState(); useEffect(() => { - if ( - streamCached && - video.current - ) { + if (streamCached && video.current) { if (Hls.isSupported()) { try { const hls = new Hls(); @@ -63,14 +60,25 @@ export function LiveVideoPlayer(
{status}
-
); } export function WebRTCPlayer(props: VideoPlayerProps) { const video = useRef(null); - const streamCached = useMemo(() => "https://customer-uu10flpvos4pfhgu.cloudflarestream.com/7634aee1af35a2de4ac13ca3d1718a8b/webRTC/play", [props.stream]); + const streamCached = useMemo( + () => + "https://customer-uu10flpvos4pfhgu.cloudflarestream.com/7634aee1af35a2de4ac13ca3d1718a8b/webRTC/play", + [props.stream] + ); const [status] = useState(); //https://customer-uu10flpvos4pfhgu.cloudflarestream.com/7634aee1af35a2de4ac13ca3d1718a8b/webRTC/play @@ -78,14 +86,19 @@ export function WebRTCPlayer(props: VideoPlayerProps) { if (video.current && streamCached) { const client = new WISH(); client.addEventListener("log", console.debug); - client.WithEndpoint(streamCached, true) + client.WithEndpoint(streamCached, true); - client.Play().then(s => { - if (video.current) { - video.current.srcObject = s; - } - }).catch(console.error); - return () => { client.Disconnect().catch(console.error); } + client + .Play() + .then((s) => { + if (video.current) { + video.current.srcObject = s; + } + }) + .catch(console.error); + return () => { + client.Disconnect().catch(console.error); + }; } }, [video, streamCached]); @@ -94,7 +107,12 @@ export function WebRTCPlayer(props: VideoPlayerProps) {
{status}
-