Skip to content

Commit fc6a764

Browse files
InrixiaInrixia
authored
Merge pull request #199 from Ceebox/dev
[Discord RPC] Allow the user to specify where their custom rich presence status shows up
2 parents cca6cb2 + 3d1a543 commit fc6a764

File tree

3 files changed

+99
-43
lines changed

3 files changed

+99
-43
lines changed

‎plugins/DiscordRPC/src/Settings.tsx‎

Lines changed: 61 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,36 @@ import React from "react";
66
import { errSignal, trace } from ".";
77
import { updateActivity } from "./updateActivity";
88

9+
export enum PresenceStatus {
10+
Tidal = 0,
11+
Artist = 1,
12+
Track = 2,
13+
Custom = 3
14+
}
15+
16+
export enum CustomStatusPosition {
17+
ReplaceAppName = 0,
18+
ReplaceTrackName = 1
19+
}
20+
921
export const settings = await ReactiveStore.getPluginStorage("DiscordRPC", {
1022
displayOnPause: true,
1123
displayArtistIcon: true,
1224
displayPlaylistButton: true,
13-
status: 1,
14-
customStatusText: ""
25+
status: PresenceStatus.Artist,
26+
customStatusText: "",
27+
customStatusPosition: CustomStatusPosition.ReplaceAppName
1528
});
1629

