public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Showing 5 distinct related feeds in title bar.

Browse source
This commit is contained in:
Samuel Clay 2024-10-13 13:48:08 -07:00
parent 914d07d51e
commit 1bd3de276f
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -179,6 +179,7 @@ monitor: deploy_monitor
deploy_staging: deploy_staging:
ansible-playbook ansible/deploy.yml -l staging ansible-playbook ansible/deploy.yml -l staging
staging: deploy_staging staging: deploy_staging
deploy_staging_static: staging_static
staging_static: staging_static:
ansible-playbook ansible/deploy.yml -l staging --tags static ansible-playbook ansible/deploy.yml -l staging --tags static
celery_stop: celery_stop:

4
apps/rss_feeds/models.py
View file

@ -1073,13 +1073,15 @@ class Feed(models.Model):
feed_ids = [result["_source"]["feed_id"] for result in results] feed_ids = [result["_source"]["feed_id"] for result in results]
similar_feeds = Feed.objects.filter(pk__in=feed_ids).distinct("feed_title") similar_feeds = Feed.objects.filter(pk__in=feed_ids).distinct("feed_title")
try: try:
self.similar_feeds.set(feed_ids) self.similar_feeds.set(similar_feeds)
except IntegrityError: except IntegrityError:
logging.debug(f" ---> ~FRIntegrity error adding similar feed: {feed_ids}") logging.debug(f" ---> ~FRIntegrity error adding similar feed: {feed_ids}")
pass pass
else: else:
feed_ids = [result["_source"]["feed_id"] for result in results] feed_ids = [result["_source"]["feed_id"] for result in results]
similar_feeds = Feed.objects.filter(pk__in=feed_ids).distinct("feed_title") 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 return similar_feeds
@classmethod @classmethod