1 files changed, 10 insertions, 9 deletions

diff --git a/src/plugins/messageActions.ts b/src/plugins/messageActions.ts
index 5fe06c0..98c920e 100644
--- a/src/plugins/messageActions.ts
+++ b/src/plugins/messageActions.ts
@@ -17,9 +17,10 @@
 */
 
 import { addClickListener, removeClickListener } from "../api/MessageEvents";
+import { lazyWebpack } from "../utils";
 import { Devs } from "../utils/constants";
 import definePlugin from "../utils/types";
-import { find, findByProps } from "../webpack";
+import { filters } from "../webpack";
 import { UserStore } from "../webpack/common";
 
 let isDeletePressed = false;
@@ -33,10 +34,10 @@ export default definePlugin({
     dependencies: ["MessageEventsAPI"],
 
     start() {
-        const { deleteMessage, startEditMessage } = findByProps("deleteMessage", "startEditMessage");
-        const { can } = findByProps("can", "initialize");
-        const { MANAGE_MESSAGES } = find(m => typeof m.MANAGE_MESSAGES === "bigint");
-        const { isEditing } = findByProps("isEditing", "isEditingAny");
+        const MessageActions = lazyWebpack(filters.byProps("deleteMessage", "startEditMessage"));
+        const PermissionStore = lazyWebpack(filters.byProps("can", "initialize"));
+        const Permissions = lazyWebpack(m => typeof m.MANAGE_MESSAGES === "bigint");
+        const EditStore = lazyWebpack(filters.byProps("isEditing", "isEditingAny"));
 
         document.addEventListener("keydown", keydown);
         document.addEventListener("keyup", keyup);
@@ -44,12 +45,12 @@ export default definePlugin({
         this.onClick = addClickListener((msg, chan, event) => {
             const isMe = msg.author.id === UserStore.getCurrentUser().id;
             if (!isDeletePressed) {
-                if (isMe && event.detail >= 2 && !isEditing(chan.id, msg.id)) {
-                    startEditMessage(chan.id, msg.id, msg.content);
+                if (isMe && event.detail >= 2 && !EditStore.isEditing(chan.id, msg.id)) {
+                    MessageActions.startEditMessage(chan.id, msg.id, msg.content);
                     event.preventDefault();
                 }
-            } else if (isMe || can(MANAGE_MESSAGES, chan)) {
-                deleteMessage(chan.id, msg.id);
+            } else if (isMe || PermissionStore.can(Permissions.MANAGE_MESSAGES, chan)) {
+                MessageActions.deleteMessage(chan.id, msg.id);
                 event.preventDefault();
             }
         });