Merge f9a59d89e1 into f27361f017

src/plugins/hideMessage/index.tsx

@@ -5,22 +5,11 @@
  */
 
 import { addButton, removeButton } from "@api/MessagePopover";
-import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import definePlugin, { OptionType } from "@utils/types";
+import definePlugin from "@utils/types";
 import { ChannelStore } from "@webpack/common";
-import { get, set } from "@api/DataStore";
+import { FluxDispatcher } from "@webpack/common";
-
+import { Message } from "discord-types/general";
-let style: HTMLStyleElement;
-
-const KEY = "HideMessage_HiddenMessages";
-
-let hiddenMessages: Set<string> = new Set();
-const getHiddenMessages = () => get(KEY).then(set => {
-    hiddenMessages = set ?? new Set<string>();
-    return hiddenMessages;
-});
-const saveHiddenMessages = (ids: Set<string>) => set(KEY, ids);
 
 const HideIcon = () => {
     return <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" aria-labelledby="eyeCrossedIconTitle" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="miter" fill="none" color="currentColor">
@@ -33,23 +22,12 @@ export default definePlugin({
     name: "HideMessage",
     description: "Adds an option to hide messages",
     authors: [Devs.Isaac],
-    dependencies: ["MessagePopoverAPI"],
+
-    options: {
+    hideMessage(msg: Message) {
-        showMessageHiddenText: {
+        FluxDispatcher.dispatch({type: "MESSAGE_DELETE", channelId: msg.channel_id, id: msg.id});
-            description: `Hidden messages will contain a small text indicating they're hidden.`,
-            type: OptionType.BOOLEAN,
-            default: true
-        },
     },
 
-    async start() {
+    start() {
-        style = document.createElement("style");
-        style.id = "VencordHideMessage";
-        document.head.appendChild(style);
-
-        await getHiddenMessages();
-        await this.buildCss();
-
         addButton("HideMessage", msg => {
             const label = "Hide Message";
 
@@ -58,7 +36,7 @@ export default definePlugin({
                 icon: HideIcon,
                 message: msg,
                 channel: ChannelStore.getChannel(msg.channel_id),
-                onClick: () => this.toggleHide(`{"channelId": "${msg.channel_id}", "messageId": "${msg.id}"}`)
+                onClick: () => this.hideMessage(msg)
             };
         });
     },
@@ -66,42 +44,4 @@ export default definePlugin({
     stop() {
         removeButton("HideMessage");
     },
-
-    async buildCss() {
-        const chatMessages = [...hiddenMessages].map(ids => `#chat-messages-${JSON.parse(ids).channelId}-${JSON.parse(ids).messageId}`).join(",");
-        const messagesContent = [...hiddenMessages].map(ids => `#message-content-${JSON.parse(ids).messageId}`).join(",");
-        const messagesAccessories = [...hiddenMessages].map(ids => `#message-accessories-${JSON.parse(ids).messageId}`).join(",");
-        style.textContent = `
-        :is(${chatMessages}) :is([class*="message_d5deea"]) :is([class*="embedWrapper"], [class*="clickableSticker"]) {
-            display: none !important;
-        }
-        :is(${messagesContent}) {
-            visibility: hidden;
-        }
-        :is(${messagesAccessories}) {
-            display: none !important;
-        }
-        `;
-        if (Settings.plugins.HideMessage.showMessageHiddenText) { 
-            style.textContent += `
-            :is(${messagesContent})::after {
-                visibility: visible;
-                content: "Message hidden" !important;
-                color: var(--text-muted);
-                font-size: 80%;
-                position: absolute;
-                display: block;
-                top: 0;
-            }
-        `}
-    },
-
-    async toggleHide(sentIds: string) {
-        const ids = await getHiddenMessages();
-        if (!ids.delete(sentIds))
-            ids.add(sentIds);
-
-        await saveHiddenMessages(ids);
-        await this.buildCss();
-    }
 });