Merge pull request #49 from usegalaxy-eu/fix-content-composition

Don't accumulate newlines on missing mentions/hashtags
arash77 · Jun 18, 2024 · 50f76db · 50f76db
2 parents dd0eb9a + 094e2f4
commit 50f76db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/plugins/bluesky.py b/lib/plugins/bluesky.py
@@ -193,7 +193,12 @@ def format_content(self, content, mentions, hashtags, images, **kwargs):
         else:
             warnings = ""
 
-        chunks = self.wrap_text_with_index(f"{content}\n\n{mentions}\n{hashtags}")
+        content += "\n"
+        if mentions:
+            content = f"{content}\n{mentions}"
+        if hashtags:
+            content = f"{content}\n{hashtags}"
+        chunks = self.wrap_text_with_index(content.strip("\n"))
 
         formatted_content = {
             "body": "\n\n".join(chunks),

diff --git a/lib/plugins/mastodon.py b/lib/plugins/mastodon.py
@@ -50,7 +50,12 @@ def format_content(self, content, mentions, hashtags, images, **kwargs):
         else:
             warnings = ""
 
-        chunks = self.wrap_text_with_index(f"{content}\n\n{mentions}\n{hashtags}")
+        content += "\n"
+        if mentions:
+            content = f"{content}\n{mentions}"
+        if hashtags:
+            content = f"{content}\n{hashtags}"
+        chunks = self.wrap_text_with_index(content.strip("\n"))
 
         formatted_content = {
             "body": "\n\n".join(chunks),