Add to mail commands too

xdnw · May 12, 2024 · 0efb3ad · 0efb3ad
1 parent 9aee4a2
commit 0efb3ad
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/AdminCommands.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/AdminCommands.java
@@ -657,6 +657,9 @@ public String announce(@Me GuildDB db, @Me Guild guild, @Me JSONObject command,
         ApiKeyPool keys = (sendMail || sendDM) ? db.getMailKey() : null;
         if ((sendMail || sendDM) && keys == null) throw new IllegalArgumentException("No API_KEY set, please use " + GuildKey.API_KEY.getCommandMention() + "");
         Set<Integer> aaIds = db.getAllianceIds();
+        if (sendMail || sendDM) {
+            GPTUtil.checkThrowModeration(announcement + "\n" + replacements);
+        }
 
         List<String> errors = new ArrayList<>();
         Collection<DBNation> nations = sendTo.getNations();

diff --git a/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/IACommands.java b/src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/IACommands.java
@@ -1676,7 +1676,9 @@ public String mailCommandOutput(NationPlaceholders placeholders, ValueStore stor
             sheet = SpreadSheet.create(db, SheetKey.MAIL_RESPONSES_SHEET);
         }
         if (body != null) {
-            GPTUtil.checkThrowModeration(body);
+            GPTUtil.checkThrowModeration(body + "\n" + command);
+        } else {
+            GPTUtil.checkThrowModeration(command);
         }
 
         List<String> header = new ArrayList<>(Arrays.asList(

diff --git a/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/UnsortedCommands.java b/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/UnsortedCommands.java
@@ -52,6 +52,7 @@
 import link.locutus.discord.db.entities.WarParser;
 import link.locutus.discord.db.guild.GuildKey;
 import link.locutus.discord.db.guild.SheetKey;
+import link.locutus.discord.gpt.GPTUtil;
 import link.locutus.discord.pnw.AllianceList;
 import link.locutus.discord.pnw.NationList;
 import link.locutus.discord.pnw.NationOrAlliance;
@@ -2095,6 +2096,9 @@ public String sendInvite(@Me GuildDB db,
         if (!member.hasPermission(Permission.CREATE_INSTANT_INVITE) && !Roles.ADMIN.has(author, inviteTo) && !Roles.INTERNAL_AFFAIRS.has(author, inviteTo)) {
             throw new IllegalArgumentException("You do not have permission to create invites in " + inviteTo);
         }
+        if (message != null) {
+            GPTUtil.checkThrowModeration(message);
+        }
 
         // dm user instructions find_announcement
         ApiKeyPool keys = (sendMail || sendDM) ? db.getMailKey() : null;