History mods

js/main/bookmarks.js

@@ -38,7 +38,7 @@ App.setup_bookmarks = () => {
   App.setup_bookmarks_ready = true
 }
 
-App.get_bookmarks = async (query = ``, deep = false) => {
+App.get_bookmarks = async (query = ``, deep = false, by_what) => {
   App.getting(`bookmarks`)
   let results = []
 

js/main/filter.js

@@ -139,6 +139,7 @@ App.do_filter = async (args = {}) => {
         query: svalue,
         deep: args.deep,
         date: search_date,
+        by_what,
       })
 
       if (App.filter_search_date !== search_date) {
@@ -1002,7 +1003,7 @@ App.get_filter_exact = (mode) => {
 App.search_items = async (args = {}) => {
   let q = args.query || `Empty`
   App.debug(`Searching ${args.mode}: ${q}`)
-  let items = await App[`get_${args.mode}`](args.query, args.deep)
+  let items = await App[`get_${args.mode}`](args.query, args.deep, args.by_what)
 
   if (App.filter_search_date !== args.date) {
     return []
@@ -1297,7 +1298,7 @@ App.toggle_filter = (mode, cmd, refine = false) => {
     App.filter_all(mode)
     return
   }
-  
+
   App.set_filter_mode({mode, cmd, refine})
 }
 

js/main/history.js

@@ -24,24 +24,35 @@ App.history_time = (deep = false) => {
   return App.now() - (App.DAY * 30 * months)
 }
 
-App.get_history = async (query = ``, deep = false) => {
+App.get_history = async (query = ``, deep = false, by_what = `all`) => {
   App.getting(`history`)
   let results, max_items
 
   if (query && App.get_setting(`auto_deep_search_history`)) {
     deep = true
   }
 
-  if (deep) {
-    max_items = App.get_setting(`deep_max_search_items_history`)
+  let normal_max = App.get_setting(`max_search_items_history`)
+  let deep_max = App.get_setting(`deep_max_search_items_history`)
+  let text = ``
+
+  if (by_what.startsWith(`re`)) {
+    max_items = Math.max(deep_max, 10 * 1000)
   }
   else {
-    max_items = App.get_setting(`max_search_items_history`)
+    text = query
+
+    if (deep) {
+      max_items = deep_max
+    }
+    else {
+      max_items = normal_max
+    }
   }
 
   try {
     results = await browser.history.search({
-      text: ``,
+      text,
       maxResults: max_items,
       startTime: App.history_time(deep)
     })

manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Grasshopper",
-  "version": "3309",
+  "version": "3311",
   "description": "Godspeed You Tab Emperor",
   "permissions": [
     "tabs",