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

Invite Detector and code improvements #131

Merged
greg6775 merged 7 commits from greg-dev into master 2019-12-02 13:59:24 +01:00
Conversation 0 Commits 7 Files changed 17 +45 -55
5 changed files with 45 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 67faa70aaf - Show all commits

3
src/main/java/com/bbn/hadder/commands/moderation/LinkCommand.java
View file

@ -10,8 +10,7 @@ public class LinkCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel()); if (args.length == 0) event.getHelpCommand().sendHelp(this, event.getRethink(), event.getAuthor(), event.getTextChannel());
switch (args[0]) { switch (args[0].toLowerCase()) {
case "add": case "add":
if (args.length != 2) return; if (args.length != 2) return;
String linkid = args[1]; String linkid = args[1];

2
src/main/java/com/bbn/hadder/commands/owner/RebootCommand.java
View file

@ -14,7 +14,7 @@ public class RebootCommand implements Command {
@Override @Override
public void executed(String[] args, CommandEvent event) { public void executed(String[] args, CommandEvent event) {
if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) { if (event.getConfig().getOwners().toString().contains(event.getAuthor().getId())) {
System.exit(69); Runtime.getRuntime().exit(69);
} else { } else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
} }

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

@ -16,7 +16,7 @@ public class ShutdownCommand implements Command {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO).setTitle("Shutdown").build()).queue();
event.getJDA().getShardManager().shutdown(); event.getJDA().getShardManager().shutdown();
System.out.println("Bot shut down via Command..."); System.out.println("Bot shut down via Command...");
System.exit(0); Runtime.getRuntime().exit(69);
} else { } else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue(); event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
} }

60
src/main/java/com/bbn/hadder/listener/LinkListener.java
View file

@ -15,7 +15,7 @@ import java.util.ArrayList;
public class LinkListener extends ListenerAdapter { public class LinkListener extends ListenerAdapter {
Rethink rethink; private Rethink rethink;
public LinkListener(Rethink rethink) { public LinkListener(Rethink rethink) {
this.rethink = rethink; this.rethink = rethink;
@ -26,44 +26,38 @@ public class LinkListener extends ListenerAdapter {
event.getChannel().retrieveMessageById(event.getMessageId()).queue( event.getChannel().retrieveMessageById(event.getMessageId()).queue(
msg -> { msg -> {
if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) { if (event.getMember().hasPermission(Permission.MANAGE_CHANNEL)) {
if (!event.getMember().getUser().equals(event.getJDA().getSelfUser())) { if (!event.getMember().getUser().equals(event.getJDA().getSelfUser()) && msg.getAuthor().equals(event.getJDA().getSelfUser()) && msg.getEmbeds().size() == 1 && msg.getEmbeds().get(0).getFooter() == null && msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) {
if (msg.getAuthor().equals(event.getJDA().getSelfUser())) { String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", "");
if (msg.getEmbeds().size() == 1) { String requestguildid = null;
if (msg.getEmbeds().get(0).getFooter() == null) { for (int i = requestguild.length() - 1; i >= 0; i--) {
if (msg.getEmbeds().get(0).getTitle().endsWith(") wants to link guilds!")) { if (String.valueOf(requestguild.charAt(i)).equals("(")) {
String requestguild = msg.getEmbeds().get(0).getTitle().replaceAll("\\) wants to link guilds!", ""); requestguildid = requestguild.substring(i + 1);
String requestguildid = null; break;
for (int i = requestguild.length() - 1; i >= 0; i--) { }
if (String.valueOf(requestguild.charAt(i)).equals("(")) { }
requestguildid = requestguild.substring(i + 1); if (requestguildid != null) {
break; if (event.getReactionEmote().getName().equals("✅")) {
} rethink.addLinkedGuild(event.getGuild().getId(), requestguildid);
} rethink.addLinkedGuild(requestguildid, event.getGuild().getId());
if (requestguildid != null) {
if (event.getReactionEmote().getName().equals("✅")) {
rethink.addLinkedGuild(event.getGuild().getId(), requestguildid);
rethink.addLinkedGuild(requestguildid, event.getGuild().getId());
msg.delete().queue(); msg.delete().queue();
MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build(); .setTitle("Guilds linked!").setDescription("The Guild allowed the link. Have fun!").build();
event.getChannel().sendMessage(msgembed).queue(); event.getChannel().sendMessage(msgembed).queue();
event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
} else if (event.getReactionEmote().getName().equals("❌")) { } else if (event.getReactionEmote().getName().equals("❌")) {
msg.delete().queue(); msg.delete().queue();
MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) MessageEmbed msgembed = new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTitle("Guild linking denied.").setDescription("The Guild denied the link. :(").build(); .setTitle("Guild linking denied.").setDescription("The Guild denied the linking. :(").build();
event.getChannel().sendMessage(msgembed).queue(); event.getChannel().sendMessage(msgembed).queue();
event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue(); event.getJDA().getTextChannelById(rethink.getLinkChannel(requestguildid)).sendMessage(msgembed).queue();
}
}
}
}
} }
} }
} }
} else {
event.getTextChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.NO_PERMISSION).build()).queue();
} }
} }
); );

33
src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
View file

@ -15,25 +15,22 @@ import java.time.Instant;
public class PrivateMessageListener extends ListenerAdapter { public class PrivateMessageListener extends ListenerAdapter {
public void onMessageReceived(MessageReceivedEvent event) { public void onMessageReceived(MessageReceivedEvent event) {
if (event.isFromType(ChannelType.PRIVATE)) { if (event.isFromType(ChannelType.PRIVATE) && !event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) {
if (!event.getAuthor().getId().equals(event.getJDA().getSelfUser().getId())) { PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete();
PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete();
PrivateChannel Skidder = event.getJDA().getUserById("477141528981012511").openPrivateChannel().complete(); Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
PrivateChannel Hax = event.getJDA().getUserById("261083609148948488").openPrivateChannel().complete(); .setTitle("New DM by " + event.getAuthor().getAsTag())
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
Skidder.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setDescription(event.getMessage().getContentRaw())
.setTitle("New DM by " + event.getAuthor().getAsTag()) .setTimestamp(Instant.now())
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .build()).queue();
.setDescription(event.getMessage().getContentRaw()) Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO)
.setTimestamp(Instant.now()) .setTitle("New DM by " + event.getAuthor().getAsTag())
.build()).queue(); .setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl())
Hax.sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.MessageType.INFO) .setDescription(event.getMessage().getContentRaw())
.setTitle("New DM by " + event.getAuthor().getAsTag()) .setTimestamp(Instant.now())
.setAuthor(event.getAuthor().getName(), event.getAuthor().getAvatarUrl(), event.getAuthor().getAvatarUrl()) .build()).queue();
.setDescription(event.getMessage().getContentRaw())
.setTimestamp(Instant.now())
.build()).queue();
}
} }
} }
} }