Merge 565ad7c98c into bcfef05a8a

src/plugins/appleMusic.desktop/index.tsx

@@ -120,7 +120,7 @@ const settings = definePluginSettings({
     stateString: {
         type: OptionType.STRING,
         description: "Activity state format string",
-        default: "{artist}"
+        default: "{artist} · {album}"
     },
     largeImageType: {
         type: OptionType.SELECT,

src/plugins/appleMusic.desktop/native.ts

@@ -11,37 +11,11 @@ import type { TrackData } from ".";
 
 const exec = promisify(execFile);
 
-// function exec(file: string, args: string[] = []) {
-//     return new Promise<{ code: number | null, stdout: string | null, stderr: string | null; }>((resolve, reject) => {
-//         const process = spawn(file, args, { stdio: [null, "pipe", "pipe"] });
-
-//         let stdout: string | null = null;
-//         process.stdout.on("data", (chunk: string) => { stdout ??= ""; stdout += chunk; });
-//         let stderr: string | null = null;
-//         process.stderr.on("data", (chunk: string) => { stdout ??= ""; stderr += chunk; });
-
-//         process.on("exit", code => { resolve({ code, stdout, stderr }); });
-//         process.on("error", err => reject(err));
-//     });
-// }
-
 async function applescript(cmds: string[]) {
     const { stdout } = await exec("osascript", cmds.map(c => ["-e", c]).flat());
     return stdout;
 }
 
-function makeSearchUrl(type: string, query: string) {
-    const url = new URL("https://tools.applemediaservices.com/api/apple-media/music/US/search.json");
-    url.searchParams.set("types", type);
-    url.searchParams.set("limit", "1");
-    url.searchParams.set("term", query);
-    return url;
-}
-
-const requestOptions: RequestInit = {
-    headers: { "user-agent": "Mozilla/5.0 (Windows NT 10.0; rv:125.0) Gecko/20100101 Firefox/125.0" },
-};
-
 interface RemoteData {
     appleMusicLink?: string,
     songLink?: string,
@@ -51,6 +25,24 @@ interface RemoteData {
 
 let cachedRemoteData: { id: string, data: RemoteData; } | { id: string, failures: number; } | null = null;
 
+const APPLE_MUSIC_BUNDLE_REGEX = /<script type="module" crossorigin src="([a-zA-Z0-9.\-/]+)"><\/script>/;
+const APPLE_MUSIC_TOKEN_REGEX = /\w+="([A-Za-z0-9-_]*\.[A-Za-z0-9-_]*\.[A-Za-z0-9-_]*)",\w+="x-apple-jingle-correlation-key"/;
+
+let cachedToken: string | undefined = undefined;
+
+const getToken = async () => {
+    if (cachedToken) return cachedToken;
+
+    const html = await fetch("https://music.apple.com/").then(r => r.text());
+    const bundleUrl = new URL(html.match(APPLE_MUSIC_BUNDLE_REGEX)![1], "https://music.apple.com/");
+
+    const bundle = await fetch(bundleUrl).then(r => r.text());
+    const token = bundle.match(APPLE_MUSIC_TOKEN_REGEX)![1];
+
+    cachedToken = token;
+    return token;
+};
+
 async function fetchRemoteData({ id, name, artist, album }: { id: string, name: string, artist: string, album: string; }) {
     if (id === cachedRemoteData?.id) {
         if ("data" in cachedRemoteData) return cachedRemoteData.data;
@@ -58,21 +50,39 @@ async function fetchRemoteData({ id, name, artist, album }: { id: string, name:
     }
 
     try {
-        const [songData, artistData] = await Promise.all([
-            fetch(makeSearchUrl("songs", artist + " " + album + " " + name), requestOptions).then(r => r.json()),
-            fetch(makeSearchUrl("artists", artist.split(/ *[,&] */)[0]), requestOptions).then(r => r.json())
-        ]);
+        const dataUrl = new URL("https://amp-api-edge.music.apple.com/v1/catalog/us/search");
+        dataUrl.searchParams.set("platform", "web");
+        dataUrl.searchParams.set("l", "en-US");
+        dataUrl.searchParams.set("limit", "1");
+        dataUrl.searchParams.set("with", "serverBubbles");
+        dataUrl.searchParams.set("types", "songs");
+        dataUrl.searchParams.set("term", `${name} ${artist} ${album}`);
+        dataUrl.searchParams.set("include[songs]", "artists");
 
-        const appleMusicLink = songData?.songs?.data[0]?.attributes.url;
-        const songLink = songData?.songs?.data[0]?.id ? `https://song.link/i/${songData?.songs?.data[0]?.id}` : undefined;
+        const token = await getToken();
 
-        const albumArtwork = songData?.songs?.data[0]?.attributes.artwork.url.replace("{w}", "512").replace("{h}", "512");
-        const artistArtwork = artistData?.artists?.data[0]?.attributes.artwork.url.replace("{w}", "512").replace("{h}", "512");
+        const songData = await fetch(dataUrl, {
+            headers: {
+                "accept": "*/*",
+                "accept-language": "en-US,en;q=0.9",
+                "authorization": `Bearer ${token}`,
+                "user-agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+                "origin": "https://music.apple.com",
+            },
+        })
+            .then(r => r.json())
+            .then(data => data.results.song.data[0]);
 
         cachedRemoteData = {
             id,
-            data: { appleMusicLink, songLink, albumArtwork, artistArtwork }
+            data: {
+                appleMusicLink: songData.attributes.url,
+                songLink: `https://song.link/i/${songData.id}`,
+                albumArtwork: songData.attributes.artwork.url.replace("{w}x{h}", "512x512"),
+                artistArtwork: songData.relationships.artists.data[0].attributes.artwork.url.replace("{w}x{h}", "512x512"),
+            }
         };
+
         return cachedRemoteData.data;
     } catch (e) {
         console.error("[AppleMusicRichPresence] Failed to fetch remote data:", e);

src/plugins/copyEmojiMarkdown/index.tsx

@@ -4,14 +4,18 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { findGroupChildrenByChildId } from "@api/ContextMenu";
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { copyWithToast } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { Menu } from "@webpack/common";
+import { Message } from "discord-types/general";
+import { ReactElement } from "react";
 
-const { convertNameToSurrogate } = findByPropsLazy("convertNameToSurrogate");
+const { convertNameToSurrogate, hasSurrogates, convertSurrogateToName } =
+    findByPropsLazy("convertNameToSurrogate");
 
 interface Emoji {
     type: string;
@@ -37,25 +41,16 @@ function getEmojiMarkdown(target: Target, copyUnicode: boolean): string {
         /https:\/\/cdn\.discordapp\.com\/emojis\/\d+\.(\w+)/
     )?.[1];
 
-    return `<${extension === "gif" ? "a" : ""}:${emojiName.replace(/~\d+$/, "")}:${emojiId}>`;
+    return `<${extension === "gif" ? "a" : ""}:${emojiName.replace(
+        /~\d+$/,
+        ""
+    )}:${emojiId}>`;
 }
 
-const settings = definePluginSettings({
-    copyUnicode: {
-        type: OptionType.BOOLEAN,
-        description: "Copy the raw unicode character instead of :name: for default emojis (👽)",
-        default: true,
-    },
-});
-
-export default definePlugin({
-    name: "CopyEmojiMarkdown",
-    description: "Allows you to copy emojis as formatted string (<:blobcatcozy:1026533070955872337>)",
-    authors: [Devs.HappyEnderman, Devs.Vishnya],
-    settings,
-
-    contextMenus: {
-        "expression-picker"(children, { target }: { target: Target }) {
+const patchExpressionPickerContextMenu = (
+    children: Array<ReactElement | null>,
+    { target }: { target: Target }
+) => {
     if (target.dataset.type !== "emoji") return;
 
     children.push(
@@ -70,6 +65,117 @@ export default definePlugin({
             }}
         />
     );
-        },
+};
+
+const addCopyButton = (
+    children: Array<ReactElement | null>,
+    emojiMarkdown: string
+) => {
+    findGroupChildrenByChildId("copy-link", children)?.push(
+        <Menu.MenuItem
+            id="vc-copy-emoji-markdown"
+            label="Copy Emoji Markdown"
+            action={() => {
+                copyWithToast(emojiMarkdown, "Success! Copied emoji markdown.");
+            }}
+        />
+    );
+};
+
+const patchMessageContextMenu = (
+    children: Array<ReactElement | null>,
+    props: {
+        favoriteableId: string | null;
+        favoriteableName: string | null;
+        favoriteableType: string | null;
+        message: Message;
+    } | null
+) => {
+    if (!props) return;
+
+    if (props.favoriteableType !== "emoji") return;
+
+    const emojiName = props.favoriteableName;
+
+    if (hasSurrogates(emojiName)) {
+        addCopyButton(
+            children,
+            settings.store.copyUnicode
+                ? emojiName
+                : convertSurrogateToName(emojiName)
+        );
+        return;
+    }
+
+    const emojiId = props.favoriteableId;
+
+    if (!emojiId) {
+        if (emojiName) {
+            const emojiMarkdown = settings.store.copyUnicode
+                ? convertNameToSurrogate(emojiName.replace(/(^:|:$)/g, ""))
+                : emojiName;
+
+            addCopyButton(
+                children,
+                emojiMarkdown !== "" ? emojiMarkdown : emojiName
+            );
+        }
+        return;
+    }
+
+    const messageEmojiMarkdown = props.message.content.match(
+        RegExp(`(<a?:\\S+:${emojiId}>)`)
+    )?.[1];
+
+    if (messageEmojiMarkdown) {
+        addCopyButton(children, messageEmojiMarkdown.replace(/~\d+/, ""));
+        return;
+    }
+
+    const reactionEmojiObject = props.message.reactions.find(
+        ({ emoji: { id } }) => id === emojiId
+    )?.emoji;
+
+    if (!reactionEmojiObject) return;
+
+    const reactionEmojiName = reactionEmojiObject.name;
+
+    if (hasSurrogates(reactionEmojiName)) {
+        addCopyButton(
+            children,
+            settings.store.copyUnicode
+                ? reactionEmojiName
+                : convertSurrogateToName(reactionEmojiName)
+        );
+        return;
+    }
+
+    addCopyButton(
+        children,
+        `<${
+            reactionEmojiObject.animated ? "a" : ""
+        }:${reactionEmojiName.replace(/~\d+$/, "")}:${emojiId}>`
+    );
+};
+
+const settings = definePluginSettings({
+    copyUnicode: {
+        type: OptionType.BOOLEAN,
+        description:
+            "Copy the raw unicode character instead of :name: for default emojis (👽)",
+        default: true,
+    },
+});
+
+export default definePlugin({
+    name: "CopyEmojiMarkdown",
+    description:
+        "Allows you to copy emojis as formatted string (<:blobcatcozy:1026533070955872337>)",
+    authors: [Devs.HappyEnderman, Devs.Vishnya],
+    settings,
+
+    contextMenus: {
+        "expression-picker": patchExpressionPickerContextMenu,
+        "message": patchMessageContextMenu,
     },
 });

src/plugins/openInApp/index.ts

@@ -33,7 +33,7 @@ interface URLReplacementRule {
 // Do not forget to add protocols to the ALLOWED_PROTOCOLS constant
 const UrlReplacementRules: Record<string, URLReplacementRule> = {
     spotify: {
-        match: /^https:\/\/open\.spotify\.com\/(?:intl-[a-z]{2}\/)?(track|album|artist|playlist|user|episode)\/(.+)(?:\?.+?)?$/,
+        match: /^https:\/\/open\.spotify\.com\/(?:intl-[a-z]{2}\/)?(track|album|artist|playlist|user|episode|prerelease)\/(.+)(?:\?.+?)?$/,
         replace: (_, type, id) => `spotify://${type}/${id}`,
         description: "Open Spotify links in the Spotify app",
         shortlinkMatch: /^https:\/\/spotify\.link\/.+$/,

src/plugins/timeBarAllActivities/README.md

@@ -1,5 +0,0 @@
-# TimeBarAllActivities
-
-Adds the Spotify time bar to all activities if they have start and end timestamps.
-
-![](https://github.com/user-attachments/assets/9fbbe33c-8218-43c9-8b8d-f907a4e809fe)

src/plugins/timeBarAllActivities/index.tsx

@@ -1,84 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { definePluginSettings } from "@api/Settings";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
-import { findComponentByCodeLazy } from "@webpack";
-import { RequiredDeep } from "type-fest";
-
-interface Activity {
-    timestamps?: ActivityTimestamps;
-}
-
-interface ActivityTimestamps {
-    start?: string;
-    end?: string;
-}
-
-interface TimebarComponentProps {
-    activity: Activity;
-}
-
-const ActivityTimeBar = findComponentByCodeLazy<ActivityTimestamps>(".bar", ".progress", "(100*");
-
-function isActivityTimestamped(activity: Activity): activity is RequiredDeep<Activity> {
-    return activity.timestamps != null && activity.timestamps.start != null && activity.timestamps.end != null;
-}
-
-export const settings = definePluginSettings({
-    hideActivityDetailText: {
-        type: OptionType.BOOLEAN,
-        description: "Hide the large title text next to the activity",
-        default: true,
-    },
-    hideActivityTimerBadges: {
-        type: OptionType.BOOLEAN,
-        description: "Hide the timer badges next to the activity",
-        default: true,
-    }
-});
-
-export default definePlugin({
-    name: "TimeBarAllActivities",
-    description: "Adds the Spotify time bar to all activities if they have start and end timestamps",
-    authors: [Devs.fawn, Devs.niko],
-    settings,
-    patches: [
-        {
-            find: ".gameState,children:",
-            replacement: [
-                // Insert Spotify time bar component
-                {
-                    match: /\(0,.{0,30}activity:(\i),className:\i\.badges\}\)/g,
-                    replace: "$&,$self.TimebarComponent({activity:$1})"
-                },
-                // Hide the large title on listening activities, to make them look more like Spotify (also visible from hovering over the large icon)
-                {
-                    match: /(\i).type===(\i\.\i)\.WATCHING/,
-                    replace: "($self.settings.store.hideActivityDetailText&&$self.isActivityTimestamped($1)&&$1.type===$2.LISTENING)||$&"
-                }
-            ]
-        },
-        // Hide the "badge" timers that count the time since the activity starts
-        {
-            find: ".TvIcon).otherwise",
-            replacement: {
-                match: /null!==\(\i=null===\(\i=(\i)\.timestamps\).{0,50}created_at/,
-                replace: "($self.settings.store.hideActivityTimerBadges&&$self.isActivityTimestamped($1))?null:$&"
-            }
-        }
-    ],
-
-    isActivityTimestamped,
-
-    TimebarComponent: ErrorBoundary.wrap(({ activity }: TimebarComponentProps) => {
-        if (!isActivityTimestamped(activity)) return null;
-
-        return <ActivityTimeBar start={activity.timestamps.start} end={activity.timestamps.end} />;
-    }, { noop: true })
-});

src/utils/constants.ts

@@ -268,7 +268,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
         id: 841509053422632990n
     },
     F53: {
-        name: "F53",
+        name: "Cassie (Code)",
         id: 280411966126948353n
     },
     AutumnVN: {