An open source, non-profit web search engine
Use new curation class in activity feed
Daoud Clarkee149645bab15
diff --git a/devdata/index-v2.tinysearch b/devdata/index-v2.tinysearchindex b0e3cee..d486421 100644Binary files a/devdata/index-v2.tinysearch and b/devdata/index-v2.tinysearch differdiff --git a/mwmbl/templates/home.html b/mwmbl/templates/home.htmlindex 3620c94..6de4c8f 100644--- a/mwmbl/templates/home.html+++ b/mwmbl/templates/home.html@@ -23,7 +23,8 @@<ul><li class="activity"><h1>- {{ item.user }} made {{ item.num_curations | apnumber }} changes to <a href="{{ item.url }}">{{ item.query }}</a> {{ item.timestamp | naturaltime }}.+ {% if item.user %}{{ item.user }}{% else %}Anonymous{% endif %} made {{ item.num_changes | apnumber }}+ changes to <a href="/?q={{ item.query|urlencode }}">{{ item.query }}</a> {{ item.timestamp | naturaltime }}.</h1></li></ul>diff --git a/mwmbl/templates/result.html b/mwmbl/templates/result.htmlindex 8445c11..958b383 100644--- a/mwmbl/templates/result.html+++ b/mwmbl/templates/result.html@@ -20,10 +20,6 @@hx-include=".result"hx-vals='{"approve_url": "{{ result.url }}", "query": "{{ query }}"{% if curation_id %}, "curation_id": {{ curation_id }}{% endif %}}'hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'>✓</button>-{# {% if result.state.value >= 7 %}#}-{# <button class="button move-up">↑</button>#}-{# <button class="button move-down">↓</button>#}-{# {% endif %}#}</div></div></li>diff --git a/mwmbl/views.py b/mwmbl/views.pyindex 30f27a7..f81fdc7 100644--- a/mwmbl/views.py+++ b/mwmbl/views.py@@ -88,15 +88,6 @@ def home_fragment(request):return response-@dataclass-class Activity:- user: MwmblUser- num_curations: int- timestamp: datetime- query: str- url: str--def _get_results_and_activity(request):query = request.GET.get("q")if query:@@ -117,23 +108,7 @@ def _get_results_and_activity(request):activity = Noneelse:results = None- curations = UserCuration.objects.order_by("-timestamp")[:1000]- sorted_curations = sorted(curations, key=lambda x: x.user.username)- groups = groupby(sorted_curations, key=lambda x: (x.user.username, x.url))- unsorted_activity = []- for (user, url), group in groups:- parsed_url_query = parse_qs(urlparse(url).query)- activity_query = parsed_url_query.get("q", [""])[0]- group = list(group)- unsorted_activity.append(Activity(- user=user,- num_curations=len(group),- timestamp=max([i.timestamp for i in group]),- query=activity_query,- url=url,- ))-- activity = sorted(unsorted_activity, key=lambda a: a.timestamp, reverse=True)+ activity = Curation.objects.order_by("-timestamp")[:500]return activity, query, results@@ -234,6 +209,7 @@ def approve(request):query=query,original_results=[asdict(d) for d in documents.values()],new_results=reranked_document_dicts,+ num_changes=1,)curation.save()