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

Master to greg-dev #19

Merged
greg6775 merged 30 commits from master into greg-dev 2019-10-30 21:50:43 +01:00
Conversation 0 Commits 30 Files changed 4 +16 -18
6 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1b4c4082ae - Show all commits

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

@ -1,8 +1,7 @@
package com.bbn.hadder;
import com.bbn.hadder.commands.TestCommand;
import com.bbn.hadder.commands.general.*;
import com.bbn.hadder.commands.fun.GifCommand;
import com.bbn.hadder.commands.general.PingCommand;
import com.bbn.hadder.commands.moderation.*;
import com.bbn.hadder.commands.owner.ShutdownCommand;
import com.bbn.hadder.commands.settings.PrefixCommand;

1
src/main/java/com/bbn/hadder/Rethink.java
View file

@ -65,7 +65,6 @@ public class Rethink {
try {
Cursor cursor = r.table("server")
.insert(r.hashMap("id", id)
.with("prefix", "h.")
).run(conn);
out = cursor.next().toString();
} catch (ClassCastException ignored) {}

7
src/main/java/com/bbn/hadder/commands/TestCommand.java → src/main/java/com/bbn/hadder/commands/general/TestCommand.java
View file

@ -1,11 +1,16 @@
package com.bbn.hadder.commands;
package com.bbn.hadder.commands.general;
/*
* @author Skidder / GregTCLTK
*/
import com.bbn.hadder.commands.Command;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
/*
* @author Skidder / GregTCLTK
*/
public class TestCommand implements Command {
public void executed(String[] args, MessageReceivedEvent event) {

19
src/main/java/com/bbn/hadder/commands/settings/PrefixCommand.java
View file

@ -14,26 +14,21 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public class PrefixCommand implements Command {
public void executed(String[] args, MessageReceivedEvent event) {
if (event.getGuild().getMemberById(event.getAuthor().getId()).hasPermission(Permission.MANAGE_SERVER)) {
if (args.length == 1) {
if (!args[0].contains("\"")) {
if (args.length == 1) {
if (!args[0].contains("\"")) {
Rethink.update("server", event.getGuild().getId(), "prefix", args[0]);
Rethink.update("user", event.getAuthor().getId(), "prefix", args[0]);
EmbedBuilder builder = new EmbedBuilder();
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for this server to " + args[0]).build()).queue();
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue();
}
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, builder).setTitle("✅ Successfully set ✅").setDescription("I successfully set the new prefix for you to " + args[0]).build()).queue();
} else {
EmbedBuilder builder = new EmbedBuilder();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("You have to set a prefix.").build()).queue();
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.WARNING, builder).setDescription("The prefix must not contain **\"**").build()).queue();
}
} else {
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.WARNING, builder).setDescription("You have to set a prefix.").build()).queue();
}
}

2
src/main/java/com/bbn/hadder/core/CommandParser.java
View file

@ -13,7 +13,7 @@ import java.util.Collections;
public class CommandParser {
public static commandContainer parser(String raw, MessageReceivedEvent event) {
String cmd = raw.replaceFirst(Rethink.get("server", "id", event.getGuild().getId(), "prefix"), "");
String cmd = raw.replaceFirst(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"), "");
String[] cmdsplit = cmd.split(" ");
String invoke = cmdsplit[0];
ArrayList<String> split = new ArrayList<>();

2
src/main/java/com/bbn/hadder/listener/CommandListener.java
View file

@ -19,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(Rethink.get("server", "id", event.getGuild().getId(), "prefix"))) {
if (event.getMessage().getContentRaw().startsWith(Rethink.get("user", "id", event.getAuthor().getId(), "prefix"))) {
if (!event.getAuthor().isBot()) {
CommandHandler.handleCommand(CommandParser.parser(event.getMessage().getContentRaw(), event));
} else if (event.getGuild().getSelfMember().hasPermission(Permission.MESSAGE_ADD_REACTION)) {