Merge pull request #6349 from WoltLab/6.2-remove-quote-dupplicate-button-click

Remove quotes that have already been inserted after clicking the button again

Author: Cyperghost

ts/WoltLabSuite/Core/Component/Quote/Message.ts

@@ -14,10 +14,12 @@ import { wheneverFirstSeen } from "WoltLabSuite/Core/Helper/Selector";
 import { CKEditor } from "WoltLabSuite/Core/Component/Ckeditor";
 import {
   saveQuote,
+  getFullQuoteUuid,
   saveFullQuote,
   markQuoteAsUsed,
   isFullQuoted,
   getKey,
+  removeQuotes,
 } from "WoltLabSuite/Core/Component/Quote/Storage";
 import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
 import { dispatchToCkeditor } from "WoltLabSuite/Core/Component/Ckeditor/Event";
@@ -96,6 +98,12 @@ export function registerContainer(
       promiseMutex(async (event: MouseEvent) => {
         event.preventDefault();
 
+        if (isFullQuoted(objectType, objectId)) {
+          removeQuotes([getFullQuoteUuid(objectType, objectId)!]);
+          quoteMessageButton!.classList.remove("active");
+          return;
+        }
+
         const quoteMessage = await saveFullQuote(objectType, className, ~~container.dataset.objectId!);
         quoteMessageButton!.classList.add("active");
 

ts/WoltLabSuite/Core/Component/Quote/Storage.ts

@@ -234,6 +234,19 @@ function storeQuote(objectType: string, message: Message, quote: Quote): string
   return uuid;
 }
 
+export function getFullQuoteUuid(objectType: string, objectId: number): string | undefined {
+  const storage = getStorage();
+  const key = getKey(objectType, objectId);
+
+  for (const [uuid, q] of storage.quotes.get(key)!) {
+    if (q.rawMessage !== undefined && q.message !== undefined) {
+      return uuid;
+    }
+  }
+
+  return undefined;
+}
+
 function getStorage(): StorageData {
   const data = window.localStorage.getItem(STORAGE_KEY);