Pr Stuff

Co-Authored-By: sadan4 <117494111+sadan4@users.noreply.github.com>

.github/workflows/syncDev.yml

@@ -1,4 +1,7 @@
 name: Sync Vencord Dev
+concurrency:
+    group: ${{ github.ref }}
+    cancel-in-progress: true
 
 env:
     WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}

.github/workflows/syncMain.yml

@@ -1,4 +1,7 @@
 name: Sync Vencord Main
+concurrency:
+    group: ${{ github.ref }}
+    cancel-in-progress: true
 
 env:
     WORKFLOW_TOKEN: ${{ secrets.ETOKEN }}

src/api/Commands/index.ts

@@ -44,11 +44,16 @@ export let OptionalMessageOption: Option = OptPlaceholder;
  */
 export let RequiredMessageOption: Option = ReqPlaceholder;
 
+// Discords command list has random gaps for some reason, which can cause issues while rendering the commands
+// add this offset too every added command to keep them unique
+let commandIdOffset: number;
+
 export const _init = function (cmds: Command[]) {
     try {
         BUILT_IN = cmds;
         OptionalMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "shrug")!.options![0];
         RequiredMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "me")!.options![0];
+        commandIdOffset = Math.abs(BUILT_IN.map(x => +x.id!).toSorted((x, y) => x - y)[0]) - BUILT_IN.length;
     } catch (e) {
         new Logger("CommandsAPI").error("Failed to load CommandsApi", e, " - cmds is", cmds);
     }
@@ -142,7 +147,7 @@ export function registerCommand<C extends Command>(command: C, plugin: string) {
     command.isVencordCommand = true;
     command.untranslatedName ??= command.name;
     command.untranslatedDescription ??= command.description;
-    command.id ??= `-${BUILT_IN.length + 1}`;
+    command.id ??= `-${BUILT_IN.length + commandIdOffset + 1}`;
     command.applicationId ??= "-1"; // BUILT_IN;
     command.type ??= ApplicationCommandType.CHAT_INPUT;
     command.inputType ??= ApplicationCommandInputType.BUILT_IN_TEXT;

src/plugins/ircColors/index.ts

@@ -81,9 +81,14 @@ export default definePlugin({
     ],
 
     calculateNameColorForMessageContext(context: any) {
-        const id = context?.message?.author?.id;
+        const userId: string | undefined = context?.message?.author?.id;
         const colorString = context?.author?.colorString;
-        const color = calculateNameColorForUser(id);
+        const color = calculateNameColorForUser(userId);
+
+        // color preview in role settings
+        // channel.id is undefined in the role menu
+        if (context?.message?.channel_id === "1337" && userId === "313337")
+            return colorString;
 
         if (settings.store.applyColorOnlyInDms && !context?.channel?.isPrivate()) {
             return colorString;

src/plugins/volumeBooster/index.ts

@@ -136,7 +136,7 @@ export default definePlugin({
         // @ts-expect-error
         if (data.sinkId != null && data.sinkId !== data.audioContext.sinkId && "setSinkId" in AudioContext.prototype) {
             // @ts-expect-error https://developer.mozilla.org/en-US/docs/Web/API/AudioContext/setSinkId
-            data.audioContext.setSinkId(data.sinkId);
+            data.audioContext.setSinkId(data.sinkId === "default" ? "" : data.sinkId);
         }
 
         data.gainNode.gain.value = data._mute

src/webpack/common/types/utils.d.ts

@@ -158,6 +158,30 @@ export interface Clipboard {
     SUPPORTS_COPY: boolean;
 }
 
+export interface ApplicationAssets {
+    lastUpdated: number;
+    assets: Record<string, { id: string; name: string; type: number; } & Record<string, any>>;
+}
+
+export interface ApplicationAssetUtils {
+    fetchAssetIds(applicationId: string, e: string[]): Promise<string[]>;
+    /**
+     * mp === media proxy
+     */
+    getAssetFromImageURL(type: "mp" | "youtube" | "spotify" | "twitch", url: string): string;
+    /**
+     * converts an asset string into an image url
+     * @param applicationId the application id if fetching an application asset
+     * @param asset asset id if fetching an application asset, otherwise something like what {@link getAssetFromImageURL} returns
+     * @param size if width and height are not needed, the largest is used. If omitted, no size is used
+     */
+    getAssetImage(applicationId: string | undefined, assetId: string, size?: number | [width: number, height: number]): undefined | string;
+    /**
+     * @returns assets or undefined
+     */
+    getAssets(applicationId: string): Promise<undefined | ApplicationAssets>;
+}
+
 export interface NavigationRouter {
     back(): void;
     forward(): void;

src/webpack/common/utils.ts

@@ -144,9 +144,12 @@ export const UploadHandler = {
     promptToUpload: findByCodeLazy("#{intl::ATTACHMENT_TOO_MANY_ERROR_TITLE}") as (files: File[], channel: Channel, draftType: Number) => void
 };
 
-export const ApplicationAssetUtils = findByPropsLazy("fetchAssetIds", "getAssetImage") as {
+export const ApplicationAssetUtils: t.ApplicationAssetUtils = mapMangledModuleLazy("getAssetImage: size must === [", {
-    fetchAssetIds: (applicationId: string, e: string[]) => Promise<string[]>;
+    fetchAssetIds: filters.byCode('.startsWith("http:")', ".dispatch({"),
-};
+    getAssetFromImageURL: filters.byCode("].serialize(", ',":"'),
+    getAssetImage: filters.byCode("getAssetImage: size must === ["),
+    getAssets: filters.byCode(".assets")
+});
 
 export const Clipboard: t.Clipboard = mapMangledModuleLazy('queryCommandEnabled("copy")', {
     copy: filters.byCode(".copy("),