Merge pull request #170 from Inrixia/master

Update dev

Author: Inrixia

plugins/DiscordRPC/package.json

@@ -9,6 +9,6 @@
 	},
 	"exports": "./src/index.ts",
 	"dependencies": {
-		"@xhayper/discord-rpc": "^1.2.1"
+		"@xhayper/discord-rpc": "^1.3.0"
 	}
 }

plugins/DiscordRPC/src/Settings.tsx

@@ -1,4 +1,4 @@
-import { LunaSettings, LunaSwitchSetting } from "@luna/ui";
+import { LunaSelectItem, LunaSelectSetting, LunaSettings, LunaSwitchSetting } from "@luna/ui";
 
 import { ReactiveStore } from "@luna/core";
 
@@ -9,11 +9,15 @@ import { updateActivity } from "./updateActivity";
 export const settings = await ReactiveStore.getPluginStorage("DiscordRPC", {
 	displayOnPause: true,
 	displayArtistIcon: true,
+	displayPlaylistButton: true,
+	status: 1,
 });
 
 export const Settings = () => {
 	const [displayOnPause, setDisplayOnPause] = React.useState(settings.displayOnPause);
 	const [displayArtistIcon, setDisplayArtistIcon] = React.useState(settings.displayArtistIcon);
+	const [displayPlaylistButton, setDisplayPlaylistButton] = React.useState(settings.displayPlaylistButton)
+	const [status, setStatus] = React.useState(settings.status);
 
 	return (
 		<LunaSettings>
@@ -41,6 +45,28 @@ export const Settings = () => {
 						.catch(trace.err.withContext("Failed to set activity"));
 				}}
 			/>
+			<LunaSwitchSetting
+				title="Display playlist button"
+				desc="When playing a playlist a button appears for it in the activity"
+				tooltip="Display playlist button"
+				checked={displayPlaylistButton}
+				onChange={(_, checked) => {
+					setDisplayPlaylistButton((settings.displayPlaylistButton = checked));
+					updateActivity()
+						.then(() => (errSignal!._ = undefined))
+						.catch(trace.err.withContext("Failed to set activity"));
+				}}
+			/>
+			<LunaSelectSetting
+				title="Status text"
+				desc="What text that you're 'Listening to' in your Discord status"
+				value={status}
+				onChange={(e) => setStatus((settings.status = parseInt(e.target.value)))}
+			>
+				<LunaSelectItem value="0" children="Listening to TIDAL" />
+				<LunaSelectItem value="1" children="Listening to [Artist Name]" />
+				<LunaSelectItem value="2" children="Listening to [Track Name]" />
+			</LunaSelectSetting>
 		</LunaSettings>
 	);
 };

plugins/DiscordRPC/src/updateActivity.ts

@@ -1,5 +1,5 @@
 import { asyncDebounce } from "@inrixia/helpers";
-import { MediaItem, PlayState } from "@luna/lib";
+import { MediaItem, PlayState, redux } from "@luna/lib";
 
 import type { SetActivity } from "@xhayper/discord-rpc";
 import { setActivity } from "./discord.native";
@@ -18,28 +18,48 @@ export const updateActivity = asyncDebounce(async (mediaItem?: MediaItem) => {
 	mediaItem ??= await MediaItem.fromPlaybackContext();
 	if (mediaItem === undefined) return;
 
+	const { sourceUrl, sourceEntityType } = redux.store.getState().playQueue;
+
 	const activity: SetActivity = { type: 2 }; // Listening type
 
+	const trackUrl = `https://tidal.com/browse/${mediaItem.tidalItem.contentType}/${mediaItem.id}?u`
+	const trackSourceUrl = `https://tidal.com/browse${sourceUrl}`;
+
 	activity.buttons = [
 		{
-			url: `https://tidal.com/browse/${mediaItem.tidalItem.contentType}/${mediaItem.id}?u`,
+			url: trackUrl,
 			label: "Play Song",
-		},
+		}
 	];
 
+	if (sourceEntityType === "playlist" && settings.displayPlaylistButton) {
+		activity.buttons.push({
+			url: trackSourceUrl,
+			label: "Playlist",
+		});
+	}
+
+	const artist = await mediaItem.artist();
+	const artistUrl = `https://tidal.com/browse/artist/${artist?.id}?u`;
+
+	// Status text
+	activity.statusDisplayType = settings.status;
+
 	// Title
 	activity.details = await mediaItem.title().then(fmtStr);
+	activity.detailsUrl = trackUrl;
 	// Artists
 	const artistNames = await MediaItem.artistNames(await mediaItem.artists());
 	activity.state = fmtStr(artistNames.join(", ")) ?? "Unknown Artist";
+	activity.stateUrl = artistUrl;
 
 	// Pause indicator
 	if (PlayState.playing) {
 		// Small Artist image
 		if (settings.displayArtistIcon) {
-			const artist = await mediaItem.artist();
 			activity.smallImageKey = artist?.coverUrl("320");
 			activity.smallImageText = fmtStr(artist?.name);
+			activity.smallImageUrl = artistUrl;
 		}
 
 		// Playback/Time
@@ -58,6 +78,7 @@ export const updateActivity = asyncDebounce(async (mediaItem?: MediaItem) => {
 	if (album) {
 		activity.largeImageKey = album.coverUrl();
 		activity.largeImageText = await album.title().then(fmtStr);
+		activity.largeImageUrl = `https://tidal.com/browse/album/${album.id}?u`;
 	}
 
 	await setActivity(activity);