sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-07-04 21:50:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix maillists issues (#49)

Browse source 
* Fix maillist deletion

* Fix duplicating of maillist while changing its name

* Permit sub-lists

* Fix messages with no mailing lists
This commit is contained in:
Athozus 2023-04-02 10:37:58 +02:00 • committed by GitHub
parent 2f996b59cd
commit 418cda1adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
storage.lua
View file

@ -148,21 +148,17 @@ function mail.get_maillist_by_name(playername, listname)
end
-- updates or creates a maillist
function mail.update_maillist(playername, list)
function mail.update_maillist(playername, list, old_list_name)
local entry = mail.get_storage_entry(playername)
local existing_updated = false
for i, existing_list in ipairs(entry.lists) do
if existing_list.name == list.name then
-- update
entry.lists[i] = list
existing_updated = true
if existing_list.name == old_list_name then
-- delete
table.remove(entry.lists, i)
break
end
end
if not existing_updated then
-- insert
table.insert(entry.lists, list)
end
-- insert
table.insert(entry.lists, list)
mail.set_storage_entry(playername, entry)
end
@ -179,22 +175,26 @@ function mail.delete_maillist(playername, listname)
end
function mail.extractMaillists(receivers_string, maillists_owner)
local globalReceivers = mail.parse_player_list(receivers_string) -- receivers including maillists
local receivers = {} -- extracted receivers
local receivers = mail.parse_player_list(receivers_string) -- extracted receivers
-- extract players from mailing lists
for _, receiver in ipairs(globalReceivers) do
local receiverInfo = receiver:split("@") -- @maillist
if receiverInfo[1] and receiver == "@" .. receiverInfo[1] then
local maillist = mail.get_maillist_by_name(maillists_owner, receiverInfo[1])
if maillist then
for _, playername in ipairs(maillist.players) do
table.insert(receivers, playername)
while string.find(receivers_string, "@") do
local globalReceivers = mail.parse_player_list(receivers_string) -- receivers including maillists
receivers = {}
for _, receiver in ipairs(globalReceivers) do
local receiverInfo = receiver:split("@") -- @maillist
if receiverInfo[1] and receiver == "@" .. receiverInfo[1] then
local maillist = mail.get_maillist_by_name(maillists_owner, receiverInfo[1])
if maillist then
for _, playername in ipairs(maillist.players) do
table.insert(receivers, playername)
end
end
else -- in case of player
table.insert(receivers, receiver)
end
else -- in case of player
table.insert(receivers, receiver)
end
receivers_string = mail.concat_player_list(receivers)
end
return receivers