From 20e99909a542535e0284e5d50241476154666501 Mon Sep 17 00:00:00 2001
From: Deimos <deimos@tildes.net>
Date: Tue, 30 Jul 2019 18:06:17 -0600
Subject: [PATCH] Add basic group-specific search

If you search while inside a group, it will now search only inside that
group. A note at the top of the results page will explain this, and
includes a link to search across all groups instead.
---
 tildes/tildes/__init__.py                    |  2 ++
 tildes/tildes/routes.py                      |  2 ++
 tildes/tildes/templates/macros/forms.jinja2  | 12 ++++++++++--
 tildes/tildes/templates/search.jinja2        | 12 +++++++++++-
 tildes/tildes/templates/topic_listing.jinja2 |  6 +++---
 tildes/tildes/views/topic.py                 | 10 ++++++++++
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/tildes/tildes/__init__.py b/tildes/tildes/__init__.py
index 98284dd..8528847 100644
--- a/tildes/tildes/__init__.py
+++ b/tildes/tildes/__init__.py
@@ -137,6 +137,7 @@ def current_listing_base_url(
     base_vars_by_route: Dict[str, Tuple[str, ...]] = {
         "bookmarks": ("per_page", "type"),
         "group": ("order", "period", "per_page", "tag", "unfiltered"),
+        "group_search": ("order", "period", "per_page", "q"),
         "home": ("order", "period", "per_page", "tag", "unfiltered"),
         "search": ("order", "period", "per_page", "q"),
         "user": ("order", "per_page", "type"),
@@ -169,6 +170,7 @@ def current_listing_normal_url(
     normal_vars_by_route: Dict[str, Tuple[str, ...]] = {
         "bookmarks": ("order", "period", "per_page"),
         "group": ("order", "period", "per_page"),
+        "group_search": ("order", "period", "per_page", "q"),
         "home": ("order", "period", "per_page"),
         "notifications": ("per_page",),
         "search": ("order", "period", "per_page", "q"),
diff --git a/tildes/tildes/routes.py b/tildes/tildes/routes.py
index 4f7aa5b..ab5947e 100644
--- a/tildes/tildes/routes.py
+++ b/tildes/tildes/routes.py
@@ -36,6 +36,8 @@ def includeme(config: Configurator) -> None:
 
         config.add_route("group_topics", "/topics", factory=group_by_path)
 
+        config.add_route("group_search", "/search", factory=group_by_path)
+
         config.add_route("group_wiki", "/wiki", factory=group_by_path)
 
         # if you change this from "new_page" make sure to also edit
diff --git a/tildes/tildes/templates/macros/forms.jinja2 b/tildes/tildes/templates/macros/forms.jinja2
index a675476..84fa77f 100644
--- a/tildes/tildes/templates/macros/forms.jinja2
+++ b/tildes/tildes/templates/macros/forms.jinja2
@@ -61,8 +61,16 @@
   </div>
 {% endmacro %}
 
-{% macro search_form(existing_query=None) %}
-  <form class="form-search" method="GET" action="/search">
+{% macro search_form(existing_query=None, group=None) %}
+  <form
+    class="form-search"
+    method="GET"
+    {% if group %}
+      action="/~{{ group.path }}/search"
+    {% else %}
+      action="/search"
+    {% endif %}
+  >
     <div class="input-group">
       <input
         type="text"
diff --git a/tildes/tildes/templates/search.jinja2 b/tildes/tildes/templates/search.jinja2
index 8a08e81..5f28678 100644
--- a/tildes/tildes/templates/search.jinja2
+++ b/tildes/tildes/templates/search.jinja2
@@ -4,13 +4,23 @@
 {% extends 'topic_listing.jinja2' %}
 
 {% from 'macros/forms.jinja2' import search_form %}
+{% from 'macros/links.jinja2' import group_linked %}
 
 {% block title %}Search results for "{{ search }}"{% endblock %}
 
 {% block header_context_link %}<span class="site-header-context">Search: "{{ search }}"</span>{% endblock %}
 
+{% block filter_info %}
+  {% if group %}
+    <div class="topic-listing-filter">
+    Search results from inside {{ group_linked(group.path) }} only.
+    <a href="{{ request.route_url("search", _query={"q": search}) }}">Search all groups</a>
+    </div>
+  {% endif %}
+{% endblock %}
+
 {% block sidebar %}
-  {{ search_form(search) }}
+  {{ search_form(search, group) }}
 
   <h2>Search results</h2>
 
diff --git a/tildes/tildes/templates/topic_listing.jinja2 b/tildes/tildes/templates/topic_listing.jinja2
index 706c53d..7de5c1f 100644
--- a/tildes/tildes/templates/topic_listing.jinja2
+++ b/tildes/tildes/templates/topic_listing.jinja2
@@ -99,7 +99,7 @@
   {% endif %}
 </div>
 
-{% if search is not defined %}
+{% block filter_info %}
 <div class="topic-listing-filter">
 {% if tag %}
   {% if is_single_group %}
@@ -124,7 +124,7 @@
   <a href="{{ request.current_listing_normal_url({'unfiltered': 'true'}) }}">View unfiltered list</a>
 {% endif %}
 </div>
-{% endif %}
+{% endblock %}
 
 {% if topics.has_prev_page %}
   <div class="pagination">
@@ -206,7 +206,7 @@
 {% endblock %}
 
 {% block sidebar %}
-  {{ search_form() }}
+  {{ search_form(group=group) }}
 
   <h3>~{{ group.path }}</h3>
 
diff --git a/tildes/tildes/views/topic.py b/tildes/tildes/views/topic.py
index 346b1cc..6a33071 100644
--- a/tildes/tildes/views/topic.py
+++ b/tildes/tildes/views/topic.py
@@ -246,6 +246,7 @@ def get_group_topics(
 
 
 @view_config(route_name="search", renderer="search.jinja2")
+@view_config(route_name="group_search", renderer="search.jinja2")
 @use_kwargs(TopicListingSchema(only=("after", "before", "order", "per_page", "period")))
 @use_kwargs({"search": String(load_from="q", missing="")})
 def get_search(
@@ -259,6 +260,10 @@ def get_search(
 ) -> dict:
     """Get a list of search results."""
     # pylint: disable=too-many-arguments
+    group = None
+    if isinstance(request.context, Group):
+        group = request.context
+
     if order is missing:
         order = TopicSortOption.NEW
 
@@ -272,6 +277,10 @@ def get_search(
         .apply_sort_option(order)
     )
 
+    # if searching from inside a group, restrict to that group alone
+    if group:
+        query = query.inside_groups([group])
+
     # restrict the time period, if not set to "all time"
     if period:
         query = query.inside_time_period(period)
@@ -295,6 +304,7 @@ def get_search(
     return {
         "search": search,
         "topics": topics,
+        "group": group,
         "order": order,
         "order_options": TopicSortOption,
         "period": period,