Skip to content

Reworked the mention system #51

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
Kqliber merged 3 commits into from
Apr 20, 2022
Merged

Reworked the mention system #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bef0d95
Reworked the mention system
BlitzOffline Apr 9, 2022
3d3e123
Actually replicated clip's allowed chars
BlitzOffline Apr 10, 2022
4841ebd
The format parsing is done per player now
BlitzOffline Apr 12, 2022
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
168 changes: 144 additions & 24 deletions plugin/src/main/java/at/helpch/chatchat/util/MessageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import at.helpch.chatchat.ChatChatPlugin;
import at.helpch.chatchat.api.Channel;
import at.helpch.chatchat.api.ChatUser;
import at.helpch.chatchat.api.User;
import at.helpch.chatchat.api.event.ChatChatEvent;
import at.helpch.chatchat.format.PMFormat;
import java.util.Map;
import java.util.regex.Pattern;
import net.kyori.adventure.text.Component;
Expand Down Expand Up @@ -32,10 +34,14 @@ public class MessageProcessor { private static final Pattern DEFAULT_URL_PATTERN

private static final String URL_PERMISSION = "chatchat.url";
private static final String UTF_PERMISSION = "chatchat.utf";
private static final String MENTION_PERMISSION = "chatchat.mention";
private static final String MENTION_PERSONAL_PERMISSION = "chatchat.mention.personal";
private static final String MENTION_EVERYONE_PERMISSION = "chatchat.mention.everyone";
private static final String MENTION_PERSONAL_BLOCK_PERMISSION = MENTION_PERSONAL_PERMISSION + ".block";
private static final String MENTION_EVERYONE_BLOCK_PERMISSION = MENTION_EVERYONE_PERMISSION + ".block";
private static final String MENTION_EVERYONE_BLOCK_OVERRIDE_PERMISSION = MENTION_EVERYONE_BLOCK_PERMISSION + ".override";
private static final String MENTION_PERSONAL_BLOCK_OVERRIDE_PERMISSION = MENTION_PERSONAL_BLOCK_PERMISSION + ".override";
private static final String TAG_BASE_PERMISSION = "chatchat.tag.";
private static final String ITEM_PERMISSION = TAG_BASE_PERMISSION + "item";
private static final String ITEM_TAG_PERMISSION = TAG_BASE_PERMISSION + "item";

private static final Map<String, TagResolver> PERMISSION_TAGS = Map.ofEntries(
Map.entry("click", StandardTags.clickEvent()),
Expand Down Expand Up @@ -81,7 +87,7 @@ public static void process(
resolver.resolver(StandardTags.decorations(tag));
}

if (user.player().hasPermission(ITEM_PERMISSION)) {
if (user.player().hasPermission(ITEM_TAG_PERMISSION)) {
resolver.resolver(
ItemUtils.createItemPlaceholder(
plugin.configManager().settings().itemFormat(),
Expand Down Expand Up @@ -114,36 +120,150 @@ public static void process(

final var oldChannel = user.channel();
user.channel(channel);
var component = FormatUtils.parseFormat(
chatEvent.format(),
user.player(),
chatEvent.message()
);

final var parsedMessage = chatEvent.message().compact();

final var mentionPrefix = plugin.configManager().settings().mentionPrefix();
final var mentionSound = plugin.configManager().settings().mentionSound();
final var mentionFormat = plugin.configManager().settings().mentionFormat();
var mentionEveryone = false;
final var globalMentionFormat = plugin.configManager().settings().globalMentionFormat();

if (user.player().hasPermission(MENTION_EVERYONE_PERMISSION)) {
final var replaced = MentionUtils.replaceMention(mentionPrefix + "(everyone|here|channel)",
component, plugin.configManager().settings().globalMentionFormat());
component = replaced.component();
mentionEveryone = replaced.didReplace();
}
var userMessage = parsedMessage;
var userIsTarget = false;

for (final var target : channel.targets(user)) {
var mention = mentionEveryone;
var transformedComponent = component;
if (target instanceof ChatUser && user.player().hasPermission(MENTION_PERMISSION)) {
final var replaced = MentionUtils.replaceMention((ChatUser) target, mentionPrefix,
component, mentionFormat);
mention = replaced.didReplace() || mention;
transformedComponent = replaced.component();
if (target.uuid() == user.uuid()) {
userIsTarget = true;
continue;
}
if (mention) target.playSound(mentionSound);
target.sendMessage(transformedComponent);

final var globalMentionProcessResult = processGlobalMentions(
mentionPrefix,
globalMentionFormat,
user,
target,
parsedMessage
);

if (!(target instanceof ChatUser)) {
if (globalMentionProcessResult.getKey()) target.playSound(mentionSound);
target.sendMessage(globalMentionProcessResult.getValue());
continue;
}

final var mentionProcessResult = processPersonalMentions(
mentionPrefix,
mentionFormat,
user,
(ChatUser) target,
globalMentionProcessResult.getValue()
);

var component = FormatUtils.parseFormat(
chatEvent.format(),
user.player(),
mentionProcessResult.getValue()
);

if (mentionProcessResult.getKey() || globalMentionProcessResult.getKey()) target.playSound(mentionSound);
target.sendMessage(component);

userMessage = processPersonalMentions(
mentionPrefix,
mentionFormat,
user,
(ChatUser) target,
userMessage
).getValue();
}

if (!userIsTarget) {
user.channel(oldChannel);
return;
}

final var globalMentionProcessResult = processGlobalMentions(
mentionPrefix,
globalMentionFormat,
user,
user,
userMessage
);

final var mentionProcessResult = processPersonalMentions(
mentionPrefix,
mentionFormat,
user,
user,
globalMentionProcessResult.getValue()
);

var component = FormatUtils.parseFormat(
chatEvent.format(),
user.player(),
mentionProcessResult.getValue()
);

if (mentionProcessResult.getKey() || globalMentionProcessResult.getKey()) user.playSound(mentionSound);
user.sendMessage(component);
user.channel(oldChannel);
}

private static @NotNull Map.Entry<@NotNull Boolean, @NotNull Component> processGlobalMentions(
@NotNull final String mentionPrefix,
@NotNull final String globalMentionFormat,
@NotNull final ChatUser user,
@NotNull final User target,
@NotNull final Component message
) {
if (!user.player().hasPermission(MENTION_EVERYONE_PERMISSION)) {
return Map.entry(false, message);
}

if (target instanceof ChatUser) {
final var targetChatUser = (ChatUser) target;

if (targetChatUser.player().hasPermission(MENTION_EVERYONE_BLOCK_PERMISSION) && !user.player().hasPermission(MENTION_EVERYONE_BLOCK_OVERRIDE_PERMISSION)) {
return Map.entry(false, message);
}

final var replaced = MentionUtils.replaceMention(
mentionPrefix + "(everyone|here|channel)",
message,
globalMentionFormat);

return Map.entry(replaced.didReplace(), replaced.component());
}

final var replaced = MentionUtils.replaceMention(
mentionPrefix + "(everyone|here|channel)",
message,
globalMentionFormat);

return Map.entry(replaced.didReplace(), replaced.component());
}

private static @NotNull Map.Entry<@NotNull Boolean, @NotNull Component> processPersonalMentions(
@NotNull final String mentionPrefix,
@NotNull final PMFormat mentionFormat,
@NotNull final ChatUser user,
@NotNull final ChatUser target,
@NotNull final Component message
) {
if (!user.player().hasPermission(MENTION_PERSONAL_PERMISSION) ||
(target.player().hasPermission(MENTION_PERSONAL_BLOCK_PERMISSION) &&
!user.player().hasPermission(MENTION_PERSONAL_BLOCK_OVERRIDE_PERMISSION))
) {
return Map.entry(false, message);
}

final var replaced = MentionUtils.replaceMention(
target,
mentionPrefix,
message,
mentionFormat
);

return Map.entry(replaced.didReplace(), replaced.component());
}
}
2 changes: 1 addition & 1 deletion plugin/src/main/java/at/helpch/chatchat/util/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
public class StringUtils {
public static boolean containsIllegalChars(String message) {
for (char ch : message.toCharArray()) {
if (ch <= 128 || ch == 167) {
if (ch <= 127 || ch == 167) {
continue;
}
return true;
Expand Down