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

Message filters/sorters (#56)

Browse source 
* Add sorters for inbox/outbox

* Add ascending/descending, fix selection issue

* Add filters

* Update translations

* Fix UI

* Fix luacheck

* Fix fields disappearing after clicking on tabs/buttons

* Fix luacheck (2)

* Fix first message not sorted correctly
This commit is contained in:
Athozus 2023-04-07 10:19:30 +02:00 • committed by GitHub
parent def93bdd0f
commit da05b5d108
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 265 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

40
ui/events.lua
View file

@ -8,10 +8,34 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
-- split inbox and sent msgs for different tests
local entry = mail.get_storage_entry(name)
local messagesInbox = entry.inbox
local messagesSent = entry.outbox
local messagesInboxUnAnalyzed = entry.inbox
local messagesOutBoxUnAnalyzed = entry.outbox
local messagesDrafts = entry.drafts
-- 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)
if fields.inbox then -- inbox table
local evt = minetest.explode_table_event(fields.inbox)
mail.selected_idxs.inbox[name] = evt.row - 1
@ -48,11 +72,11 @@ 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)
mail.show_inbox(name, sortfield, sortdirection, filter)
elseif fields.boxtab == "2" then
mail.selected_idxs.boxtab[name] = 2
mail.show_sent(name)
mail.show_sent(name, sortfield, sortdirection, filter)
elseif fields.boxtab == "3" then
mail.selected_idxs.boxtab[name] = 3
@ -86,7 +110,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
mail.delete_mail(name, messagesDrafts[mail.selected_idxs.drafts[name]].id)
end
mail.show_mail_menu(name)
mail.show_mail_menu(name, sortfield, sortdirection, filter)
elseif fields.reply then
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
@ -122,7 +146,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
mail.mark_read(name, messagesSent[mail.selected_idxs.sent[name]].id)
end
mail.show_mail_menu(name)
mail.show_mail_menu(name, sortfield, sortdirection, filter)
elseif fields.markunread then
if formname == "mail:inbox" and messagesInbox[mail.selected_idxs.inbox[name]] then
@ -131,7 +155,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
mail.mark_unread(name, messagesSent[mail.selected_idxs.sent[name]].id)
end
mail.show_mail_menu(name)
mail.show_mail_menu(name, sortfield, sortdirection, filter)
elseif fields.new then
mail.show_compose(name)
@ -145,6 +169,8 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
elseif fields.about then
mail.show_about(name)
elseif fields.sortfield or fields.sortdirection or fields.filter then
mail.show_mail_menu(name, sortfield, sortdirection, filter)
end
return true