diff --git a/lists/copypastas.txt b/lists/copypastas.txt index d8f3589..ebdc144 100644 --- a/lists/copypastas.txt +++ b/lists/copypastas.txt @@ -3,7 +3,8 @@ // False Discord PSA False PSA || out for a Discord && going around && those who accept && send this to as many && if you see this -Fake Discord shutdown || closing down && active discord members && please send && deleted without hesitation +Fake Hacker PSA || not accept friend request from && hackers && tell everyone && copy && paste +Fake Discord shutdown || discord && clos && populated && active && please send && copy && paste && deleted without hesitation // Share or else Cooldog || ╰━▅╮ && ╰╮ && ┳━━╯ && ╰┳╯ diff --git a/lists/referral_domains.txt b/lists/referral_domains.txt index 35ba5f4..5514b42 100644 --- a/lists/referral_domains.txt +++ b/lists/referral_domains.txt @@ -48,12 +48,16 @@ wn.nr featu.re pointsprizes.com +weeklyjob.online +justdoit.cards // Scams +oprewards.com free-gg.com rbxfree.com fortnitevb.com fortnite-gifts.com +fortnite-giveaway.com fortnite-special.com fortnite-vbucks.net fortnite-vbucks.de @@ -66,4 +70,5 @@ steamspecial.com easter-event.com steam-wallet-rewards.com -steam-gift-codes.com \ No newline at end of file +steam-gift-codes.com +steam-money.org \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2cd02ef..39cfd21 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ net.dv8tion JDA - 3.6.0_376 + 3.7.0_384 com.jagrosh diff --git a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java index 34434c8..06d6131 100644 --- a/src/main/java/com/jagrosh/vortex/automod/AutoMod.java +++ b/src/main/java/com/jagrosh/vortex/automod/AutoMod.java @@ -368,7 +368,8 @@ if(settings.everyoneStrikes > 0 && preventSpam && !message.getMember().hasPermission(message.getTextChannel(), Permission.MESSAGE_MENTION_EVERYONE)) { - if(message.getContentRaw().contains("@everyone") || message.getContentRaw().contains("@here") + String filtered = message.getContentRaw().replace("`@everyone`", "").replace("`@here`", ""); + if(filtered.contains("@everyone") || filtered.contains("@here") || message.getMentionedRoles().stream().anyMatch(role -> role.getName().equalsIgnoreCase("everyone") || role.getName().equalsIgnoreCase("here"))) { strikeTotal += settings.everyoneStrikes; diff --git a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java index 803e570..b4fd837 100644 --- a/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java +++ b/src/main/java/com/jagrosh/vortex/logging/BasicLogger.java @@ -37,8 +37,6 @@ import net.dv8tion.jda.core.events.guild.voice.GuildVoiceJoinEvent; import net.dv8tion.jda.core.events.guild.voice.GuildVoiceLeaveEvent; import net.dv8tion.jda.core.events.guild.voice.GuildVoiceMoveEvent; -import net.dv8tion.jda.core.events.user.UserAvatarUpdateEvent; -import net.dv8tion.jda.core.events.user.UserNameUpdateEvent; import net.dv8tion.jda.core.events.user.update.UserUpdateAvatarEvent; import net.dv8tion.jda.core.events.user.update.UserUpdateDiscriminatorEvent; import net.dv8tion.jda.core.events.user.update.UserUpdateNameEvent; diff --git a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java index 587127b..da32389 100644 --- a/src/main/java/com/jagrosh/vortex/utils/LogUtil.java +++ b/src/main/java/com/jagrosh/vortex/utils/LogUtil.java @@ -101,7 +101,7 @@ if(m.getAuthor().getIdLong()!=m.getJDA().getSelfUser().getIdLong()) return 0; String match = "(?is)`\\[.{8}\\]` `\\["+(caseNum==-1 ? "(\\d+)" : caseNum)+"\\]` .+"; - if(m.getContentRaw().matches(match)) + if(m.getContentRaw().matches(match) && (caseNum!=-1 || m.getContentRaw().endsWith(NO_REASON))) return caseNum==-1 ? Integer.parseInt(m.getContentRaw().replaceAll(match, "$1")) : caseNum; return 0; }