Merge remote-tracking branch 'upstream/dev' into dev

src/plugins/implicitRelationships/index.ts

@@ -84,7 +84,7 @@ export default definePlugin({
 
         // Add support for the nonce parameter to Discord's shitcode
         {
-            find: ".GUILD_SUBSCRIPTIONS_BULK,{",
+            find: ".REQUEST_GUILD_MEMBERS,",
             replacement: {
                 match: /\.send\(\i\.\i\.REQUEST_GUILD_MEMBERS,{/,
                 replace: "$&nonce:arguments[1].nonce,"

src/plugins/roleColorEverywhere/index.tsx

@@ -198,6 +198,9 @@ export default definePlugin({
             const { messageSaturation } = settings.use(["messageSaturation"]);
             const author = useMessageAuthor(message);
 
+            // Do not apply role color if the send fails, otherwise it becomes indistinguishable if the message is sent
+            if (message.state !== "SENT") return;
+
             if (author.colorString != null && messageSaturation !== 0) {
                 const value = `color-mix(in oklab, ${author.colorString} ${messageSaturation}%, var({DEFAULT}))`;
 

src/plugins/userVoiceShow/components.tsx

@@ -26,14 +26,12 @@ const ActionButtonClasses = findByPropsLazy("actionButton", "highlight");
 
 type IconProps = Omit<React.ComponentPropsWithoutRef<"div">, "children"> & {
     size?: number;
-    iconClassName?: string;
 };
 
 function Icon(props: PropsWithChildren<IconProps>) {
     const {
         size = 16,
         className,
-        iconClassName,
         ...restProps
     } = props;
 
@@ -43,7 +41,6 @@ function Icon(props: PropsWithChildren<IconProps>) {
             className={classes(cl("speaker"), className)}
         >
             <svg
-                className={iconClassName}
                 width={size}
                 height={size}
                 viewBox="0 0 24 24"
@@ -194,8 +191,12 @@ export const VoiceChannelIndicator = ErrorBoundary.wrap(({ userId, isProfile, is
                     {...props}
                     role="button"
                     onClick={onClick}
-                    className={classes(cl("clickable"), isActionButton && ActionButtonClasses.actionButton, isActionButton && shouldHighlight && ActionButtonClasses.highlight)}
-                    iconClassName={classes(cl(isProfile && "profile-speaker"))}
+                    className={classes(
+                        cl("clickable"),
+                        isActionButton && ActionButtonClasses.actionButton,
+                        isActionButton && shouldHighlight && ActionButtonClasses.highlight,
+                        cl(isProfile && "profile-speaker")
+                    )}
                     size={isActionButton ? 20 : 16}
                 />
             )}