Skip to content

ChatFilter Module improvements #1

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

Merged
Omega172 merged 4 commits into from
Jun 5, 2025
Merged

ChatFilter Module improvements #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fea0a7c
ChatFilterModule improvements
Powie69 Jun 5, 2025
008d858
Merge branch '1.21.4' of https://github.com/Powie69/OmegaWare-Addons …
Powie69 Jun 5, 2025
bd43a8e
remove unused import
Powie69 Jun 5, 2025
1b1df03
Merge branch 'Omega172:1.21.4' into 1.21.4
Powie69 Jun 5, 2025
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
92 changes: 58 additions & 34 deletions src/main/java/xyz/omegaware/addon/modules/ChatFilterModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;
import java.util.Set;
import java.util.List;

public class ChatFilterModule extends Module {
public ChatFilterModule() {
super(OmegawareAddons.CATEGORY, "6B6T-chat-filter", "This module filters chat messages based on selected criteria.");
}

private final SettingGroup sgGeneral = this.settings.getDefaultGroup();
private final SettingGroup sgIgnoredUsers = this.settings.createGroup("Ignored Users");
private final SettingGroup sgMessageStartFlags = this.settings.createGroup("Message Start Flags");
private final SettingGroup sgMessageContains = this.settings.createGroup("Message Contains");

private final Setting<Boolean> rankedOnly = sgGeneral.add(new BoolSetting.Builder()
.name("ranked-users-only")
Expand All @@ -44,30 +47,59 @@ public ChatFilterModule() {
.build()
);

private final Setting<String> ignoredUsers = sgGeneral.add(new StringSetting.Builder()
.name("filtered-users")
.description("A comma-separated list of users to filter.")
.defaultValue("user1,user2,user3")
private final Setting<Boolean> toggleIgnoredUsers = sgIgnoredUsers.add(new BoolSetting.Builder()
.name("toggle-ignored-users")
.description("Toggle ignoring of users.")
.defaultValue(true)
.build()
);

private final Setting<List<String>> ignoredUsers = sgIgnoredUsers.add(new StringListSetting.Builder()
.name("filtered-users-list")
.description("A list of users to filter.")
.defaultValue(List.of("user1", "user2", "user3"))
.visible(toggleIgnoredUsers::get)
.build()
);

private final Setting<Boolean> toggleMessageStartFlags = sgMessageStartFlags.add(new BoolSetting.Builder()
.name("toggle-message-start-flags")
.description("Toggle filtering of messages that start with a selected flag.")
.defaultValue(true)
.build()
);

private final Setting<String> messageStartFlags = sgGeneral.add(new StringSetting.Builder()
private final Setting<List<String>> messageStartFlags = sgMessageStartFlags.add(new StringListSetting.Builder()
.name("message-start-flags")
.description("A comma-separated list of flags that will get a message filtered if they are at the start of a players message.")
.defaultValue("!,$,%,#,.,?")
.description("A list of flags that will get a message filtered if they are at the start of a players message.")
.defaultValue(List.of("!", "$", "%", "#", ".", "?"))
.visible(toggleMessageStartFlags::get)
.build()
);

private final Setting<Boolean> toggleMessageContainsFlags = sgMessageContains.add(new BoolSetting.Builder()
.name("toggle-message-contains-flags")
.description("Toggle filtering of messages that contain a selected flag.")
.defaultValue(true)
.build()
);

private final Setting<String> messageContainsFlags = sgGeneral.add(new StringSetting.Builder()
private final Setting<List<String>> messageContainsFlags = sgMessageContains.add(new StringListSetting.Builder()
.name("message-contains-flags")
.description("A comma-separated list of flags that will get a message filtered if they are contained in a players message.")
.defaultValue("discord,.gg,https://,aternos")
.description("A list of flags that will get a message filtered if they are contained in a players message.")
.defaultValue(List.of("discord", ".gg", "https://", "aternos"))
.visible(toggleMessageContainsFlags::get)
.build()
);

private static Integer filteredCount = 0;
private boolean loaded = false;

private void incrementFilteredCount() {
filteredCount++;
saveFilteredCount();
}

private void saveFilteredCount() {
File configFile = OmegawareAddons.GetConfigFile("chat-filter", "filtered.count");

Expand Down Expand Up @@ -125,13 +157,15 @@ private void onMessageReceive(ReceiveMessageEvent event) {

if ((message.startsWith("Welcome to 6b6t.org") || message.startsWith("You can vote! Type /vote") || message.startsWith("---------------------------")) && filterServerMessages.get()) {
event.cancel();
filteredCount++;
saveFilteredCount();
incrementFilteredCount();
return;
}

if (!message.contains("»")) return;

String username = message.split(" » ")[0];
if (username.equals(mc.player.getNameForScoreboard())) return;

boolean isRanked = false;
if (message.startsWith("[")) {
isRanked = true;
Expand All @@ -140,43 +174,33 @@ private void onMessageReceive(ReceiveMessageEvent event) {

if (rankedOnly.get() && !isRanked) {
event.cancel();
filteredCount++;
saveFilteredCount();
incrementFilteredCount();
return;
}

String username = message.split(" » ")[0];
message = message.substring(message.indexOf("»") + 1).trim();

if (username.equals(mc.player.getNameForScoreboard())) return;

Set<String> ignoredUsersList = Set.of(ignoredUsers.get().split(","));
if (!ignoredUsersList.isEmpty() && ignoredUsersList.contains(username)) {
if (toggleIgnoredUsers.get() && !ignoredUsers.get().isEmpty() && ignoredUsers.get().contains(username)) {
event.cancel();
filteredCount++;
saveFilteredCount();
incrementFilteredCount();
return;
}

Set<String> messageStartFlagsList = Set.of(messageStartFlags.get().split(","));
if (!messageStartFlagsList.isEmpty()) {
for (String flag : messageStartFlagsList) {
message = message.substring(message.indexOf("»") + 1).trim();

if (toggleMessageStartFlags.get() && !messageStartFlags.get().isEmpty()) {
for (String flag : messageStartFlags.get()) {
if (message.startsWith(flag)) {
event.cancel();
filteredCount++;
saveFilteredCount();
incrementFilteredCount();
return;
}
}
}

Set<String> messageContainsFlagsList = Set.of(messageContainsFlags.get().split(","));
if (!messageContainsFlagsList.isEmpty()) {
for (String flag : messageContainsFlagsList) {
if (toggleMessageContainsFlags.get() && !messageContainsFlags.get().isEmpty()){
for (String flag : messageContainsFlags.get()) {
if (message.contains(flag)) {
event.cancel();
filteredCount++;
saveFilteredCount();
incrementFilteredCount();
return;
}
}
Expand Down