Conflict wiki fix

xdnw · May 27, 2024 · 97e44b2 · 97e44b2
1 parent 98915ae
commit 97e44b2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java b/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java
@@ -576,8 +576,14 @@ public String importWikiPage(@Me GuildDB db, ConflictManager manager,
             if (conflict.getStartTurn() < TimeUtil.getTurn(1577836800000L)) {
                 response.append("Conflict `" + name + "` before the war cutoff date of " + DiscordUtil.timestamp(1577836800000L, null) + "\n");
             } else {
-                loadWikiConflicts(db, manager, List.of(conflict), true, true);
+                Set<Conflict> conflicts = loadWikiConflicts(db, manager, List.of(conflict), true, true);
+                List<String> conflictNamesAndIds = conflicts.stream().map(f -> f.getName() + " - #" + f.getId()).toList();
                 response.append("Loaded conflict `" + name + "` with url `https://politicsandwar.com/wiki/" + url + "`\n");
+                if (conflictNamesAndIds.isEmpty()) {
+                    response.append("No conflicts created\n");
+                } else {
+                    response.append("Created loaded\n- " + StringMan.join(conflictNamesAndIds, "\n- ") + "\n");
+                }
                 response.append("See: " +
                         CM.conflict.info.cmd.toSlashMention() +
                         "\n\n");

diff --git a/src/main/java/link/locutus/discord/db/conflict/Conflict.java b/src/main/java/link/locutus/discord/db/conflict/Conflict.java
@@ -724,6 +724,7 @@ public double getDamageConverted(boolean isPrimary) {
     }
 
     public void addAnnouncement(String desc, DBTopic topic, boolean saveToDB) {
+        announcements.entrySet().removeIf(f -> f.getValue().topic_id == topic.topic_id);
         announcements.put(desc, topic);
         if (saveToDB) {
             getManager().addAnnouncement(id, topic.topic_id, desc);