public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Attempting to correct sub counts for branched feeds.

Browse source
This commit is contained in:
Samuel Clay 2016-05-05 19:37:02 +08:00
parent 0f644dcb7e
commit 1497412133
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/rss_feeds/models.py
View file

@ -692,7 +692,7 @@ class Feed(models.Model):
def count_subscribers(self, recount=True, verbose=False): def count_subscribers(self, recount=True, verbose=False):
if recount or not self.counts_converted_to_redis: if recount or not self.counts_converted_to_redis:
from apps.profile.models import Profile from apps.profile.models import Profile
Profile.count_feed_subscribers(feed_id=self.pk) Profile.count_feed_subscribers(feed_id=self.original_feed_id)
SUBSCRIBER_EXPIRE_DATE = datetime.datetime.now() - datetime.timedelta(days=settings.SUBSCRIBER_EXPIRE) SUBSCRIBER_EXPIRE_DATE = datetime.datetime.now() - datetime.timedelta(days=settings.SUBSCRIBER_EXPIRE)
subscriber_expire = int(SUBSCRIBER_EXPIRE_DATE.strftime('%s')) subscriber_expire = int(SUBSCRIBER_EXPIRE_DATE.strftime('%s'))
now = int(datetime.datetime.now().strftime('%s')) now = int(datetime.datetime.now().strftime('%s'))
@ -723,10 +723,10 @@ class Feed(models.Model):
results = pipeline.execute() results = pipeline.execute()
# -1 due to key=-1 signaling counts_converted_to_redis # -1 due to key=-1 signaling counts_converted_to_redis
total += results[0] - 1 total += results[0]
active += results[1] - 1 active += results[1]
premium += results[2] - 1 premium += results[2]
active_premium += results[3] - 1 active_premium += results[3]
original_num_subscribers = self.num_subscribers original_num_subscribers = self.num_subscribers
original_active_subs = self.active_subscribers original_active_subs = self.active_subscribers