Refactored code

This commit is contained in:
Anthony committed 2018-04-16 10:07:13 -04:00
1 parent 35cce0f36e
commit f37ad7f8d6
7 files changed
+7 -14

No files matched your search

@@ -17,7 +17,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.security.auth.login.LoginException;
import java.io.IOException;
public class MusicBot {
@@ -2,12 +2,10 @@ package netneutrality.command.basic;
import java.awt.Color;
import java.util.HashMap;
import java.util.function.Consumer;
import net.dv8tion.jda.core.EmbedBuilder;
import net.dv8tion.jda.core.MessageBuilder;
import net.dv8tion.jda.core.entities.MessageChannel;
import net.dv8tion.jda.core.entities.PrivateChannel;
import net.dv8tion.jda.core.entities.TextChannel;
import net.dv8tion.jda.core.entities.User;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
@@ -3,7 +3,6 @@ package netneutrality.command.message;
import java.util.ArrayList;
import java.util.function.Consumer;
import net.dv8tion.jda.core.entities.Message;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import netneutrality.command.AbstractCommand;
import netneutrality.command.Visibility;
@@ -69,7 +68,7 @@ public class BlacklistCommand extends AbstractCommand {
@Override
public void accept(ArrayList<MBlacklist> mBlacklists) {
for (MBlacklist bl : mBlacklists) {
sb.append(bl.getWord() + " -> " + (bl.isEnabled() ? "enabled" : "disabled") + "\n");
sb.append(bl.getWord()).append(" -> ").append(bl.isEnabled() ? "enabled" : "disabled").append("\n");
}
t.editMessage("List of blacklisted words for this server [" + event.getGuild().getName() + "] :\n" + (mBlacklists.isEmpty() ? "No word found" : sb.toString())).queue();
@@ -89,11 +89,11 @@ public class DatabaseCommand extends AbstractCommand {
EmbedBuilder embed = new EmbedBuilder();
embed.setColor(Color.BLUE);
embed.setTimestamp(OffsetDateTime.now());
for (int i = 0; i < messages.size(); i++) {
for (MMessage message1 : messages) {
embed.addField(
"Message in channel \"" + messages.get(i).getChannelName() + "\" sent on "
+ messages.get(i).getDateSent(),
"" + messages.get(i).getMessage(), false);
"Message in channel \"" + message1.getChannelName() + "\" sent on "
+ message1.getDateSent(),
"" + message1.getMessage(), false);
}
embed.setFooter("Guild : " + event.getGuild().getName(), null);
@@ -79,7 +79,7 @@ public class MusicManager {
return player.getPlayingTrack();
}
public boolean leave() {
public void leave() {
if (isConnected()) {
stopMusic();
}
@@ -89,7 +89,6 @@ public class MusicManager {
guild.getAudioManager().closeAudioConnection();
}
return true;
}
public synchronized void stopMusic() {
@@ -7,9 +7,7 @@ package netneutrality.utils;
*/
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
import net.dv8tion.jda.core.EmbedBuilder;