From c65f757bc450beee76c4266610a13f6f56ed7b94 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Wed, 26 Oct 2022 15:10:11 +0200
Subject: [PATCH] Fix betterUploadButton

---
 src/plugins/betterUploadButton.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/plugins/betterUploadButton.ts b/src/plugins/betterUploadButton.ts
index 52d8aed84..94c1f4946 100644
--- a/src/plugins/betterUploadButton.ts
+++ b/src/plugins/betterUploadButton.ts
@@ -21,15 +21,17 @@ import definePlugin from "../utils/types";
 
 export default definePlugin({
     name: "BetterUploadButton",
-    authors: [Devs.obscurity],
+    authors: [Devs.obscurity, Devs.Ven],
     description: "Upload with a single click, open menu with right click",
     patches: [
         {
             find: "Messages.CHAT_ATTACH_UPLOAD_OR_INVITE",
             replacement: {
-                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:([^,]+),onClick:([^,]+)}}/,
-                replace:
-                    "CHAT_ATTACH_UPLOAD_OR_INVITE,onClick:$1,onContextMenu:$2}}",
+                // Discord merges multiple props here with Object.assign()
+                // This patch passes a third object to it with which we override onClick and onContextMenu
+                match: /CHAT_ATTACH_UPLOAD_OR_INVITE,onDoubleClick:(.+?:void 0)\},(.{1,3})\)/,
+                replace: (m, onDblClick, otherProps) =>
+                    `${m.slice(0, -1)},{onClick:${onDblClick},onContextMenu:${otherProps}.onClick})`,
             },
         },
     ],