From b1518dbd1c398205a23af37aab1e3dafb9143b88 Mon Sep 17 00:00:00 2001 From: sys4-fr Date: Sat, 5 Jan 2019 23:07:31 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Traduction=20des=20messages=20en=20fran?= =?UTF-8?q?=C3=A7ais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Ajoute message de chargement du mod dans le journal "action" --- init.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/init.lua b/init.lua index a544294..72bd0f3 100644 --- a/init.lua +++ b/init.lua @@ -2,13 +2,13 @@ minetest.register_chatcommand("report", { func = function(name, param) param = param:trim() if param == "" then - return false, "Please add a message to your report. " .. - "If it's about (a) particular player(s), please also include their name(s)." + return false, "Veuillez écrire un message pour le rapport. " .. + "Si il s'agit d'un (de) joueur(s) en particulier, veuillez aussi indiquer son (leur) nom(s)." end local _, count = string.gsub(param, " ", "") if count == 0 then - minetest.chat_send_player(name, "If you're reporting a player, " .. - "you should also include a reason why. (Eg: swearing, sabotage)") + minetest.chat_send_player(name, "Si vous rapportez l'attitude d'un joueur, " .. + "vous devriez aussi dire quelle en est la raison. (Ex: insulte, sabotage)") end -- Send to online moderators / admins @@ -18,19 +18,21 @@ minetest.register_chatcommand("report", { local toname = player:get_player_name() if minetest.check_player_privs(toname, {kick = true, ban = true}) then table.insert(mods, toname) - minetest.chat_send_player(toname, "-!- " .. name .. " reported: " .. param) + minetest.chat_send_player(toname, "-!- " .. name .. " a rapporté : " .. param) end end if #mods > 0 then mod_list = table.concat(mods, ", ") email.send_mail(name, minetest.setting_get("name"), - "Report: " .. param .. " (mods online: " .. mod_list .. ")") - return true, "Reported. Moderators currently online: " .. mod_list + "Rapport: " .. param .. " (modos connecté(s) : " .. mod_list .. ")") + return true, "Rapporté. Moderateur(s) connecté(s) : " .. mod_list else email.send_mail(name, minetest.setting_get("name"), - "Report: " .. param .. " (no mods online)") - return true, "Reported. We'll get back to you." + "Rapport: " .. param .. " (pas de modo connecté)") + return true, "Rapporté. On reviendra vers vous." end end }) + +minetest.log("action", "[report] loaded.") From dfe4d8e321d4fbc4f7386ca3f9dc1c0459e24f18 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 24 Jul 2021 12:48:31 +0200 Subject: [PATCH 2/7] Begin write of send email to offline moderators --- init.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/init.lua b/init.lua index 72bd0f3..dfa1761 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,22 @@ +local function save_modo(name) + +end + +local function get_modo_list() + +end + +minetest.register_on_joinplayer(function(player) + -- 1. Obtenir la liste des modérateur connus + -- local modo_saved = get_modo_list() + -- 2. Obtenir les privs du player + -- 3. Si player n'est pas dans la liste modos connus et a privs modos alors + -- 4. Ajouter nom du player dans liste modos connus + -- 5. Sinon si player est dans liste modos connus et n'a pas privs modos alors + -- 6. Supprimer nom du player de la liste modos connus. + -- 7. Fin +end) + minetest.register_chatcommand("report", { func = function(name, param) param = param:trim() From 8b2ff073ea876e795a2ec40037c9b9edb16f15b4 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sun, 25 Jul 2021 00:01:37 +0200 Subject: [PATCH 3/7] Can send reports to offline moderators + add french translation --- init.lua | 96 +++++++++++++++++++++++++++++++++------------ locale/report.fr.tr | 10 +++++ 2 files changed, 80 insertions(+), 26 deletions(-) create mode 100644 locale/report.fr.tr diff --git a/init.lua b/init.lua index dfa1761..38805d5 100644 --- a/init.lua +++ b/init.lua @@ -1,55 +1,99 @@ -local function save_modo(name) +local S = minetest.get_translator("report") -end +local storage = minetest.get_mod_storage() +assert(storage, "mod_storage is required") local function get_modo_list() + local store = storage:get_string("report") + if store then + return minetest.deserialize(store) or {} + end + return nil +end + +local function is_known_modo(name) + for _, modo in ipairs(get_modo_list()) do + if modo == name then + return true + end + end + return false end minetest.register_on_joinplayer(function(player) - -- 1. Obtenir la liste des modérateur connus - -- local modo_saved = get_modo_list() - -- 2. Obtenir les privs du player - -- 3. Si player n'est pas dans la liste modos connus et a privs modos alors - -- 4. Ajouter nom du player dans liste modos connus - -- 5. Sinon si player est dans liste modos connus et n'a pas privs modos alors - -- 6. Supprimer nom du player de la liste modos connus. - -- 7. Fin + -- Obtenir les privs du player + local player_name = player:get_player_name() + local is_modo = minetest.check_player_privs(player_name, {kick = true, ban = true}) + + -- Le joueur est-il un modérateur connu ? + local known = is_known_modo(player_name) + + -- Ajouter ou supprimer le joueur de la liste des modérateurs + if not known and is_modo then + -- Ajouter nom du player dans liste modos + local modos = get_modo_list() + table.insert(modos, player_name) + storage:set_string("report", minetest.serialize(modos)) + elseif known and not is_modo then + -- Supprimer nom du player de la liste modos + local modos = get_modo_list() + for i, modo in ipairs(modos) do + if modo == player_name then + table.remove(modos, i) + storage:set_string("report", minetest.serialize(modos)) + break + end + end + end end) minetest.register_chatcommand("report", { + description = S("Report: @1 to see moderators list. @2 is the message to report to moderators.", "'modos'", "'msg'"), + params = "modos|msg", func = function(name, param) param = param:trim() if param == "" then - return false, "Veuillez écrire un message pour le rapport. " .. - "Si il s'agit d'un (de) joueur(s) en particulier, veuillez aussi indiquer son (leur) nom(s)." + return false, S("Please write a message for the report. If it's about one or several players in particular, please give their name.") + end + if param == "modos" then + return true, S("Moderators list: @1", table.concat(get_modo_list(), ", ")) end local _, count = string.gsub(param, " ", "") if count == 0 then - minetest.chat_send_player(name, "Si vous rapportez l'attitude d'un joueur, " .. - "vous devriez aussi dire quelle en est la raison. (Ex: insulte, sabotage)") + minetest.chat_send_player(name, S("If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)")) end -- Send to online moderators / admins -- Get comma separated list of online moderators and admins - local mods = {} + local modos_online = {} for _, player in pairs(minetest.get_connected_players()) do local toname = player:get_player_name() - if minetest.check_player_privs(toname, {kick = true, ban = true}) then - table.insert(mods, toname) - minetest.chat_send_player(toname, "-!- " .. name .. " a rapporté : " .. param) + if is_known_modo(toname) then + table.insert(modos_online, toname) + minetest.chat_send_player(toname, S("-!- @1 has reported: @2", name, param)) end end - if #mods > 0 then - mod_list = table.concat(mods, ", ") - email.send_mail(name, minetest.setting_get("name"), - "Rapport: " .. param .. " (modos connecté(s) : " .. mod_list .. ")") - return true, "Rapporté. Moderateur(s) connecté(s) : " .. mod_list + local admin = minetest.setting_get("name") + + if #modos_online > 0 then + local mod_list = table.concat(modos_online, ", ") + email.send_mail(name, admin, S("Report: @1 (online moderator(s): @2)", param, mod_list)) + for _, modo in ipairs(get_modo_list()) do + if modo ~= admin then + email.send_mail(name, modo, S("Report: @1 (online moderator(s): @2)", param, mod_list)) + end + end + return true, S("Reported. Online moderator(s): @1", mod_list) else - email.send_mail(name, minetest.setting_get("name"), - "Rapport: " .. param .. " (pas de modo connecté)") - return true, "Rapporté. On reviendra vers vous." + email.send_mail(name, admin, S("Report: (no online moderator)", param)) + for _, modo in ipairs(get_modo_list()) do + if modo ~= admin then + email.send_mail(name, modo, S("Report: @1 (no online moderator)", param)) + end + end + return true, S("Reported. We will get back to you.") end end }) diff --git a/locale/report.fr.tr b/locale/report.fr.tr new file mode 100644 index 0000000..f684c57 --- /dev/null +++ b/locale/report.fr.tr @@ -0,0 +1,10 @@ +# textdomain:report +Report: @1 to see moderators list. @2 is the message to report to moderators.=Report: @1 pour voir la liste des modérateurs. @2 est le message à rapporter aux modérateurs. +Please write a message for the report. If it's about one or several players in particular, please give their name.=Veuillez écrire un message pour le rapport. Si il s'agit d'un ou plusieurs joueurs en particulier, veuillez aussi indiquer leur nom. +Moderators list: @1=Liste de modérateurs : @1 +If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)=Si vous rapportez l'attitude d'un joueur, vous devriez aussi dire quelle en est la raison. (Ex: insulte, sabotage) +-!- @1 has reported: @2=-!- @1 a rapporté : @2 +Report: @1 (online moderator(s): @2)=Rapport : @1 (moderateur(s) connecté(s) : @2) +Reported. Online moderator(s): @1=Rapporté. Moderateur(s) connecté(s) : @1 +Report: @1 (no online moderator)=Rapport : @1 (pas de modérateur connecté) +Reported. We will get back to you.=Rapporté. On reviendra vers vous. \ No newline at end of file From e7f0275a88b86d42e00024e3fd7f655989e20038 Mon Sep 17 00:00:00 2001 From: sys4 Date: Wed, 11 Aug 2021 21:54:30 +0200 Subject: [PATCH 4/7] Fix crash when no moderators online --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 38805d5..11403ea 100644 --- a/init.lua +++ b/init.lua @@ -87,7 +87,7 @@ minetest.register_chatcommand("report", { end return true, S("Reported. Online moderator(s): @1", mod_list) else - email.send_mail(name, admin, S("Report: (no online moderator)", param)) + email.send_mail(name, admin, S("Report: @1 (no online moderator)", param)) for _, modo in ipairs(get_modo_list()) do if modo ~= admin then email.send_mail(name, modo, S("Report: @1 (no online moderator)", param)) From 2abc7e46ee4458da09e5d7d3e8387ae071a58037 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 2 Jul 2022 15:25:17 +0200 Subject: [PATCH 5/7] Remove load message at startup --- init.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/init.lua b/init.lua index 11403ea..a65a3ca 100644 --- a/init.lua +++ b/init.lua @@ -97,5 +97,3 @@ minetest.register_chatcommand("report", { end end }) - -minetest.log("action", "[report] loaded.") From 75ddb31b5b7b6e9255efa1658c4d733658278743 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 2 Jul 2022 15:27:55 +0200 Subject: [PATCH 6/7] Delete depends.txt and description.txt, add mod.conf --- depends.txt | 1 - description.txt | 1 - mod.conf | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 depends.txt delete mode 100644 description.txt create mode 100644 mod.conf diff --git a/depends.txt b/depends.txt deleted file mode 100644 index 7df2c28..0000000 --- a/depends.txt +++ /dev/null @@ -1 +0,0 @@ -email diff --git a/description.txt b/description.txt deleted file mode 100644 index e840629..0000000 --- a/description.txt +++ /dev/null @@ -1 +0,0 @@ -Allows players to report misconduct or bugs using /report. diff --git a/mod.conf b/mod.conf new file mode 100644 index 0000000..48b5baf --- /dev/null +++ b/mod.conf @@ -0,0 +1,4 @@ +name = report +title = Report +description = Allows players to report misconduct or bugs using /report. +depends = email From 1ae980fc430abbc7894e09c4879de1808f8b7439 Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 2 Jul 2022 16:27:32 +0200 Subject: [PATCH 7/7] Help of the command /report simplified. - Command "/report modos" renamed to "/report modos_list" - Add template.txt file in locale folder - Rewrite comments in english --- init.lua | 15 ++++++--------- locale/report.fr.tr | 4 ++-- locale/template.txt | 10 ++++++++++ 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 locale/template.txt diff --git a/init.lua b/init.lua index a65a3ca..8e4650d 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,6 @@ local function get_modo_list() if store then return minetest.deserialize(store) or {} end - return nil end @@ -22,21 +21,19 @@ local function is_known_modo(name) end minetest.register_on_joinplayer(function(player) - -- Obtenir les privs du player + -- Get player privs local player_name = player:get_player_name() local is_modo = minetest.check_player_privs(player_name, {kick = true, ban = true}) - -- Le joueur est-il un modérateur connu ? + -- Is player a known moderator? local known = is_known_modo(player_name) - -- Ajouter ou supprimer le joueur de la liste des modérateurs + -- Add or remove the player to/from moderators list if not known and is_modo then - -- Ajouter nom du player dans liste modos local modos = get_modo_list() table.insert(modos, player_name) storage:set_string("report", minetest.serialize(modos)) elseif known and not is_modo then - -- Supprimer nom du player de la liste modos local modos = get_modo_list() for i, modo in ipairs(modos) do if modo == player_name then @@ -49,14 +46,14 @@ minetest.register_on_joinplayer(function(player) end) minetest.register_chatcommand("report", { - description = S("Report: @1 to see moderators list. @2 is the message to report to moderators.", "'modos'", "'msg'"), - params = "modos|msg", + description = S("Send a report to moderators. '/report modos_list' to get the list of moderators."), + params = "", func = function(name, param) param = param:trim() if param == "" then return false, S("Please write a message for the report. If it's about one or several players in particular, please give their name.") end - if param == "modos" then + if param == "modos_list" then return true, S("Moderators list: @1", table.concat(get_modo_list(), ", ")) end local _, count = string.gsub(param, " ", "") diff --git a/locale/report.fr.tr b/locale/report.fr.tr index f684c57..76b0bca 100644 --- a/locale/report.fr.tr +++ b/locale/report.fr.tr @@ -1,5 +1,5 @@ # textdomain:report -Report: @1 to see moderators list. @2 is the message to report to moderators.=Report: @1 pour voir la liste des modérateurs. @2 est le message à rapporter aux modérateurs. +Send a report to moderators. '/report modos_list' to get the list of moderators.=Envoie un rapport aux modérateurs. '/report modos_list' pour obtenir la liste des modérateurs. Please write a message for the report. If it's about one or several players in particular, please give their name.=Veuillez écrire un message pour le rapport. Si il s'agit d'un ou plusieurs joueurs en particulier, veuillez aussi indiquer leur nom. Moderators list: @1=Liste de modérateurs : @1 If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)=Si vous rapportez l'attitude d'un joueur, vous devriez aussi dire quelle en est la raison. (Ex: insulte, sabotage) @@ -7,4 +7,4 @@ If you are reporting a player's attitude, you should also say why. (Ex: insult, Report: @1 (online moderator(s): @2)=Rapport : @1 (moderateur(s) connecté(s) : @2) Reported. Online moderator(s): @1=Rapporté. Moderateur(s) connecté(s) : @1 Report: @1 (no online moderator)=Rapport : @1 (pas de modérateur connecté) -Reported. We will get back to you.=Rapporté. On reviendra vers vous. \ No newline at end of file +Reported. We will get back to you.=Rapporté. On reviendra vers vous. diff --git a/locale/template.txt b/locale/template.txt new file mode 100644 index 0000000..053a04e --- /dev/null +++ b/locale/template.txt @@ -0,0 +1,10 @@ +# textdomain:report +Send a report to moderators. '/report modos_list' to get the list of moderators.= +Please write a message for the report. If it's about one or several players in particular, please give their name.= +Moderators list: @1= +If you are reporting a player's attitude, you should also say why. (Ex: insult, sabotage)= +-!- @1 has reported: @2= +Report: @1 (online moderator(s): @2)= +Reported. Online moderator(s): @1= +Report: @1 (no online moderator)= +Reported. We will get back to you.=