etlegacy
/
wolfadmin
mirror of https://github.com/etlegacy/wolfadmin.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PM can now be sent to multiple recipients (refs #46)

This commit is contained in:
Timo Smit 2017-03-16 21:02:23 +01:00
parent 5898b079bf
commit fe30fe8d87
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
luamods/wolfadmin/commands/client/pm.lua
View File

@ -21,6 +21,7 @@ local players = require (wolfa_getLuaPath()..".players.players")
local logs = require (wolfa_getLuaPath()..".util.logs") local logs = require (wolfa_getLuaPath()..".util.logs")
local settings = require (wolfa_getLuaPath()..".util.settings") local settings = require (wolfa_getLuaPath()..".util.settings")
local util = require (wolfa_getLuaPath()..".util.util")
function commandPersonalMessage(clientId, command, recipient, ...) function commandPersonalMessage(clientId, command, recipient, ...)
if recipient and ... then if recipient and ... then
@ -42,46 +43,48 @@ end
commands.addclient("pm", commandPersonalMessage, "", "", true, (settings.get("fs_game") ~= "legacy")) commands.addclient("pm", commandPersonalMessage, "", "", true, (settings.get("fs_game") ~= "legacy"))
commands.addclient("m", commandPersonalMessage, "", "", true, (settings.get("fs_game") ~= "legacy")) commands.addclient("m", commandPersonalMessage, "", "", true, (settings.get("fs_game") ~= "legacy"))
function commandPersonalMessage(clientId, command, recipient, ...) function commandPersonalMessage(clientId, command, target, ...)
if not recipient or not ... then if not target or not ... then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^9usage: "..commands.getclient("pm")["syntax"].."\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^9usage: "..commands.getclient("pm")["syntax"].."\";")
return true return true
end end
local cmdClient local recipients = {}
if tonumber(recipient) == nil or tonumber(recipient) > tonumber(et.trap_Cvar_Get("sv_maxclients")) then local targetSanitized = string.lower(util.removeColors(target))
cmdClient = et.ClientNumberFromString(recipient)
else for playerId = 0, et.trap_Cvar_Get("sv_maxclients") - 1 do
cmdClient = tonumber(recipient) if players.isConnected(playerId) then
local playerNameSanitized = string.lower(util.removeColors(players.getName(playerId)))
if string.find(playerNameSanitized, targetSanitized, 1, true) then
table.insert(recipients, playerId)
end
end
end end
if cmdClient == -1 or cmdClient == nil then if #recipients == 0 then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^9pm: ^7no or multiple matches for '^7"..recipient.."^9'.\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^9pm: ^7no or multiple matches for '^7"..target.."^9'.\";")
return true
elseif not et.gentity_get(cmdClient, "pers.netname") then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..clientId.." \"^dpm: ^7no connected player by that name or slot #\";")
return true return true
end end
local message = table.concat({...}, " ") local message = table.concat({...}, " ")
if cmdClient ~= -1 and et.gentity_get(cmdClient, "pers.netname") then et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat "..clientId.." \"^7"..et.gentity_get(clientId, "pers.netname").."^7 -> "..target.."^7: ("..#recipients.." recipients): ^3"..message.."\";")
players.setLastPMSender(cmdClient, clientId) et.trap_SendConsoleCommand(et.EXEC_APPEND, "playsound "..clientId.." \"sound/misc/pm.wav\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat "..clientId.." \"^7"..et.gentity_get(clientId, "pers.netname").."^7 -> "..recipient.."^7: (1 recipients): ^3"..message.."\";") for _, recipient in ipairs(recipients) do
et.trap_SendConsoleCommand(et.EXEC_APPEND, "playsound "..clientId.." \"sound/misc/pm.wav\";") players.setLastPMSender(recipient, clientId)
if clientId ~= cmdClient then if clientId ~= recipient then
et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat "..cmdClient.." \"^7"..et.gentity_get(clientId, "pers.netname").."^7 -> "..recipient.."^7: (1 recipients): ^3"..message.."\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "cchat "..recipient.." \"^7"..et.gentity_get(clientId, "pers.netname").."^7 -> "..recipient.."^7: ("..#recipients.." recipients): ^3"..message.."\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "playsound "..cmdClient.." \"sound/misc/pm.wav\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "playsound "..recipient.." \"sound/misc/pm.wav\";")
end end
et.trap_SendConsoleCommand(et.EXEC_APPEND, "ccp "..cmdClient.." \"^3private message from "..et.gentity_get(clientId, "pers.netname").."\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "ccp "..recipient.." \"^3private message from "..et.gentity_get(clientId, "pers.netname").."\";")
et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..cmdClient.." \"^9reply: ^7r [^2message^7]\";") et.trap_SendConsoleCommand(et.EXEC_APPEND, "csay "..recipient.." \"^9reply: ^7r [^2message^7]\";")
end end
logs.writeChat(clientId, "priv", cmdClient, ...) logs.writeChat(clientId, "priv", cmdClient, ...)