Skip to content

Commit

Permalink
Fixes (#31)
Browse files Browse the repository at this point in the history 
* minor cleanup

* fix chat style formatting

* fix player ping functionality

* tweak discord to minecraft listeners

* fix issue with tags leaving behind a \

* make getTags properly strip tags

* properly strip tags from discord messages
  • Loading branch information
@Boy0000
Boy0000 authored Sep 13, 2022
1 parent c9adbe7 commit 66da35b
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 141 deletions.
3 changes: 2 additions & 1 deletion chatty-paper/src/main/kotlin/com/mineinabyss/chatty/ChattyMessages.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ object ChattyMessages : IdofrontConfig<ChattyMessages.Messages>(chatty, Messages
val otherEmpty: String = "<yellow>Removed nickname for %player_name%!",
val invalidPlayer: String = "<red>That player doesn't exist!",
val consoleNicknameSelf: String = "<red>Sadly console cannot have cool nickname :(",
val disallowedStyling: String = "<red>This nickname contains formatting that are not allowed!",
val disallowedStyling: String = "<red>This nickname formatting you cannot use!",
val tooLong: String = "<red>The nickname was too long!",
)

Expand Down Expand Up @@ -82,6 +82,7 @@ object ChattyMessages : IdofrontConfig<ChattyMessages.Messages>(chatty, Messages

@Serializable
data class Other(
val disallowedStyling: String = "<red>Your message contains formatting you cannot use!",
val configReloaded: String = "<green>Chatty config reloaded.",
val messagesReloaded: String = "<green>Chatty messages reloaded.",
val nickNameChanged: String = "<green>Nickname set to <white><i>&%chatty_player_displayname%.",
Expand Down
91 changes: 31 additions & 60 deletions chatty-paper/src/main/kotlin/com/mineinabyss/chatty/helpers/ChatHelpers.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@ import com.combimagnetron.imageloader.Image
import com.mineinabyss.chatty.components.ChannelType
import com.mineinabyss.chatty.components.chattyData
import com.mineinabyss.idofront.messaging.miniMsg
import com.mineinabyss.idofront.messaging.serialize
import me.clip.placeholderapi.PlaceholderAPI
import net.kyori.adventure.key.Key
import net.kyori.adventure.text.Component
import net.kyori.adventure.text.TextReplacementConfig
import net.kyori.adventure.text.format.Style
import net.kyori.adventure.text.minimessage.MiniMessage
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer
import org.bukkit.Bukkit
import org.bukkit.ChatColor
import org.bukkit.Sound
import org.bukkit.SoundCategory
import org.bukkit.entity.Player

const val ZERO_WIDTH = "\u200B"
Expand All @@ -41,24 +40,24 @@ fun Component.handlePlayerPings(player: Player, pingedPlayer: Player) {
val pingSound = pingedPlayer.chattyData.pingSound ?: ping.defaultPingSound
val clickToReply =
if (ping.clickToReply) "<insert:@${
player.displayName().stripTags()
player.displayName().toPlainText()
} ><hover:show_text:'<red>Shift + Click to mention!'>"
else ""
val pingMessage = this.replaceText(
TextReplacementConfig.builder()
.match(ping.pingPrefix + player.chattyData.displayName)
.replacement((ping.pingReceiveFormat + clickToReply + ping.pingPrefix + player.chattyData.displayName).miniMsg())
.match(ping.pingPrefix + pingedPlayer.chattyData.displayName)
.replacement((ping.pingReceiveFormat + clickToReply + ping.pingPrefix + pingedPlayer.chattyData.displayName).miniMsg())
.build()
)

if (!pingedPlayer.chattyData.disablePingSound)
pingedPlayer.playSound(pingedPlayer.location, pingSound, ping.pingVolume, ping.pingPitch)
pingedPlayer.playSound(pingedPlayer.location, pingSound, SoundCategory.VOICE, ping.pingVolume, ping.pingPitch)
pingedPlayer.sendMessage(pingMessage)

val pingerMessage = this.replaceText(
TextReplacementConfig.builder()
.match(ping.pingPrefix + player.chattyData.displayName)
.replacement((ping.pingSendFormat + clickToReply + ping.pingPrefix + player.chattyData.displayName).miniMsg())
.match(ping.pingPrefix + pingedPlayer.chattyData.displayName)
.replacement((ping.pingSendFormat + ping.pingPrefix + pingedPlayer.chattyData.displayName).miniMsg())
.build()
)
player.sendMessage(pingerMessage)
Expand Down Expand Up @@ -100,8 +99,8 @@ fun translatePlaceholders(player: Player, message: String): Component {
TextReplacementConfig.builder()
.match("%chatty_playerhead%")
.replacement(player.translatePlayerHeadComponent()).build()
)
return PlaceholderAPI.setPlaceholders(player, msg.serialize()).deSerializeLegacy()
).serialize()
return PlaceholderAPI.setPlaceholders(player, msg).miniMsg().fixLegacy()
}

val playerHeadMapCache = mutableMapOf<Player, Component>()
Expand All @@ -116,7 +115,7 @@ fun Player.translatePlayerHeadComponent(): Component {
}

private fun convertToImageComponent(image: String, font: Key): Component {
return MiniMessage.builder().build().deserialize(image).style(Style.style().font(font).build())
return mm.deserialize(image).style(Style.style().font(font).build())
}

private fun convertURLToImageString(
Expand All @@ -125,61 +124,33 @@ private fun convertURLToImageString(
return Image.builder().image(url).colorType(colorType).ascent(ascent).build().generate()
}

fun String.deSerializeLegacy() = LegacyComponentSerializer.legacy('§').deserialize(this).fixLegacy()

fun Component.fixLegacy(): Component =
this.serialize().replace("\\<", "<").replace("\\>", ">").miniMsg()

// Splits <color> and <gradient:...> tags and checks if they're allowed
fun String.verifyChatStyling(): String {
val finalString = this
this.getTags().filter { tag -> tag !in chattyConfig.chat.allowedTags }.forEach { tag ->
finalString.replace(tag.toString().lowercase(), "\\<${tag.toString().lowercase()}")
}
return finalString
}
fun Component.serialize() = mm.serialize(this)

fun String.verifyBookStyling(): String {
val finalString = this
this.getTags().filter { tag -> tag !in chattyConfig.book.allowedTags }.forEach { tag ->
finalString.replace(tag.toString().lowercase(), "\\<${tag.toString().lowercase()}")
fun Component.toPlainText() = plainText.serialize(this)

// Cache tagmap so as it is static
private var cachedTags = mutableSetOf<String>()
fun String.getTags(): Set<ChattyTags> {
val tags = mutableSetOf<ChattyTags>()
val allTags = cachedTags.takeIf { it.isNotEmpty() } ?: run {
cachedTags += ChattyTags.values().map { t -> "<${t.name.lowercase()}" }
cachedTags += ChatColor.values().map { c -> "<${c.name.lowercase()}" }
cachedTags
}
return finalString
}

fun Component.serialize() = MiniMessage.builder().build().serialize(this)

fun Component.toPlainText() = PlainTextComponentSerializer.builder().build().serialize(this)

fun Component.stripTags() = MiniMessage.builder().build().stripTags(this.serialize())

fun String.getTags(): List<ChattyTags> {
val tags = mutableListOf<ChattyTags>()
if (" " in this) tags.add(ChattyTags.SPACES)
MiniMessage.builder().build().deserializeToTree(this).toString()
.split("TagNode(", ") {").filter { "Node" !in it && it.isNotBlank() }.toList().forEach {
val tag = it.replace("'", "").replace(",", "")
when {
tag in ChatColor.values().toString().lowercase() -> tags.add(ChattyTags.TEXTCOLOR)
tag.startsWith("gradient") -> tags.add(ChattyTags.GRADIENT)
tag.startsWith("#") -> tags.add(ChattyTags.HEXCOLOR)
tag.startsWith("i") || tag.startsWith("italic") -> tags.add(ChattyTags.ITALIC)
tag.startsWith("b") || tag.startsWith("bold") -> tags.add(ChattyTags.BOLD)
tag.startsWith("u") || tag.startsWith("underline") -> tags.add(ChattyTags.UNDERLINE)
tag.startsWith("st") || tag.startsWith("strikethrough") -> tags.add(ChattyTags.STRIKETHROUGH)
tag.startsWith("obf") || tag.startsWith("obfuscated") -> tags.add(ChattyTags.OBFUSCATED)
tag.startsWith("click") -> tags.add(ChattyTags.CLICK)
tag.startsWith("hover") -> tags.add(ChattyTags.HOVER)
tag.startsWith("insert") -> tags.add(ChattyTags.INSERTION)
tag.startsWith("rainbow") -> tags.add(ChattyTags.RAINBOW)
tag.startsWith("transition") -> tags.add(ChattyTags.TRANSITION)
tag.startsWith("reset") -> tags.add(ChattyTags.RESET)
tag.startsWith("font") -> tags.add(ChattyTags.FONT)
tag.startsWith("key") -> tags.add(ChattyTags.KEYBIND)
tag.startsWith("lang") -> tags.add(ChattyTags.TRANSLATABLE)
}
allTags.forEach {
val tag = it.replace("<", "")
if (tag.isNotBlank() && it in this) {
if (tag.uppercase() in ChattyTags.values().map { t -> t.name })
tags += ChattyTags.valueOf(tag.uppercase())
else if (tag.uppercase() in ChatColor.values().map { c -> c.name })
tags += ChattyTags.TEXTCOLOR
}
return tags.toList()
}
return tags
}

fun List<String>.toSentence() = this.joinToString(" ")
Expand Down
2 changes: 1 addition & 1 deletion chatty-paper/src/main/kotlin/com/mineinabyss/chatty/helpers/NicknameHelpers.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.bukkit.entity.Player
fun String.verifyNickLength(): Boolean {
return when (chattyConfig.nicknames.countColorsInLength) {
true -> this.length <= chattyConfig.nicknames.maxLength
false -> this.miniMsg().stripTags().length <= chattyConfig.nicknames.maxLength
false -> this.miniMsg().toPlainText().length <= chattyConfig.nicknames.maxLength
}
}

Expand Down
4 changes: 4 additions & 0 deletions chatty-paper/src/main/kotlin/com/mineinabyss/chatty/helpers/PluginHelpers.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@ package com.mineinabyss.chatty.helpers

import com.mineinabyss.chatty.ChattyConfig
import com.mineinabyss.chatty.ChattyMessages
import net.kyori.adventure.text.minimessage.MiniMessage
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer
import org.bukkit.entity.Player

//val bondrewd = BondrewdLikesHisEmotes.getPlugin(BondrewdLikesHisEmotes::class.java)
val chattyConfig = ChattyConfig.data
val chattyMessages = ChattyMessages.data
val emoteFixer = DiscordEmoteFixer.data
val mm = MiniMessage.miniMessage()
val plainText = PlainTextComponentSerializer.plainText()

fun Player.checkPermission(perm: String): Boolean {
return if (perm.isEmpty()) true
Expand Down
20 changes: 13 additions & 7 deletions chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/ChatListener.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ class ChatListener : Listener {
val channelId = player.chattyData.channelId
val channel = getChannelFromId(channelId) ?: return
val formatted =
if (player.checkPermission(chattyConfig.chat.bypassFormatPermission)) originalMessage().fixLegacy()
else originalMessage().serialize().verifyChatStyling().miniMsg()

result("<reset>".miniMsg().append(translatePlaceholders(player, channel.format + formatted.serialize())))
if (player.checkPermission(chattyConfig.chat.bypassFormatPermission)) originalMessage().fixLegacy().serialize()
else originalMessage().serialize().verifyChatStyling(player)
result("<reset>".miniMsg().append(translatePlaceholders(player, channel.format + formatted)))
}

@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
Expand All @@ -54,13 +53,12 @@ class ChatListener : Listener {
val channel = getChannelFromId(channelId) ?: return

if (viewers().isNotEmpty()) viewers().clear()
viewers().addAll(setAudienceForChannelType(player))
viewers() += setAudienceForChannelType(player)

val pingedPlayer = originalMessage().serialize().checkForPlayerPings(channelId)
if (pingedPlayer != null && pingedPlayer != player && pingedPlayer in viewers()) {
message().handlePlayerPings(player, pingedPlayer)
viewers().remove(pingedPlayer)
viewers().remove(player)
viewers() -= setOf(pingedPlayer, player)
}

if (channel.proxy) {
Expand All @@ -80,6 +78,14 @@ class ChatListener : Listener {
}
}

private fun String.verifyChatStyling(player: Player): String {
return if (this.getTags().all { tag -> tag in chattyConfig.chat.allowedTags }) this
else {
player.sendFormattedMessage(chattyMessages.other.disallowedStyling)
mm.stripTags(miniMsg().toPlainText())
}
}

private fun setAudienceForChannelType(player: Player): Set<Audience> {
val onlinePlayers = Bukkit.getOnlinePlayers()
val channel = getChannelFromId(player.chattyData.channelId) ?: return emptySet()
Expand Down
Loading

0 comments on commit 66da35b

Please sign in to comment.