public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing stories outside a mark read date cutoff. Also slightly optimizing a check for old unread stories by checking existance instead of zrevrange -1 -1.

Browse source
This commit is contained in:
Samuel Clay 2022-06-24 18:12:00 -04:00
parent 71cd36f215
commit 4b0a599a03
3 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/profile/views.py
View file

@ -33,9 +33,10 @@ from utils import log as logging
from vendor.paypalapi.exceptions import PayPalAPIResponseError
from paypal.standard.forms import PayPalPaymentsForm
SINGLE_FIELD_PREFS = ('timezone','feed_pane_size','hide_mobile','send_emails',
INTEGER_FIELD_PREFS = ('feed_pane_size', 'days_of_unread')
SINGLE_FIELD_PREFS = ('timezone','hide_mobile','send_emails',
'hide_getting_started', 'has_setup_feeds', 'has_found_friends',
'has_trained_intelligence', 'days_of_unread')
'has_trained_intelligence')
SPECIAL_PREFERENCES = ('old_password', 'new_password', 'autofollow_friends', 'dashboard_date',)
@ajax_login_required
@ -51,6 +52,10 @@ def set_preference(request):
if preference_value in ['true','false']: preference_value = True if preference_value == 'true' else False
if preference_name in SINGLE_FIELD_PREFS:
setattr(request.user.profile, preference_name, preference_value)
elif preference_name in INTEGER_FIELD_PREFS:
setattr(request.user.profile, preference_name, int(preference_value))
if preference_name in preferences:
del preferences[preference_name]
elif preference_name in SPECIAL_PREFERENCES:
if preference_name == 'autofollow_friends':
social_services = MSocialServices.get_user(request.user.pk)

46
apps/reader/models.py
View file

@ -134,9 +134,20 @@ class UserSubscription(models.Model):
unread_ranked_stories_keys = []
read_dates = dict()
manual_unread_pipeline = r.pipeline()
manual_unread_feed_oldest_date = dict()
oldest_manual_unread = None
for us in usersubs:
read_dates[us.feed_id] = int(max(us.mark_read_date, cutoff_date).strftime('%s'))
user_unread_stories_feed_key = f"uU:{user_id}:{us.feed_id}"
manual_unread_pipeline.exists(user_unread_stories_feed_key)
results = manual_unread_pipeline.execute()
for i, us in enumerate(usersubs):
if results[i]:
user_unread_stories_feed_key = f"uU:{user_id}:{us.feed_id}"
oldest_manual_unread = r.zrevrange(user_unread_stories_feed_key, -1, -1, withscores=True)
manual_unread_feed_oldest_date[us.feed_id] = int(oldest_manual_unread[0][1])
for feed_id_group in chunks(feed_ids, 20):
pipeline = r.pipeline()
for feed_id in feed_id_group:
@ -166,23 +177,20 @@ class UserSubscription(models.Model):
min_score, max_score = max_score, min_score
pipeline.zinterstore(unread_ranked_stories_key, [sorted_stories_key, unread_stories_key])
# if order == 'oldest':
# pipeline.zremrangebyscore(unread_ranked_stories_key, 0, min_score-1)
# pipeline.zremrangebyscore(unread_ranked_stories_key, max_score+1, 2*max_score)
# else:
# pipeline.zremrangebyscore(unread_ranked_stories_key, 0, max_score-1)
# pipeline.zremrangebyscore(unread_ranked_stories_key, min_score+1, 2*min_score)
if order == 'oldest':
pipeline.zremrangebyscore(unread_ranked_stories_key, 0, min_score-1)
pipeline.zremrangebyscore(unread_ranked_stories_key, max_score+1, 2*max_score)
else:
pipeline.zremrangebyscore(unread_ranked_stories_key, 0, max_score-1)
pipeline.zremrangebyscore(unread_ranked_stories_key, min_score+1, 2*min_score)
if is_archive:
user_unread_stories_feed_key = f"uU:{user_id}:{feed_id}"
oldest_manual_unread = r.zrevrange(user_unread_stories_feed_key, -1, -1, withscores=True)
if oldest_manual_unread:
if order == 'oldest':
min_score = int(oldest_manual_unread[0][1])
else:
max_score = int(oldest_manual_unread[0][1])
pipeline.zunionstore(unread_ranked_stories_key, [unread_ranked_stories_key, user_unread_stories_feed_key], aggregate="MAX")
if is_archive and feed_id in manual_unread_feed_oldest_date:
if order == 'oldest':
min_score = manual_unread_feed_oldest_date[feed_id]
else:
max_score = manual_unread_feed_oldest_date[feed_id]
pipeline.zunionstore(unread_ranked_stories_key, [unread_ranked_stories_key, user_unread_stories_feed_key], aggregate="MAX")
if settings.DEBUG and False:
debug_stories = r.zrevrange(unread_ranked_stories_key, 0, -1, withscores=True)
@ -765,12 +773,12 @@ class UserSubscription(models.Model):
def invert_read_stories_after_unread_story(self, story, request=None):
data = dict(code=1)
if story.story_date > self.mark_read_date:
if story.story_date > self.mark_read_date and self.mark_read_date > self.user.profile.unread_cutoff:
return data
# Check if user is archive and story is outside unread cutoff
if self.user.profile.is_archive and story.story_date < self.user.profile.unread_cutoff:
user_unread_story = RUserUnreadStory.mark_unread(
RUserUnreadStory.mark_unread(
user_id=self.user_id,
story_hash=story.story_hash,
story_date=story.story_date,

6
apps/reader/views.py
View file

@ -1920,9 +1920,6 @@ def mark_story_as_unread(request):
if not story:
logging.user(request, "~FY~SBUnread~SN story in feed: %s (NOT FOUND)" % (feed))
return dict(code=-1, message="Story not found.")
if usersub:
data = usersub.invert_read_stories_after_unread_story(story, request)
message = RUserStory.story_can_be_marked_unread_by_user(story, request.user)
if message:
@ -1930,6 +1927,9 @@ def mark_story_as_unread(request):
data['message'] = message
return data
if usersub:
data = usersub.invert_read_stories_after_unread_story(story, request)
social_subs = MSocialSubscription.mark_dirty_sharing_story(user_id=request.user.pk,
story_feed_id=feed_id,
story_guid_hash=story.guid_hash)