greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Hax dev #8

Merged
greg6775 merged 8 commits from hax-dev into greg-dev 2019-10-27 15:26:49 +01:00
Conversation 0 Commits 8 Files changed 3 +21 -8
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/bbn/hadder/commands/general/PingCommand.java
View file

@ -14,7 +14,9 @@ public class PingCommand implements Command {
@Override @Override
public void executed(String[] args, MessageReceivedEvent event) { public void executed(String[] args, MessageReceivedEvent event) {
EmbedBuilder builder = new EmbedBuilder(); EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription("0").build()).queue(); event.getJDA().getRestPing().queue(ping -> {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Ping").setDescription(String.valueOf(ping)).build()).queue();
});
} }
@Override @Override

2
src/main/java/com/bbn/hadder/commands/moderation/KickCommand.java
View file

@ -47,6 +47,6 @@ public class KickCommand implements Command {
@Override @Override
public String[] labels() { public String[] labels() {
return new String[0]; return new String[]{"kick"};
} }
} }

23
src/main/java/com/bbn/hadder/commands/owner/ShutdownCommand.java
View file

@ -4,11 +4,25 @@ package com.bbn.hadder.commands.owner;
* @author Skidder / GregTCLTK * @author Skidder / GregTCLTK
*/ */
import com.bbn.hadder.Hadder;
import com.bbn.hadder.Rethink; import com.bbn.hadder.Rethink;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.OnlineStatus;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.json.JSONObject;
import javax.annotation.Nonnull;
import javax.security.auth.login.LoginException;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
public class ShutdownCommand implements Command { public class ShutdownCommand implements Command {
@Override @Override
@ -16,12 +30,9 @@ public class ShutdownCommand implements Command {
if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) { if (event.getAuthor().getId().equals("477141528981012511") || event.getAuthor().getId().equals("261083609148948488")) {
EmbedBuilder builder = new EmbedBuilder(); EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("Shutdown").build()).queue();
try { event.getJDA().getShardManager().shutdown();
Thread.sleep(1000); System.out.println("Bot shut down via Command...");
} catch (InterruptedException e) { System.exit(0);
e.printStackTrace();
}
event.getJDA().shutdown();
} else { } else {
EmbedBuilder builder = new EmbedBuilder(); EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue();