From 1bd3de276fe91d5587c5cbca83c6ac6bb9b629fb Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Sun, 13 Oct 2024 13:48:08 -0700 Subject: [PATCH] Showing 5 distinct related feeds in title bar. --- Makefile | 1 + apps/rss_feeds/models.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 31f125995..93892dfa5 100644 --- a/Makefile +++ b/Makefile @@ -179,6 +179,7 @@ monitor: deploy_monitor deploy_staging: ansible-playbook ansible/deploy.yml -l staging staging: deploy_staging +deploy_staging_static: staging_static staging_static: ansible-playbook ansible/deploy.yml -l staging --tags static celery_stop: diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index c1d0522d4..c98b618d6 100755 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -1073,13 +1073,15 @@ class Feed(models.Model): feed_ids = [result["_source"]["feed_id"] for result in results] similar_feeds = Feed.objects.filter(pk__in=feed_ids).distinct("feed_title") try: - self.similar_feeds.set(feed_ids) + self.similar_feeds.set(similar_feeds) except IntegrityError: logging.debug(f" ---> ~FRIntegrity error adding similar feed: {feed_ids}") pass else: feed_ids = [result["_source"]["feed_id"] for result in results] similar_feeds = Feed.objects.filter(pk__in=feed_ids).distinct("feed_title") + if self.similar_feeds.count() < 5: + self.similar_feeds.add(*similar_feeds[: 5 - self.similar_feeds.count()]) return similar_feeds @classmethod