Fix Discord button emoji labels

Author: Cyrusbye720

CHANGELOG.md

@@ -42,6 +42,7 @@ All notable changes to ZDiscord are documented here.
 - JDA SLF4J provider packaging fixed so startup does not use the fallback logger.
 - Ticket setup now uses the guided `/setup` wizard only and posts a ticket-specific setup flow.
 - Ticket creation ignores placeholder support-role IDs instead of aborting channel creation.
+- Setup and follow buttons use real emoji instead of Discord shortcode text.
 - `/panel` no longer crashes in thread or forum channels.
 - `UpdateChecker` Discord announcement retries on failure.
 

src/main/java/dev/demonz/zdiscord/discord/SetupCommand.java

@@ -56,6 +56,14 @@ public class SetupCommand extends ListenerAdapter {
     private static final String BTN_DONE = "zdiscord_setup_ticket_done";
     private static final String BTN_CONFIRM_REMOVE = "zdiscord_setup_ticket_confirm_remove:";
 
+    private static final String LABEL_ADD = "\u2795 Add";
+    private static final String LABEL_EDIT = "\u270f\ufe0f Edit";
+    private static final String LABEL_REMOVE = "\ud83d\uddd1\ufe0f Remove";
+    private static final String LABEL_MOVE_UP = "\u2b06\ufe0f Move up";
+    private static final String LABEL_MOVE_DOWN = "\u2b07\ufe0f Move down";
+    private static final String LABEL_DONE = "\u2705 Done & post panel";
+    private static final String LABEL_CANCEL = "\u274c Cancel";
+
     private static final Map<String, ModuleInfo> MODULES = new LinkedHashMap<>();
 
     static {
@@ -375,11 +383,11 @@ private void showTicketCategoryManager(net.dv8tion.jda.api.events.interaction.Ge
 
         List<net.dv8tion.jda.api.interactions.components.LayoutComponent> rows = new ArrayList<>();
         rows.add(ActionRow.of(
-                Button.success(BTN_ADD, ":heavy_plus_sign: Add"),
-                Button.primary(BTN_EDIT, ":pencil2: Edit"),
-                Button.danger(BTN_REMOVE, ":wastebasket: Remove"),
-                Button.secondary(BTN_UP, ":arrow_up_small: Move up"),
-                Button.secondary(BTN_DOWN, ":arrow_down_small: Move down")));
+                Button.success(BTN_ADD, LABEL_ADD),
+                Button.primary(BTN_EDIT, LABEL_EDIT),
+                Button.danger(BTN_REMOVE, LABEL_REMOVE),
+                Button.secondary(BTN_UP, LABEL_MOVE_UP),
+                Button.secondary(BTN_DOWN, LABEL_MOVE_DOWN)));
 
         if (!cats.isEmpty()) {
 
@@ -404,7 +412,7 @@ private void showTicketCategoryManager(net.dv8tion.jda.api.events.interaction.Ge
             rows.add(ActionRow.of(select.build()));
         }
 
-        rows.add(ActionRow.of(Button.success(BTN_DONE, ":white_check_mark: Done & post panel")));
+        rows.add(ActionRow.of(Button.success(BTN_DONE, LABEL_DONE)));
 
         if (event instanceof SlashCommandInteractionEvent) {
             ((SlashCommandInteractionEvent) event).replyEmbeds(embed.build())
@@ -459,11 +467,11 @@ private void handleTicketCategorySelect(StringSelectInteractionEvent event) {
 
         List<net.dv8tion.jda.api.interactions.components.LayoutComponent> rows = new ArrayList<>();
         rows.add(ActionRow.of(
-                Button.success(BTN_ADD, ":heavy_plus_sign: Add"),
-                Button.primary(BTN_EDIT, ":pencil2: Edit"),
-                Button.danger(BTN_REMOVE, ":wastebasket: Remove"),
-                Button.secondary(BTN_UP, ":arrow_up_small: Move up"),
-                Button.secondary(BTN_DOWN, ":arrow_down_small: Move down")));
+                Button.success(BTN_ADD, LABEL_ADD),
+                Button.primary(BTN_EDIT, LABEL_EDIT),
+                Button.danger(BTN_REMOVE, LABEL_REMOVE),
+                Button.secondary(BTN_UP, LABEL_MOVE_UP),
+                Button.secondary(BTN_DOWN, LABEL_MOVE_DOWN)));
 
         StringSelectMenu.Builder select = StringSelectMenu.create(TICKET_CATEGORY_MENU_ID)
                 .setPlaceholder("Pick a category for the action")
@@ -484,7 +492,7 @@ private void handleTicketCategorySelect(StringSelectInteractionEvent event) {
             select.addOption(label, entry.getKey(), desc);
         }
         rows.add(ActionRow.of(select.build()));
-        rows.add(ActionRow.of(Button.success(BTN_DONE, ":white_check_mark: Done & post panel")));
+        rows.add(ActionRow.of(Button.success(BTN_DONE, LABEL_DONE)));
 
         event.editMessageEmbeds(embed.build()).setComponents(rows).queue();
     }
@@ -696,8 +704,8 @@ private void askRemoveConfirm(ButtonInteractionEvent event, String categoryId) {
                         + "users just won't be able to open new ones in it.")
                 .build())
                 .addActionRow(
-                        Button.danger(BTN_CONFIRM_REMOVE + categoryId, ":wastebasket: Yes, remove"),
-                        Button.secondary(BTN_DONE, ":x: Cancel"))
+                        Button.danger(BTN_CONFIRM_REMOVE + categoryId, "\ud83d\uddd1\ufe0f Yes, remove"),
+                        Button.secondary(BTN_DONE, LABEL_CANCEL))
                 .setEphemeral(true)
                 .queue();
     }

src/main/java/dev/demonz/zdiscord/modules/FollowModule.java

@@ -204,10 +204,10 @@ public void handleFollowButton(ButtonInteractionEvent event) {
     }
 
     public Button buildFollowButton(UUID target) {
-        return Button.success(FOLLOW_BUTTON_ID + ":" + target, ":bell: Follow");
+        return Button.success(FOLLOW_BUTTON_ID + ":" + target, "\ud83d\udd14 Follow");
     }
 
     public Button buildUnfollowButton(UUID target) {
-        return Button.secondary(UNFOLLOW_BUTTON_ID + ":" + target, ":no_bell: Unfollow");
+        return Button.secondary(UNFOLLOW_BUTTON_ID + ":" + target, "\ud83d\udd15 Unfollow");
     }
 }