From cb1c591b177ef2ace85ae33342e991d3acada85a Mon Sep 17 00:00:00 2001 From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com> Date: Sun, 25 Aug 2024 16:51:16 +0200 Subject: [PATCH] feat: w2g chat --- common/components/Sidebar.svelte | 2 +- common/modules/sections.js | 3 +- common/views/Player/MediaHandler.svelte | 2 +- common/views/Player/Player.svelte | 4 +- common/views/ViewAnime/ViewAnime.svelte | 2 +- common/views/WatchTogether/Lobby.svelte | 103 ++++++-- common/views/WatchTogether/Message.svelte | 47 ++++ common/views/WatchTogether/User.svelte | 20 ++ .../views/WatchTogether/WatchTogether.svelte | 166 +++---------- common/views/WatchTogether/events.js | 16 ++ common/views/WatchTogether/w2g.js | 233 ++++++++++++++++++ 11 files changed, 436 insertions(+), 162 deletions(-) create mode 100644 common/views/WatchTogether/Message.svelte create mode 100644 common/views/WatchTogether/User.svelte create mode 100644 common/views/WatchTogether/events.js create mode 100644 common/views/WatchTogether/w2g.js diff --git a/common/components/Sidebar.svelte b/common/components/Sidebar.svelte index 7a7ba66..5a41e8a 100644 --- a/common/components/Sidebar.svelte +++ b/common/components/Sidebar.svelte @@ -28,7 +28,7 @@ if (anilistClient.userID?.viewer?.data?.Viewer) { $logout = true } else { - IPC.emit('open', 'https://anilist.co/api/v2/oauth/authorize?client_id=20321&response_type=token') // Change redirect_url to miru://auth/ + IPC.emit('open', 'https://anilist.co/api/v2/oauth/authorize?client_id=20321&response_type=token') // Change redirect_url to migu://auth/ if (platformMap[window.version.platform] === 'Linux') { toast('Support Notification', { description: "If your linux distribution doesn't support custom protocol handlers, you can simply paste the full URL into the app.", diff --git a/common/modules/sections.js b/common/modules/sections.js index eaecb26..5c1ff1f 100644 --- a/common/modules/sections.js +++ b/common/modules/sections.js @@ -190,7 +190,6 @@ function createSections () { { title: 'Romance', variables: { sort: 'TRENDING_DESC', genre: 'Romance' } }, { title: 'Action', variables: { sort: 'TRENDING_DESC', genre: 'Action' } }, { title: 'Adventure', variables: { sort: 'TRENDING_DESC', genre: 'Adventure' } }, - { title: 'Fantasy', variables: { sort: 'TRENDING_DESC', genre: 'Fantasy' } }, - { title: 'Comedy', variables: { sort: 'TRENDING_DESC', genre: 'Comedy' } } + { title: 'Fantasy', variables: { sort: 'TRENDING_DESC', genre: 'Fantasy' } } ] } diff --git a/common/views/Player/MediaHandler.svelte b/common/views/Player/MediaHandler.svelte index e4e127f..1c807ad 100644 --- a/common/views/Player/MediaHandler.svelte +++ b/common/views/Player/MediaHandler.svelte @@ -211,7 +211,7 @@ } function setDiscordRPC (np = nowPlaying.value) { - const w2g = state.value + const w2g = state.value?.code const details = [np.title, np.episodeTitle].filter(i => i).join(' - ') || undefined const activity = { details, diff --git a/common/views/Player/Player.svelte b/common/views/Player/Player.svelte index a33474e..65e88b6 100644 --- a/common/views/Player/Player.svelte +++ b/common/views/Player/Player.svelte @@ -25,12 +25,12 @@ const emit = createEventDispatcher() - w2gEmitter.on('playerupdate', ({ detail }) => { + w2gEmitter.on('playerupdate', detail => { currentTime = detail.time paused = detail.paused }) - w2gEmitter.on('setindex', ({ detail }) => { + w2gEmitter.on('setindex', detail => { playFile(detail) }) diff --git a/common/views/ViewAnime/ViewAnime.svelte b/common/views/ViewAnime/ViewAnime.svelte index a82106e..2a781ec 100644 --- a/common/views/ViewAnime/ViewAnime.svelte +++ b/common/views/ViewAnime/ViewAnime.svelte @@ -140,7 +140,7 @@ - - +
+
+
+ {#each groupMessages($messages) as { user, messages, type, date }} + + {/each} +
+ + +