vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-09 20:29:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove discord-rpc import in renderer

Browse Source
This commit is contained in:
jeffvli
2026-04-10 01:30:33 -07:00
parent 515638c063
commit 9fe088174d
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preload/discord-rpc.ts
+2 -1
View File
@@ -1,4 +1,5 @@
import { SetActivity } from '@xhayper/discord-rpc'; import type { SetActivity } from '@xhayper/discord-rpc';
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
const initialize = (clientId: string) => { const initialize = (clientId: string) => {
src/renderer/features/discord-rpc/use-discord-rpc.ts
+13 -5
View File
@@ -1,4 +1,5 @@
import { SetActivity, StatusDisplayType } from '@xhayper/discord-rpc'; import type { SetActivity } from '@xhayper/discord-rpc';
import isElectron from 'is-electron'; import isElectron from 'is-electron';
import React, { useCallback, useEffect, useRef, useState } from 'react'; import React, { useCallback, useEffect, useRef, useState } from 'react';
@@ -27,6 +28,13 @@ import { LibraryItem, QueueSong, ServerType } from '/@/shared/types/domain-types
import { PlayerStatus } from '/@/shared/types/types'; import { PlayerStatus } from '/@/shared/types/types';
const discordRpc = isElectron() ? window.api.discordRpc : null; const discordRpc = isElectron() ? window.api.discordRpc : null;
const DiscordStatusDisplayType = {
DETAILS: 2,
NAME: 0,
STATE: 1,
} as const;
type ActivityState = [QueueSong | undefined, number, PlayerStatus]; type ActivityState = [QueueSong | undefined, number, PlayerStatus];
const MAX_FIELD_LENGTH = 127; const MAX_FIELD_LENGTH = 127;
@@ -122,7 +130,7 @@ export const useDiscordRpc = () => {
: undefined : undefined
: sentenceCase(current[2]), : sentenceCase(current[2]),
state: truncate(artist), state: truncate(artist),
statusDisplayType: StatusDisplayType.STATE, statusDisplayType: DiscordStatusDisplayType.STATE,
type: discordSettings.showAsListening ? 2 : 0, type: discordSettings.showAsListening ? 2 : 0,
}; };
@@ -196,9 +204,9 @@ export const useDiscordRpc = () => {
const artists = song?.artists.map((artist) => artist.name).join(', '); const artists = song?.artists.map((artist) => artist.name).join(', ');
const statusDisplayMap = { const statusDisplayMap = {
[DiscordDisplayType.ARTIST_NAME]: StatusDisplayType.STATE, [DiscordDisplayType.ARTIST_NAME]: DiscordStatusDisplayType.STATE,
[DiscordDisplayType.FEISHIN]: StatusDisplayType.NAME, [DiscordDisplayType.FEISHIN]: DiscordStatusDisplayType.NAME,
[DiscordDisplayType.SONG_NAME]: StatusDisplayType.DETAILS, [DiscordDisplayType.SONG_NAME]: DiscordStatusDisplayType.DETAILS,
}; };
const activity: SetActivity = { const activity: SetActivity = {