Adding Rethink and new commands #4

Merged
greg6775 merged 5 commits from greg-dev into master 2019-10-27 11:06:51 +01:00
8 changed files with 25 additions and 7 deletions
Showing only changes of commit e94bfd60b1 - Show all commits

View file

@ -7,5 +7,5 @@ package com.bbn.hadder.commands;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public interface Command {
void executed(MessageReceivedEvent event);
void executed(String[] args, MessageReceivedEvent event);
}

View file

@ -8,7 +8,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class TestCommand implements Command {
public void executed(MessageReceivedEvent event) {
public void executed(String[] args, MessageReceivedEvent event) {
event.getTextChannel().sendMessage("TEST my friends").queue();
}
}

View file

@ -13,7 +13,7 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class BanCommand implements Command {
public void executed(MessageReceivedEvent event) {
public void executed(String[] args, MessageReceivedEvent event) {
if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.BAN_MEMBERS) || event.getGuild().getOwner().getId().equals(event.getAuthor().getId())) {
if (event.getMessage().getMentionedMembers().size() == 1) {
Member victim = event.getMessage().getMentionedMembers().get(0);

View file

@ -14,7 +14,7 @@ public class CommandHandler {
public static void handleCommand(CommandParser.commandContainer cmd) {
if(cmdlist.containsKey(cmd.invoke)) {
cmdlist.get(cmd.invoke).executed(cmd.event);
cmdlist.get(cmd.invoke).executed(cmd.args, cmd.event);
}
}

View file

@ -4,6 +4,7 @@ package com.bbn.hadder.core;
* @author Skidder / GregTCLTK
*/
import com.bbn.hadder.Rethink;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import java.util.ArrayList;
@ -12,7 +13,7 @@ import java.util.Collections;
public class CommandParser {
public static commandContainer parser(String raw, MessageReceivedEvent event) {
String cmd = raw.replaceFirst("h.", "");
String cmd = raw.replaceFirst(Rethink.get("server", "id", event.getGuild().getId(), "prefix"), "");
String[] cmdsplit = cmd.split(" ");
String invoke = cmdsplit[0];
ArrayList<String> split = new ArrayList<>();

View file

@ -1,5 +1,6 @@
package com.bbn.hadder.listener;
import com.bbn.hadder.Rethink;
import com.bbn.hadder.core.CommandHandler;
import com.bbn.hadder.core.CommandParser;
import net.dv8tion.jda.api.Permission;
@ -18,7 +19,7 @@ public class CommandListener extends ListenerAdapter {
@Override
public void onMessageReceived(@Nonnull MessageReceivedEvent event) {
if (event.isFromType(ChannelType.TEXT)) {
if (event.getMessage().getContentRaw().startsWith("h.")) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("server", "id", event.getGuild().getId(), "prefix"))) {
if (!event.getAuthor().isBot()) {
CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
} else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {

View file

@ -0,0 +1,16 @@
package com.bbn.hadder.listener;
/*
* @author Skidder / GregTCLTK
*/
import net.dv8tion.jda.api.events.guild.GuildLeaveEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
import org.jetbrains.annotations.NotNull;
public class GuildLeaveListener extends ListenerAdapter {
public void onGuildLeave(@NotNull GuildLeaveEvent event) {
}
}

View file

@ -25,7 +25,7 @@ public class MessageEditor {
break;
case NO_SELF_PERMISSION:
embedBuilder.setTitle("⛔ No Permission ⛔").setDescription("Unfortunately, I do not have the required ban rights to perform this action").setColor(Color.RED);
embedBuilder.setTitle("⛔ No Permission ⛔").setDescription("Unfortunately, I do not have the required rights to perform this action").setColor(Color.RED);
break;
}
return embedBuilder;