diff --git a/src/main/java/dev/logal/logalbot/commands/audio/Remove.java b/src/main/java/dev/logal/logalbot/commands/audio/Remove.java index a6c1d68..f1304a0 100644 --- a/src/main/java/dev/logal/logalbot/commands/audio/Remove.java +++ b/src/main/java/dev/logal/logalbot/commands/audio/Remove.java @@ -17,7 +17,6 @@ package dev.logal.logalbot.commands.audio; import java.util.concurrent.TimeUnit; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; -import com.vdurmont.emoji.EmojiManager; import dev.logal.logalbot.audio.TrackScheduler; import dev.logal.logalbot.commands.Command; @@ -26,6 +25,7 @@ import dev.logal.logalbot.commands.ReactionCallback; import dev.logal.logalbot.utils.AudioUtil; import dev.logal.logalbot.utils.CommandManager; import dev.logal.logalbot.utils.ReactionCallbackManager; +import dev.logal.logalbot.utils.StringUtil; import dev.logal.logalbot.utils.TrackUtil; import dev.logal.logalbot.utils.VoiceChannelUtil; import net.dv8tion.jda.core.Permission; @@ -69,7 +69,7 @@ public final class Remove implements Command { break; } - response.addReactionCallback(EmojiManager.getForAlias("" + trackNumber), new ReactionCallback() { + response.addReactionCallback(StringUtil.intToKeycapEmoji(trackNumber), new ReactionCallback() { @Override public final void run(final Member reactor, final long messageID) { ReactionCallbackManager.unregisterMessage(messageID); diff --git a/src/main/java/dev/logal/logalbot/utils/StringUtil.java b/src/main/java/dev/logal/logalbot/utils/StringUtil.java index c1907a7..e1ab64b 100644 --- a/src/main/java/dev/logal/logalbot/utils/StringUtil.java +++ b/src/main/java/dev/logal/logalbot/utils/StringUtil.java @@ -1,5 +1,8 @@ package dev.logal.logalbot.utils; +import com.vdurmont.emoji.Emoji; +import com.vdurmont.emoji.EmojiManager; + // Copyright 2019 Logan Fick // Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,6 +36,50 @@ public final class StringUtil { return string.replaceAll("[`]", "'").replaceAll("[\r\n]", ""); } + public static final Emoji intToKeycapEmoji(final int number) { + final String word; + switch (number) { + case 0: + word = "zero"; + break; + case 1: + word = "one"; + break; + case 2: + word = "two"; + break; + case 3: + word = "three"; + break; + case 4: + word = "four"; + break; + case 5: + word = "five"; + break; + case 6: + word = "six"; + break; + case 7: + word = "seven"; + break; + case 8: + word = "eight"; + break; + case 9: + word = "nine"; + break; + case 10: + word = "keycap_ten"; + break; + default: + word = "hash"; + break; + } + + return EmojiManager.getForAlias(word); + } + public static final String formatTime(final long milliseconds) { Checks.notNull(milliseconds, "Milliseconds");