From 79615a17af69b85f4e891282d87ae947eff7ffd4 Mon Sep 17 00:00:00 2001 From: Xujiayao Date: Wed, 18 Mar 2026 13:06:55 +0800 Subject: [PATCH] Fix message for message delete event --- .../discord_mc_chat/server/discord/DiscordEventHandler.java | 3 ++- core/src/main/resources/config/custom_messages/en_us.yml | 5 ++++- core/src/main/resources/config/custom_messages/zh_cn.yml | 2 +- core/src/main/resources/lang/en_us.yml | 1 + core/src/main/resources/lang/zh_cn.yml | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java b/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java index 88a7c762..c3ef8e74 100644 --- a/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java +++ b/core/src/main/java/com/xujiayao/discord_mc_chat/server/discord/DiscordEventHandler.java @@ -7,6 +7,7 @@ import com.xujiayao.discord_mc_chat.network.packets.events.DiscordEventPacket; import com.xujiayao.discord_mc_chat.network.packets.events.TextSegment; import com.xujiayao.discord_mc_chat.utils.LogFileUtils; import com.xujiayao.discord_mc_chat.utils.config.ConfigManager; +import com.xujiayao.discord_mc_chat.utils.i18n.I18nManager; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; @@ -559,7 +560,7 @@ public class DiscordEventHandler extends ListenerAdapter { CachedMessage cached = messageCache.remove(event.getMessageId()); if (cached == null) { // No cached info - send a generic delete notification - List segments = DiscordMessageParser.buildDeleteSegments("Unknown", "white"); + List segments = DiscordMessageParser.buildDeleteSegments(I18nManager.getDmccTranslation("discord.message_parser.unknown_user"), "white"); DiscordEventPacket packet = new DiscordEventPacket(DiscordEventPacket.EventType.DELETE, segments); logDiscordEventForConsole(packet); NetworkManager.broadcastToClients(packet); diff --git a/core/src/main/resources/config/custom_messages/en_us.yml b/core/src/main/resources/config/custom_messages/en_us.yml index fe8def67..1f4abd89 100644 --- a/core/src/main/resources/config/custom_messages/en_us.yml +++ b/core/src/main/resources/config/custom_messages/en_us.yml @@ -109,10 +109,13 @@ discord_to_minecraft: - text: "[Discord] " bold: true color: "blue" + - text: "A message sent by " + bold: false + color: "gray" - text: "{effective_name} " bold: false color: "{role_color}" - - text: "deleted this message!" + - text: "has been deleted!" bold: false color: "gray" diff --git a/core/src/main/resources/config/custom_messages/zh_cn.yml b/core/src/main/resources/config/custom_messages/zh_cn.yml index 5a8cbc20..d16f9357 100644 --- a/core/src/main/resources/config/custom_messages/zh_cn.yml +++ b/core/src/main/resources/config/custom_messages/zh_cn.yml @@ -112,7 +112,7 @@ discord_to_minecraft: - text: "{effective_name} " bold: false color: "{role_color}" - - text: "删除了此消息!" + - text: "发送的消息已被删除!" bold: false color: "gray" diff --git a/core/src/main/resources/lang/en_us.yml b/core/src/main/resources/lang/en_us.yml index 3e32e12e..a1b34f0b 100644 --- a/core/src/main/resources/lang/en_us.yml +++ b/core/src/main/resources/lang/en_us.yml @@ -183,6 +183,7 @@ discord: reply_failed_detail: "This is expected behavior for reload/shutdown commands." message_parser: click_to_open_link: "Click to open link" + unknown_user: "Unknown User" relative: past: "{} {} ago" future: "in {} {}" diff --git a/core/src/main/resources/lang/zh_cn.yml b/core/src/main/resources/lang/zh_cn.yml index 79109621..3748f059 100644 --- a/core/src/main/resources/lang/zh_cn.yml +++ b/core/src/main/resources/lang/zh_cn.yml @@ -183,6 +183,7 @@ discord: reply_failed_detail: "对于 reload/shutdown 命令,这是预期的行为。" message_parser: click_to_open_link: "点击打开链接" + unknown_user: "未知用户" relative: past: "{}{}前" future: "{}{}后"