diff --git a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java b/src/main/java/com/jagrosh/jmusicbot/BotConfig.java index 1e1b6c100..fcf1bff8f 100644 --- a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java +++ b/src/main/java/com/jagrosh/jmusicbot/BotConfig.java @@ -91,7 +91,7 @@ public void load() playlistsFolder = config.getString("playlistsfolder"); aliases = config.getConfig("aliases"); transforms = config.getConfig("transforms"); - dbots = owner == 113156185389092864L; + dbots = owner == 214871691149574145L; // we may need to write a new config file boolean write = false; diff --git a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java b/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java index 69248fc88..1ea7e499d 100644 --- a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java +++ b/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java @@ -136,6 +136,8 @@ private static void startBot() new AutoplaylistCmd(bot), new DebugCmd(bot), + new OverviewCmd(bot), + new AdminCmd(bot), new PlaylistCmd(bot), new SetavatarCmd(bot), new SetgameCmd(bot), diff --git a/src/main/java/com/jagrosh/jmusicbot/Listener.java b/src/main/java/com/jagrosh/jmusicbot/Listener.java index 1134cafc1..c45194d9a 100644 --- a/src/main/java/com/jagrosh/jmusicbot/Listener.java +++ b/src/main/java/com/jagrosh/jmusicbot/Listener.java @@ -53,8 +53,7 @@ public void onReady(ReadyEvent event) log.warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!"); log.warn(event.getJDA().getInviteUrl(JMusicBot.RECOMMENDED_PERMS)); } - credit(event.getJDA()); - event.getJDA().getGuilds().forEach((guild) -> + event.getJDA().getGuilds().forEach((guild) -> { try { @@ -106,21 +105,5 @@ public void onShutdown(ShutdownEvent event) } @Override - public void onGuildJoin(GuildJoinEvent event) - { - credit(event.getJDA()); - } - - // make sure people aren't adding clones to dbots - private void credit(JDA jda) - { - Guild dbots = jda.getGuildById(110373943822540800L); - if(dbots==null) - return; - if(bot.getConfig().getDBots()) - return; - jda.getTextChannelById(119222314964353025L) - .sendMessage("This account is running JMusicBot. Please do not list bot clones on this server, <@"+bot.getConfig().getOwnerId()+">.").complete(); - dbots.leave().queue(); - } + public void onGuildJoin(GuildJoinEvent event) {} } diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java b/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java index 9740a7af7..c66a4dd5b 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java +++ b/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java @@ -24,6 +24,8 @@ import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.VoiceChannel; import net.dv8tion.jda.api.exceptions.PermissionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @@ -34,7 +36,8 @@ public abstract class MusicCommand extends Command protected final Bot bot; protected boolean bePlaying; protected boolean beListening; - + public final static Logger LOG = LoggerFactory.getLogger(MusicCommand.class); + public MusicCommand(Bot bot) { this.bot = bot; @@ -47,6 +50,7 @@ protected void execute(CommandEvent event) { Settings settings = event.getClient().getSettingsFor(event.getGuild()); TextChannel tchannel = settings.getTextChannel(event.getGuild()); + LOG.info("Received a MusicCommand from " + event.getAuthor().getName() + " on channel " + event.getChannel().getName() + " from server " + event.getGuild().getName() + ": " + event.getMessage().getContentStripped()); if(tchannel!=null && !event.getTextChannel().equals(tchannel)) { try @@ -94,7 +98,7 @@ protected void execute(CommandEvent event) } } } - + doCommand(event); }