From b67546e723da05ba4c6e29a004fec89080581af4 Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:07:40 -0700 Subject: [PATCH 01/10] chore: navigation improvements --- common/App.svelte | 2 +- common/components/Navbar.svelte | 28 ++++++++++++--------- common/components/NavbarLink.svelte | 6 +++-- common/components/Profiles.svelte | 11 ++++++++- common/components/Sidebar.svelte | 37 +++++++++++++++------------- common/components/SidebarLink.svelte | 11 ++++++--- 6 files changed, 58 insertions(+), 37 deletions(-) diff --git a/common/App.svelte b/common/App.svelte index dc1a2b2..a590d10 100644 --- a/common/App.svelte +++ b/common/App.svelte @@ -64,10 +64,10 @@
-
+ diff --git a/common/components/Navbar.svelte b/common/components/Navbar.svelte index fb1fa2b..3f39e98 100644 --- a/common/components/Navbar.svelte +++ b/common/components/Navbar.svelte @@ -1,6 +1,8 @@
{ _click(); if (!icon.includes("favorite")) { window.dispatchEvent(new Event('overlay-check')) } } }> + use:click={() => { if (!icon.includes("favorite")) { window.dispatchEvent(new Event('overlay-check')) } _click() } }> - {icon} + {icon}
diff --git a/common/components/Profiles.svelte b/common/components/Profiles.svelte index 030e6b7..376bf20 100644 --- a/common/components/Profiles.svelte +++ b/common/components/Profiles.svelte @@ -86,9 +86,15 @@ if (keyCode === 27) close() } $: $profileView && modal?.focus() + + window.addEventListener('overlay-check', () => { + if ($profileView) { + close() + } + }) -
+
{#if $profileView}
@@ -183,6 +189,9 @@ .mt-2 { margin-top: .4rem; } + .z-55 { + z-index: 55; + } .mw-400 { min-width: 35rem; } diff --git a/common/components/Sidebar.svelte b/common/components/Sidebar.svelte index 41e181e..f69273f 100644 --- a/common/components/Sidebar.svelte +++ b/common/components/Sidebar.svelte @@ -1,9 +1,10 @@
{ _click(); if (!icon.includes("login") && !icon.includes("favorite")) { window.dispatchEvent(new Event('overlay-check')) } } }> + use:click={() => { if (!icon.includes("login") && !icon.includes("favorite")) { window.dispatchEvent(new Event('overlay-check')) } _click() } }> {#if image} logo - {text} + {text} {:else} + {@const active = (page === _page && overlay !== 'active') || (overlay === 'active' && nowPlaying)} - {icon} + {icon} - {text} + {text} {/if}
From d98f566bdbd8bba12cf1ef601c52df7ed407971a Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:10:16 -0700 Subject: [PATCH 02/10] fix: user sort options --- common/components/Search.svelte | 14 ++++++++------ common/modules/sections.js | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/common/components/Search.svelte b/common/components/Search.svelte index 68e5013..dc8ec9e 100644 --- a/common/components/Search.svelte +++ b/common/components/Search.svelte @@ -480,18 +480,20 @@
From 0468f345dc2948ed3d9bda22403f7d6df32a633b Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:12:45 -0700 Subject: [PATCH 04/10] feat: Stories You Missed --- common/modules/sections.js | 18 ++++++++++++++++++ common/views/Home/Home.svelte | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/common/modules/sections.js b/common/modules/sections.js index 54bfc0a..9d9344b 100644 --- a/common/modules/sections.js +++ b/common/modules/sections.js @@ -100,6 +100,24 @@ function createSections () { }, hide: !Helper.isAuthorized() || Helper.isMalAuth() // disable this section when authenticated with MyAnimeList. API for userLists fail to return relations and likely will never be fixed on their end. }, + { + title: 'Stories You Missed', variables : { sort: 'POPULARITY_DESC', userList: true, missedList: true, disableHide: true }, + load: (page = 1, perPage = 50, variables = {}) => { + if (Helper.isMalAuth()) return {} // same as Sequels You Missed + const res = Helper.userLists(variables).then(res => { + const mediaList = res.data.MediaListCollection.lists.find(({ status }) => status === 'COMPLETED')?.entries + const excludeIds = res.data.MediaListCollection.lists.reduce((filtered, { status, entries }) => { return (['CURRENT', 'REPEATING', 'COMPLETED', 'DROPPED', 'PAUSED'].includes(status)) ? filtered.concat(entries) : filtered}, []).map(({ media }) => media.id) || [] + if (!mediaList) return {} + const ids = mediaList.flatMap(({ media }) => { + return media.relations.edges.filter(edge => !['SEQUEL', 'CHARACTER', 'OTHER'].includes(edge.relationType)) + }).map(({ node }) => node.id) + if (!ids.length) return {} + return anilistClient.searchIDS({ page, perPage, id: ids, id_not: excludeIds, ...SectionsManager.sanitiseObject(variables), status: ['FINISHED', 'RELEASING'] }) + }) + return SectionsManager.wrapResponse(res, perPage) + }, + hide: !Helper.isAuthorized() || Helper.isMalAuth() + }, { title: 'Continue Watching', variables: { sort: 'UPDATED_TIME_DESC', userList: true, continueWatching: true, disableHide: true }, load: (page = 1, perPage = 50, variables = {}) => { diff --git a/common/views/Home/Home.svelte b/common/views/Home/Home.svelte index 1228be9..4346722 100644 --- a/common/views/Home/Home.svelte +++ b/common/views/Home/Home.svelte @@ -17,7 +17,7 @@ for (const sectionTitle of settings.value.homeSections) manager.add(mappedSections[sectionTitle]) if (Helper.getUser()) { - const userSections = ['Continue Watching', 'Sequels You Missed', 'Planning List', 'Completed List', 'Paused List', 'Dropped List', 'Watching List'] + const userSections = ['Continue Watching', 'Sequels You Missed', 'Stories You Missed', 'Planning List', 'Completed List', 'Paused List', 'Dropped List', 'Watching List'] Helper.getClient().userLists.subscribe(value => { if (!value) return for (const section of manager.sections) { From 83e4d30d250932f0ee167a823b3c8130409c22ba Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:14:45 -0700 Subject: [PATCH 05/10] fix: unnecessary list queries --- common/modules/al.d.ts | 1 + common/modules/helper.js | 46 ++++++++++++++----------- common/modules/mal.d.ts | 1 + common/views/ViewAnime/Scoring.svelte | 48 ++++++++++++++++++--------- 4 files changed, 61 insertions(+), 35 deletions(-) diff --git a/common/modules/al.d.ts b/common/modules/al.d.ts index 2e37fba..cc651ce 100644 --- a/common/modules/al.d.ts +++ b/common/modules/al.d.ts @@ -149,6 +149,7 @@ export type Viewer = { } name: string id: number + sync: boolean mediaListOptions?: { animeList?: { customLists?: string[] diff --git a/common/modules/helper.js b/common/modules/helper.js index b9cd4a5..4387c5d 100644 --- a/common/modules/helper.js +++ b/common/modules/helper.js @@ -256,30 +256,36 @@ export default class Helper { } Object.assign(variables, this.getFuzzyDate(media, status)) + if (media.mediaListEntry?.status !== variables.status || media.mediaListEntry?.progress !== variables.episode || media.mediaListEntry?.score !== variables.score || media.mediaListEntry?.repeat !== variables.repeat) { + let res + const description = `Title: ${anilistClient.title(media)}\nStatus: ${this.statusName[variables.status]}\nEpisode: ${videoEpisode} / ${media.episodes ? media.episodes : '?'}` + if (this.isAniAuth()) { + res = await anilistClient.alEntry(lists, variables) + } else if (this.isMalAuth()) { + res = await malClient.malEntry(media, variables) + } + this.listToast(res, description, false) - let res - const description = `Title: ${anilistClient.title(media)}\nStatus: ${this.statusName[variables.status]}\nEpisode: ${videoEpisode} / ${media.episodes ? media.episodes : '?'}` - if (this.isAniAuth()) { - res = await anilistClient.alEntry(lists, variables) - } else if (this.isMalAuth()) { - res = await malClient.malEntry(media, variables) - } - this.listToast(res, description, false) - - if (this.getUser().sync) { // handle profile entry syncing - const mediaId = media.id - for (const profile of get(profiles)) { - if (profile.viewer?.data?.Viewer.sync) { - let res - if (profile.viewer?.data?.Viewer?.avatar) { - const currentLists = (await anilistClient.getUserLists({userID: profile.viewer.data.Viewer.id, token: profile.token}))?.data?.MediaListCollection?.lists?.flatMap(list => list.entries).find(({ media }) => media.id === mediaId)?.media?.mediaListEntry?.customLists?.filter(list => list.enabled).map(list => list.name) || [] - res = await anilistClient.alEntry(currentLists, {...variables, token: profile.token}) - } else { - res = await malClient.malEntry(media, {...variables, token: profile.token}) + if (this.getUser().sync) { // handle profile entry syncing + const mediaId = media.id + for (const profile of get(profiles)) { + if (profile.viewer?.data?.Viewer.sync) { + let res + if (profile.viewer?.data?.Viewer?.avatar) { + const currentLists = (await anilistClient.getUserLists({ + userID: profile.viewer.data.Viewer.id, + token: profile.token + }))?.data?.MediaListCollection?.lists?.flatMap(list => list.entries).find(({media}) => media.id === mediaId)?.media?.mediaListEntry?.customLists?.filter(list => list.enabled).map(list => list.name) || [] + res = await anilistClient.alEntry(currentLists, {...variables, token: profile.token}) + } else { + res = await malClient.malEntry(media, {...variables, token: profile.token}) + } + this.listToast(res, description, profile) } - this.listToast(res, description, profile) } } + } else { + debug(`No entry changes detected for ${media.title.userPreferred}`) } } } diff --git a/common/modules/mal.d.ts b/common/modules/mal.d.ts index b62bcb5..0641735 100644 --- a/common/modules/mal.d.ts +++ b/common/modules/mal.d.ts @@ -40,6 +40,7 @@ export type Viewer = { id: number name: string picture: string + sync: boolean } export type MediaList = { diff --git a/common/views/ViewAnime/Scoring.svelte b/common/views/ViewAnime/Scoring.svelte index 30542d3..a989601 100644 --- a/common/views/ViewAnime/Scoring.svelte +++ b/common/views/ViewAnime/Scoring.svelte @@ -61,7 +61,7 @@ status = 'NOT IN LIST' if (media.mediaListEntry) { const res = await Helper.delete(Helper.isAniAuth() ? {id: media.mediaListEntry.id} : {idMal: media.idMal}) - const description = `${anilistClient.title(media)} has been deleted from your list` + const description = `${anilistClient.title(media)} has been deleted from your list.` printToast(res, description, false, false) if (res) media.mediaListEntry = undefined @@ -99,25 +99,43 @@ lists, ...fuzzyDate } - const res = await Helper.entry(media, variables) + if (media?.mediaListEntry?.status !== variables.status || media?.mediaListEntry?.progress !== variables.episode || media?.mediaListEntry?.score !== variables.score || media?.mediaListEntry?.repeat !== variables.repeat) { + const res = await Helper.entry(media, variables) - if (res?.data?.SaveMediaListEntry) { media.mediaListEntry = res?.data?.SaveMediaListEntry } + if (res?.data?.SaveMediaListEntry) { + media.mediaListEntry = res?.data?.SaveMediaListEntry + } - const description = `Title: ${anilistClient.title(media)}\nStatus: ${Helper.statusName[status]}\nEpisode: ${episode} / ${totalEpisodes}${score !== 0 ? `\nYour Score: ${score}` : ''}` - printToast(res, description, true, false) - if (Helper.getUser().sync) { // handle profile syncing - const mediaId = media.id - for (const profile of get(profiles)) { - if (profile.viewer?.data?.Viewer.sync) { - const anilist = profile.viewer?.data?.Viewer?.avatar - const currentLists = (anilist ? (await anilistClient.getUserLists({userID: profile.viewer.data.Viewer.id, token: profile.token}))?.data?.MediaListCollection?.lists?.flatMap(list => list.entries).find(({ media }) => media.id === mediaId)?.media?.mediaListEntry?.customLists?.filter(list => list.enabled).map(list => list.name) || [] : lists) - if (!currentLists.includes('Watched using Miru')) { - currentLists.push('Watched using Miru') + const description = `Title: ${anilistClient.title(media)}\nStatus: ${Helper.statusName[status]}\nEpisode: ${episode} / ${totalEpisodes}${score !== 0 ? `\nYour Score: ${score}` : ''}` + printToast(res, description, true, false) + if (Helper.getUser().sync) { // handle profile syncing + const mediaId = media.id + for (const profile of get(profiles)) { + if (profile.viewer?.data?.Viewer.sync) { + const anilist = profile.viewer?.data?.Viewer?.avatar + const currentLists = (anilist ? (await anilistClient.getUserLists({ + userID: profile.viewer.data.Viewer.id, + token: profile.token + }))?.data?.MediaListCollection?.lists?.flatMap(list => list.entries).find(({media}) => media.id === mediaId)?.media?.mediaListEntry?.customLists?.filter(list => list.enabled).map(list => list.name) || [] : lists) + if (!currentLists.includes('Watched using Miru')) { + currentLists.push('Watched using Miru') + } + const res = await Helper.entry(media, { + ...variables, + lists: currentLists, + score: (anilist ? (score * 10) : score), + token: profile.token, + anilist + }) + printToast(res, description, true, profile) } - const res = await Helper.entry(media, { ...variables, lists: currentLists, score: (anilist ? (score * 10) : score), token: profile.token, anilist }) - printToast(res, description, true, profile) } } + } else { + toast.warning('No Changes to List', { + description: `Title: ${anilistClient.title(media)}\nStatus: ${Helper.statusName[status]}\nEpisode: ${episode} / ${totalEpisodes}${score !== 0 ? `\nYour Score: ${score}` : ''}`, + duration: 6000 + }) } } else { await deleteEntry() From 1b1d07bb0b4cbf34663f57731ac265b1ef231c1b Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:15:30 -0700 Subject: [PATCH 06/10] chore: magnet link toast --- common/modules/torrent.js | 1 + 1 file changed, 1 insertion(+) diff --git a/common/modules/torrent.js b/common/modules/torrent.js index bd11cf8..ac5d3a6 100644 --- a/common/modules/torrent.js +++ b/common/modules/torrent.js @@ -26,6 +26,7 @@ class TorrentWorker extends EventTarget { if (torrentRx.exec(text)) { media.set(null) add(text) + this.dispatch('info', 'A Magnet Link has been detected and is being processed. Files will be loaded shortly...') } } }) From 219ed4543fd384a9a9470fd679ada21543477469 Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Thu, 26 Sep 2024 20:19:24 -0700 Subject: [PATCH 07/10] chore: major discord-rpc improvments --- common/views/Player/MediaHandler.svelte | 50 --------------- common/views/Player/Player.svelte | 84 ++++++++++++++++++++++++- electron/src/main/discord.js | 8 ++- 3 files changed, 88 insertions(+), 54 deletions(-) diff --git a/common/views/Player/MediaHandler.svelte b/common/views/Player/MediaHandler.svelte index 1fdcc98..a40e847 100644 --- a/common/views/Player/MediaHandler.svelte +++ b/common/views/Player/MediaHandler.svelte @@ -3,8 +3,6 @@ import AnimeResolver from '@/modules/animeresolver.js' import { videoRx } from '@/modules/util.js' import { tick } from 'svelte' - import { state } from '../WatchTogether/WatchTogether.svelte' - import IPC from '@/modules/ipc.js' import { anilistClient } from "@/modules/anilist.js" import Debug from 'debug' @@ -69,7 +67,6 @@ episodeTitle: streamingEpisode && episodeRx.exec(streamingEpisode.title)[2], thumbnail: streamingEpisode?.thumbnail || media?.coverImage.extraLarge } - setDiscordRPC(np) setMediaSession(np) nowPlaying.set(np) } @@ -210,53 +207,6 @@ : new MediaMetadata({ title: name }) navigator.mediaSession.metadata = metadata } - - function setDiscordRPC (np = nowPlaying.value) { - const w2g = state.value?.code - const details = [np.title, np.episodeTitle].filter(i => i).join(' - ') || undefined - const activity = { - details, - state: details && 'Watching Episode ' + ((!np.media?.episodes && np.episode) || ''), - timestamps: { - start: Date.now() - }, - party: { - size: (np.episode && np.media?.episodes && [np.episode, np.media.episodes]) || undefined - }, - assets: { - large_text: np.title, - large_image: np.thumbnail, - small_image: 'logo', - small_text: 'https://github.com/ThaUnknown/miru' - }, - instance: true, - type: 3 - } - // cannot have buttons and secrets at once - if (w2g) { - activity.secrets = { - join: w2g, - match: w2g + 'm' - } - activity.party.id = w2g + 'p' - } else { - activity.buttons = [ - { - label: 'Download app', - url: 'https://github.com/ThaUnknown/miru/releases/latest' - }, - { - label: 'Watch on Miru', - url: `miru://anime/${np.media?.id}` - } - ] - } - IPC.emit('discord', { activity }) - } - state.subscribe(() => { - setDiscordRPC() - return noop - }) diff --git a/electron/src/main/discord.js b/electron/src/main/discord.js index 2d655cf..d82119a 100644 --- a/electron/src/main/discord.js +++ b/electron/src/main/discord.js @@ -6,7 +6,7 @@ export default class Discord { defaultStatus = { activity: { timestamps: { start: Date.now() }, - details: 'Stream anime torrents, real-time.', + details: 'Stream anime torrents', state: 'Watching anime', assets: { small_image: 'logo', @@ -55,6 +55,10 @@ export default class Discord { } }) + ipcMain.on('discord-hidden', () => { + this.debouncedDiscordRPC(undefined, true) + }) + this.discord.on('ready', async () => { this.setDiscordRPC(this.cachedPresence || this.defaultStatus) this.discord.subscribe('ACTIVITY_JOIN_REQUEST') @@ -66,7 +70,7 @@ export default class Discord { window.webContents.send('w2glink', secret) }) - this.debouncedDiscordRPC = debounce(status => this.setDiscordRPC(status), 4500) + this.debouncedDiscordRPC = debounce((status, logout) => logout ? this.logoutRPC() : this.setDiscordRPC(status), 4500) } loginRPC () { From b4da5f07e97feb2aa1f8a9c549d7c59a7bad7383 Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Sat, 28 Sep 2024 21:58:09 -0700 Subject: [PATCH 08/10] chore: player toast duration --- common/views/Player/Player.svelte | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/common/views/Player/Player.svelte b/common/views/Player/Player.svelte index 9cd866a..dc9f203 100644 --- a/common/views/Player/Player.svelte +++ b/common/views/Player/Player.svelte @@ -18,7 +18,7 @@ import { SUPPORTS } from '@/modules/support.js' import 'rvfc-polyfill' import IPC from '@/modules/ipc.js' - import { ArrowDown, ArrowUp, Captions, Cast, CircleHelp, Contrast, FastForward, RefreshCw, Keyboard, List, ListMusic, ListVideo, Maximize, Minimize, Pause, PictureInPicture, PictureInPicture2, Play, Proportions, RefreshCcw, Rewind, RotateCcw, RotateCw, ScreenShare, SkipBack, SkipForward, Users, Volume1, Volume2, VolumeX } from 'lucide-svelte' + import { ArrowDown, ArrowUp, Captions, Cast, CircleHelp, Contrast, FastForward, Keyboard, List, ListMusic, ListVideo, Maximize, Minimize, Pause, PictureInPicture, PictureInPicture2, Play, Proportions, RefreshCcw, Rewind, RotateCcw, RotateCw, ScreenShare, SkipBack, SkipForward, Users, Volume1, Volume2, VolumeX } from 'lucide-svelte' const emit = createEventDispatcher() @@ -995,7 +995,7 @@ console.warn('A network error caused the video download to fail part-way.', target.error) toast.error('Video Network Error', { description: 'A network error caused the video download to fail part-way. Dismiss this toast to reload the video.', - duration: 10000, + duration: Infinity, onDismiss: () => target.load() }) break @@ -1003,7 +1003,7 @@ console.warn('The video playback was aborted due to a corruption problem or because the video used features your browser did not support.', target.error) toast.error('Video Decode Error', { description: 'The video playback was aborted due to a corruption problem. Dismiss this toast to reload the video.', - duration: 10000, + duration: Infinity, onDismiss: () => target.load() }) break @@ -1297,11 +1297,6 @@ {#if playbackRate !== 1}
x{playbackRate.toFixed(1)}
{/if} - {#if video} - video.load()}> - - - {/if} (showKeybinds = true)}> From d20f0de09928d84cd988b02eee462777c415e2db Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Sat, 28 Sep 2024 21:59:03 -0700 Subject: [PATCH 09/10] fix: mal refresh typo --- common/modules/settings.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/modules/settings.js b/common/modules/settings.js index b192493..9a9265a 100644 --- a/common/modules/settings.js +++ b/common/modules/settings.js @@ -134,8 +134,9 @@ async function handleMalToken (code, state) { export async function refreshMalToken (token) { const { clientID } = await import('./myanimelist.js') const refresh = malToken?.token === token ? malToken.refresh : get(profiles).find(profile => profile.token === token)?.refresh + debug(`Attempting to refresh authorization token ${token} with the refresh token ${refresh}`) let response - if (!refresh || !(refresh.length > 0)) { + if (refresh && refresh.length > 0) { response = await fetch('https://myanimelist.net/v1/oauth2/token', { method: 'POST', headers: { @@ -148,9 +149,9 @@ export async function refreshMalToken (token) { }) }) } - if (!refresh || !(refresh.length > 0) || !response?.ok) { + if (!refresh || refresh.length <= 0 || !response?.ok) { toast.error('Failed to re-authenticate with MyAnimeList. You will need to log in again.', { description: JSON.stringify(response?.status || response) }) - debug(`Failed to refresh MyAnimeList User Token ${ !refresh || !(refresh.length > 0) ? 'as the refresh token could not be fetched!' : ': ' + JSON.stringify(response)}`) + debug(`Failed to refresh MyAnimeList User Token ${ !refresh || refresh.length <= 0 ? 'as the refresh token could not be fetched!' : ': ' + JSON.stringify(response)}`) if (malToken?.token === token) { swapProfiles(null) location.reload() From b0fb2a87170d80c6600d25675e82bf6168e361bc Mon Sep 17 00:00:00 2001 From: RockinChaos Date: Sat, 28 Sep 2024 22:00:43 -0700 Subject: [PATCH 10/10] fix: sorting --- common/components/Search.svelte | 31 +++++++++++++++++-------------- common/modules/anilist.js | 2 +- common/modules/sections.js | 2 +- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/common/components/Search.svelte b/common/components/Search.svelte index dc8ec9e..530eaa2 100644 --- a/common/components/Search.svelte +++ b/common/components/Search.svelte @@ -1,7 +1,7 @@