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

1.3.18 #556

Merged
greg6775 merged 6 commits from greg-dev into master 2020-10-13 22:44:09 +02:00
Conversation 0 Commits 6 Files changed 2 +10 -12
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 656cce4851 - Show all commits

8
src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
View file

@ -43,7 +43,7 @@ public class InviteLinkListener extends ListenerAdapter {
@Override @Override
public void onMessageReceived(@Nonnull MessageReceivedEvent e) { public void onMessageReceived(@Nonnull MessageReceivedEvent e) {
scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember());
} }
public void checkInvite(Message message, String regex) { public void checkInvite(Message message, String regex) {
@ -64,11 +64,10 @@ public class InviteLinkListener extends ListenerAdapter {
@Override @Override
public void onMessageUpdate(@Nonnull MessageUpdateEvent e) { public void onMessageUpdate(@Nonnull MessageUpdateEvent e) {
scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember()); if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember());
} }
public void scanMessage(boolean fromType, Guild guild, Message message, Member member) { public void scanMessage(Guild guild, Message message, Member member) {
if (fromType) {
RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink); RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink);
if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) { if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
checkInvite(message, "discord.gg/"); checkInvite(message, "discord.gg/");
@ -79,4 +78,3 @@ public class InviteLinkListener extends ListenerAdapter {
} }
} }
} }
}