Merge branch 'dev' into immediate-finds

src/plugins/ctrlEnterSend/index.ts

@@ -39,6 +39,15 @@ export default definePlugin({
         }
     }),
     patches: [
+        // Only one of the two patches will be at effect; Discord often updates to switch between them.
+        // See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
+        {
+            find: ".ENTER&&(!",
+            replacement: {
+                match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
+                replace: "$self.shouldSubmit($1, $2)"
+            }
+        },
         {
             find: "!this.hasOpenCodeBlock()",
             replacement: {

src/plugins/experiments/index.tsx

@@ -88,8 +88,8 @@ export default definePlugin({
         {
             find: "useCanFavoriteChannel",
             replacement: {
-                match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
-                replace: "true",
+                match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
+                replace: "false",
             }
         }
     ],