Or

xdnw · Jan 10, 2024 · ca55b27 · ca55b27
1 parent 83386d3
commit ca55b27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/...ava/link/locutus/discord/commands/manager/v2/impl/pw/commands/AllianceMetricCommands.java b/...ava/link/locutus/discord/commands/manager/v2/impl/pw/commands/AllianceMetricCommands.java
@@ -90,22 +90,6 @@ public String saveMetrics(Set<AllianceMetric> metrics, @Default @Timestamp Long
         return "Done. " + changesDays.getKey() + " changes made for " + changesDays.getValue() + " days.";
     }
 
-    public static void main(String[] args) {
-        System.out.println("Turn " + TimeUtil.getTurn());
-
-        int turnsTillDC = getTurnsTillDC();
-        long newTurn = TimeUtil.getTurn() + getTurnsTillDC();
-        System.out.println("New turn " + newTurn + " > " + TimeUtil.getTurn());
-
-    }
-
-    private static int getTurnsTillDC() {
-        int dc_turn = 6;//-1;
-        int currentTurn = (int) TimeUtil.getDayTurn();
-        if (currentTurn >= dc_turn) return ((dc_turn + 12) - currentTurn);
-        return ( dc_turn - currentTurn);
-    }
-
     @Command
     @RolePermission(value = Roles.ADMIN, root = true)
     @NoFormat

diff --git a/src/main/java/link/locutus/discord/db/guild/GuildKey.java b/src/main/java/link/locutus/discord/db/guild/GuildKey.java
@@ -2664,11 +2664,14 @@ public String toReadableString(GuildDB db, List<CustomConditionMessage> value) {
             return toJson(value).toString(4);
         }
 
-    }.setupRequirements(f -> f.requires(API_KEY).requires(ALLIANCE_ID).requireValidAlliance().requires(RECRUIT_MESSAGE_OUTPUT).requiresCoalition("recruit")
+    }.setupRequirements(f -> f.requires(API_KEY).requires(ALLIANCE_ID).requireValidAlliance().requires(RECRUIT_MESSAGE_OUTPUT)
         .requireFunction((db) -> {
         if (!Settings.INSTANCE.TASKS.CUSTOM_MESSAGE_HANDLER) {
             throw new IllegalArgumentException("This setting is disabled. Enable it in the settings file");
         }
+        if (!db.hasCoalitionPermsOnRoot("recruit")) {
+            throw new IllegalArgumentException("You must have `recruit` permissions on the root channel to use this setting");
+        }
     }));
 
     private static final Map<String, GuildSetting> BY_NAME = new HashMap<>();

diff --git a/src/main/java/link/locutus/discord/util/math/ArrayUtil.java b/src/main/java/link/locutus/discord/util/math/ArrayUtil.java
@@ -20,6 +20,7 @@
 import link.locutus.discord.db.entities.DBWar;
 import link.locutus.discord.util.IOUtil;
 import link.locutus.discord.util.MathMan;
+import link.locutus.discord.util.PnwUtil;
 import link.locutus.discord.util.StringMan;
 import link.locutus.discord.util.task.ia.IACheckup;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -1595,20 +1596,17 @@ private static <T> ParseResult<T> parseTokens(String input, Function<String, Set
                         throw new IllegalArgumentException("Invalid group: `" + xorGroup + "`: Empty group");
                     }
                     char char0 = elem.charAt(0);
-                    if (char0 == '#') {
-                        elem = elem.substring(1);
-                        Predicate<T> filter = parseFilter.apply(elem);
-                        orResults.add(new ParseResult<>(elem, List.of(filter), new AtomicBoolean()));
-                    } else if (elem.contains("{")) {
-                        Predicate<T> filter = parseFilter.apply(elem);
-                        orResults.add(new ParseResult<>(elem, List.of(filter), new AtomicBoolean()));
-                    } else if (char0 == '(') {
+                    if (char0 == '(') {
                         if (!elem.endsWith(")")) {
                             throw new IllegalArgumentException("Invalid group: `" + elem + "`: No end bracket found");
                         }
                         elem = elem.substring(1, elem.length() - 1);
                         ParseResult<T> result = parseTokens(elem, parseSet2, parseElemPredicate, parseFilter);
                         orResults.add(result);
+                    } else if (char0 == '#' || elem.contains("{")) {
+                        elem = elem.substring(1);
+                        Predicate<T> filter = parseFilter.apply(elem);
+                        orResults.add(new ParseResult<>(elem, List.of(filter), new AtomicBoolean()));
                     } else {
                         ParseResult<T> result = new ParseResult<>(elem, List.of(), new AtomicBoolean());
                         if (parseSet2 != null) {