DominikSLK/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-12-12 22:34:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

chatv2: channels, hidden modes and automatic webpack

Browse Source
This commit is contained in:
blattersturm
2020-11-01 12:48:44 +01:00
parent 65fc598a5f
commit 439b8a9c45
6 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
resources/[gameplay]/chat/sv_chat.lua
View File

@@ -62,7 +62,9 @@ exports('registerMode', function(modeData)
local clObj = {
name = modeData.name,
displayName = modeData.displayName,
color = modeData.color or '#fff'
color = modeData.color or '#fff',
isChannel = modeData.isChannel,
isGlobal = modeData.isGlobal,
}
if not modeData.seObject then
@@ -185,9 +187,6 @@ local function routeMessage(source, author, message, mode, fromConsole)
TriggerEvent('chatMessage', source, #outMessage.args > 1 and outMessage.args[1] or '', outMessage.args[#outMessage.args])
if not WasEventCanceled() then
-- remove the mode name, we don't need this for routing
outMessage.mode = nil
if type(routingTarget) ~= 'table' then
TriggerClientEvent('chat:addMessage', routingTarget, outMessage)
else
@@ -270,7 +269,9 @@ AddEventHandler('chat:init', function()
local clObj = {
name = modeData.name,
displayName = modeData.displayName,
color = modeData.color or '#fff'
color = modeData.color or '#fff',
isChannel = modeData.isChannel,
isGlobal = modeData.isGlobal,
}
if not modeData.seObject or IsPlayerAceAllowed(source, modeData.seObject) then