From 78dd9d0096ab74993cb684f14c2cd87312006d64 Mon Sep 17 00:00:00 2001
From: Josh Taylor <me@broccol.ai>
Date: Wed, 1 Nov 2023 00:09:28 +0000
Subject: [PATCH] fix: close all tags inserted in messages

---
 .../core/service/message/MiniMessageService.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java b/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
index 3d02172..ce1aed5 100644
--- a/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
+++ b/core/src/main/java/broccolai/tags/core/service/message/MiniMessageService.java
@@ -30,12 +30,12 @@ public MiniMessageService(
 
     @Override
     public TagResolver prefix() {
-        return TagResolver.resolver("prefix", Tag.inserting(this.locale.prefix.asComponent()));
+        return TagResolver.resolver("prefix", Tag.selfClosingInserting(this.locale.prefix.asComponent()));
     }
 
     @Override
     public Component commandSelect(final @NonNull ConstructedTag tag) {
-        TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+        TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
 
         return this.locale.commands.player.select.asComponent(this.prefix(), tagComponent);
     }
@@ -46,7 +46,7 @@ public Component commandList(final @NonNull Collection<ConstructedTag> tags) {
 
         for (ConstructedTag tag : tags) {
             TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
-            TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+            TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
 
             component = component.append(this.locale.commands.player.listEntry.asComponent(nameTemplate, tagComponent));
         }
@@ -57,7 +57,7 @@ public Component commandList(final @NonNull Collection<ConstructedTag> tags) {
     @Override
     public Component commandInfo(final @NonNull ConstructedTag tag) {
         TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
-        TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+        TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
         TagResolver reasonTemplate = TagResolver.resolver("reason", Tag.preProcessParsed(tag.reason()));
 
         return this.locale.commands.player.info.asComponent(this.prefix(), nameTemplate, tagTemplate, reasonTemplate);
@@ -68,7 +68,7 @@ public Component commandAdminGive(
         final @NonNull ConstructedTag tag,
         final @NonNull TagsUser target
     ) {
-        TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+        TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
         TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));
 
         return this.locale.commands.admin.give.asComponent(this.prefix(), tagComponent, targetComponent);
@@ -79,7 +79,7 @@ public Component commandAdminRemove(
         final @NonNull ConstructedTag tag,
         final @NonNull TagsUser target
     ) {
-        TagResolver tagComponent = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+        TagResolver tagComponent = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
         TagResolver targetComponent = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));
 
         return this.locale.commands.admin.remove.asComponent(this.prefix(), tagComponent, targetComponent);
@@ -91,7 +91,7 @@ public Component commandAdminList(final @NonNull Collection<ConstructedTag> tags
 
         for (ConstructedTag tag : tags) {
             TagResolver nameTemplate = TagResolver.resolver("name", Tag.preProcessParsed(tag.name()));
-            TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+            TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
 
             component = component.append(this.locale.commands.admin.listEntry.asComponent(nameTemplate, tagTemplate));
         }
@@ -101,7 +101,7 @@ public Component commandAdminList(final @NonNull Collection<ConstructedTag> tags
 
     @Override
     public Component commandAdminSet(@NonNull final ConstructedTag tag, @NonNull final TagsUser target) {
-        TagResolver tagTemplate = TagResolver.resolver("tag", Tag.inserting(tag.component()));
+        TagResolver tagTemplate = TagResolver.resolver("tag", Tag.selfClosingInserting(tag.component()));
         TagResolver targetTemplate = TagResolver.resolver("target", Tag.preProcessParsed(this.nameFromUser(target)));
 
         return this.locale.commands.admin.set.asComponent(this.prefix(), tagTemplate, targetTemplate);