Skip to content

Skip some automod checks on message edits #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Frostbyte0x70 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Skip some automod checks on message edits #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/jagrosh/vortex/Listener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void onEvent(GenericEvent event)
vortex.getMessageCache().putMessage(m);

// Run automod on the message
vortex.getAutoMod().performAutomod(m);
vortex.getAutoMod().performAutomod(m, false);
}
}
else if (event instanceof GuildMessageUpdateEvent)
Expand All @@ -84,7 +84,7 @@ else if (event instanceof GuildMessageUpdateEvent)
if(!m.getAuthor().isBot()) // ignore bot edits
{
// Run automod on the message
vortex.getAutoMod().performAutomod(m);
vortex.getAutoMod().performAutomod(m, true);

// Store and log the edit
CachedMessage old = vortex.getMessageCache().putMessage(m);
Expand Down
17 changes: 11 additions & 6 deletions src/main/java/com/jagrosh/vortex/automod/AutoMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public void dehoist(Member member)
catch(Exception ignore) {}
}

public void performAutomod(Message message)
public void performAutomod(Message message, boolean isEdit)
{
//ignore users with Manage Messages, Kick Members, Ban Members, Manage Server, or anyone the bot can't interact with
if(!shouldPerformAutomod(message.getMember(), message.getTextChannel()))
Expand All @@ -280,18 +280,23 @@ public void performAutomod(Message message)
AutomodStatus currentStatus = new AutomodStatus();
if(preventSpam)
{
runAntiDuplicate(settings, currentStatus, message);
if(!isEdit)
runAntiDuplicate(settings, currentStatus, message);
runMaxLines(settings, currentStatus, message);
runAntiCopypasta(settings, currentStatus, message);
runAntiEveryone(settings, currentStatus, message);
if(!isEdit)
runAntiEveryone(settings, currentStatus, message);
}
if(preventInvites)
{
runAntiInvite(settings, currentStatus, message, inviteWhitelist);
}
runAntiMention(settings, currentStatus, message);
runAntiMentionRoles(settings, currentStatus, message);
runAntiReferral(settings, currentStatus, message);
if(!isEdit)
{
runAntiMention(settings, currentStatus, message);
runAntiMentionRoles(settings, currentStatus, message);
}
runAntiReferral(settings, currentStatus, message);
runFilters(settings, currentStatus, message, filters);

// delete the message if applicable
Expand Down