From 3d7d1142d38d647796a5ca1b241a01774b710073 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Sat, 8 Mar 2025 01:15:34 -0600 Subject: [PATCH 1/4] Attempt to load pinned posts when loading a timeline for an user --- src/controller/buffers/mastodon/base.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py index 8c7f0b3f..667e87f5 100644 --- a/src/controller/buffers/mastodon/base.py +++ b/src/controller/buffers/mastodon/base.py @@ -108,13 +108,24 @@ class BaseBuffer(base.Buffer): min_id = self.session.db[self.name][0].id else: min_id = self.session.db[self.name][-1].id + # loads pinned posts from user accounts. + # Load those posts only when there are no items previously loaded. + if "-timeline" in self.name and "account_statuses" in self.function and len(self.session.db.get(self.name, [])) == 0: + pinned_posts = self.session.api.account_statuses(pinned=True, limit=count, *self.args, **self.kwargs) + pinned_posts.reverse() + else: + pinned_posts = None try: results = getattr(self.session.api, self.function)(min_id=min_id, limit=count, *self.args, **self.kwargs) results.reverse() except Exception as e: log.exception("Error %s" % (str(e))) return + if pinned_posts != None and len(pinned_posts) > 0: + amount_of_pinned_posts = self.session.order_buffer(self.name, pinned_posts) number_of_items = self.session.order_buffer(self.name, results) + if pinned_posts != None and len(pinned_posts) > 0: + number_of_items = amount_of_pinned_posts+number_of_items log.debug("Number of items retrieved: %d" % (number_of_items,)) if hasattr(self, "finished_timeline") and self.finished_timeline == False: if "-timeline" in self.name: From 460d71075b9f0425b36df2904499babddc666110 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Sat, 8 Mar 2025 01:31:50 -0600 Subject: [PATCH 2/4] Expose status of pinned posts in variable templates --- src/sessions/mastodon/templates.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/sessions/mastodon/templates.py b/src/sessions/mastodon/templates.py index 1318f226..465d64c4 100644 --- a/src/sessions/mastodon/templates.py +++ b/src/sessions/mastodon/templates.py @@ -9,7 +9,7 @@ from . import utils, compose # This will be used for the edit template dialog. # Available variables for post objects. # safe_text will be the content warning in case a post contains one, text will always be the full text, no matter if has a content warning or not. -post_variables = ["date", "display_name", "screen_name", "source", "lang", "safe_text", "text", "image_descriptions", "visibility"] +post_variables = ["date", "display_name", "screen_name", "source", "lang", "safe_text", "text", "image_descriptions", "visibility", "pinned"] person_variables = ["display_name", "screen_name", "description", "followers", "following", "favorites", "posts", "created_at"] conversation_variables = ["users", "last_post"] notification_variables = ["display_name", "screen_name", "text", "date"] @@ -57,6 +57,7 @@ def render_post(post, template, settings, relative_times=False, offset_hours=0): $text: Toot text. This always displays the full text, even if there is a content warning present. $image_descriptions: Information regarding image descriptions added by twitter users. $visibility: post's visibility: public, not listed, followers only or direct. + $pinned: Wether the post is pinned or not (if not pinned, this will be blank). """ global post_variables available_data = dict(source="") @@ -88,6 +89,12 @@ def render_post(post, template, settings, relative_times=False, offset_hours=0): else: image_descriptions = process_image_descriptions(post.media_attachments) available_data.update(image_descriptions=image_descriptions) + # Process if the post is pinned + if post.pinned: + pinned = _("Pinned.") + else: + pinned = "" + available_data.update(pinned=pinned) result = Template(_(template)).safe_substitute(**available_data) return result From ea7916536243c52eb35d4e63328e38d896f2d283 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Sat, 8 Mar 2025 05:21:20 -0600 Subject: [PATCH 3/4] Adjust the way pinned posts are sorted --- src/controller/buffers/mastodon/base.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/controller/buffers/mastodon/base.py b/src/controller/buffers/mastodon/base.py index 667e87f5..39b56209 100644 --- a/src/controller/buffers/mastodon/base.py +++ b/src/controller/buffers/mastodon/base.py @@ -121,9 +121,13 @@ class BaseBuffer(base.Buffer): except Exception as e: log.exception("Error %s" % (str(e))) return - if pinned_posts != None and len(pinned_posts) > 0: - amount_of_pinned_posts = self.session.order_buffer(self.name, pinned_posts) + if self.session.settings["general"]["reverse_timelines"]: + if pinned_posts != None and len(pinned_posts) > 0: + amount_of_pinned_posts = self.session.order_buffer(self.name, pinned_posts) number_of_items = self.session.order_buffer(self.name, results) + if self.session.settings["general"]["reverse_timelines"] == False: + if pinned_posts != None and len(pinned_posts) > 0: + amount_of_pinned_posts = self.session.order_buffer(self.name, pinned_posts) if pinned_posts != None and len(pinned_posts) > 0: number_of_items = amount_of_pinned_posts+number_of_items log.debug("Number of items retrieved: %d" % (number_of_items,)) From 582d14708f0d35e1a7fe2d3f7f883adf09ae3243 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Sat, 8 Mar 2025 11:06:15 -0600 Subject: [PATCH 4/4] Improve pinned post parsing for templates --- src/sessions/mastodon/templates.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sessions/mastodon/templates.py b/src/sessions/mastodon/templates.py index 465d64c4..0c0083f6 100644 --- a/src/sessions/mastodon/templates.py +++ b/src/sessions/mastodon/templates.py @@ -90,7 +90,7 @@ def render_post(post, template, settings, relative_times=False, offset_hours=0): image_descriptions = process_image_descriptions(post.media_attachments) available_data.update(image_descriptions=image_descriptions) # Process if the post is pinned - if post.pinned: + if post.get("pinned", False): pinned = _("Pinned.") else: pinned = ""