sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-04-30 16:31:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exclude sender from (mailing list) recipients

Browse source
This commit is contained in:
y5nw 2024-01-13 20:51:10 +01:00
parent c7f631664e
commit 0bfb4d5cbc
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
util/normalize.lua
View file

@ -1,8 +1,8 @@
local S = minetest.get_translator("mail") local S = minetest.get_translator("mail")
local function recursive_expand_recipient_names(sender, list, recipients, undeliverable) local function recursive_expand_recipient_names(sender, list, is_toplevel, recipients, undeliverable)
for _, name in ipairs(list) do for _, name in ipairs(list) do
if not (recipients[name] or undeliverable[name]) then if not (recipients[name] or undeliverable[name] or (name == sender and not is_toplevel)) then
local succ, value local succ, value
for _, handler in ipairs(mail.registered_recipient_handlers) do for _, handler in ipairs(mail.registered_recipient_handlers) do
succ, value = handler(sender, name) succ, value = handler(sender, name)
@ -13,9 +13,9 @@ local function recursive_expand_recipient_names(sender, list, recipients, undeli
local vtp = type(value) local vtp = type(value)
if succ then if succ then
if vtp == "string" then if vtp == "string" then
recursive_expand_recipient_names(sender, {value}, recipients, undeliverable) recursive_expand_recipient_names(sender, {value}, false, recipients, undeliverable)
elseif vtp == "table" then elseif vtp == "table" then
recursive_expand_recipient_names(sender, value, recipients, undeliverable) recursive_expand_recipient_names(sender, value, false, recipients, undeliverable)
elseif vtp == "function" then elseif vtp == "function" then
recipients[name] = value recipients[name] = value
else else
@ -37,7 +37,7 @@ and add individual player names to recipient list
--]] --]]
function mail.normalize_players_and_add_recipients(sender, field, recipients, undeliverable) function mail.normalize_players_and_add_recipients(sender, field, recipients, undeliverable)
local order = mail.parse_player_list(field) local order = mail.parse_player_list(field)
recursive_expand_recipient_names(sender, order, recipients, undeliverable) recursive_expand_recipient_names(sender, order, true, recipients, undeliverable)
return mail.concat_player_list(order) return mail.concat_player_list(order)
end end