From a71283e6d5252a57f8ccd80e5e05c5c3b4da9512 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 2 Jun 2024 14:38:11 -0400
Subject: [PATCH] improve trend

---
 catalog/jobs/discover.py | 14 ++++----------
 neodb-takahe             |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/catalog/jobs/discover.py b/catalog/jobs/discover.py
index 33e63935..fff5d238 100644
--- a/catalog/jobs/discover.py
+++ b/catalog/jobs/discover.py
@@ -103,12 +103,8 @@ class DiscoverGenerator(BaseJob):
                     DAYS_FOR_TRENDS, item_ids
                 )[:3]
             for i in Item.objects.filter(pk__in=set(item_ids)):
-                er = (
-                    i.external_resources.exclude(id_type=IdType.Fediverse).first()
-                    or i.external_resources.first()
-                )
                 cnt = ShelfMember.objects.filter(
-                    item=i, created_time__gt=timezone.now() - timedelta(days=1)
+                    item=i, created_time__gt=timezone.now() - timedelta(days=7)
                 ).count()
                 trends.append(
                     {
@@ -116,19 +112,17 @@ class DiscoverGenerator(BaseJob):
                         "description": i.brief,
                         "url": i.absolute_url,
                         "image": i.cover_image_url or "",
-                        "provider_name": str(er.site_name.label)
-                        if er
-                        else settings.SITE_INFO["site_name"],
+                        "provider_name": str(i.category.label),
                         "history": [
                             {
-                                "day": int(time.time() / 38600) * 38600,
+                                "day": int(time.time() / 38600 - 3) * 38600,
                                 "accounts": cnt,
                                 "uses": cnt,
                             }
                         ],
                     }
                 )
-
+        trends.sort(key=lambda x: x["history"][0]["accounts"], reverse=True)
         cache.set(cache_key, gallery_list, timeout=None)
         cache.set("trends_links", trends, timeout=None)
         logger.info(f"Discover data updated, trends: {len(trends)}.")
diff --git a/neodb-takahe b/neodb-takahe
index 8127c17e..a3002178 160000
--- a/neodb-takahe
+++ b/neodb-takahe
@@ -1 +1 @@
-Subproject commit 8127c17ece569bf2483ea1b8715509d79db5d9c1
+Subproject commit a30021784b52f9d55d33af927145c273f9c49b96