mirror of
https://github.com/mt-mods/mail.git
synced 2025-07-07 23:20:31 -04:00
Simplify sorting and make it more readable (#58)
* Simplify sorting and make it more readable * Make sorter local * Fix sorters dropdowns go back to default * Fix luacheck * Move sorting dropdown values to selected_idxs * Show previous sorters when going back from message/contacts/... * Use shallow copy instead of original table * Open mail interface with previous tab/dropdowns * Rework mail.sort_messages * Combine filter and sort, make filtering safe * Remove checks and logging from sorters --------- Co-authored-by: Athozus <athozus@gmail.com>
This commit is contained in:
SX
GitHub
parent
0435a0fd21
commit
67bda9a788
6 changed files with 108 additions and 168 deletions
128
ui/events.lua
128
ui/events.lua
|
|
@ -1,46 +1,44 @@
|
|||
|
||||
-- Getter to filter and sort messages on demand
|
||||
local function messageGetter(messages, sortfield, ascending, filter)
|
||||
local results
|
||||
return function()
|
||||
if not results then
|
||||
results = mail.sort_messages(messages, sortfield, ascending, filter)
|
||||
end
|
||||
return results
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||
if formname ~= "mail:inbox" and formname ~= "mail:sent" and formname ~= "mail:drafts" then
|
||||
return
|
||||
end
|
||||
|
||||
-- Get player name and handle / convert common input fields
|
||||
local name = player:get_player_name()
|
||||
local filter = fields.filter or ""
|
||||
local sortfieldindex = tonumber(fields.sortfield or mail.selected_idxs.sortfield[name]) or 3
|
||||
local sortdirection = fields.sortdirection or mail.selected_idxs.sortdirection[name] or "1"
|
||||
local inboxsortfield = ({"from","subject","time"})[sortfieldindex]
|
||||
local outboxsortfield = ({"to","subject","time"})[sortfieldindex]
|
||||
|
||||
-- Store common player configuration for reuse
|
||||
mail.selected_idxs.sortfield[name] = sortfieldindex
|
||||
mail.selected_idxs.sortdirection[name] = sortdirection
|
||||
|
||||
-- split inbox and sent msgs for different tests
|
||||
local entry = mail.get_storage_entry(name)
|
||||
|
||||
local messagesInboxUnAnalyzed = entry.inbox
|
||||
local messagesOutBoxUnAnalyzed = entry.outbox
|
||||
local messagesDrafts = entry.drafts
|
||||
local getInbox = messageGetter(entry.inbox, inboxsortfield, sortdirection == "2", filter)
|
||||
local getOutbox = messageGetter(entry.outbox, outboxsortfield, sortdirection == "2", filter)
|
||||
|
||||
-- filter inbox/outbox messages
|
||||
|
||||
local filter = fields.filter
|
||||
if not filter then
|
||||
filter = ""
|
||||
end
|
||||
|
||||
local messagesInboxFiltered = mail.filter_messages(messagesInboxUnAnalyzed, filter)
|
||||
local messagesOutboxFiltered = mail.filter_messages(messagesOutBoxUnAnalyzed, filter)
|
||||
|
||||
-- then sort them
|
||||
|
||||
local sortfield = tostring(fields.sortfield)
|
||||
local sortdirection = tostring(fields.sortdirection)
|
||||
if not sortfield or sortfield == "" or sortfield == "0" then
|
||||
sortfield = "3"
|
||||
end
|
||||
if not sortdirection or sortdirection == "" or sortdirection == "0" then
|
||||
sortdirection = "1"
|
||||
end
|
||||
|
||||
local messagesInbox = mail.sort_messages(messagesInboxFiltered, sortfield, sortdirection, filter)
|
||||
local messagesSent = mail.sort_messages(messagesOutboxFiltered, sortfield, sortdirection, filter)
|
||||
|
||||
-- Hanmdle formspec event
|
||||
if fields.inbox then -- inbox table
|
||||
local evt = minetest.explode_table_event(fields.inbox)
|
||||
mail.selected_idxs.inbox[name] = evt.row - 1
|
||||
if evt.type == "DCL" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||
if evt.type == "DCL" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
mail.show_message(name, getInbox()[mail.selected_idxs.inbox[name]].id)
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
|
@ -48,8 +46,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||
if fields.sent then -- sent table
|
||||
local evt = minetest.explode_table_event(fields.sent)
|
||||
mail.selected_idxs.sent[name] = evt.row - 1
|
||||
if evt.type == "DCL" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||
if evt.type == "DCL" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
mail.show_message(name, getOutbox()[mail.selected_idxs.sent[name]].id)
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
|
@ -72,21 +70,21 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||
|
||||
if fields.boxtab == "1" then
|
||||
mail.selected_idxs.boxtab[name] = 1
|
||||
mail.show_inbox(name, sortfield, sortdirection, filter)
|
||||
mail.show_inbox(name, sortfieldindex, sortdirection, filter)
|
||||
|
||||
elseif fields.boxtab == "2" then
|
||||
mail.selected_idxs.boxtab[name] = 2
|
||||
mail.show_sent(name, sortfield, sortdirection, filter)
|
||||
mail.show_sent(name, sortfieldindex, sortdirection, filter)
|
||||
|
||||
elseif fields.boxtab == "3" then
|
||||
mail.selected_idxs.boxtab[name] = 3
|
||||
mail.show_drafts(name)
|
||||
|
||||
elseif fields.read then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||
mail.show_message(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
||||
mail.show_message(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||
mail.show_message(name, getInbox()[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then -- sent table
|
||||
mail.show_message(name, getOutbox()[mail.selected_idxs.sent[name]].id)
|
||||
end
|
||||
|
||||
elseif fields.edit then
|
||||
|
|
@ -102,60 +100,60 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||
end
|
||||
|
||||
elseif fields.delete then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||
mail.delete_mail(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then -- sent table
|
||||
mail.delete_mail(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then -- inbox table
|
||||
mail.delete_mail(name, getInbox()[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then -- sent table
|
||||
mail.delete_mail(name, getOutbox()[mail.selected_idxs.sent[name]].id)
|
||||
elseif formname == "mail:drafts" and messagesDrafts[mail.selected_idxs.drafts[name]] then -- drafts table
|
||||
mail.delete_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
|
||||
end
|
||||
|
||||
mail.show_mail_menu(name, sortfield, sortdirection, filter)
|
||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||
|
||||
elseif fields.reply then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
local message = getInbox()[mail.selected_idxs.inbox[name]]
|
||||
mail.reply(name, message)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
local message = getOutbox()[mail.selected_idxs.sent[name]]
|
||||
mail.reply(name, message)
|
||||
end
|
||||
|
||||
elseif fields.replyall then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
local message = getInbox()[mail.selected_idxs.inbox[name]]
|
||||
mail.replyall(name, message)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
local message = getOutbox()[mail.selected_idxs.sent[name]]
|
||||
mail.replyall(name, message)
|
||||
end
|
||||
|
||||
elseif fields.forward then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
local message = messagesInbox[mail.selected_idxs.inbox[name]]
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
local message = getInbox()[mail.selected_idxs.inbox[name]]
|
||||
mail.forward(name, message)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
local message = messagesSent[mail.selected_idxs.sent[name]]
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
local message = getOutbox()[mail.selected_idxs.sent[name]]
|
||||
mail.forward(name, message)
|
||||
end
|
||||
|
||||
elseif fields.markread then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
mail.mark_read(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
mail.mark_read(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
mail.mark_read(name, getInbox()[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
mail.mark_read(name, getOutbox()[mail.selected_idxs.sent[name]].id)
|
||||
end
|
||||
|
||||
mail.show_mail_menu(name, sortfield, sortdirection, filter)
|
||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||
|
||||
elseif fields.markunread then
|
||||
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
|
||||
mail.mark_unread(name, messagesInbox[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and messagesSent[mail.selected_idxs.sent[name]] then
|
||||
mail.mark_unread(name, messagesSent[mail.selected_idxs.sent[name]].id)
|
||||
if formname == "mail:inbox" and getInbox()[mail.selected_idxs.inbox[name]] then
|
||||
mail.mark_unread(name, getInbox()[mail.selected_idxs.inbox[name]].id)
|
||||
elseif formname == "mail:sent" and getOutbox()[mail.selected_idxs.sent[name]] then
|
||||
mail.mark_unread(name, getOutbox()[mail.selected_idxs.sent[name]].id)
|
||||
end
|
||||
|
||||
mail.show_mail_menu(name, sortfield, sortdirection, filter)
|
||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||
|
||||
elseif fields.new then
|
||||
mail.show_compose(name)
|
||||
|
|
@ -170,7 +168,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
|
|||
mail.show_about(name)
|
||||
|
||||
elseif fields.sortfield or fields.sortdirection or fields.filter then
|
||||
mail.show_mail_menu(name, sortfield, sortdirection, filter)
|
||||
mail.show_mail_menu(name, sortfieldindex, sortdirection, filter)
|
||||
end
|
||||
|
||||
return true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue