added approve/reject click actions for join request/invitation messages

Author: zefir-git

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

@@ -302,24 +302,36 @@ public Messages() {
 
     public @NotNull Component nationJoinRequestSent(final @NotNull Nation nation) {
         return MiniMessage.miniMessage()
-                .deserialize(Objects.requireNonNull(config.getString("nation.join.request-sent")), Placeholder.unparsed("nation", nation.name));
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.request-sent"))
+                                .replaceAll("<nation-id>", nation.id),
+                        Placeholder.unparsed("nation", nation.name)
+                );
     }
 
     public @NotNull Component nationJoinRequestReceived(final @NotNull Member member) {
         return MiniMessage.miniMessage()
-                .deserialize(Objects.requireNonNull(config.getString("nation.join.request-received")), Placeholder.unparsed("player", Optional
-                        .ofNullable(member.player().getName()).orElse(member.uuid.toString())));
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.request-received"))
+                                .replaceAll("<player>", Optional.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())));
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.invite-sent"))
+                                .replaceAll("<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));
+                .deserialize(
+                        Objects.requireNonNull(config.getString("nation.join.invite-received"))
+                                .replaceAll("<nation-id>", nation.id),
+                        Placeholder.unparsed("nation", nation.name)
+                );
     }
 
     public @NotNull Component nationJoinJoined(final @NotNull Member member) {

src/main/resources/messages.yml

@@ -64,10 +64,14 @@ nation:
         promote: <click:run_command:/nation vice-promote <member-name>><hover:show_text:'Appoint citizen as vice-leader'><dark_gray>[<green>Promote</green>]</dark_gray></hover></click>
     kicked: <green>(!) Player <gray><player></gray> is no longer a citizen of the nation.</green>
   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>
-    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>
+    request-sent: <green>(!) Your request to join <gray><nation></gray> has been sent.</green> <click:run_command:"/nation cancel <nation-id>"><hover:show_text:"<red>Click to cancel.</red>"><white>[Cancel]</white></hover></click>
+    request-received: |-
+      <green>(!) Member <gray><player></gray> requests to join your nation.</green>
+      <dark_gray>></dark_gray> <click:run_command:"/nation citizens invite <player>"><hover:show_text:"<green>Click to accept.</green>"><bold><green>[ACCEPT]</green></bold></hover></click> <click:run_command:"/nation citizens reject <player>"><hover:show_text:"<red>Click to reject.</red>"><bold><red>[REJECT]</red></bold></hover></click>
+    invite-sent: <green>(!) You have invited <gray><player></gray> to join the nation.</green> <click:run_command:"/nation citizens cancel <player>"><hover:show_text:"<red>Click to cancel.</red>"><white>[Cancel]</white></hover></click>
+    invite-received: |-
+      <green>(!) You have been invited to join <gray><nation></gray>!</green>
+      <dark_gray>></dark_gray> <click:run_command:"/nation join <nation-id>"><hover:show_text:"<green>Click to accept.</green>"><bold><green>[ACCEPT]</green></bold></hover></click> <click:run_command:"/nation reject <nation-id>"><hover:show_text:"<red>Click to reject.</red>"><bold><red>[REJECT]</red></bold></hover></click>
     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>