commands for cancelling/rejecting requests/invites

Author: zefir-git

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

@@ -334,6 +334,41 @@ public Messages() {
                         .ofNullable(member.player().getName()).orElse(member.uuid.toString())));
     }
 
+    public @NotNull Component nationJoinRequestCancelled(final @NotNull Nation nation) {
+        return MiniMessage.miniMessage()
+                .deserialize(Objects.requireNonNull(config.getString("nation.join.request-cancelled")), Placeholder.unparsed("nation", nation.name));
+    }
+
+    public @NotNull Component nationJoinRequestRejected(final @NotNull Member member, final @NotNull Nation nation) {
+        return MiniMessage.miniMessage()
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.request-rejected")),
+                        Placeholder.unparsed("player", Optional.ofNullable(
+                                member.player().getName()).orElse(member.uuid.toString())
+                        ),
+                        Placeholder.unparsed("nation", nation.name)
+                );
+    }
+
+    public @NotNull Component nationJoinInviteCancelled(final @NotNull Member member, final @NotNull Nation nation) {
+        return MiniMessage.miniMessage()
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.invite-cancelled")),
+                        Placeholder.unparsed("player", Optional.ofNullable(
+                                member.player().getName()).orElse(member.uuid.toString())
+                        ),
+                        Placeholder.unparsed("nation", nation.name)
+                );
+    }
+
+    public @NotNull Component nationJoinInviteRejected(final @NotNull Nation nation) {
+        return MiniMessage.miniMessage()
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.invite-rejected")),
+                        Placeholder.unparsed("nation", nation.name)
+                );
+    }
+
     // errors
 
     public @NotNull Component errorNoPermission() {
@@ -462,6 +497,14 @@ public Messages() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.already-invited")), Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
     }
 
+    public @NotNull Component errorNoRequest(final @NotNull Nation nation) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.no-request-nation")), Placeholder.unparsed("nation", nation.name));
+    }
+
+    public @NotNull Component errorNoRequest(final @NotNull Member member) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.no-request-player")), Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
+    }
+
     public record SubCommandArgument(@NotNull String name, boolean required) {
         public @NotNull Component component() {
             return required ? SMPCore.messages().subCommandArgumentRequired(name) : SMPCore.messages()

src/main/java/pro/cloudnode/smp/smpcore/command/NationCommand.java

@@ -55,6 +55,7 @@ public boolean run(
         return switch (args[0]) {
             case "citizens", "members", "subjects", "nationals", "people", "residents", "population", "cits", "pop" -> citizens(member.orElse(null), nation.orElse(null), sender, command, argsSubset);
             case "join", "request", "req" -> join(member.orElse(null), sender, command, argsSubset);
+            case "cancel", "reject", "decline", "withdraw", "refuse", "deny" -> memberCancel(member.orElse(null), sender, command, argsSubset);
             case "leave", "abandon", "renounce" -> leave(member.orElse(null), nation.orElse(null), sender);
             default -> helpSubCommands(member.orElse(null), nation.orElse(null), sender, label);
         };
@@ -106,6 +107,19 @@ public static boolean helpSubCommands(
                             new Messages.SubCommandArgument("nation", true)
                     }, "Request to join a nation."
             ));
+            if (member != null && !CitizenRequest.get(member, true).isEmpty())
+                subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
+                        command + " cancel ", "cancel", new Messages.SubCommandArgument[]{
+                                new Messages.SubCommandArgument("nation", true)
+                        }, "Cancel request to join nation."
+                ));
+
+            if (member != null && !CitizenRequest.get(member, false).isEmpty())
+                subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
+                        command + " reject ", "reject", new Messages.SubCommandArgument[]{
+                                new Messages.SubCommandArgument("nation", true)
+                        }, "Reject invitation to join nation."
+                ));
         }
 
         return sendMessage(sender, subCommandBuilder.build());
@@ -129,6 +143,7 @@ public static boolean citizens(
             case "list", "show", "get" -> listCitizens(member, nation, sender);
             case "kick", "remove", "delete", "rm", "del" -> kickCitizen(member, nation, sender, command, argsSubset);
             case "invite", "request", "req" -> inviteCitizen(member, nation, sender, command, argsSubset);
+            case "cancel", "reject", "decline", "withdraw", "refuse", "deny" -> nationCancel(member, nation, sender, command, argsSubset);
             case "add" -> addCitizen(member, nation, sender, command, argsSubset);
             default -> citizensSubcommands(member, nation, sender, label);
         };
@@ -165,13 +180,28 @@ public static boolean citizensSubcommands(
             ));
 
         if ((!other && sender.hasPermission(Permission.NATION_INVITE))
-                || sender.hasPermission(Permission.NATION_INVITE_OTHER))
+                || sender.hasPermission(Permission.NATION_INVITE_OTHER)) {
             subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
                     label + " invite ", "invite", new Messages.SubCommandArgument[]{
                             new Messages.SubCommandArgument("member", true)
                     }, "Invite to join nation."
             ));
 
