Skip to content

Apply unicode normalization before checking for spam #129

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
skbeh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Apply unicode normalization before checking for spam #129

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
8 changes: 5 additions & 3 deletions api/src/main/java/io/github/_4drian3d/chatregulator/api/checks/SpamCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Range;

import java.text.Normalizer;
import java.util.Iterator;
import java.util.Locale;

import static java.util.Objects.requireNonNull;

Expand Down Expand Up @@ -39,13 +41,13 @@ private SpamCheck(final @NotNull SourceType type, int similarLimit) {
String previous = null;
while(it.hasNext()) {
actual = it.next();
if (previous != null && !actual.equalsIgnoreCase(previous)) {
if (previous != null && !actual.equals(previous)) {
return CheckResult.allowed();
}
previous = actual;
}
if (chain.last().equalsIgnoreCase(string)) {

if (chain.last().equals(Normalizer.normalize(string.toLowerCase(Locale.ROOT), Normalizer.Form.NFKD))) {
return CheckResult.denied(type());
} else {
return CheckResult.allowed();
Expand Down
4 changes: 3 additions & 1 deletion plugin/src/main/java/io/github/_4drian3d/chatregulator/plugin/impl/StringChainImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
import io.github._4drian3d.chatregulator.common.configuration.ConfigurationContainer;
import org.jetbrains.annotations.NotNull;

import java.text.Normalizer;
import java.time.Instant;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.Locale;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
Expand Down Expand Up @@ -90,7 +92,7 @@ public void executed(final String string) {
}

private void addExecution(String string) {
queue.add(string);
queue.add(Normalizer.normalize(string.toLowerCase(Locale.ROOT), Normalizer.Form.NFKD));
lastExecuted.set(Instant.now());
}
}