smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-11 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: discord-rpc (#1278)

Browse Source
This commit is contained in:
JellyBrick
2023-10-08 14:44:48 +09:00
committed by GitHub
parent c258a4855e 26de5802a0
commit 0bee281d1d
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
plugins/discord/back.ts
View File

@ -4,7 +4,7 @@ import { dev } from 'electron-is';
import { SetActivity } from '@xhayper/discord-rpc/dist/structures/ClientUser'; import { SetActivity } from '@xhayper/discord-rpc/dist/structures/ClientUser';
import registerCallback from '../../providers/song-info'; import registerCallback, { type SongInfoCallback, type SongInfo } from '../../providers/song-info';
import type { ConfigType } from '../../config/dynamic'; import type { ConfigType } from '../../config/dynamic';
@ -15,7 +15,7 @@ export interface Info {
rpc: DiscordClient; rpc: DiscordClient;
ready: boolean; ready: boolean;
autoReconnect: boolean; autoReconnect: boolean;
lastSongInfo?: import('../../providers/song-info').SongInfo; lastSongInfo?: SongInfo;
} }
const info: Info = { const info: Info = {
@ -39,36 +39,14 @@ const resetInfo = () => {
console.log('discord disconnected'); console.log('discord disconnected');
} }
for (const cb of refreshCallbacks) { setTimeout(() => {
cb(); for (const cb of refreshCallbacks) {
} cb();
}
}, 100);
}; };
info.rpc.on('connected', () => {
if (dev()) {
console.log('discord connected');
}
for (const cb of refreshCallbacks) {
cb();
}
});
info.rpc.on('ready', () => {
info.ready = true;
if (info.lastSongInfo) {
updateActivity(info.lastSongInfo);
}
});
info.rpc.on('disconnected', () => {
resetInfo();
if (info.autoReconnect) {
connectTimeout();
}
});
const connectTimeout = () => new Promise((resolve, reject) => setTimeout(() => { const connectTimeout = () => new Promise((resolve, reject) => setTimeout(() => {
if (!info.autoReconnect || info.rpc.isConnected) { if (!info.autoReconnect || info.rpc.isConnected) {
return; return;
@ -117,7 +95,7 @@ export const connect = (showError = false) => {
}; };
let clearActivity: NodeJS.Timeout | undefined; let clearActivity: NodeJS.Timeout | undefined;
let updateActivity: import('../../providers/song-info').SongInfoCallback; let updateActivity: SongInfoCallback;
type DiscordOptions = ConfigType<'discord'>; type DiscordOptions = ConfigType<'discord'>;
@ -125,6 +103,31 @@ export default (
win: Electron.BrowserWindow, win: Electron.BrowserWindow,
options: DiscordOptions, options: DiscordOptions,
) => { ) => {
info.rpc.on('connected', () => {
if (dev()) {
console.log('discord connected');
}
for (const cb of refreshCallbacks) {
cb();
}
});
info.rpc.on('ready', () => {
info.ready = true;
if (info.lastSongInfo) {
updateActivity(info.lastSongInfo);
}
});
info.rpc.on('disconnected', () => {
resetInfo();
if (info.autoReconnect) {
connectTimeout();
}
});
info.autoReconnect = options.autoReconnect; info.autoReconnect = options.autoReconnect;
window = win; window = win;