1730
export const Settings = () => {
1831
const [displayOnPause, setDisplayOnPause] = React.useState(settings.displayOnPause);
1932
const [displayArtistIcon, setDisplayArtistIcon] = React.useState(settings.displayArtistIcon);
2033
const [displayPlaylistButton, setDisplayPlaylistButton] = React.useState(settings.displayPlaylistButton)
21-
const [status, setStatus] = React.useState(settings.status);
34+
const [status, setStatus] = React.useState(settings.status as PresenceStatus);
2235
const [customStatusText, setCustomStatusText] = React.useState(settings.customStatusText);
36+
const [customStatusPosition, setCustomStatusPosition] = React.useState(
37+
Number(settings.customStatusPosition) as CustomStatusPosition
38+
);
2339

2440
return (
2541
<LunaSettings>
@@ -62,10 +78,11 @@ export const Settings = () => {
6278
<LunaSelectSetting
6379
title="Status text"
6480
desc="What text that you're 'Listening to' in your Discord status"
65-
value={status}
81+
value={String(status)}
6682
onChange={(e) => {
67-
const newStatus = parseInt(e.target.value);
68-
setStatus((settings.status = newStatus));
83+
const newStatus = Number(e.target.value) as PresenceStatus;
84+
setStatus(settings.status = newStatus);
85+
6986
updateActivity()
7087
.then(() => (errSignal!._ = undefined))
7188
.catch(trace.err.withContext("Failed to set activity"));
@@ -78,29 +95,44 @@ export const Settings = () => {
7895
</LunaSelectSetting>
7996

8097
{status === 3 && (
81-
<LunaTextSetting
82-
title="Custom status text"
83-
desc={
84-
<>
85-
Set your own message for Discord activity.
86-
<br />
87-
You can use the following tags:
88-
<ul>
89-
<li>{`{artist}`}</li>
90-
<li>{`{track}`}</li>
91-
<li>{`{album}`}</li>
92-
</ul>
93-
Example: <b>{"Listening to {track} by {artist}"}</b>
94-
</>
95-
}
96-
value={customStatusText}
97-
onChange={(e) => {
98-
setCustomStatusText((settings.customStatusText = e.target.value));
99-
updateActivity()
100-
.then(() => (errSignal!._ = undefined))
101-
.catch(trace.err.withContext("Failed to set activity"));
102-
}}
103-
/>
98+
<div>
99+
<LunaTextSetting
100+
title="Custom status text"
101+
desc={
102+
<>
103+
Set your own message for Discord activity.
104+
<br />
105+
You can use the following tags:
106+
<ul>
107+
<li>{`{artist}`}</li>
108+
<li>{`{track}`}</li>
109+
<li>{`{album}`}</li>
110+
</ul>
111+
Example: <b>{"Listening to {track} by {artist}"}</b>
112+
</>
113+
}
114+
value={customStatusText}
115+
onChange={(e) => {
116+
setCustomStatusText((settings.customStatusText = e.target.value));
117+
updateActivity()
118+
.then(() => (errSignal!._ = undefined))
119+
.catch(trace.err.withContext("Failed to set activity"));
120+
}}
121+
/>
122+
<LunaSelectSetting
123+
title="Custom status position"
124+
desc="Choose what the custom status replaces in the rich presence area"
125+
value={String(customStatusPosition)}
126+
onChange={(e) => {
127+
const pos = Number(e.target.value) as CustomStatusPosition;
128+
setCustomStatusPosition(settings.customStatusPosition = pos);
129+
updateActivity().catch(trace.err.withContext("Failed to set activity"));
130+
}}
131+
>
132+
<LunaSelectItem value="0" children="TIDAL" />
133+
<LunaSelectItem value="1" children="Track Name" />
134+
</LunaSelectSetting>
135+
</div>
104136
)}
105137
</LunaSettings>
106138
);

‎plugins/DiscordRPC/src/activityTextHelpers.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { MediaItem } from "@luna/lib";
2-
import { settings } from "./Settings";
2+
import { PresenceStatus, settings } from "./Settings";
33

44
const STR_MAX_LEN = 127;
55
export const fmtStr = (s?: string) => {
@@ -16,13 +16,13 @@ export const getStatusText = async (mediaItem: MediaItem) => {
1616
const album = await (await mediaItem.album())?.title() ?? "";
1717

1818
switch (settings.status) {
19-
case 0:
20-
return "Listening to TIDAL";
21-
case 1:
22-
return `Listening to ${artist}`;
23-
case 2:
24-
return `Listening to ${track}`;
25-
case 3: {
19+
case PresenceStatus.Tidal:
20+
return "TIDAL";
21+
case PresenceStatus.Artist:
22+
return fmtStr(artist);
23+
case PresenceStatus.Track:
24+
return fmtStr(track);
25+
case PresenceStatus.Custom: {
2626
let custom = settings.customStatusText || "";
2727
custom = custom
2828
.replaceAll("{artist}", artist)

‎plugins/DiscordRPC/src/updateActivity.ts‎

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { asyncDebounce } from "@inrixia/helpers";
22
import { MediaItem, PlayState, redux } from "@luna/lib";
33

4-
import type { SetActivity } from "@xhayper/discord-rpc";
4+
import { StatusDisplayType, type SetActivity } from "@xhayper/discord-rpc";
55
import { setActivity } from "./discord.native";
6-
import { settings } from "./Settings";
6+
import { CustomStatusPosition, PresenceStatus, settings } from "./Settings";
77
import { fmtStr, getStatusText } from "./activityTextHelpers";
88

99
export const updateActivity = asyncDebounce(async (mediaItem?: MediaItem) => {
@@ -16,7 +16,7 @@ export const updateActivity = asyncDebounce(async (mediaItem?: MediaItem) => {
1616

1717
const activity: SetActivity = { type: 2 }; // Listening type
1818

19-
const trackUrl = `https://tidal.com/${mediaItem.tidalItem.contentType}/${mediaItem.id}/u`
19+
const trackUrl = `https://tidal.com/${mediaItem.tidalItem.contentType}/${mediaItem.id}/u`;
2020
const trackSourceUrl = `https://tidal.com/browse${sourceUrl}`;
2121

2222
activity.buttons = [
@@ -36,18 +36,42 @@ export const updateActivity = asyncDebounce(async (mediaItem?: MediaItem) => {
3636
const artist = await mediaItem.artist();
3737
const artistUrl = `https://tidal.com/artist/${artist?.id}/u`;
3838

39-
// Status text (if this is custom, we want to display our message)
40-
activity.statusDisplayType = settings.status == 3 ? 2 : settings.status;
39+
// Status text
40+
const statusText = fmtStr(await getStatusText(mediaItem));
41+
activity.name = "TIDAL";
42+
if (settings.status === PresenceStatus.Custom) {
43+
activity.statusDisplayType = StatusDisplayType.DETAILS;
44+
} else {
45+
// Convert from our custom enum
46+
activity.statusDisplayType = settings.status as unknown as StatusDisplayType;
47+
}
4148

4249
// Title
43-
activity.details = await getStatusText(mediaItem);
50+
const trackTitle = fmtStr(await mediaItem.title());
51+
activity.details = trackTitle;
4452
activity.detailsUrl = trackUrl;
4553

4654
// Artists
4755
const artistNames = await MediaItem.artistNames(await mediaItem.artists());
4856
activity.state = fmtStr(artistNames.join(", ")) ?? "Unknown Artist";
4957
activity.stateUrl = artistUrl;
5058

59+
if (settings.status === PresenceStatus.Custom) {
60+
61+
// Due to Discord's constraints, we can't have a separate property for the title
62+
// It has to either replace the application name or the song name
63+
if (settings.customStatusPosition === CustomStatusPosition.ReplaceTrackName) {
64+
// Replace the song title with the custom status
65+
activity.details = statusText;
66+
activity.statusDisplayType = 2;
67+
} else {
68+
// Replace the application name with the custom status
69+
activity.name = statusText;
70+
activity.details = trackTitle;
71+
activity.statusDisplayType = 0;
72+
}
73+
}
74+
5175
// Pause indicator
5276
if (PlayState.playing) {
5377
// Small Artist image

0 commit comments

Comments
 (0)