link facet. and required adoption_url and img

Author: Jonny Johannes

abstractions.py

@@ -16,9 +16,9 @@ class AdoptablePet:
     species: str  # "dog" or "cat"
     breed: str
     location: str
+    adoption_url: str
+    image_url: str
     description: str = ""
-    adoption_url: str | None = None
-    image_url: str | None = None
     age_string: str | None = None
     sex: str | None = None
     size_group: str | None = None
@@ -50,8 +50,8 @@ class Post:
     """Represents a social media post about an adoptable pet."""
 
     text: str
-    image_url: str | None = None
-    link: str | None = None
+    image_url: str
+    link: str
     alt_text: str | None = None  # For image accessibility
     tags: list[str] = field(default_factory=list)
 

social_posters/bluesky.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from typing import Optional
 import os
 
 import requests
@@ -147,36 +146,34 @@ def format_post(self, pet):
             alt_text=f"Photo of {name}, a {pet.breed} available for adoption",
             tags=tags,
         )
+
     def _build_text_and_facets(self, post: Post) -> tuple[str, list]:
         body = post.text
         facets: list = []
         separator = "\n\n"
         limit = 300
 
-        tag_strings = [f"#{tag}" for tag in (post.tags or []) if tag]
-        if tag_strings:
-            tags_section = " ".join(tag_strings)
-            # Truncate body so the full text (body + separator + tags) fits in limit chars.
-            max_body = limit - len(separator) - len(tags_section)
-            full_text = f"{body[:max_body]}{separator}{tags_section}"
-        else:
-            full_text = body[:limit]
+        tag_strings = [f"#{tag}" for tag in (post.tags) if tag]
+        tags_section = " ".join(tag_strings)
+        link_section = post.link
+        # Truncate body so the full text (body + link + tags + separators) fits in limit chars.
+        max_body = limit - len(separator) - len(link_section) - len(separator) - len(tags_section)
+        full_text = f"{body[:max_body]}{separator}{link_section}{separator}{tags_section}"
 
         encoded = full_text.encode("utf-8")
 
-        if post.link:
-            link_bytes = post.link.encode("utf-8")
-            link_idx = encoded.find(link_bytes)
-            if link_idx != -1:
-                facets.append({
-                    "index": {
-                        "byteStart": link_idx,
-                        "byteEnd": link_idx + len(link_bytes),
-                    },
-                    "features": [
-                        {"$type": "app.bsky.richtext.facet#link", "uri": post.link}
-                    ],
-                })
+        link_bytes = post.link.encode("utf-8")
+        link_idx = encoded.find(link_bytes)
+        if link_idx != -1:
+            facets.append({
+                "index": {
+                    "byteStart": link_idx,
+                    "byteEnd": link_idx + len(link_bytes),
+                },
+                "features": [
+                    {"$type": "app.bsky.richtext.facet#link", "uri": post.link}
+                ],
+            })
 
         search_from = 0
         for tag_str in tag_strings:

tests/test_bluesky.py

@@ -41,6 +41,22 @@ def test_link_and_tags_facets_sorted_by_byte_start(self):
         for facet in facets[1:]:
             assert facet["features"][0]["$type"] == "app.bsky.richtext.facet#tag"
 
+    def test_long_body_still_includes_full_url_and_link_facet_with_tags(self):
+        """Without preserving the URL suffix, body[:max_body] would drop the link entirely."""
+        url = "https://www.rescuegroups.org/html/sa_details.html?id=12345"
+        tags = ["AdoptDontShop", "Boston", "DogsOfBluesky"]
+        tags_section = " ".join(f"#{t}" for t in tags)
+        filler = "x" * 400
+        post = Post(text=f"{filler}\n\n{url}", tags=tags, link=url)
+        text, facets = self.poster._build_text_and_facets(post)
+
+        assert url in text
+        assert text.endswith(f"\n\n{tags_section}")
+        assert len(text) <= 300
+        link_facets = [f for f in facets if f["features"][0]["$type"] == "app.bsky.richtext.facet#link"]
+        assert len(link_facets) == 1
+        assert link_facets[0]["features"][0]["uri"] == url
+
     def test_tags_produce_facets_with_correct_byte_offsets(self):
         post = Post(text="Adopt me!", tags=["AdoptDontShop", "Boston", "DogsOfBluesky"])
         text, facets = self.poster._build_text_and_facets(post)