antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-01 10:23:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: discord presence display type

Browse source
This commit is contained in:
mae taylor 2025-08-01 16:43:34 +01:00
parent 7ff74b8d5e
commit 76770de7d8
No known key found for this signature in database
GPG key ID: 3C80D76BA7A3B9BD
4 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/renderer/features/discord-rpc/use-discord-rpc.ts
View file

@ -1,9 +1,10 @@
import { SetActivity } from '@xhayper/discord-rpc';
import { SetActivity, StatusDisplayType } from '@xhayper/discord-rpc';
import isElectron from 'is-electron';
import { useCallback, useEffect, useState } from 'react';
import { controller } from '/@/renderer/api/controller';
import {
DiscordDisplayType,
getServerById,
useDiscordSetttings,
useGeneralSettings,
@ -54,6 +55,12 @@ export const useDiscordRpc = () => {
const artists = song?.artists.map((artist) => artist.name).join(', ');
const statusDisplayMap = {
[DiscordDisplayType.ARTIST_NAME]: StatusDisplayType.STATE,
[DiscordDisplayType.FEISHIN]: StatusDisplayType.NAME,
[DiscordDisplayType.SONG_NAME]: StatusDisplayType.DETAILS,
};
const activity: SetActivity = {
details: song?.name.padEnd(2, ' ') || 'Idle',
instance: false,
@ -61,7 +68,8 @@ export const useDiscordRpc = () => {
largeImageText: song?.album || 'Unknown album',
smallImageKey: undefined,
smallImageText: current[2] as string,
state: (artists && `By ${artists}`) || 'Unknown artist',
state: artists || 'Unknown artist',
statusDisplayType: statusDisplayMap[discordSettings.displayType],
// I would love to use the actual type as opposed to hardcoding to 2,
// but manually installing the discord-types package appears to break things
type: discordSettings.showAsListening ? 2 : 0,
@ -134,6 +142,7 @@ export const useDiscordRpc = () => {
discordSettings.showPaused,
generalSettings.lastfmApiKey,
discordSettings.clientId,
discordSettings.displayType,
lastUniqueId,
],
);

46
src/renderer/features/settings/components/window/discord-settings.tsx
View file

@ -6,10 +6,12 @@ import {
SettingsSection,
} from '/@/renderer/features/settings/components/settings-section';
import {
DiscordDisplayType,
useDiscordSetttings,
useGeneralSettings,
useSettingsStoreActions,
} from '/@/renderer/store';
import { Select } from '/@/shared/components/select/select';
import { Switch } from '/@/shared/components/switch/switch';
import { TextInput } from '/@/shared/components/text-input/text-input';
@ -120,6 +122,50 @@ export const DiscordSettings = () => {
postProcess: 'sentenceCase',
}),
},
{
control: (
<Select
aria-label={t('setting.discordDisplayType')}
clearable={false}
data={[
{ label: 'Feishin', value: DiscordDisplayType.FEISHIN },
{
label: t('setting.discordDisplayType', {
context: 'songname',
postProcess: 'sentenceCase',
}),
value: DiscordDisplayType.SONG_NAME,
},
{
label: t('setting.discordDisplayType_artistname', {
context: 'artistname',
postProcess: 'sentenceCase',
}),
value: DiscordDisplayType.ARTIST_NAME,
},
]}
defaultValue={settings.displayType}
onChange={(e) => {
if (!e) return;
setSettings({
discord: {
...settings,
displayType: e as DiscordDisplayType,
},
});
}}
/>
),
description: t('setting.discordDisplayType', {
context: 'description',
postProcess: 'sentenceCase',
}),
isHidden: !isElectron(),
title: t('setting.discordDisplayType', {
discord: 'Discord',
postProcess: 'sentenceCase',
}),
},
{
control: (
<Switch