GM Macro socket

MrPrimate · Apr 30, 2024 · 220cafe · 220cafe
1 parent 806ee7e
commit 220cafe
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/effects/DDBMacros.js b/src/effects/DDBMacros.js
@@ -297,6 +297,22 @@ return game.modules.get("ddb-importer")?.api.macros.executeMacro("${type}", "${f
     return macro.execute(...params);
   }
 
+  static async executeDDBMacroAsGM(type, name, ...params) {
+    const gmUser = game.users.find((f) => f.isGM);
+    if (!gmUser) {
+      ui.notifications.error("No GM user found");
+      return undefined;
+    }
+    if (!game.modules.get("socketlib")?.active) {
+      ui.notifications.warn(`Socketlib needs to be installed and active for this macro functionality`);
+      return DDBMacros.executeDDBMacro(type, name, ...params);
+    } else if (game.user.isGM) {
+      return DDBMacros.executeDDBMacro(type, name, ...params);
+    } else {
+      return globalThis.socketlib.modules.get("ddb-importer").executeAsGM("ddbMacro", type, name, ...params);
+    }
+  }
+
   static getMacroFunction(type, name) {
     const macroFunction = async (...params) => {
       const macro = await DDBMacros.getMacro(type, name);

diff --git a/src/hooks/socket/socketlib.js b/src/hooks/socket/socketlib.js
@@ -5,7 +5,7 @@ export function setupSocketlib() {
   const socket = globalThis.socketlib.registerModule("ddb-importer");
   socket.register("simpleButtonDialog", DDBImporter.lib.DialogHelper.buttonDialog);
   socket.register("chooserDialog", DDBImporter.lib.DialogHelper.ChooserDialog.Ask);
-
+  socket.register("ddbMacro", DDBImporter.lib.DDBMacros.executeDDBMacro);
   return socket;
 
 }