feat: 🎸 カラーコードによる装飾に権限を設定できるように

BlueSheep2804 · Jul 21, 2023 · e7a60c7 · e7a60c7
1 parent e15f9cc
commit e7a60c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/listener/ChatListenerSpigot.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/listener/ChatListenerSpigot.kt
@@ -26,7 +26,7 @@ class ChatListenerSpigot(private val plugin: SeleneChatSpigot) : Listener {
             }
             event.isCancelled = true
         } else {
-            val returnMessage = ChatMessage.message(message, sender.isEnabledJapanize)
+            val returnMessage = ChatMessage.message(message, sender)
             event.message = LegacyComponentSerializer.legacySection().serialize(returnMessage)
         }
         if (config.shouldSendPluginMessage) {

diff --git a/src/main/kotlin/io/github/bluesheep2804/selenechat/message/ChatMessage.kt b/src/main/kotlin/io/github/bluesheep2804/selenechat/message/ChatMessage.kt
@@ -24,9 +24,9 @@ object ChatMessage {
         get() = SimpleDateFormat(config.dateFormat)
     private val timeFormat: SimpleDateFormat
         get() = SimpleDateFormat(config.timeFormat)
-    fun message(msg: String, shouldJapanize: Boolean): Component {
+    fun message(msg: String, sender: SeleneChatPlayer): Component {
         val mm = MiniMessage.miniMessage()
-        val serializedMessage = if (config.useColorCode) {
+        val serializedMessage = if (config.useColorCode || sender.hasPermission("selenechat.colorcode")) {
             LegacyComponentSerializer.legacyAmpersand().deserialize(msg.removePrefix("$"))
         } else {
             Component.text(msg.removePrefix("$"))
@@ -38,7 +38,7 @@ object ChatMessage {
         )
         val jpTagResolver = TagResolver.resolver("jp")
         { args: ArgumentQueue, _: Context ->
-            if (!shouldJapanize || config.convertMode == ConvertMode.NONE || !japaneseConversion.shouldConvert() || msg[0] == '$') {
+            if (!sender.isEnabledJapanize || config.convertMode == ConvertMode.NONE || !japaneseConversion.shouldConvert() || msg[0] == '$') {
                 return@resolver Tag.selfClosingInserting(Component.text(""))
             }
             val prefix = args.popOr("prefix").value()
@@ -62,7 +62,7 @@ object ChatMessage {
         { args: ArgumentQueue, _: Context ->
             return@resolver serverTag(sender, args)
         }
-        val messageTagResolver = Placeholder.component("message", message(msg, sender.isEnabledJapanize))
+        val messageTagResolver = Placeholder.component("message", message(msg, sender))
         val dateTagResolver = Placeholder.component("date", Component.text(dateFormat.format(Date())))
         val timeTagResolver = Placeholder.component("time", Component.text(timeFormat.format(Date())))
 
@@ -96,7 +96,7 @@ object ChatMessage {
         }
         val messageTagResolver = Placeholder.component(
                 "message",
-                message(msg, sender.isEnabledJapanize)
+                message(msg, sender)
         )
         val dateTagResolver = Placeholder.component("date", Component.text(dateFormat.format(Date())))
         val timeTagResolver = Placeholder.component("time", Component.text(timeFormat.format(Date())))

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -25,6 +25,9 @@ commands:
     permission: selenechat.command.japanize
 
 permissions:
+  selenechat.colorcode:
+    description: Allow color codes to be used in chat
+    default: true
   selenechat.command.selenechat:
     description: Allow the use of SeleneChat commands
     default: op