diff --git a/src/plugins/fullUserInChatbox/index.tsx b/src/plugins/fullUserInChatbox/index.tsx index ceeb56926..70eca888b 100644 --- a/src/plugins/fullUserInChatbox/index.tsx +++ b/src/plugins/fullUserInChatbox/index.tsx @@ -27,6 +27,7 @@ export default definePlugin({ patches: [ { + // same find as RoleColorEverywhere chatbox mentions find: ':"text":', replacement: { match: /(hidePersonalInformation\).+?)(if\(null!=\i\){.+?return \i)(?=})/, diff --git a/src/plugins/roleColorEverywhere/index.tsx b/src/plugins/roleColorEverywhere/index.tsx index 2ab8db07c..2e9fda620 100644 --- a/src/plugins/roleColorEverywhere/index.tsx +++ b/src/plugins/roleColorEverywhere/index.tsx @@ -91,7 +91,8 @@ export default definePlugin({ }, // Slate { - find: ".userTooltip,children", + // same find as FullUserInChatbox + find: ':"text":', replacement: [ { match: /let\{id:(\i),guildId:\i,channelId:(\i)[^}]*\}.*?\.\i,{(?=children)/, @@ -123,20 +124,20 @@ export default definePlugin({ }, // Voice Users { - find: ".usernameSpeaking]:", + find: "#{intl::GUEST_NAME_SUFFIX})]", replacement: [ { - match: /\.usernameSpeaking\]:.+?,(?=children)(?<=guildId:(\i),.+?user:(\i).+?)/, - replace: "$&style:$self.getColorStyle($2.id,$1)," + match: /#{intl::GUEST_NAME_SUFFIX}\)\].+?\](?<=guildId:(\i),.+?user:(\i).+?)/, + replace: "$&,style:$self.getColorStyle($2.id,$1)," } ], predicate: () => settings.store.voiceUsers }, // Reaction List { - find: ".reactionDefault", + find: "MessageReactions.render:", replacement: { - match: /tag:"strong"(?=.{0,50}\i\.name)(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/, + match: /tag:"strong",variant:"text-md\/\w+"(?<=onContextMenu:.{0,15}\((\i),(\i),\i\).+?)/, replace: "$&,style:$self.getColorStyle($2?.id,$1?.channel?.id)" }, predicate: () => settings.store.reactorsList,