delete all citizen requests upon joining a nation

Author: zefir-git

src/main/java/pro/cloudnode/smp/smpcore/CitizenRequest.java

@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.logging.Level;
+import java.util.stream.Collectors;
 
 public final class CitizenRequest {
     /**
@@ -264,4 +265,37 @@ public void delete() {
             return new ArrayList<>();
         }
     }
+
+    /**
+     * Deletes multiple requests
+     *
+     * @param requests Requests
+     */
+    public static void delete(final @NotNull List<@NotNull CitizenRequest> requests) {
+        try (
+                final @NotNull Connection conn = SMPCore.getInstance().db().getConnection();
+                final @NotNull PreparedStatement stmt = conn.prepareStatement(
+                        "DELETE FROM `citizen_requests` WHERE `member` = ? AND `nation` = ?")
+        ) {
+            conn.setAutoCommit(false);
+            for (final @NotNull CitizenRequest request : requests) {
+                stmt.setString(1, request.uuid.toString());
+                stmt.setString(2, request.nationID);
+                stmt.addBatch();
+            }
+
+            stmt.executeBatch();
+            conn.commit();
+        }
+        catch (final @NotNull SQLException e) {
+            SMPCore.getInstance().getLogger().log(
+                    Level.SEVERE,
+                    "could not delete citizen requests: "
+                            + requests.stream()
+                                      .map(r -> "(" + r.nationID + ", " + r.uuid + ")")
+                                      .collect(Collectors.joining(", ")),
+                    e
+            );
+        }
+    }
 }

src/main/java/pro/cloudnode/smp/smpcore/Nation.java

@@ -1,5 +1,6 @@
 package pro.cloudnode.smp.smpcore;
 
+import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.TextColor;
@@ -132,10 +133,15 @@ public Nation(final @NotNull String id, final @NotNull String name, final @NotNu
     }
 
     public void add(final @NotNull Member member) {
+        member.nation().ifPresent(nation -> nation.remove(member));
         member.nationID = id;
         member.save();
         getTeam().addPlayer(member.player());
+
+        Audience.audience(onlinePlayers()).sendMessage(SMPCore.messages().nationJoinJoined(member));
+
         CitizenRequest.get(member, this).ifPresent(CitizenRequest::delete);
+        CitizenRequest.delete(CitizenRequest.get(member, true));
     }
 
     public void remove(final @NotNull Member member) {