diff --git a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java b/src/main/java/com/jagrosh/jmusicbot/BotConfig.java index cec94c0..5cfb8e5 100644 --- a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java +++ b/src/main/java/com/jagrosh/jmusicbot/BotConfig.java @@ -46,7 +46,8 @@ public class BotConfig private long owner, maxSeconds; private OnlineStatus status; private Game game; - + + private Config config; private boolean valid = false; public BotConfig(Prompt prompt) @@ -72,7 +73,7 @@ public class BotConfig // load in the config file, plus the default values //Config config = ConfigFactory.parseFile(path.toFile()).withFallback(ConfigFactory.load()); - Config config = ConfigFactory.load(); + config = ConfigFactory.load(); // set values token = config.getString("token"); @@ -300,4 +301,12 @@ public class BotConfig return false; return Math.round(track.getDuration()/1000.0) > maxSeconds; } + + public String[] getAliases(String command) + { + String aliases = config.getString("alias."+command); + if(aliases == null || aliases.length() <= 0) + return new String[]{}; + return aliases.split(" "); + } } diff --git a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java b/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java index a65eae5..6be2c93 100644 --- a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java +++ b/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java @@ -46,6 +46,7 @@ public class JMusicBot public final static Permission[] RECOMMENDED_PERMS = new Permission[]{Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI, Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE}; + public static BotConfig config; /** * @param args the command line arguments */ @@ -71,7 +72,7 @@ public class JMusicBot String version = OtherUtil.checkVersion(prompt); // load config - BotConfig config = new BotConfig(prompt); + config = new BotConfig(prompt); config.load(); if(!config.isValid()) return; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java index befe637..3423461 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.AdminCommand; import com.jagrosh.jmusicbot.settings.Settings; import com.jagrosh.jmusicbot.utils.FormatUtil; @@ -34,6 +35,7 @@ public class SetdjCmd extends AdminCommand this.name = "setdj"; this.help = "sets the DJ role for certain music commands"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); } @Override diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java index 6c408c0..3d750be 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.AdminCommand; import com.jagrosh.jmusicbot.settings.Settings; import com.jagrosh.jmusicbot.utils.FormatUtil; @@ -34,6 +35,7 @@ public class SettcCmd extends AdminCommand this.name = "settc"; this.help = "sets the text channel for music commands"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); } @Override diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java index 15296cf..a106438 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.AdminCommand; import com.jagrosh.jmusicbot.settings.Settings; import com.jagrosh.jmusicbot.utils.FormatUtil; @@ -34,6 +35,7 @@ public class SetvcCmd extends AdminCommand this.name = "setvc"; this.help = "sets the voice channel for playing music"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); } @Override diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java index e18534d..5aa1c1c 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java @@ -19,6 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.menu.OrderedMenu; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; import net.dv8tion.jda.core.Permission; @@ -40,7 +41,7 @@ public class ForceRemoveCmd extends DJCommand this.name = "forceremove"; this.help = "removes all entries by a user from the queue"; this.arguments = ""; - this.aliases = new String[]{"forcedelete", "modremove", "moddelete"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = false; this.bePlaying = true; this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS}; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java index 7413a2b..a2d79dc 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; import net.dv8tion.jda.core.entities.User; @@ -32,7 +33,7 @@ public class ForceskipCmd extends DJCommand super(bot); this.name = "forceskip"; this.help = "skips the current song"; - this.aliases = new String[]{"modskip"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java index 0275342..b4f0945 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java @@ -3,6 +3,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.audio.QueuedTrack; import com.jagrosh.jmusicbot.commands.DJCommand; @@ -20,7 +21,7 @@ public class MoveTrackCmd extends DJCommand this.name = "movetrack"; this.help = "move a track in the current queue to a different position"; this.arguments = " "; - this.aliases = new String[]{"move"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java index 4c5a3b1..c374fb2 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; @@ -31,6 +32,7 @@ public class PauseCmd extends DJCommand super(bot); this.name = "pause"; this.help = "pauses the current song"; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java index b547210..9c2b277 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.audio.QueuedTrack; import com.jagrosh.jmusicbot.commands.DJCommand; @@ -42,6 +43,7 @@ public class PlaynextCmd extends DJCommand this.name = "playnext"; this.arguments = ""; this.help = "plays a single song next"; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = true; this.bePlaying = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java index 693dc74..183d7da 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.DJCommand; import com.jagrosh.jmusicbot.settings.Settings; @@ -32,6 +33,7 @@ public class RepeatCmd extends DJCommand this.name = "repeat"; this.help = "re-adds music to the queue when finished"; this.arguments = "[on|off]"; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java index e8b95d2..9eb2ce1 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; @@ -32,7 +33,7 @@ public class SkiptoCmd extends DJCommand this.name = "skipto"; this.help = "skips to the specified song"; this.arguments = ""; - this.aliases = new String[]{"jumpto"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java index 53c292b..b8d6700 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; @@ -31,6 +32,7 @@ public class StopCmd extends DJCommand super(bot); this.name = "stop"; this.help = "stops the current song and clears the queue"; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java index 40acb7e..c45e741 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.DJCommand; import com.jagrosh.jmusicbot.settings.Settings; @@ -32,7 +33,7 @@ public class VolumeCmd extends DJCommand { super(bot); this.name = "volume"; - this.aliases = new String[]{"vol"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.help = "sets or shows volume"; this.arguments = "[0-150]"; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java index ceb2138..899e544 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.general; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.settings.Settings; import net.dv8tion.jda.core.EmbedBuilder; import net.dv8tion.jda.core.MessageBuilder; @@ -36,7 +37,7 @@ public class SettingsCmd extends Command { this.name = "settings"; this.help = "shows the bots settings"; - this.aliases = new String[]{"status"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java index 1d408f1..89feb43 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java @@ -19,6 +19,7 @@ import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jlyrics.Lyrics; import com.jagrosh.jlyrics.LyricsClient; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.MusicCommand; import java.util.concurrent.ExecutionException; @@ -39,6 +40,7 @@ public class LyricsCmd extends MusicCommand this.name = "lyrics"; this.arguments = "[song name]"; this.help = "shows the lyrics to the currently-playing song"; + this.aliases = JMusicBot.config.getAliases(this.name); this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS}; this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java index e7be1c1..6350369 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.MusicCommand; import net.dv8tion.jda.core.Permission; @@ -33,7 +34,7 @@ public class NowplayingCmd extends MusicCommand super(bot); this.name = "nowplaying"; this.help = "shows the song that is currently playing"; - this.aliases = new String[]{"np","current"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.botPermissions = new Permission[]{Permission.MESSAGE_EMBED_LINKS}; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java index eb77b82..ccf711a 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java @@ -15,6 +15,7 @@ */ package com.jagrosh.jmusicbot.commands.music; +import com.jagrosh.jmusicbot.JMusicBot; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; @@ -53,6 +54,7 @@ public class PlayCmd extends MusicCommand this.name = "play"; this.arguments = ""; this.help = "plays the provided song"; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = true; this.bePlaying = false; this.children = new Command[]{new PlaylistCmd(bot)}; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java index 9aa73ae..04cc071 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.music; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.MusicCommand; /** @@ -31,7 +32,7 @@ public class PlaylistsCmd extends MusicCommand super(bot); this.name = "playlists"; this.help = "shows the available playlists"; - this.aliases = new String[]{"pls"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = true; this.beListening = false; this.beListening = false; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java index fa7e0f5..a503fc1 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java @@ -47,7 +47,7 @@ public class QueueCmd extends MusicCommand this.name = "queue"; this.help = "shows the current queue"; this.arguments = "[pagenum]"; - this.aliases = new String[]{"list"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.bePlaying = true; this.botPermissions = new Permission[]{Permission.MESSAGE_ADD_REACTION,Permission.MESSAGE_EMBED_LINKS}; builder = new Paginator.Builder() diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java index 2878c99..d6ddfa0 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.audio.QueuedTrack; import com.jagrosh.jmusicbot.commands.MusicCommand; @@ -36,7 +37,7 @@ public class RemoveCmd extends MusicCommand this.name = "remove"; this.help = "removes a song from the queue"; this.arguments = ""; - this.aliases = new String[]{"delete"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = true; this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java index 2a10645..a908e0d 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java @@ -16,6 +16,7 @@ package com.jagrosh.jmusicbot.commands.music; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; /** * @@ -29,6 +30,6 @@ public class SCSearchCmd extends SearchCmd this.searchPrefix = "scsearch:"; this.name = "scsearch"; this.help = "searches Soundcloud for a provided query"; - this.aliases = new String[]{}; + this.aliases = JMusicBot.config.getAliases(this.name); } } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java index caaf2e1..7d413bb 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java @@ -15,6 +15,7 @@ */ package com.jagrosh.jmusicbot.commands.music; +import com.jagrosh.jmusicbot.JMusicBot; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; @@ -46,7 +47,7 @@ public class SearchCmd extends MusicCommand super(bot); this.searchingEmoji = bot.getConfig().getSearching(); this.name = "search"; - this.aliases = new String[]{"ytsearch"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.arguments = ""; this.help = "searches Youtube for a provided query"; this.beListening = true; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java index 4b817e3..68421b7 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.MusicCommand; @@ -31,6 +32,7 @@ public class ShuffleCmd extends MusicCommand super(bot); this.name = "shuffle"; this.help = "shuffles songs you have added"; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = true; this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java index 7fcedf8..9604e1c 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.audio.AudioHandler; import com.jagrosh.jmusicbot.commands.MusicCommand; import net.dv8tion.jda.core.entities.User; @@ -32,7 +33,7 @@ public class SkipCmd extends MusicCommand super(bot); this.name = "skip"; this.help = "votes to skip the current song"; - this.aliases = new String[]{"voteskip"}; + this.aliases = JMusicBot.config.getAliases(this.name); this.beListening = true; this.bePlaying = true; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java index 7eff824..a908bba 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import com.jagrosh.jmusicbot.settings.Settings; @@ -35,6 +36,7 @@ public class AutoplaylistCmd extends OwnerCommand this.name = "autoplaylist"; this.arguments = ""; this.help = "sets the default playlist for the server"; + this.aliases = JMusicBot.config.getAliases(this.name); } @Override diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java index 39ad0a9..8b29ce3 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import com.jagrosh.jmusicbot.utils.OtherUtil; import com.sedmelluq.discord.lavaplayer.tools.PlayerLibrary; @@ -41,6 +42,7 @@ public class DebugCmd extends OwnerCommand this.bot = bot; this.name = "debug"; this.help = "shows debug info"; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java index 0fdcef0..82e6d94 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java @@ -19,6 +19,7 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; /** @@ -34,6 +35,7 @@ public class EvalCmd extends OwnerCommand this.bot = bot; this.name = "eval"; this.help = "evaluates nashorn code"; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java index 6c8982a..5167e5c 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java @@ -20,6 +20,7 @@ import java.util.List; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import com.jagrosh.jmusicbot.commands.owner.AutoplaylistCmd; import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; @@ -38,6 +39,7 @@ public class PlaylistCmd extends OwnerCommand this.name = "playlist"; this.arguments = ""; this.help = "playlist management"; + this.aliases = JMusicBot.config.getAliases(this.name); this.children = new OwnerCommand[]{ new ListCmd(), new AppendlistCmd(), diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java index 13f83da..c0b877a 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java @@ -18,6 +18,7 @@ package com.jagrosh.jmusicbot.commands.owner; import java.io.IOException; import java.io.InputStream; import com.jagrosh.jdautilities.command.CommandEvent; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import com.jagrosh.jmusicbot.utils.OtherUtil; import net.dv8tion.jda.core.entities.Icon; @@ -33,6 +34,7 @@ public class SetavatarCmd extends OwnerCommand this.name = "setavatar"; this.help = "sets the avatar of the bot"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java index 443fbd6..7d778d6 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java @@ -16,6 +16,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import net.dv8tion.jda.core.entities.Game; @@ -30,6 +31,7 @@ public class SetgameCmd extends OwnerCommand this.name = "setgame"; this.help = "sets the game the bot is playing"; this.arguments = "[action] [game]"; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; this.children = new OwnerCommand[]{ new SetlistenCmd(), diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java index fab1c05..5a0b485 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import net.dv8tion.jda.core.exceptions.RateLimitedException; @@ -31,6 +32,7 @@ public class SetnameCmd extends OwnerCommand this.name = "setname"; this.help = "sets the name of the bot"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java index 6089848..adb385b 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java @@ -16,6 +16,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; import net.dv8tion.jda.core.OnlineStatus; @@ -30,6 +31,7 @@ public class SetstatusCmd extends OwnerCommand this.name = "setstatus"; this.help = "sets the status the bot displays"; this.arguments = ""; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java index b9ee0f3..fe0f87b 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java @@ -17,6 +17,7 @@ package com.jagrosh.jmusicbot.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jmusicbot.Bot; +import com.jagrosh.jmusicbot.JMusicBot; import com.jagrosh.jmusicbot.commands.OwnerCommand; /** @@ -32,6 +33,7 @@ public class ShutdownCmd extends OwnerCommand this.bot = bot; this.name = "shutdown"; this.help = "safely shuts down"; + this.aliases = JMusicBot.config.getAliases(this.name); this.guildOnly = false; } diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf index c89a67d..36e4b82 100644 --- a/src/main/resources/reference.conf +++ b/src/main/resources/reference.conf @@ -123,6 +123,66 @@ updatealerts=true lyrics.default = "A-Z Lyrics" +// These settings allow you to configure custom aliases for all commands. +// Multiple aliases may be given, separated by spaces. +// +// Example 1: Giving command "play" the alias "p": +// alias.play = "p" +// +// Example 2: Giving command "search" the aliases "s" and "find": +// alias.search = "s find" + +// General commands + +alias.settings = "status" + + +// Music commands + +alias.lyrics = "" +alias.nowplaying = "np current" +alias.play = "" +alias.playlists = "pls" +alias.queue = "list" +alias.remove = "delete" +alias.scsearch = "" +alias.search = "ytsearch" +alias.shuffle = "" +alias.skip = "voteskip" + +// Admin commands + +alias.setdj = "" +alias.settc = "" +alias.setvc = "" + + +// DJ Commands + +alias.forceremove = "forcedelete modremove moddelete" +alias.forceskip = "modskip" +alias.movetrack = "move" +alias.pause = "" +alias.playnext = "" +alias.repeat = "" +alias.skipto = "jumpto" +alias.stop = "" +alias.volume = "v" + + +// Owner commands + +alias.autoplaylist = "" +alias.debug = "" +alias.eval = "" +alias.playlist = "" +alias.setavatar = "" +alias.setgame = "" +alias.setname = "" +alias.setstatus = "" +alias.shutdown = "" + + // If you set this to true, it will enable the eval command for the bot owner. This command // allows the bot owner to run arbitrary code from the bot's account. //