Change mail to fasle by default for beige violation

xdnw · Jan 6, 2024 · 6236bb6 · 6236bb6
1 parent cce1d89
commit 6236bb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/link/locutus/discord/db/GuildHandler.java b/src/main/java/link/locutus/discord/db/GuildHandler.java
@@ -2203,13 +2203,14 @@ public void beigeAlert(AbstractCursor root) {
 
         Role milcom = Roles.ENEMY_BEIGE_ALERT_AUDITOR.toRole(db.getGuild());
         if (!allowed) {
-            boolean sendMail = GuildKey.BEIGE_VIOLATION_MAIL.getOrNull(db) != Boolean.FALSE;
+            boolean sendMail = GuildKey.BEIGE_VIOLATION_MAIL.getOrNull(db) == Boolean.TRUE;
 
             String ping = "";
             if (milcom != null) ping += milcom.getAsMention();
             if (user != null) ping += user.getAsMention();
 
             String explanation = getBeigeCyclingInfo(allowedReasons, !allowed);
+            explanation += "\n\nSent from " + guild.toString();
 
             if (!ping.isEmpty()) {
                 RateLimitUtil.queueWhenFree(channel.sendMessage("^" + ping));

diff --git a/src/main/java/link/locutus/discord/db/guild/GuildKey.java b/src/main/java/link/locutus/discord/db/guild/GuildKey.java
@@ -1700,7 +1700,7 @@ public String BEIGE_VIOLATION_MAIL(@Me GuildDB db, @Me User user, boolean value)
         @Override
         public String help() {
             return "Whether to send a mail to the nation when a beige violation occurs\n" +
-                    "Default: True";
+                    "Default: False";
         }
     }.setupRequirements(f -> f.requires(ENEMY_BEIGED_ALERT_VIOLATIONS).requireValidAlliance().requires(ALLOWED_BEIGE_REASONS));