Skip to content

feat(chat): Server message routing as done to client-side messages. #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slashkeyvalue wants to merge 6 commits into
base: master
Choose a base branch
from
Open

feat(chat): Server message routing as done to client-side messages. #164

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b61c5e7
Handle server-sent messages routing in the same as a client-sent ones
slashkeyvalue Mar 29, 2021
b9a69ec
tweak: undo `addMessage` override, thats stupid
slashkeyvalue Mar 29, 2021
195eb4d
tweak: only do ace checking if source is valid.
slashkeyvalue Mar 29, 2021
4f82c13
tweak: do not trigger `chatMessage` when its routed from server
slashkeyvalue Mar 29, 2021
47874c0
fix: remove weird spacing
slashkeyvalue Mar 29, 2021
f7250fe
fix: awkward... actually set a routing target when fromServer
slashkeyvalue Mar 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions resources/[gameplay]/chat/sv_chat.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ exports('addMessage', function(target, message)
TriggerClientEvent('chat:addMessage', target, message)
end)

exports('sendMessage', function(target, author, message, mode)
routeMessage(target, author, message, mode, true, true)
end)

local hooks = {}
local hookIdx = 1

Expand Down Expand Up @@ -108,8 +112,8 @@ local function unregisterHooks(resource)
end
end

local function routeMessage(source, author, message, mode, fromConsole)
if source >= 1 then
local function routeMessage(source, author, message, mode, fromConsole, fromServer)
if not fromServer and source >= 1 then
author = GetPlayerName(source)
end

Expand All @@ -127,13 +131,14 @@ local function routeMessage(source, author, message, mode, fromConsole)
if mode and modes[mode] then
local modeData = modes[mode]

if modeData.seObject and not IsPlayerAceAllowed(source, modeData.seObject) then
if modeData.seObject and (source >= 1 and not IsPlayerAceAllowed(source, modeData.seObject)) then
return
end
end

local messageCanceled = false
local routingTarget = -1

local routingTarget = fromServer and source or -1

local hookRef = {
updateMessage = function(t)
Expand Down Expand Up @@ -170,21 +175,21 @@ local function routeMessage(source, author, message, mode, fromConsole)

for _, hook in pairs(hooks) do
if hook.fn then
hook.fn(source, outMessage, hookRef)
hook.fn(source, outMessage, hookRef, fromServer)
end
end

if modes[mode] then
local m = modes[mode]

m.cb(source, outMessage, hookRef)
m.cb(source, outMessage, hookRef, fromServer)
end

if messageCanceled then
return
end

TriggerEvent('chatMessage', source, #outMessage.args > 1 and outMessage.args[1] or '', outMessage.args[#outMessage.args])
TriggerEvent('chatMessage', fromServer and 0 or source, #outMessage.args > 1 and outMessage.args[1] or '', outMessage.args[#outMessage.args])

if not WasEventCanceled() then
if type(routingTarget) ~= 'table' then
Expand Down