Make chatbox message name "format" only

Author: Ale32bit

src/main/java/cc/reconnected/chatbox/ClientPacketsHandler.java

@@ -78,10 +78,13 @@ public static void register() {
             var owner = PlayerData.getPlayer(ownerId);
 
             var name = packet.name != null ? packet.name : owner.getEffectiveName();
-            var message = TextComponents.buildChatbotMessage(name, packet.text, packet.mode, owner);
+            var message = Component.empty()
+                    .append(TextComponents.sayPrefix)
+                    .appendSpace()
+                    .append(TextComponents.buildChatbotMessage(name, packet.text, packet.mode, owner));
 
-            var cbmsg = new ClientMessage(client.webSocket, packet.id != null ? packet.id : -1, MessageTypes.SAY, message, null);
-            if(tryEnqueue(client.license.uuid(), cbmsg)) {
+            var fullMessage = new ClientMessage(client.webSocket, packet.id != null ? packet.id : -1, MessageTypes.SAY, message, null);
+            if(tryEnqueue(client.license.uuid(), fullMessage)) {
                 client.webSocket.send(Chatbox.GSON.toJson(new SuccessPacket("message_queued", packet.id)));
             } else {
                 var err = ClientErrors.RATE_LIMITED;
@@ -113,8 +116,8 @@ public static void register() {
                     .appendSpace()
                     .append(TextComponents.buildChatbotMessage(name, packet.text, packet.mode, owner));
 
-            var cbmsg = new ClientMessage(client.webSocket, packet.id != null ? packet.id : -1, MessageTypes.TELL, message, player.getUuid());
-            if(tryEnqueue(client.license.uuid(), cbmsg)) {
+            var fullMessage = new ClientMessage(client.webSocket, packet.id != null ? packet.id : -1, MessageTypes.TELL, message, player.getUuid());
+            if(tryEnqueue(client.license.uuid(), fullMessage)) {
                 client.webSocket.send(Chatbox.GSON.toJson(new SuccessPacket("message_queued", packet.id)));
             } else {
                 var err = ClientErrors.RATE_LIMITED;

src/main/java/cc/reconnected/chatbox/parsers/MarkdownParser.java

@@ -15,15 +15,7 @@ public class MarkdownParser {
             MarkdownLiteParserV1.MarkdownFormat.URL
     };
 
-    public static final MarkdownFormat[] NAME = new MarkdownFormat[] {
-            MarkdownLiteParserV1.MarkdownFormat.BOLD,
-            MarkdownLiteParserV1.MarkdownFormat.ITALIC,
-            MarkdownLiteParserV1.MarkdownFormat.UNDERLINE,
-            MarkdownLiteParserV1.MarkdownFormat.STRIKETHROUGH,
-    };
-
     public static final NodeParser contentParser = createParser(ALL);
-    public static final NodeParser nameParser = createParser(NAME);
 
     public static NodeParser createParser(MarkdownFormat[] capabilities) {
         return new MarkdownLiteParserV1(

src/main/java/cc/reconnected/chatbox/parsers/MiniMessageSerializer.java

@@ -22,17 +22,8 @@ public class MiniMessageSerializer {
             StandardTags.translatable(),
             StandardTags.insertion()
     );
-    public static final Set<TagResolver> labelTags = Set.of(
-            StandardTags.color(),
-            StandardTags.decorations(),
-            StandardTags.gradient(),
-            StandardTags.rainbow(),
-            StandardTags.reset(),
-            StandardTags.transition()
-    );
 
     public static final MiniMessage defaultSerializer = createSerializer(defaultTags);
-    public static final MiniMessage labelSerializer = createSerializer(labelTags);
 
     public static MiniMessage createSerializer(Collection<TagResolver> tags) {
         return MiniMessage.builder()

src/main/java/cc/reconnected/chatbox/utils/TextComponents.java

@@ -17,7 +17,10 @@ public class TextComponents {
             .append(Component.text("CB PM").color(NamedTextColor.DARK_GRAY).hoverEvent(HoverEvent.showText(Component.text("This message was privately sent to you by an automated chatbot."))))
             .append(Component.text("]", NamedTextColor.GRAY));
 
-    public static final Style chatbotNameStyle = Style.style(NamedTextColor.WHITE);
+    public static final Component sayPrefix = Component.empty()
+            .append(Component.text("[", NamedTextColor.GRAY))
+            .append(Component.text("CB").color(NamedTextColor.DARK_GRAY).hoverEvent(HoverEvent.showText(Component.text("This message was publicly sent by an automated chatbot."))))
+            .append(Component.text("]", NamedTextColor.GRAY));
 
     public static Component getChatbotName(Component name, PlayerData owner) {
         var ownerMeta = Component.text("Owned by " + owner.getEffectiveName());
@@ -26,25 +29,18 @@ public static Component getChatbotName(Component name, PlayerData owner) {
 
     public static Component buildChatbotMessage(String label, String content, String type, PlayerData owner) {
         content = content.trim();
-        label = label.trim();
-        Component formattedLabel;
+        Component formattedLabel = LegacyComponentSerializer.legacyAmpersand().deserialize(label.trim());
         Component formattedContent;
         if ("format".equals(type)) {
             formattedContent = LegacyComponentSerializer.legacyAmpersand().deserialize(content);
-            formattedLabel = LegacyComponentSerializer.legacyAmpersand().deserialize(label);
         } else if ("markdown".equals(type)) {
-            var rawLabel = MarkdownParser.nameParser.parseNode(label).toText();
             var rawContent = MarkdownParser.contentParser.parseNode(content).toText();
             var json = JSONComponentSerializer.json();
-
-            formattedLabel = json.deserialize(Text.Serializer.toJson(rawLabel));
             formattedContent = json.deserialize(Text.Serializer.toJson(rawContent));
         } else if("minimessage".equals(type)) {
-            formattedLabel = MiniMessageSerializer.labelSerializer.deserialize(label);
             formattedContent = MiniMessageSerializer.defaultSerializer.deserialize(content);
         } else {
             formattedContent = Component.text(content);
-            formattedLabel = Component.text(label);
         }
         return Component.empty()
                 .append(getChatbotName(formattedLabel, owner))