Merge branch 'dev' into NeverPausePreviews

src/plugins/_api/badges/index.tsx

@@ -93,17 +93,13 @@ export default definePlugin({
         {
             find: ".PANEL]:14",
             replacement: {
-                match: /(?<=\i=\(0,\i\.default\)\(\i\);)return 0===\i.length/,
+                match: /(?<=(\i)=\(0,\i\.default\)\(\i\);)return 0===\i.length\?/,
-                replace: "$& && $self.getBadges(arguments[0]?.displayProfile).length===0"
+                replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
             }
         },
         {
             find: ".description,delay:",
             replacement: [
-                {
-                    match: /...(\i)\}=\(0,\i\.useUserProfileAnalyticsContext\)\(\);/,
-                    replace: "$&arguments[0].badges?.unshift(...$self.getBadges($1));"
-                },
                 {
                     // alt: "", aria-hidden: false, src: originalSrc
                     match: /alt:" ","aria-hidden":!0,src:(?=.{0,20}(\i)\.icon)/,

src/plugins/roleColorEverywhere/index.tsx

@@ -40,9 +40,16 @@ const settings = definePluginSettings({
         default: true,
         description: "Show role colors in the voice chat user list",
         restartNeeded: true
+    },
+    reactorsList: {
+        type: OptionType.BOOLEAN,
+        default: true,
+        description: "Show role colors in the reactors list",
+        restartNeeded: true
     }
 });
 
+
 export default definePlugin({
     name: "RoleColorEverywhere",
     authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN],
@@ -99,6 +106,14 @@ export default definePlugin({
                 }
             ],
             predicate: () => settings.store.voiceUsers,
+        },
+        {
+            find: ".reactorDefault",
+            replacement: {
+                match: /\.openUserContextMenu\)\((\i),(\i),\i\).{0,250}tag:"strong"/,
+                replace: "$&,style:{color:$self.getColor($2?.id,$1)}"
+            },
+            predicate: () => settings.store.reactorsList,
         }
     ],
     settings,