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

Greg dev #140

Merged
greg6775 merged 102 commits from greg-dev into hax-dev 2019-12-03 06:57:07 +01:00
Conversation 0 Commits 102 Files changed 55 +72 -39
2 changed files with 72 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f838793e19 - Show all commits

14
src/main/java/com/bbn/hadder/commands/moderation/RulesCommand.java
View file

@ -106,6 +106,7 @@ public class RulesCommand implements Command {
.build()).queue(); .build()).queue();
new EventWaiter().newOnMessageEventWaiter(event5 -> { new EventWaiter().newOnMessageEventWaiter(event5 -> {
Emote demote = event5.getMessage().getEmotes().get(0); Emote demote = event5.getMessage().getEmotes().get(0);
if (!aemote.equals(demote)) {
Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Rules") .setTitle("Rules")
.setDescription(message) .setDescription(message)
@ -125,6 +126,12 @@ public class RulesCommand implements Command {
e.printStackTrace(); e.printStackTrace();
} }
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString()); event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote.toString(), demote.toString());
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
.setTitle("Emotes are equal")
.setDescription("The 1st and 2nd emote equals each other.")
.build()).queue();
}
}, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor());
} else { } else {
String aemote = event4.getMessage().getContentRaw(); String aemote = event4.getMessage().getContentRaw();
@ -134,6 +141,7 @@ public class RulesCommand implements Command {
.build()).queue(); .build()).queue();
new EventWaiter().newOnMessageEventWaiter(event5 -> { new EventWaiter().newOnMessageEventWaiter(event5 -> {
String demote = event5.getMessage().getContentRaw(); String demote = event5.getMessage().getContentRaw();
if (!aemote.equals(demote)) {
Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) Message rules = channel.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Rules") .setTitle("Rules")
.setDescription(message) .setDescription(message)
@ -153,6 +161,12 @@ public class RulesCommand implements Command {
e.printStackTrace(); e.printStackTrace();
} }
event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote); event.getRethink().updateRules(event.getGuild().getId(), rules.getId(), role.getId(), aemote, demote);
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.WARNING)
.setTitle("Emotes are equal")
.setDescription("The 1st and 2nd emote equals each other.")
.build()).queue();
}
}, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor());
} }
}, event.getJDA(), event.getAuthor()); }, event.getJDA(), event.getAuthor());

29
src/main/java/com/bbn/hadder/utils/MessageEditor.java
View file

@ -11,23 +11,42 @@ public class MessageEditor {
EmbedBuilder builder = new EmbedBuilder(); EmbedBuilder builder = new EmbedBuilder();
switch (type) { switch (type) {
case INFO: case INFO:
builder.setColor(new Color(47, 94, 105)).setTimestamp(Instant.now()); builder
.setColor(new Color(47, 94, 105))
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break; break;
case ERROR: case ERROR:
builder.setColor(Color.RED).setTimestamp(Instant.now()); builder
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break; break;
case WARNING: case WARNING:
builder.setColor(Color.ORANGE).setTimestamp(Instant.now()); builder
.setColor(Color.ORANGE)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break; break;
case NO_PERMISSION: case NO_PERMISSION:
builder.setTitle("⛔ No Permission ⛔").setDescription("You are not authorized to execute this command!").setColor(Color.RED).setTimestamp(Instant.now()); builder
.setTitle("⛔ No Permission ⛔")
.setDescription("You are not authorized to execute this command!")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break; break;
case NO_SELF_PERMISSION: case NO_SELF_PERMISSION:
builder.setTitle("⛔ No Permission ⛔").setDescription("Unfortunately, I do not have the required rights to perform this action").setColor(Color.RED).setTimestamp(Instant.now()); builder
.setTitle("⛔ No Permission ⛔")
.setDescription("Unfortunately, I do not have the required rights to perform this action")
.setColor(Color.RED)
.setFooter("Hadder", "https://bigbotnetwork.com/images/Hadder.png")
.setTimestamp(Instant.now());
break; break;
} }
return builder; return builder;