filter simplifications

README.md

@@ -130,13 +130,16 @@ For using a tooltip filter as the first filter part there is an explicit **toolt
 
 Here are some queries I use myself for illustration:
 
-**or/and2/buy-profit/5g/buy-pct/60/and3/bid-profit/5g/bid-pct/60/left/30m**<br/>
+**or/and2/profit/5g/percent/60/and3/bid-profit/5g/bid-percent/60/left/30m**<br/>
 This filter will search the whole auction house for auctions either with a buyout price of 5g or more higher than the market value and 60% or less of the market value or a bid price for which the same is true and in addition only 30m or less remaining.
 
+**wrangler's wristbands/exact/or2/and2/+3 agility/+3 stamina/+5 stamina/price/1g**<br/>
+This will search for wrangler's wristband with 3/3 monkey or 5 stam suffixes for at most 1g buyout price.
+
 **recipe/usable/not/libram**<br/>
 This will scan for usable recipes and exclude those with "libram" in the tooltip (i.e., librams)
 
-**armor/cloth/50/and/intellect/stamina**<br/>
+**armor/cloth/50/intellect/stamina**<br/>
 This will scan the auction house for cloth armor which has a requirement of at least lvl 50 as well both intellect and stamina stats.
 
 ## Historical Value

tabs/search/filter.lua

@@ -323,7 +323,7 @@ function set_filter_display_offset(x_offset, y_offset)
 end
 
 function initialize_filter_dropdown()
-	for _, filter in ipairs(temp-A('and', 'or', 'not', 'min-unit-bid', 'min-unit-buy', 'max-unit-bid', 'max-unit-buy', 'bid-profit', 'buy-profit', 'bid-vend-profit', 'buy-vend-profit', 'bid-dis-profit', 'buy-dis-profit', 'bid-pct', 'buy-pct', 'item', 'tooltip', 'min-lvl', 'max-lvl', 'rarity', 'left', 'utilizable')) do
+	for _, filter in ipairs(temp-A('and', 'or', 'not', 'price', 'profit', 'vend-profit', 'disenchant-profit', 'percent', 'bid-price', 'bid-profit', 'bid-vend-profit', 'bid-disenchant-profit', 'bid-percent', 'item', 'tooltip', 'min-level', 'max-level', 'rarity', 'left', 'utilizable')) do
 		UIDropDownMenu_AddButton(O(
 			'text', filter,
 			'value', filter,

util/filter.lua

@@ -68,7 +68,7 @@ M.filters = {
         end
     },
 
-    ['min-lvl'] = {
+    ['min-level'] = {
         input_type = 'number',
         validator = function(level)
             return function(auction_record)
@@ -77,7 +77,7 @@ M.filters = {
         end
     },
 
-    ['max-lvl'] = {
+    ['max-level'] = {
         input_type = 'number',
         validator = function(level)
             return function(auction_record)
@@ -86,25 +86,7 @@ M.filters = {
         end
     },
 
-    ['min-unit-bid'] = {
+    ['bid-price'] = {
-        input_type = 'money',
-        validator = function(amount)
-            return function(auction_record)
-                return auction_record.unit_bid_price >= amount
-            end
-        end
-    },
-
-    ['min-unit-buy'] = {
-        input_type = 'money',
-        validator = function(amount)
-            return function(auction_record)
-                return auction_record.unit_buyout_price >= amount
-            end
-        end
-    },
-
-    ['max-unit-bid'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)
@@ -113,7 +95,7 @@ M.filters = {
         end
     },
 
-    ['max-unit-buy'] = {
+    ['price'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)
@@ -122,7 +104,7 @@ M.filters = {
         end
     },
 
-    ['bid-pct'] = {
+    ['bid-percent'] = {
         input_type = 'number',
         validator = function(pct)
             return function(auction_record)
@@ -131,7 +113,7 @@ M.filters = {
         end
     },
 
-    ['buy-pct'] = {
+    ['percent'] = {
         input_type = 'number',
         validator = function(pct)
             return function(auction_record)
@@ -151,7 +133,7 @@ M.filters = {
         end
     },
 
-    ['buy-profit'] = {
+    ['profit'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)
@@ -160,7 +142,7 @@ M.filters = {
         end
     },
 
-    ['bid-dis-profit'] = {
+    ['bid-disenchant-profit'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)
@@ -170,7 +152,7 @@ M.filters = {
         end
     },
 
-    ['buy-dis-profit'] = {
+    ['disenchant-profit'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)
@@ -190,7 +172,7 @@ M.filters = {
         end
     },
 
-    ['buy-vend-profit'] = {
+    ['vend-profit'] = {
         input_type = 'money',
         validator = function(amount)
             return function(auction_record)