diff --git a/apps/newsletters/models.py b/apps/newsletters/models.py index b0c9280db..1d1d942b5 100644 --- a/apps/newsletters/models.py +++ b/apps/newsletters/models.py @@ -10,6 +10,9 @@ from django.utils.html import linebreaks from apps.rss_feeds.models import Feed, MStory, MFetchHistory from apps.reader.models import UserSubscription, UserSubscriptionFolders from apps.profile.models import Profile, MSentEmail +from apps.notifications.tasks import QueueNotifications +from apps.notifications.models import MUserFeedNotification + from utils import log as logging from utils.story_functions import linkify from utils.scrubber import Scrubber @@ -208,4 +211,6 @@ class EmailNewsletter: except redis.ConnectionError: logging.debug(" ***> [%-30s] ~BMRedis is unavailable for real-time." % (feed.log_title[:30],)) + if MUserFeedNotification.feed_has_users(feed.pk) > 0: + QueueNotifications.delay(feed.pk, 1) \ No newline at end of file diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py index 61fe1039e..866641cb7 100644 --- a/utils/feed_fetcher.py +++ b/utils/feed_fetcher.py @@ -24,7 +24,8 @@ from apps.reader.models import UserSubscription from apps.rss_feeds.models import Feed, MStory from apps.rss_feeds.page_importer import PageImporter from apps.rss_feeds.icon_importer import IconImporter -from apps.notifications.tasks import QueueNotifications, MUserFeedNotification +from apps.notifications.tasks import QueueNotifications +from apps.notifications.models import MUserFeedNotification from apps.push.models import PushSubscription from apps.statistics.models import MAnalyticsFetcher, MStatistics import feedparser