send invites to join nation & access requests to join

Author: zefir-git

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

@@ -91,12 +91,19 @@ public boolean send() {
         final @NotNull Member member = member();
         final @Nullable Player player = member.player().getPlayer();
         final @NotNull Nation nation = nation();
-        if (player != null)
-            player.sendMessage(SMPCore.messages().nationJoinRequestSent(nation));
+
+        // invited
+        if (!mode) {
+            if (player != null)
+                player.sendMessage(SMPCore.messages().nationJoinInviteReceived(nation));
+            return true;
+        }
+
+        // requested
         return Command.sendMessage(
                 Audience.audience(
                         nation().onlinePlayers().stream()
-                                .filter(p -> p.hasPermission(Permission.NATION_JOIN_REQUEST_ACCEPT))
+                                .filter(p -> p.hasPermission(Permission.NATION_INVITE))
                                 .toList()
                 ),
                 SMPCore.messages().nationJoinRequestReceived(member)

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

@@ -311,6 +311,17 @@ public Messages() {
                         .ofNullable(member.player().getName()).orElse(member.uuid.toString())));
     }
 
+    public @NotNull Component nationJoinInviteSent(final @NotNull Member member) {
+        return MiniMessage.miniMessage()
+                .deserialize(Objects.requireNonNull(config.getString("nation.join.invite-sent")), Placeholder.unparsed("player", Optional
+                        .ofNullable(member.player().getName()).orElse(member.uuid.toString())));
+    }
+
+    public @NotNull Component nationJoinInviteReceived(final @NotNull Nation nation) {
+        return MiniMessage.miniMessage()
+                .deserialize(Objects.requireNonNull(config.getString("nation.join.invite-received")), Placeholder.unparsed("nation", nation.name));
+    }
+
     public @NotNull Component nationJoinJoined(final @NotNull Member member) {
         return MiniMessage.miniMessage()
                 .deserialize(Objects.requireNonNull(config.getString("nation.join.joined")), Placeholder.unparsed("player", Optional
@@ -415,6 +426,10 @@ public Messages() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.already-citizen-nation")), Placeholder.unparsed("nation", nation.name));
     }
 
+    public @NotNull Component errorAlreadyCitizen(final @NotNull Member member) {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.already-citizen-player")), Placeholder.unparsed("player", Optional.ofNullable(member.player().getName()).orElse(member.player().getUniqueId().toString())));
+    }
+
     public @NotNull Component errorNotPlayer() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.not-player")));
     }
@@ -439,6 +454,10 @@ public Messages() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("error.already-requested-join")), Placeholder.unparsed("nation", nation.name));
     }
 
+    public @NotNull Component errorAlreadyInvited(final @NotNull Member member) {
+        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 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/Permission.java

@@ -110,12 +110,12 @@ public final class Permission {
     /**
      * Send invitation to join your nation
      */
-    public static @NotNull String NATION_INVITE_SEND = "smpcore.nation.invite";
+    public static @NotNull String NATION_INVITE = "smpcore.nation.invite";
 
     /**
      * Send invitation to join any nation
      */
-    public static @NotNull String NATION_INVITE_SEND_OTHER = "smpcore.nation.invite.other";
+    public static @NotNull String NATION_INVITE_OTHER = "smpcore.nation.invite.other";
 
     /**
      * Accept request to join your nation

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

@@ -123,6 +123,7 @@ public boolean citizens(
         return switch (args[0]) {
             case "list" -> listMembers(member, nation, sender);
             case "kick" -> kickMember(member, nation, sender, command, argsSubset);
+            case "invite" -> inviteMember(member, nation, sender, command, argsSubset);
             default -> citizensSubcommand(member, nation, sender, "/" + label);
         };
     }
@@ -157,6 +158,14 @@ public boolean citizensSubcommand(
                     }, "Revoke citizenship."
             ));
 
+        if ((!other && sender.hasPermission(Permission.NATION_INVITE))
+                || 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."
+            ));
+
         return sendMessage(sender, subCommandBuilder.build());
     }
 
@@ -256,6 +265,7 @@ public boolean join(
                     Date.from(Instant.now().plusSeconds(SMPCore.config().joinRequestExpireMinutes() * 60L))
             );
             newRequest.save();
+            sendMessage(sender, SMPCore.messages().nationJoinRequestSent(nation.get()));
             return newRequest.send();
         }
 
@@ -265,4 +275,56 @@ public boolean join(
         request.get().accept();
         return true;
     }
+
+    public boolean inviteMember(
+            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));
+
+        if (nation.id.equals(target.get().nationID))
+            return sendMessage(sender, SMPCore.messages().errorAlreadyCitizen(target.get()));
+
+        final @NotNull var request = CitizenRequest.get(target.get(), nation);
+
+        if (request.isEmpty() || request.get().expired()) {
+            request.ifPresent(CitizenRequest::delete);
+
+            final var newRequest = new CitizenRequest(
+                    target.get().uuid,
+                    nation.id,
+                    false,
+                    new Date(),
+                    Date.from(Instant.now().plusSeconds(SMPCore.config().joinRequestExpireMinutes() * 60L))
+            );
+            newRequest.save();
+            sendMessage(sender, SMPCore.messages().nationJoinInviteSent(target.get()));
+            return newRequest.send();
+        }
+
+        if (!request.get().mode)
+            return sendMessage(sender, SMPCore.messages().errorAlreadyInvited(target.get()));
+
+        request.get().accept();
+        return true;
+    }
 }

src/main/resources/messages.yml

@@ -66,8 +66,10 @@ nation:
   join:
     request-sent: <green>(!) Your request to join <gray><nation></gray> has been sent.</green>
     request-received: <green>(!) Member <gray><player></gray> requests to join your nation.</green>
-    joined: <green>(!) Member <gray><player></gray> has joined your nation!</green>
-    left: <gold>(!) Member <gray><player></gray> has left your nation!</gold>
+    invite-sent: <green>(!) You have invited <gray><player></gray> to join the nation.</green>
+    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>
 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>
@@ -90,5 +92,7 @@ error:
   nation-not-found: <red>(!) Nation <gray><nation></gray> not found.</red>
   already-citizen: <red>(!) You are already a citizen of a nation.</red>
   already-citizen-nation: <red>(!) You are already a citizen of <gray><nation></gray>.</red>
+  already-citizen-player: <red>(!) Citizen <gray><player></gray> is already in the nation.</red>
   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>