diff --git a/package.json b/package.json index 9ee1355..ff5d753 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "6.0.15", + "version": "6.0.16", "license": "BUSL-1.1", "private": true, "packageManager": "pnpm@9.14.4", diff --git a/src/lib/components/KeepAlive.svelte b/src/lib/components/KeepAlive.svelte index 59f0c89..910a1b3 100644 --- a/src/lib/components/KeepAlive.svelte +++ b/src/lib/components/KeepAlive.svelte @@ -27,16 +27,12 @@ export let id: string - // eslint-disable-next-line no-unused-vars type $$Props = HTMLAttributes & { id: string } function mount (node: HTMLDivElement) { const entry = keep.get(id) if (entry) node.appendChild(entry.node) } - - console.log($$props.$$slots) -
diff --git a/src/lib/components/Shadow.svelte b/src/lib/components/Shadow.svelte index 05026d5..1ad1e2b 100644 --- a/src/lib/components/Shadow.svelte +++ b/src/lib/components/Shadow.svelte @@ -2,8 +2,6 @@ import dompurify from 'dompurify' import { marked } from 'marked' - import { dragScroll } from '$lib/modules/navigate' - marked.setOptions({ gfm: true, breaks: true, @@ -57,4 +55,4 @@ export { className as class } -
+
diff --git a/src/lib/components/ui/player/subtitles.ts b/src/lib/components/ui/player/subtitles.ts index ae05885..cdc5ada 100644 --- a/src/lib/components/ui/player/subtitles.ts +++ b/src/lib/components/ui/player/subtitles.ts @@ -48,15 +48,7 @@ export default class Subtitles { this.selectCaptions(value) }) - native.subtitles(this.selected.hash, this.selected.id, (subtitle: { text: string, time: number, duration: number, style?: string }, trackNumber) => { - const { events, meta, styles } = this.track(trackNumber) - if (events.has(subtitle)) return - const event = this.constructSub(subtitle, meta.type !== 'ass', events.size, '' + (styles[subtitle.style ?? 'Default'] ?? 0)) - events.add(subtitle, event) - if (Number(this.current.value) === trackNumber) this.renderer?.createEvent(event) - }) - - native.tracks(this.selected.hash, this.selected.id).then(tracklist => { + const tracks = native.tracks(this.selected.hash, this.selected.id).then(tracklist => { for (const track of tracklist) { const newtrack = this.track(track.number) newtrack.styles.Default = 0 @@ -89,6 +81,15 @@ export default class Subtitles { } }) + native.subtitles(this.selected.hash, this.selected.id, async (subtitle: { text: string, time: number, duration: number, style?: string }, trackNumber) => { + await tracks + const { events, meta, styles } = this.track(trackNumber) + if (events.has(subtitle)) return + const event = this.constructSub(subtitle, meta.type !== 'ass', events.size, '' + (styles[subtitle.style ?? 'Default'] ?? 0)) + events.add(subtitle, event) + if (Number(this.current.value) === trackNumber) this.renderer?.createEvent(event) + }) + native.attachments(this.selected.hash, this.selected.id).then(attachments => { for (const attachment of attachments) { if (fontRx.test(attachment.filename) || attachment.mimetype.toLowerCase().includes('font')) { diff --git a/src/lib/components/ui/profile/Profile.svelte b/src/lib/components/ui/profile/Profile.svelte index 12cdaa2..fe95608 100644 --- a/src/lib/components/ui/profile/Profile.svelte +++ b/src/lib/components/ui/profile/Profile.svelte @@ -18,61 +18,59 @@ export let user: ResultOf -{#if user} - {@const name = user.name} - {@const avatar = user.avatar?.medium ?? ''} - {@const banner = user.bannerImage ?? ''} - {@const bubble = user.donatorBadge} -
- - - - - {name} - - - -
-
- {#if banner} - banner - {/if} - - - {name} - -
-
- {name} -
-
- {#if user.isFollower} - Follows you - {/if} - Joined {since(new Date((user.createdAt ?? 0) * 1000))} +{@const name = user.name} +{@const avatar = user.avatar?.medium ?? ''} +{@const banner = user.bannerImage ?? ''} +{@const bubble = user.donatorBadge} +
+ + + + + {name} + + + +
+
+ {#if banner} + banner + {/if} + + + {name} + +
+
+ {name} +
+
+ {#if user.isFollower} + Follows you + {/if} + Joined {since(new Date((user.createdAt ?? 0) * 1000))} +
+
+ {#if bubble && bubble !== 'Donator'} +
+
+ + {bubble} +
- {#if bubble && bubble !== 'Donator'} -
-
- - {bubble} - -
-
- {/if} -
- -
- {user.statistics?.anime?.count ?? 0} anime - {user.statistics?.anime?.episodesWatched ?? 0} episodes - {since(new Date(Date.now() - (user.statistics?.anime?.minutesWatched ?? 0) * 60 * 1000)).replace('ago', 'watched')} -
+ {/if}
-
-
-
-{/if} + +
+ {user.statistics?.anime?.count ?? 0} anime + {user.statistics?.anime?.episodesWatched ?? 0} episodes + {since(new Date(Date.now() - (user.statistics?.anime?.minutesWatched ?? 0) * 60 * 1000)).replace('ago', 'watched')} +
+
+ + +