v2: first search should use 'relevant' sort order. #318

Author: lemon24

src/reader/_app/v2/__init__.py

@@ -28,7 +28,6 @@ def entries():
     reader = get_reader()
 
     # TODO: search improvements
-    # TODO: search bug: first search uses recent
     # TODO: paqgination
     # TODO: read time
 
@@ -37,8 +36,12 @@ def entries():
     else:
         form = EntryFilter(request.args)
 
-    if form.args != request.args.to_dict():
-        return redirect(url_for('.entries', **form.args))
+    form_args = form.args
+    if q := form_args.pop('Q', ''):
+        form_args['q'] = q
+        return redirect(url_for('.entries', **form_args))
+    if form_args != request.args.to_dict():
+        return redirect(url_for('.entries', **form_args))
 
     feed = None
     if form.feed.data:

src/reader/_app/v2/forms.py

@@ -115,7 +115,7 @@ def radio_field(*args, choices, **kwargs):
 
 class EntryFilter(PresetsMixin, Form):
     feed = HiddenField("feed")
-    search = SearchField("search", name='q')
+    search = SearchField("search", name='Q')
     feed_tags = TagFilterField("tags", name='tags')
     read = radio_field("read", choices=BOOL_CHOICES, default='no')
     important = radio_field("important", choices=TRISTATE_CHOICES, default='maybe')
@@ -134,6 +134,7 @@ class EntryFilter(PresetsMixin, Form):
 
 
 class SearchEntryFilter(EntryFilter):
+    search = SearchField("search", name='q')
     sort = RadioField(
         "sort", choices=['relevant'] + ENTRY_SORT_CHOICES, default='relevant'
     )