From 0caea7e9ffb2a84f582157b1891778fa5ceec5b1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 22 Mar 2021 18:54:17 -0700 Subject: [PATCH] Python formatting --- bookwyrm/activitystreams.py | 67 +++++++++++++++++++------------------ bookwyrm/views/feed.py | 2 +- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index bceb1cad..6910d7bc 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -18,11 +18,11 @@ class ActivityStream(ABC): def stream_id(self, user): """ the redis key for this user's instance of this stream """ - return '{}-{}'.format(user.id, self.key) + return "{}-{}".format(user.id, self.key) def unread_id(self, user): """ the redis key for this user's unread count for this stream """ - return '{}-unread'.format(self.stream_id(user)) + return "{}-unread".format(self.stream_id(user)) def add_status(self, status): """ add a status to users' feeds """ @@ -38,94 +38,93 @@ class ActivityStream(ABC): # and go! pipeline.execute() - def get_value(self, status): # pylint: disable=no-self-use """ the status id and the rank (ie, published date) """ return {status.id: status.published_date.timestamp()} - def get_activity_stream(self, user): """ load the ids for statuses to be displayed """ # clear unreads for this feed r.set(self.unread_id(user), 0) statuses = r.zrevrange(self.stream_id(user), 0, -1) - return models.Status.objects.select_subclasses().filter( - id__in=statuses - ).order_by('-published_date') - + return ( + models.Status.objects.select_subclasses() + .filter(id__in=statuses) + .order_by("-published_date") + ) def populate_stream(self, user): - ''' go from zero to a timeline ''' + """ go from zero to a timeline """ pipeline = r.pipeline() statuses = self.stream_statuses(user) stream_id = self.stream_id(user) - for status in statuses.all()[:settings.MAX_STREAM_LENGTH]: + for status in statuses.all()[: settings.MAX_STREAM_LENGTH]: pipeline.zadd(stream_id, self.get_value(status)) pipeline.execute() - def stream_users(self, status): # pylint: disable=no-self-use """ given a status, what users should see it """ # direct messages don't appeard in feeds. - if status.privacy == 'direct': + if status.privacy == "direct": return None # everybody who could plausibly see this status audience = models.User.objects.filter( is_active=True, - local=True # we only create feeds for users of this instance + local=True, # we only create feeds for users of this instance ).exclude( Q(id__in=status.user.blocks.all()) | Q(blocks=status.user) # not blocked ) # only visible to the poster's followers and tagged users - if status.privacy == 'followers': + if status.privacy == "followers": audience = audience.filter( Q(id=status.user.id) # if the user is the post's author - | Q(following=status.user) # if the user is following the author + | Q(following=status.user) # if the user is following the author ) return audience - def stream_statuses(self, user): # pylint: disable=no-self-use """ given a user, what statuses should they see on this stream """ return privacy_filter( user, models.Status.objects.select_subclasses(), - privacy_levels=["public", 'unlisted', 'followers'], + privacy_levels=["public", "unlisted", "followers"], ) class HomeStream(ActivityStream): """ users you follow """ - key = 'home' + + key = "home" def stream_users(self, status): audience = super().stream_users(status) return audience.filter( Q(id=status.user.id) # if the user is the post's author - | Q(following=status.user) # if the user is following the author - | Q(id__in=status.mention_users.all()) # or the user is mentioned + | Q(following=status.user) # if the user is following the author + | Q(id__in=status.mention_users.all()) # or the user is mentioned ) def stream_statuses(self, user): return privacy_filter( user, models.Status.objects.select_subclasses(), - privacy_levels=["public", 'unlisted', 'followers'], - following_only=True + privacy_levels=["public", "unlisted", "followers"], + following_only=True, ) class LocalStream(ActivityStream): """ users you follow """ - key = 'local' + + key = "local" def stream_users(self, status): # this stream wants no part in non-public statuses - if status.privacy != 'public': + if status.privacy != "public": return None return super().stream_users(status) @@ -140,11 +139,12 @@ class LocalStream(ActivityStream): class FederatedStream(ActivityStream): """ users you follow """ - key = 'federated' + + key = "federated" def stream_users(self, status): # this stream wants no part in non-public statuses - if status.privacy != 'public': + if status.privacy != "public": return None return super().stream_users(status) @@ -156,20 +156,23 @@ class FederatedStream(ActivityStream): ) - streams = { - 'home': HomeStream(), - 'local': LocalStream(), - 'federated': FederatedStream(), + "home": HomeStream(), + "local": LocalStream(), + "federated": FederatedStream(), } + @receiver(signals.post_save) # pylint: disable=unused-argument def update_feeds(sender, instance, created, *args, **kwargs): """ add statuses to activity feeds """ # we're only interested in new statuses that aren't dms - if not created or not issubclass(sender, models.Status) or \ - instance.privacy == 'direct': + if ( + not created + or not issubclass(sender, models.Status) + or instance.privacy == "direct" + ): return for stream in streams.values(): diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index a07ea524..b7ef9eb8 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -28,7 +28,7 @@ class Feed(View): page = 1 if not tab in STREAMS: - tab = 'home' + tab = "home" activities = activitystreams.streams[tab].get_activity_stream(request.user)