mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-11-18 23:03:13 +09:00
Move the report commands into exp_reports
The create-report, get-reports and clear-reports commands now live in the plugin's own module next to the functions they call, with their locale. The permissions keep their exp_scenario.command names because the command authority derives them from the command name. The Discord report alert in exp_scenario is gone since exp_reports posts to its own webhook. The shared add_player stub takes an options table with connected and admin defaulting to true and false, replacing the copy in the exp_reports test environment. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e47f41d440
commit
9ddb7b362b
20 files changed
+95
-155
No files matched your search
@@ -0,0 +1,62 @@
|
||||
--[[-- ExpReports - Commands
|
||||
Commands which let players report each other and admins manage the reports
|
||||
]]
|
||||
|
||||
local Commands = require("modules/exp_commands")
|
||||
local parse_input = Commands.parse_input
|
||||
|
||||
local Roles = require("modules/exp_roles")
|
||||
local player_has_permission = Roles.player_has_permission
|
||||
|
||||
local Reports = require("modules/exp_reports")
|
||||
|
||||
--- @param input string
|
||||
--- @param player LuaPlayer
|
||||
--- @return Commands.Status
|
||||
--- @return LuaPlayer | LocalisedString
|
||||
local function reportable_player(input, player)
|
||||
local success, status, result = parse_input(input, player, Commands.types.player)
|
||||
if not success then return status, result end
|
||||
--- @cast result LuaPlayer
|
||||
|
||||
if player_has_permission(result, "exp_scenario.bypass.reports") then
|
||||
return Commands.status.invalid_input{ "exp-reports_commands.player-immune" }
|
||||
elseif player == result then
|
||||
return Commands.status.invalid_input{ "exp-reports_commands.self-report" }
|
||||
else
|
||||
return Commands.status.success(result)
|
||||
end
|
||||
end
|
||||
|
||||
--- Reports a player and notifies admins, the outcome is printed once the controller answers
|
||||
Commands.new("create-report", { "exp-reports_commands.description-create" })
|
||||
:argument("player", { "exp-reports_commands.arg-player-create" }, reportable_player)
|
||||
:argument("reason", { "exp-reports_commands.arg-reason" }, Commands.types.string)
|
||||
:enable_auto_concatenation()
|
||||
:add_aliases{ "report" }
|
||||
:register(function(player, other_player, reason)
|
||||
--- @cast other_player LuaPlayer
|
||||
--- @cast reason string
|
||||
Reports.create_report(player, other_player, reason)
|
||||
end)
|
||||
|
||||
--- Lists the reports against a player, or the number against every player, printed once the controller answers
|
||||
Commands.new("get-reports", { "exp-reports_commands.description-get" })
|
||||
:optional("player", { "exp-reports_commands.arg-player-get" }, Commands.types.player)
|
||||
:add_aliases{ "reports" }
|
||||
:add_flags{ "admin_only" }
|
||||
:register(function(player, other_player)
|
||||
--- @cast other_player LuaPlayer?
|
||||
Reports.list_reports(player, other_player)
|
||||
end)
|
||||
|
||||
--- Clears all reports from a player or just the report from one player, printed once the controller answers
|
||||
Commands.new("clear-reports", { "exp-reports_commands.description-clear" })
|
||||
:argument("player", { "exp-reports_commands.arg-player-clear" }, Commands.types.player)
|
||||
:optional("from-player", { "exp-reports_commands.arg-from-player" }, Commands.types.player)
|
||||
:add_flags{ "admin_only" }
|
||||
:register(function(player, other_player, from_player)
|
||||
--- @cast other_player LuaPlayer
|
||||
--- @cast from_player LuaPlayer?
|
||||
Reports.delete_reports(player, other_player, from_player and from_player.name)
|
||||
end)
|
||||
@@ -8,3 +8,15 @@ list-all-entry=__1__: __2__ __plural_for_parameter__2__{1=report|rest=reports}__
|
||||
list-all-none=No players have reports against them.
|
||||
deleted=__1__ had __2__ __plural_for_parameter__2__{1=report|rest=reports}__ removed by __3__.
|
||||
deleted-none=__1__ has no reports against them.
|
||||
|
||||
[exp-reports_commands]
|
||||
description-create=Reports a player and notifies moderators
|
||||
description-get=Gets a list of all reports that a player has on them. If no player then lists all players and the number of reports on them.
|
||||
description-clear=Clears all reports from a player or just the report from one player.
|
||||
arg-player-create=Player you want to report.
|
||||
arg-player-get=Player to get the reports of.
|
||||
arg-player-clear=Player to clear the reports of.
|
||||
arg-reason=Reason you want to report this player.
|
||||
arg-from-player=Only remove the report from this player.
|
||||
player-immune=This player can not be reported.
|
||||
self-report=You cannot report yourself.
|
||||
@@ -8,3 +8,15 @@ list-all-entry=__1__: __2__
|
||||
list-all-none=沒有用戶被舉報。
|
||||
deleted=__1__ 被舉報的 __2__ 個紀錄已被 __3__ 清除。
|
||||
deleted-none=__1__ 沒有被舉報的紀錄。
|
||||
|
||||
[exp-reports_commands]
|
||||
description-create=檢舉用戶並通知管理員。
|
||||
description-get=取得用戶的報告清單。如果沒有設定用戶,則列出所有用戶以及有關他們的報告數量。
|
||||
description-clear=清除一名用戶的所有報告或僅清除一名用戶的報告。
|
||||
arg-player-create=用戶
|
||||
arg-player-get=用戶
|
||||
arg-player-clear=用戶
|
||||
arg-reason=原因
|
||||
arg-from-player=用戶
|
||||
player-immune=用戶不能被舉報
|
||||
self-report=你不能舉報自己。
|
||||
@@ -8,3 +8,15 @@ list-all-entry=__1__: __2__
|
||||
list-all-none=沒有用戶被舉報。
|
||||
deleted=__1__ 被舉報的 __2__ 個紀錄已被 __3__ 清除。
|
||||
deleted-none=__1__ 沒有被舉報的紀錄。
|
||||
|
||||
[exp-reports_commands]
|
||||
description-create=檢舉用戶並通知管理員。
|
||||
description-get=取得用戶的報告清單。如果沒有設定用戶,則列出所有用戶以及有關他們的報告數量。
|
||||
description-clear=清除一名用戶的所有報告或僅清除一名用戶的報告。
|
||||
arg-player-create=用戶
|
||||
arg-player-get=用戶
|
||||
arg-player-clear=用戶
|
||||
arg-reason=原因
|
||||
arg-from-player=用戶
|
||||
player-immune=用戶不能被舉報
|
||||
self-report=你不能舉報自己。
|
||||
@@ -1,12 +1,15 @@
|
||||
{
|
||||
"name": "exp_reports",
|
||||
"load": [
|
||||
"commands.lua"
|
||||
],
|
||||
"require": [
|
||||
"globals.lua"
|
||||
],
|
||||
"dependencies": {
|
||||
"clusterio": "*",
|
||||
"exp_util": "*"
|
||||
"exp_util": "*",
|
||||
"exp_commands": "*",
|
||||
"exp_roles": "*"
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user