From 3e2d022c8796fc9024e4a1d5b14f954ee572709f Mon Sep 17 00:00:00 2001 From: Athozus Date: Wed, 5 Apr 2023 17:40:40 +0200 Subject: [PATCH] Add sorters for inbox/outbox --- storage.lua | 40 ++++++++++++++++++++++++++++++++++++++++ ui/events.lua | 15 +++++++++++++-- ui/inbox.lua | 45 +++++++++++++++++++++++++++------------------ ui/outbox.lua | 41 +++++++++++++++++++++++++---------------- 4 files changed, 105 insertions(+), 36 deletions(-) diff --git a/storage.lua b/storage.lua index cd8cffd..98c4287 100644 --- a/storage.lua +++ b/storage.lua @@ -43,6 +43,46 @@ function mail.get_message(playername, msg_id) end end +function mail.sort_messages(unsorted_messages, sortfield, sortdirection) + local messages = {} + if not sortfield then + local sortfield = 3 + end + if not sortdirection then + local sortdirection = 1 + end + + if unsorted_messages[1] then + -- add first message + table.insert(messages, unsorted_messages[1]) + table.remove(unsorted_messages, 1) + -- sort messages + for i, unsorted_msg in ipairs(unsorted_messages) do + local is_message_sorted = false + for j, sorted_msg in ipairs(messages) do + if sortfield == 1 and unsorted_msg.from >= sorted_msg.from then + table.insert(messages, j+1, unsorted_msg) + is_message_sorted = true + break + elseif sortfield == 2 and unsorted_msg.subject >= sorted_msg.subject then + table.insert(messages, j+1, unsorted_msg) + is_message_sorted = true + break + elseif sortfield == 3 and unsorted_msg.time >= sorted_msg.time then + table.insert(messages, j+1, unsorted_msg) + is_message_sorted = true + break + end + end + if not is_message_sorted then + table.insert(messages, 1, unsorted_msg) + end + end + end + + return messages +end + -- marks a mail read by its id function mail.mark_read(playername, msg_id) local entry = mail.get_storage_entry(playername) diff --git a/ui/events.lua b/ui/events.lua index ae0f823..e78aa09 100644 --- a/ui/events.lua +++ b/ui/events.lua @@ -7,9 +7,18 @@ 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 sortfield = fields.sortfield + local sortdirection = 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 = entry.inbox - local messagesSent = entry.outbox + local messagesInbox = mail.sort_messages(entry.inbox, fields.sortfield, fields.sortdirection) + local messagesSent = mail.sort_messages(entry.outbox, fields.sortfield, fields.sortdirection) local messagesDrafts = entry.drafts if fields.inbox then -- inbox table @@ -145,6 +154,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 then + mail.show_inbox(name, fields.sortfield, fields.sortdirection) end return true diff --git a/ui/inbox.lua b/ui/inbox.lua index b9ab082..83a0ae5 100644 --- a/ui/inbox.lua +++ b/ui/inbox.lua @@ -1,30 +1,39 @@ -- translation local S = minetest.get_translator("mail") -local inbox_formspec = "size[8.5,10;]" .. mail.theme .. [[ - tabheader[0.3,1;boxtab;]] .. S("Inbox") .. "," .. S("Sent messages").. "," .. S("Drafts") .. [[;1;false;false] - button[6,0.10;2.5,0.5;new;]] .. S("New") .. [[] - button[6,0.95;2.5,0.5;read;]] .. S("Read") .. [[] - button[6,1.70;2.5,0.5;reply;]] .. S("Reply") .. [[] - button[6,2.45;2.5,0.5;replyall;]] .. S("Reply all") .. [[] - button[6,3.20;2.5,0.5;forward;]] .. S("Forward") .. [[] - button[6,3.95;2.5,0.5;delete;]] .. S("Delete") .. [[] - button[6,4.82;2.5,0.5;markread;]] .. S("Mark Read") .. [[] - button[6,5.55;2.5,0.5;markunread;]] .. S("Mark Unread") .. [[] - button[6,6.8;2.5,0.5;contacts;]] .. S("Contacts") .. [[] - button[6,7.6;2.5,0.5;maillists;]] .. S("Mail lists") .. [[] - button[6,8.7;2.5,0.5;about;]] .. S("About") .. [[] - button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[] +function mail.show_inbox(name, sortfield, 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 - tablecolumns[color;text;text] - table[0,0.7;5.75,9.35;inbox;#999,]] .. S("From") .. "," .. S("Subject") + local inbox_formspec = "size[8.5,10;]" .. mail.theme .. [[ + tabheader[0.3,1;boxtab;]] .. S("Inbox") .. "," .. S("Sent messages").. "," .. S("Drafts") .. [[;1;false;false] + button[6,0.10;2.5,0.5;new;]] .. S("New") .. [[] + button[6,0.95;2.5,0.5;read;]] .. S("Read") .. [[] + button[6,1.70;2.5,0.5;reply;]] .. S("Reply") .. [[] + button[6,2.45;2.5,0.5;replyall;]] .. S("Reply all") .. [[] + button[6,3.20;2.5,0.5;forward;]] .. S("Forward") .. [[] + button[6,3.95;2.5,0.5;delete;]] .. S("Delete") .. [[] + button[6,4.82;2.5,0.5;markread;]] .. S("Mark Read") .. [[] + button[6,5.55;2.5,0.5;markunread;]] .. S("Mark Unread") .. [[] + button[6,6.8;2.5,0.5;contacts;]] .. S("Contacts") .. [[] + button[6,7.6;2.5,0.5;maillists;]] .. S("Mail lists") .. [[] + button[6,8.7;2.5,0.5;about;]] .. S("About") .. [[] + button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[] -function mail.show_inbox(name) + dropdown[0,9.4;2,0.5;sortfield;]] .. S("From") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] .. tostring(sortfield) .. [[;1] + dropdown[2.2,9.4;2,0.5;sortdirection;]] .. S("Ascending") .. "," .. S("Descending") .. [[;]] .. tostring(sortdirection) .. [[;1] + + tablecolumns[color;text;text] + 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 = entry.inbox + local messages = mail.sort_messages(entry.inbox, sortfield, sortdirection) mail.message_drafts[name] = nil diff --git a/ui/outbox.lua b/ui/outbox.lua index 0eeecc6..b9dc635 100644 --- a/ui/outbox.lua +++ b/ui/outbox.lua @@ -1,28 +1,37 @@ -- translation local S = minetest.get_translator("mail") -local sent_formspec = "size[8.5,10;]" .. mail.theme .. [[ - tabheader[0.3,1;boxtab;]] .. S("Inbox") .. "," .. S("Sent messages").. "," .. S("Drafts") .. [[;2;false;false] - button[6,0.10;2.5,0.5;new;]] .. S("New") .. [[] - button[6,0.95;2.5,0.5;read;]] .. S("Read") .. [[] - button[6,1.70;2.5,0.5;reply;]] .. S("Reply") .. [[] - button[6,2.45;2.5,0.5;replyall;]] .. S("Reply all") .. [[] - button[6,3.20;2.5,0.5;forward;]] .. S("Forward") .. [[] - button[6,3.95;2.5,0.5;delete;]] .. S("Delete") .. [[] - button[6,6.8;2.5,0.5;contacts;]] .. S("Contacts") .. [[] - button[6,7.6;2.5,0.5;maillists;]] .. S("Mail lists") .. [[] - button[6,8.7;2.5,0.5;about;]] .. S("About") .. [[] - button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[] +function mail.show_sent(name, sortfield, 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 - tablecolumns[color;text;text] - table[0,0.7;5.75,9.35;sent;#999,]] .. S("To") .. "," .. S("Subject") + local sent_formspec = "size[8.5,10;]" .. mail.theme .. [[ + tabheader[0.3,1;boxtab;]] .. S("Inbox") .. "," .. S("Sent messages").. "," .. S("Drafts") .. [[;2;false;false] + button[6,0.10;2.5,0.5;new;]] .. S("New") .. [[] + button[6,0.95;2.5,0.5;read;]] .. S("Read") .. [[] + button[6,1.70;2.5,0.5;reply;]] .. S("Reply") .. [[] + button[6,2.45;2.5,0.5;replyall;]] .. S("Reply all") .. [[] + button[6,3.20;2.5,0.5;forward;]] .. S("Forward") .. [[] + button[6,3.95;2.5,0.5;delete;]] .. S("Delete") .. [[] + button[6,6.8;2.5,0.5;contacts;]] .. S("Contacts") .. [[] + button[6,7.6;2.5,0.5;maillists;]] .. S("Mail lists") .. [[] + button[6,8.7;2.5,0.5;about;]] .. S("About") .. [[] + button_exit[6,9.5;2.5,0.5;quit;]] .. S("Close") .. [[] -function mail.show_sent(name) + dropdown[0,9.4;2,0.5;sortfield;]] .. S("From") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] .. tostring(sortfield) .. [[;1] + dropdown[2.2,9.4;2,0.5;sortdirection;]] .. S("Ascending") .. "," .. S("Descending") .. [[;]] .. tostring(sortdirection) .. [[;1] + + tablecolumns[color;text;text] + 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 = entry.outbox + local messages = mail.sort_messages(entry.outbox, sortfield, sortdirection) mail.message_drafts[name] = nil