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

Combine filter and sort, make filtering safe

Browse source
This commit is contained in:
SX 2023-04-10 13:10:07 +03:00 • committed by GitHub
parent de4bdb2f5d
commit d765b40ad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
storage.lua
View file

@ -43,8 +43,25 @@ function mail.get_message(playername, msg_id)
end
end
function mail.sort_messages(messages, sortfield, descending)
local results = {unpack(messages)}
local function safe_find(str, sub)
return str and sub and str:find(sub, 1, true) or nil
end
function mail.sort_messages(messages, sortfield, descending, filter)
local results = {}
-- Filtering
if filter and filter ~= "" then
for _, msg in ipairs(messages) do
if safe_find(msg.from, filter) or safe_find(msg.to, filter) or safe_find(msg.subject, filter) then
table.insert(results, msg)
end
end
else
for i = 1, #messages do
results[i] = messages[i]
end
end
-- Sorting
if sortfield ~= nil then
if descending then
table.sort(results, function(a, b)
@ -65,22 +82,6 @@ function mail.sort_messages(messages, sortfield, descending)
return results
end
function mail.filter_messages(unfiltered_messages, filter)
if not filter or filter == "" then
return unfiltered_messages
end
local filtered_messages = {}
for _, msg in ipairs(unfiltered_messages) do
if string.find(msg.from, filter) or string.find(msg.to, filter) or string.find(msg.subject, filter) then
table.insert(filtered_messages, msg)
end
end
return filtered_messages
end
-- marks a mail read by its id
function mail.mark_read(playername, msg_id)
local entry = mail.get_storage_entry(playername)

2
ui/events.lua
View file

@ -4,7 +4,7 @@ local function messageGetter(messages, sortfield, ascending, filter)
local results
return function()
if not results then
results = mail.sort_messages(mail.filter_messages(messages, filter), sortfield, ascending)
results = mail.sort_messages(messages, sortfield, ascending, filter)
end
return results
end

7
ui/inbox.lua
View file

@ -34,11 +34,8 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
table[0,0.7;5.75,8.35;inbox;#999,]] .. S("From") .. "," .. S("Subject")
local formspec = { inbox_formspec }
local entry = mail.get_storage_entry(name)
local messages = mail.sort_messages(
mail.filter_messages(entry.inbox, filter),
({"from","subject","time"})[sortfieldindex],
sortdirection == "2"
)
local sortfield = ({"from","subject","time"})[sortfieldindex]
local messages = mail.sort_messages(entry.inbox, sortfield, sortdirection == "2", filter)
mail.message_drafts[name] = nil

7
ui/outbox.lua
View file

@ -32,11 +32,8 @@ function mail.show_sent(name, sortfieldindex, sortdirection, filter)
table[0,0.7;5.75,8.35;sent;#999,]] .. S("To") .. "," .. S("Subject")
local formspec = { sent_formspec }
local entry = mail.get_storage_entry(name)
local messages = mail.sort_messages(
mail.filter_messages(entry.outbox, filter),
({"to","subject","time"})[sortfieldindex],
sortdirection == "2"
)
local sortfield = ({"to","subject","time"})[sortfieldindex]
local messages = mail.sort_messages(entry.outbox, sortfield, sortdirection == "2", filter)
mail.message_drafts[name] = nil