From b784e9599d3d4292e96b55841e33b77ae2fc3585 Mon Sep 17 00:00:00 2001
From: SX <50966843+S-S-X@users.noreply.github.com>
Date: Mon, 10 Apr 2023 13:10:07 +0300
Subject: [PATCH] Combine filter and sort, make filtering safe

---
 storage.lua   | 37 +++++++++++++++++++------------------
 ui/events.lua |  2 +-
 ui/inbox.lua  |  7 ++-----
 ui/outbox.lua |  7 ++-----
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/storage.lua b/storage.lua
index ac53b99..37c145f 100644
--- a/storage.lua
+++ b/storage.lua
@@ -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)
diff --git a/ui/events.lua b/ui/events.lua
index 487b666..6ff24bc 100644
--- a/ui/events.lua
+++ b/ui/events.lua
@@ -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
diff --git a/ui/inbox.lua b/ui/inbox.lua
index a538abd..554ce85 100644
--- a/ui/inbox.lua
+++ b/ui/inbox.lua
@@ -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
 
diff --git a/ui/outbox.lua b/ui/outbox.lua
index 9d9175e..97e6a2f 100644
--- a/ui/outbox.lua
+++ b/ui/outbox.lua
@@ -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