@quenty/chatproviderservice 9.18.1-canary.520.f23602e.0 → 9.19.0-canary.520.49fdd74.0

package/CHANGELOG.md

@@ -3,16 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [9.18.1-canary.520.f23602e.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/chatproviderservice@9.18.0...@quenty/chatproviderservice@9.18.1-canary.520.f23602e.0) (2024-11-14)
+# [9.19.0-canary.520.49fdd74.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/chatproviderservice@9.18.0...@quenty/chatproviderservice@9.19.0-canary.520.49fdd74.0) (2024-11-20)
 
 
 ### Bug Fixes
 
 * Create properties from metadata instead of caching ([f23602e](https://github.com/Quenty/NevermoreEngine/commit/f23602e73a41ce4135ca18bc4ab7f01e935b2cab))
+* pcall metadata in case it isn't a hex color ([0c6df93](https://github.com/Quenty/NevermoreEngine/commit/0c6df93f4e611dcdcf8c1fde454ee4bf7fa43ef0))
+* Take encoded message data as parameter + make channel optional ([20071a8](https://github.com/Quenty/NevermoreEngine/commit/20071a874fd7dbe733fdc116789fa8993ef0a405))
 
 
 ### Features
 
+* Add TextChannelUtils ([49fdd74](https://github.com/Quenty/NevermoreEngine/commit/49fdd7495ee83b23aa8e042f7055d080e50f9687))
 * Add way to send system messages ([4db9577](https://github.com/Quenty/NevermoreEngine/commit/4db95775860f06b6e4cd9793c6a0e6457a27a0e1))
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/chatproviderservice",
-  "version": "9.18.1-canary.520.f23602e.0",
+  "version": "9.19.0-canary.520.49fdd74.0",
   "description": "Provide wrapper around chat system to allow tags to be set",
   "keywords": [
     "Roblox",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f23602e73a41ce4135ca18bc4ab7f01e935b2cab"
+  "gitHead": "49fdd7495ee83b23aa8e042f7055d080e50f9687"
 }

package/src/Client/ChatProviderServiceClient.lua

@@ -4,12 +4,14 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local TextChatService = game:GetService("TextChatService")
+local HttpService = game:GetService("HttpService")
 local Players = game:GetService("Players")
+local TextChatService = game:GetService("TextChatService")
 
 local Maid = require("Maid")
 local Signal = require("Signal")
 local String = require("String")
+local TextChannelUtils = require("TextChannelUtils")
 
 local ChatProviderServiceClient = {}
 ChatProviderServiceClient.ServiceName = "ChatProviderServiceClient"
@@ -38,12 +40,22 @@ function ChatProviderServiceClient:Start()
 
 		local metadata = textChatMessage.Metadata
 		if metadata then
-			local isValidColor = Color3.fromHex(metadata)
-			if isValidColor then
-				local overrideProperties = Instance.new("TextChatMessageProperties")
-				overrideProperties.Text = `<font color="#{metadata}">{textChatMessage.Text}</font>`
-
-				return overrideProperties
+			local success, decodedMessageData = pcall(function()
+				return HttpService:JSONDecode(metadata)
+			end)
+
+			if success and decodedMessageData then
+				local color = decodedMessageData.Color or "#ffffff"
+				local isValidHex = pcall(function()
+					return Color3.fromHex(color)
+				end)
+
+				if isValidHex then
+					local overrideProperties = Instance.new("TextChatMessageProperties")
+					overrideProperties.Text = `<font color="#{color}">{textChatMessage.Text}</font>`
+
+					return overrideProperties
+				end
 			end
 		end
 
@@ -64,12 +76,24 @@ function ChatProviderServiceClient:Start()
 	end
 end
 
-function ChatProviderServiceClient:SendSystemMessage(channel: TextChannel, message: string, color: Color3?)
-	assert(typeof(channel) == "Instance" and channel.ClassName == "TextChannel", "[ChatProviderServiceClient.SendSystemMessage] - Bad channel")
+--[=[
+	Sends a system message to the provided TextChannel.
+	@param encodedMessageData string
+	@param channel TextChannel?
+]=]
+function ChatProviderServiceClient:SendSystemMessage(message: string, encodedMessageData: string?, channel: TextChannel?)
 	assert(typeof(message) == "string", "[ChatProviderServiceClient.SendSystemMessage] - Bad message")
-	assert(typeof(color) == "Color3" or color == nil, "[ChatProviderServiceClient.SendSystemMessage] - Bad color")
 
-	channel:DisplaySystemMessage(message, color and color:ToHex())
+	if not channel then
+		channel = TextChannelUtils.getDefaultTextChannel()
+	end
+
+	if not channel then
+		warn("[ChatProviderServiceClient.SendSystemMessage] - Failed to get default channel")
+		return
+	end
+
+	channel:DisplaySystemMessage(message, encodedMessageData)
 end
 
 function ChatProviderServiceClient:_renderTags(textSource)

package/src/Shared/TextChannelUtils.lua

@@ -0,0 +1,29 @@
+--[=[
+	Utility functions for querying text channels.
+	@class TextChannelUtils
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local TextChatService = game:GetService("TextChatService")
+
+local TextChannelUtils = {}
+
+function TextChannelUtils.getDefaultTextChannel()
+	return TextChannelUtils.getTextChannel("RBXGeneral")
+end
+
+function TextChannelUtils.getTextChannel(channelName: string)
+	local channels = TextChannelUtils.getTextChannels()
+	if not channels then
+		return
+	end
+
+	return channels:FindFirstChild(channelName)
+end
+
+function TextChannelUtils.getTextChannels()
+	return TextChatService:FindFirstChild("TextChannels")
+end
+
+return TextChannelUtils