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

Meddl Leude TJ_beastboy hier #14

Merged
greg6775 merged 3 commits from greg-dev into master 2019-10-29 15:57:54 +01:00
Conversation 0 Commits 3 Files changed 4 +67 -8
4 changed files with 67 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8e18cff02d - Show all commits

2
pom.xml
View file

@ -5,7 +5,7 @@
<groupId>Hadder</groupId>
<artifactId>Hadder</artifactId>
<version>0.2-ALPHA</version>
<version>0.3-ALPHA</version>
<name>Hadder</name>

5
src/main/java/com/bbn/hadder/Hadder.java
View file

@ -3,8 +3,7 @@ package com.bbn.hadder;
import com.bbn.hadder.commands.TestCommand;
import com.bbn.hadder.commands.fun.GifCommand;
import com.bbn.hadder.commands.general.PingCommand;
import com.bbn.hadder.commands.moderation.BanCommand;
import com.bbn.hadder.commands.moderation.KickCommand;
import com.bbn.hadder.commands.moderation.*;
import com.bbn.hadder.commands.owner.ShutdownCommand;
import com.bbn.hadder.commands.settings.PrefixCommand;
import com.bbn.hadder.core.CommandHandler;
@ -47,7 +46,7 @@ public class Hadder {
builder.setToken(config.getString("Token"));
CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand()));
CommandHandler.cmdlist.addAll(List.of(new TestCommand(), new BanCommand(), new PrefixCommand(), new ShutdownCommand(), new KickCommand(), new PingCommand(), new GifCommand(), new ClearCommand()));
builder.addEventListeners(
new MentionListener(),

6
src/main/java/com/bbn/hadder/commands/fun/GifCommand.java
View file

@ -25,8 +25,6 @@ public class GifCommand implements Command {
@Override
public void executed(String[] args, MessageReceivedEvent event) {
if (args.length > 0) {
String url;
JSONArray array;
StringBuilder query = new StringBuilder();
for (String arg : args) {
query.append(arg.toLowerCase()).append("+");
@ -47,9 +45,9 @@ public class GifCommand implements Command {
Random rand = new Random();
Response response = caller.newCall(request).execute();
JSONObject json = new JSONObject(response.body().string());
array = json.getJSONArray("data");
JSONArray array = json.getJSONArray("data");
int gifIndex = rand.nextInt(array.length());
url = (String) array.getJSONObject(gifIndex).get("url");
String url = array.getJSONObject(gifIndex).get("url").toString();
event.getTextChannel().sendMessage(url).queue();
} catch (Exception e) {
EmbedBuilder builder = new EmbedBuilder();

62
src/main/java/com/bbn/hadder/commands/moderation/ClearCommand.java Normal file
View file

@ -0,0 +1,62 @@
package com.bbn.hadder.commands.moderation;
/*
* @author Skidder / GregTCLTK
*/
import com.bbn.hadder.commands.Command;
import com.bbn.hadder.utils.MessageEditor;
import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.Permission;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import static java.time.temporal.ChronoUnit.DAYS;
public class ClearCommand implements Command {
@Override
public void executed(String[] args, MessageReceivedEvent event) {
if (args.length > 0) {
if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MESSAGE_MANAGE) || event.getGuild().getOwnerId().equals(event.getAuthor().getId())) {
if (event.getGuild().getMemberById(event.getJDA().getSelfUser().getId()).hasPermission(Permission.MESSAGE_MANAGE)) {
try {
int nbToDelete = Integer.parseInt(args[0]);
if(nbToDelete < 1 || nbToDelete > 200) {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to choose a number between 1 and 200!").build()).queue();
return;
}
List<Message> history = event.getTextChannel().getHistory().retrievePast(nbToDelete +1).complete();
List<Message> msgToDelete = new ArrayList<>();
msgToDelete.addAll(history);
event.getTextChannel().deleteMessages(msgToDelete).queue();
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setDescription("Successfully deleted " + nbToDelete + " messages.").build()).queue();
} catch (NumberFormatException e) {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to specify a number!").build()).queue();
}
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_SELF_PERMISSION, builder).build()).queue();
}
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.NO_PERMISSION, builder).build()).queue();
}
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to specify a number!").build()).queue();
}
}
@Override
public String[] labels() {
return new String[]{"clear"};
}
}