From 9bc190443c60a9ccad101a6ac782a08f89544352 Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Sun, 24 Jan 2021 23:08:49 +0100
Subject: [PATCH] Fix search filters

---
 API.md   | 20 +++++++++++---------
 init.lua | 16 +++++++++-------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/API.md b/API.md
index 7aeb05b..864ab01 100644
--- a/API.md
+++ b/API.md
@@ -185,7 +185,7 @@ Returns a map of recipe filters, indexed by name.
 ### Search filters
 
 Search filters are used to perform specific searches inside the search field.
-You can cumulate several filters to perform a specific search.
+These filters are cumulative to perform a specific search.
 They can be used like so: `<optional_name> +<filter name>=<value1>,<value2>,<...>`
 
 Example usages:
@@ -200,20 +200,22 @@ Notes:
 
 #### `i3.add_search_filter(name, function(item, values))`
 
-Adds a search filter with the given `name`.
+Adds a search filter with the given `name`. `values` is a table of all possible values.
 The search function must return a boolean value (whether the given item should be listed or not).
 
 Example function sorting items by drawtype:
 
 ```lua
-i3.add_search_filter("type", function(item, drawtype)
-	if drawtype == "node" then
-		return reg_nodes[item]
-	elseif drawtype == "item" then
-		return reg_craftitems[item]
-	elseif drawtype == "tool" then
-		return reg_tools[item]
+i3.add_search_filter("types", function(item, drawtypes)
+	local t = {}
+
+	for i, dt in ipairs(drawtypes) do
+		t[i] = (dt == "node" and reg_nodes[item] and 1) or
+		       (dt == "item" and reg_craftitems[item] and 1) or
+		       (dt == "tool" and reg_tools[item] and 1) or nil
 	end
+
+	return #t > 0
 end)
 ```
 
diff --git a/init.lua b/init.lua
index 5aea816..a60de83 100644
--- a/init.lua
+++ b/init.lua
@@ -2512,14 +2512,16 @@ i3.add_search_filter("groups", function(item, groups)
 	return has_groups
 end)
 
-i3.add_search_filter("type", function(item, drawtype)
-	if drawtype == "node" then
-		return reg_nodes[item]
-	elseif drawtype == "item" then
-		return reg_craftitems[item]
-	elseif drawtype == "tool" then
-		return reg_tools[item]
+i3.add_search_filter("types", function(item, drawtypes)
+	local t = {}
+
+	for i, dt in ipairs(drawtypes) do
+		t[i] = (dt == "node" and reg_nodes[item] and 1) or
+		       (dt == "item" and reg_craftitems[item] and 1) or
+		       (dt == "tool" and reg_tools[item] and 1) or nil
 	end
+
+	return #t > 0
 end)
 
 --[[	As `core.get_craft_recipe` and `core.get_all_craft_recipes` do not