+            if (!CitizenRequest.get(nation, true).isEmpty())
+                subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
+                        label + " reject ", "reject", new Messages.SubCommandArgument[]{
+                                new Messages.SubCommandArgument("member", true)
+                        }, "Reject request to join nation."
+                ));
+
+            if (!CitizenRequest.get(nation, false).isEmpty())
+                subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
+                        label + " cancel ", "cancel", new Messages.SubCommandArgument[]{
+                                new Messages.SubCommandArgument("member", true)
+                        }, "Cancel invitation to join nation."
+                ));
+        }
+
         if ((!other && sender.hasPermission(Permission.NATION_CITIZEN_ADD))
         || sender.hasPermission(Permission.NATION_CITIZEN_ADD_OTHER))
             subCommandBuilder.append(Component.newline()).append(SMPCore.messages().subCommandEntry(
@@ -381,6 +411,70 @@ public static boolean join(
         return true;
     }
 
+    public static boolean memberCancel(
+            final @Nullable Member member,
+            final @NotNull CommandSender sender,
+            final @NotNull String label,
+            final @NotNull String @NotNull [] args
+    ) {
+        if (member == null)
+            return sendMessage(sender, SMPCore.messages().errorNotMember());
+
+        if (!hasAnyPermission(sender, Permission.NATION_JOIN_REQUEST, Permission.NATION_INVITE_ACCEPT))
+            return sendMessage(sender, SMPCore.messages().errorNoPermission());
+
+        if (args.length < 1)
+            return sendMessage(sender, SMPCore.messages().usage(label, "<nation>"));
+
+        final var nation = Nation.get(args[0]);
+        if (nation.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNationNotFound(args[0]));
+
+        final var request = CitizenRequest.get(member, nation.get());
+        if (request.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNoRequest(nation.get()));
+
+        request.get().delete();
+        if (request.get().mode)
+            return sendMessage(sender, SMPCore.messages().nationJoinRequestCancelled(nation.get()));
+        return sendMessage(sender, SMPCore.messages().nationJoinInviteRejected(nation.get()));
+    }
+
+    public static boolean nationCancel(
+            final @Nullable Member member,
+            final @NotNull Nation nation,
+            final @NotNull CommandSender sender,
+            final @NotNull String label,
+            final @NotNull String @NotNull [] args
+    ) {
+        if (
+                !sender.hasPermission(Permission.NATION_INVITE)
+                        || (
+                        (member == null || !nation.id.equals(member.nationID))
+                                && !sender.hasPermission(Permission.NATION_INVITE_OTHER)
+                )
+        )
+            return sendMessage(sender, SMPCore.messages().errorNoPermission());
+
+        if (args.length < 1)
+            return sendMessage(sender, SMPCore.messages().usage(label, "<member>"));
+
+        final var targetPlayer = sender.getServer().getOfflinePlayer(args[0]);
+        final @NotNull var target = Member.get(targetPlayer);
+
+        if (target.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNotMember(targetPlayer));
+
+        final var request = CitizenRequest.get(target.get(), nation);
+        if (request.isEmpty())
+            return sendMessage(sender, SMPCore.messages().errorNoRequest(target.get()));
+
+        request.get().delete();
+        if (request.get().mode)
+            return sendMessage(sender, SMPCore.messages().nationJoinRequestRejected(target.get(), nation));
+        return sendMessage(sender, SMPCore.messages().nationJoinInviteCancelled(target.get(), nation));
+    }
+
     public static boolean leave(
             final @Nullable Member member,
             final @Nullable Nation nation,

src/main/resources/messages.yml

@@ -70,6 +70,10 @@ nation:
     invite-received: <green>(!) You have been invited to join <gray><nation></gray>!</green>
     joined: <green>(!) Member <gray><player></gray> has joined the nation!</green>
     left: <gold>(!) Member <gray><player></gray> has left the nation!</gold>
+    request-cancelled: <green>(!) You have withdrawn your request to join <gray><nation></gray>.</green>
+    request-rejected: <green>(!) You have rejected the request of <gray><player></gray> to join <gray><nation></gray>.</green>
+    invite-cancelled: <green>(!) You have cancelled the invitation to <gray><player></gray> to join <gray><nation></gray>.</green>
+    invite-rejected: <green>(!) You have rejected the invitation to join <gray><nation></gray>.</green>
 error:
   no-permission: <red>(!) You don't have permission to use this command.</red>
   player-not-banned: <red>(!) Player <gray><player></gray> is not banned and is not a member.</red>
@@ -97,3 +101,5 @@ error:
   not-invited: <red>(!) You were not invited to join <gray><nation></gray>.</red>
   already-requested-join: <red>(!) You have already requested to join <gray><nation></gray>.</red>
   already-invited: <red>(!) You have already invited <gray><player></gray> to join the nation.</red>
+  no-request-nation: <red>(!) No invitation or request to join <gray><nation></gray> found.</red>
+  no-request-player: <red>(!) No request to join or invitation to <gray><player></gray> found.</red>