feature/control-separation

modules/commands/jail.lua

@@ -1,5 +1,5 @@
 local Commands = require 'expcore.commands'
-local JailControl = require 'modules.addons.jail-control'
+local Jail = require 'modules.control.jail'
 local format_chat_player_name = ext_require('expcore.common','format_chat_player_name')
 require 'config.expcore-commands.parse_roles'
 
@@ -11,7 +11,7 @@ Commands.new_command('jail','Puts a player into jail and removes all other roles
     reason = reason or 'Non Given.'
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
-    if JailControl.jail_player(action_player,player.name) then
+    if Jail.jail_player(action_player,player.name,reason) then
         game.print{'expcom-jail.give',action_player_name_color,by_player_name_color,reason}
     else
         return Commands.error{'expcom-jail.already-jailed',action_player_name_color}
@@ -25,7 +25,7 @@ Commands.new_command('unjail','Removes a player from jail.')
 :register(function(player,action_player,raw)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
-    if JailControl.unjail_player(action_player,player.name) then
+    if Jail.unjail_player(action_player,player.name) then
         game.print{'expcom-jail.remove',action_player_name_color,by_player_name_color}
     else
         return Commands.error{'expcom-jail.not-jailed',action_player_name_color}
@@ -39,7 +39,7 @@ Commands.new_command('temp-ban','Temp bans a player until the next reset; this r
 :register(function(player,action_player,reason,raw)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
-    if JailControl.temp_ban_player(action_player,player.name,reason) then
+    if Jail.temp_ban_player(action_player,player.name,reason) then
         game.print{'expcom-jail.temp-ban',action_player_name_color,by_player_name_color,reason}
     else
         return Commands.error{'expcom-jail.already-banned',action_player_name_color}
@@ -53,7 +53,7 @@ Commands.new_command('clear-temp-ban','Removes temp ban from a player; this will
 :register(function(player,action_player,raw)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
-    if JailControl.clear_temp_ban_player(action_player,player.name) then
+    if Jail.untemp_ban_player(action_player,player.name) then
         game.print{'expcom-jail.temp-ban-clear',action_player_name_color,by_player_name_color}
     else
         return Commands.error{'expcom-jail.not-temp-banned',action_player_name_color}

modules/commands/reports.lua

@@ -1,6 +1,6 @@
 local Roles = require 'expcore.roles'
 local Commands = require 'expcore.commands'
-local ReportsControl = require 'modules.addons.reports-control'
+local Reports = require 'modules.control.reports'
 local format_chat_player_name = ext_require('expcore.common','format_chat_player_name')
 require 'config.expcore-commands.parse_general'
 
@@ -20,7 +20,7 @@ end)
 :register(function(player,action_player,reason,raw)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
-    if ReportsControl.report_player(action_player,reason,player.name) then
+    if Reports.report_player(action_player,player.name,reason) then
         game.print{'expcom-report.non-admin',action_player_name_color,reason}
         Roles.print_to_roles_higher('Trainee',{'expcom-report.admin',action_player_name_color,by_player_name_color,reason})
     else
@@ -33,7 +33,7 @@ Commands.new_command('get-reports','Gets a list of all reports that a player has
 :add_alias('reports','list-reports')
 :register(function(player,action_player,raw)
     if action_player then
-        local reports = ReportsControl.get_player_reports(action_player)
+        local reports = Reports.get_reports(action_player)
         local action_player_name_color = format_chat_player_name(action_player)
         Commands.print{'expcom-report.player-report-title',action_player_name_color}
         for player_name,reason in pairs(reports) do
@@ -41,11 +41,11 @@ Commands.new_command('get-reports','Gets a list of all reports that a player has
             Commands.print{'expcom-report.list',by_player_name_color,reason}
         end
     else
-        local user_reports = ReportsControl.user_reports
+        local user_reports = Reports.user_reports
         Commands.print{'expcom-report.player-count-title'}
         for player_name,reports in pairs(user_reports) do
             local player_name_color = format_chat_player_name(player_name)
-            local report_count = ReportsControl.count_player_reports(player_name)
+            local report_count = Reports.count_reports(player_name)
             Commands.print{'expcom-report.list',player_name_color,report_count}
         end
     end
@@ -56,11 +56,11 @@ Commands.new_command('clear-reports','Clears all reports from a player or just t
 :add_param('from-player',true,'player')
 :register(function(player,action_player,from_player,raw)
     if from_player then
-        if not ReportsControl.remove_player_report(action_player,from_player.name) then
+        if not Reports.remove_report(action_player,from_player.name,player.name) then
             return Commands.error{'expcom-report.not-reported'}
         end
     else
-        if not ReportsControl.clear_player_reports(action_player) then
+        if not Reports.remove_all(action_player,player.name) then
             return Commands.error{'expcom-report.not-reported'}
         end
     end

modules/commands/warnings.lua

@@ -1,5 +1,5 @@
 local Commands = require 'expcore.commands'
-local WarningsControl = require 'modules.addons.warnings-control'
+local Warnings = require 'modules.control.warnings'
 local format_chat_player_name = ext_require('expcore.common','format_chat_player_name')
 local config = require 'config.warnings'
 require 'config.expcore-commands.parse_roles'
@@ -10,7 +10,7 @@ Commands.new_command('give-warning','Gives a warning to a player; may lead to au
 :add_alias('warn')
 :enable_auto_concat()
 :register(function(player,action_player,reason,raw)
-    WarningsControl.add_warnings(action_player,player.name)
+    Warnings.add_warning(action_player,player.name,reason)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
     game.print{'expcom-warnings.received',action_player_name_color,by_player_name_color,reason}
@@ -21,18 +21,18 @@ Commands.new_command('get-warnings','Gets the number of warnings a player has. I
 :add_alias('warnings','list-warnings')
 :register(function(player,action_player,raw)
     if action_player then
-        local warnings = WarningsControl.get_warnings(action_player)
-        local script_warnings = WarningsControl.get_temp_warnings(action_player)
+        local warnings = Warnings.get_warnings(action_player)
+        local script_warnings = Warnings.get_script_warnings(action_player)
         local action_player_name_color = format_chat_player_name(action_player)
         Commands.print{'expcom-warnings.player',action_player_name_color,warnings,script_warnings,config.temp_warning_limit}
     else
         local rtn = {}
-        local user_warnings = WarningsControl.user_warnings
-        local user_temp_warnings = WarningsControl.user_temp_warnings
+        local user_warnings = Warnings.user_warnings
+        local user_script_warnings = Warnings.user_script_warnings
         for player_name,warnings in pairs(user_warnings) do
             rtn[player_name] = {#warnings,0}
         end
-        for player_name,warnings in pairs(user_temp_warnings) do
+        for player_name,warnings in pairs(user_script_warnings) do
             if not rtn[player_name] then
                 rtn[player_name] = {0,0}
             end
@@ -49,8 +49,8 @@ end)
 Commands.new_command('clear-warnings','Clears all warnings (and script warnings) from a player')
 :add_param('player',false,'player')
 :register(function(player,action_player,raw)
-    WarningsControl.clear_warnings(action_player,player.name)
-    WarningsControl.clear_temp_warnings(action_player,player.name)
+    Warnings.clear_warnings(action_player,player.name)
+    Warnings.clear_script_warnings(action_player,player.name)
     local action_player_name_color = format_chat_player_name(action_player)
     local by_player_name_color = format_chat_player_name(player)
     game.print{'expcom-warnings.cleared',action_player_name_color,by_player_name_color}