Skip to content

Commit eea97cb

Browse files
committed
Fix scam link listener throwing many exceptions
1 parent 475866d commit eea97cb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/watcher/java/com/mcmoddev/mmdbot/watcher/punishments/ScamLink.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public Class<GenericMessageEvent> getEventClass() {
4747

4848
@Override
4949
public @Nullable Member getPunishedMember(final GenericMessageEvent event) {
50-
if (event.isFromGuild()) {
50+
if (!event.isFromGuild()) {
5151
return null;
5252
}
5353
if (event instanceof MessageReceivedEvent received) {
@@ -74,7 +74,7 @@ public String getReason() {
7474
public boolean test(final GenericMessageEvent genericMessageEvent) {
7575
if (!genericMessageEvent.isFromGuild()) return false;
7676
final var msg = resolveMessage(genericMessageEvent);
77-
if (msg == null) return false;
77+
if (msg == null || msg.getMember() == null) return false;
7878
if (!Objects.requireNonNull(msg.getMember()).hasPermission(Permission.MESSAGE_MANAGE)) {
7979
return ScamDetector.containsScam(msg.getContentRaw().toLowerCase(Locale.ROOT));
8080
}

0 commit comments

Comments
 (0)