Compare commits

..
6 Commits
Author SHA1 Message Date
PhilandClaude Opus 5.5 c51cf726b0 fix: Header shows Admin when logged in (v2.3.2)
Build Container / build (push) Successful in 9s
Public pages never checked the session, so they always showed Log in.
Set g.me in before_request when a session cookie is present.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 18:57:12 -06:00
PhilandClaude Opus 5.5 2616ef5060 fix: Put Log in back in the header nav (v2.3.1)
Build Container / build (push) Successful in 7s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 18:46:33 -06:00
Phil 0ae16bd1fc Merge branch 'feature/v2.3.0-style-pass' for v2.3.0 release
Build Container / build (push) Successful in 8s
2026-10-31 18:43:20 -06:00
PhilandClaude Opus 5.5 cc09098741 style: Public page pass (v2.3.0)
Fix note metadata inheriting page-footer styles, show full notes instead of
HTML cut at 300 chars, auto-link bare URLs, one-line meta, SITE_NAME in the
header and titles, serif reading font, dark mode.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 18:24:29 -06:00
Phil 16925663a3 Merge branch 'feature/v2.2.0-bluesky' for v2.2.0 release
Build Container / build (push) Successful in 7s
2026-10-31 14:19:17 -06:00
PhilandClaude Opus 5.5 e92c27a84c feat: Crosspost notes to Bluesky (v2.2.0)
BlueskyClient behind the ADR-065 reconcile loop: plain text with link and
hashtag facets, images under 1 MB with alt text, link cards, app-password
sessions with refresh. Deletes follow; edits don't (ADR-066).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 14:19:17 -06:00
17 changed files with 976 additions and 206 deletions

No files matched your search

+42
View File
@@ -7,6 +7,48 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [2.3.2] - 2026-10-31
### Changed
- Header link reads "Admin" (was "Dashboard") when logged in
### Fixed
- Public pages never knew you were logged in (only `/admin` routes checked the session), so the header always said "Log in"
## [2.3.1] - 2026-10-31
### Fixed
- "Log in" is back in the header nav (2.3.0 had moved it to the footer, where it was easy to miss)
## [2.3.0] - 2026-10-31
### Changed
- **Public pages restyled**: compact header with the site name from `SITE_NAME`, serif reading font for notes, one-line metadata (date · #tags · Also on …), dark mode via `prefers-color-scheme`, footer pinned to the bottom, "Log in" moved to the footer
- Home and tag pages show short notes in full; titled notes show a summary and "Read more"
- Author h-card kept for parsers but visually hidden on this single-author site
- Page titles use the note text and `SITE_NAME` instead of the slug and "StarPunk"
### Fixed
- Every note's metadata was styled as the page footer (centered, ruled, padded)
- Previews cut the note's HTML at 300 characters, which could break markup
- Bare URLs in notes are now links
## [2.2.0] - 2026-10-31
### Added
- **Crossposting to Bluesky**, ADR-066
- Plain-text note (Markdown stripped) with clickable link and hashtag facets, shortened to 300 characters with the permalink kept
- Images (up to 4, shrunk under Bluesky's 1 MB limit) with alt text; notes without images get a link card
- Unpublishing, unticking and deleting remove the Bluesky post; edits don't follow (Bluesky has no edits)
- Logs in with an app password: `BLUESKY_HANDLE`, `BLUESKY_APP_PASSWORD` (optional `BLUESKY_SERVICE`, default `https://bsky.social`)
- Shown in the editor and Micropub `syndicate-to` next to GoToSocial
## [2.1.0] - 2026-10-31
### Added
@@ -0,0 +1,37 @@
# ADR-066: Crossposting to Bluesky
## Status
Accepted (v2.2.0, 2026-10-31)
## Context
ADR-065 added direct crossposting to GoToSocial. Bluesky was still fed by
Echofeed, with the same problems: no per-post control, no record of the
copy, deletes never follow.
## Decision
1. **Second client, same loop.** `BlueskyClient` sits behind the reconcile
loop and `syndications` table from ADR-065, as target id `bluesky`.
Clients share a small interface: `create`, `update`, `delete`, `can_edit`.
2. **Auth.** An app password (`BLUESKY_HANDLE`, `BLUESKY_APP_PASSWORD`).
`createSession` against `BLUESKY_SERVICE` (default `https://bsky.social`);
writes go to the PDS named in the returned DID document. Expired access
tokens are refreshed, falling back to a new session.
3. **Content.** Plain text (Markdown rendered and stripped), then the
permalink and hashtags (at most a third of the space), shortened to 300
characters at a word boundary. Link and hashtag facets use UTF-8 byte
offsets. Images (up to 4) are re-encoded as JPEG if over 1 MB, with alt
text and aspect ratio; a note without images gets a link card.
4. **Edits don't follow.** Bluesky has no edit; rewriting the record would
break likes and replies, and delete-and-repost would lose them. The post
stays as first sent. Unpublish, untick and delete remove it.
5. **No double posts.** When a create is retried, recent posts are checked
for one already linking to the note (a send whose reply was lost).
## Consequences
- Echofeed is no longer needed; it must stop posting to Bluesky or posts
appear twice.
- A post deleted by hand on Bluesky is not re-created.
+18 -4
View File
@@ -280,6 +280,21 @@ def create_app(config=None):
"""Add correlation ID to request context for tracing"""
add_correlation_id()
# Know who is logged in on every page, not just /admin (v2.3.2), so
# the header can say "Admin" instead of "Log in". Only requests that
# carry a session cookie touch the database.
from flask import g, request
token = request.cookies.get("starpunk_session")
if token:
from starpunk.auth import verify_session
try:
info = verify_session(token)
except Exception:
info = None
if info:
g.user = info
g.me = info["me"]
# Response middleware - Add webmention Link header (v1.6.0)
@app.after_request
def add_webmention_headers(response):
@@ -337,9 +352,8 @@ def create_app(config=None):
app.webmention_worker.stop()
# Start syndication worker when a target is configured (v2.1.0)
if (app.config.get("GOTOSOCIAL_URL") and app.config.get("GOTOSOCIAL_ACCESS_TOKEN")
and not app.config.get("TESTING", False)):
from starpunk.syndication import SyndicationWorker
from starpunk.syndication import SyndicationWorker, targets_configured
if targets_configured(app.config) and not app.config.get("TESTING", False):
app.syndication_worker = SyndicationWorker(
app, poll_interval=app.config["SYNDICATION_POLL_INTERVAL"]
)
@@ -450,5 +464,5 @@ def create_app(config=None):
# Package version (Semantic Versioning 2.0.0)
# See docs/standards/versioning-strategy.md for details
__version__ = "2.1.0"
__version__ = "2.3.2"
__version_info__ = (2, 1, 0)
+5
View File
@@ -132,6 +132,11 @@ def load_config(app, config_override=None):
app.config["GOTOSOCIAL_VISIBILITY"] = os.getenv("GOTOSOCIAL_VISIBILITY", "public")
app.config["GOTOSOCIAL_MAX_CHARS"] = int(os.getenv("GOTOSOCIAL_MAX_CHARS", "5000"))
app.config["GOTOSOCIAL_MAX_MEDIA"] = int(os.getenv("GOTOSOCIAL_MAX_MEDIA", "4"))
app.config["BLUESKY_HANDLE"] = os.getenv("BLUESKY_HANDLE", "")
app.config["BLUESKY_APP_PASSWORD"] = os.getenv("BLUESKY_APP_PASSWORD", "")
app.config["BLUESKY_SERVICE"] = os.getenv("BLUESKY_SERVICE", "https://bsky.social")
app.config["BLUESKY_NAME"] = os.getenv("BLUESKY_NAME", "Bluesky")
app.config["BLUESKY_MAX_CHARS"] = int(os.getenv("BLUESKY_MAX_CHARS", "300"))
app.config["SYNDICATION_POLL_INTERVAL"] = int(os.getenv("SYNDICATION_POLL_INTERVAL", "10"))
# Apply overrides if provided
+42
View File
@@ -0,0 +1,42 @@
"""
Markdown extension: turn bare URLs into links (v2.3.0)
Python-Markdown only links <https://...>; notes often contain pasted URLs.
"""
import re
import xml.etree.ElementTree as etree
from markdown.extensions import Extension
from markdown.inlinepatterns import InlineProcessor
from markdown.treeprocessors import Treeprocessor
from markdown.util import AtomicString
# Stop at whitespace and brackets; trailing punctuation is not part of the URL
BARE_URL_RE = r"(?<![\w/\"'=])https?://[^\s<>()\[\]\"']*[^\s<>()\[\]\"'.,;:!?…]"
class _BareUrl(InlineProcessor):
def handleMatch(self, m, data):
url = m.group(0)
el = etree.Element("a")
el.set("href", url)
el.text = AtomicString(url)
return el, m.start(0), m.end(0)
class _UnnestLinks(Treeprocessor):
"""[https://x](https://x) would put a link inside a link; keep the outer one"""
def run(self, root):
for outer in root.iter("a"):
for inner in list(outer.iter("a"))[1:]:
inner.tag = "span"
inner.attrib.clear()
class BareUrlExtension(Extension):
def extendMarkdown(self, md):
# Below links (160) and <autolinks> (120), so those win
md.inlinePatterns.register(_BareUrl(BARE_URL_RE, md), "bare_url", 105)
md.treeprocessors.register(_UnnestLinks(md), "unnest_links", 0)
+3 -1
View File
@@ -34,7 +34,9 @@ DEFAULT_AUTH_STATE_EXPIRY_MINUTES = 5
DEFAULT_TOKEN_EXPIRY_DAYS = 90
# Constants - Markdown rendering
MARKDOWN_EXTENSIONS = ["extra", "codehilite", "nl2br"]
from starpunk.markdown_ext import BareUrlExtension
MARKDOWN_EXTENSIONS = ["extra", "codehilite", "nl2br", BareUrlExtension()]
# Constants - Content limits
MAX_TITLE_LENGTH = 200
+318 -20
View File
@@ -1,9 +1,10 @@
"""
Crossposting (POSSE) for StarPunk (v2.1.0, ADR-065)
Crossposting (POSSE) for StarPunk (v2.1.0 ADR-065, v2.2.0 ADR-066)
Published notes are copied to syndication targets, and later edits and
deletes follow them. Currently one target kind exists: a GoToSocial (or any
Mastodon-API) account.
deletes follow them. Two target kinds exist: a GoToSocial (or any
Mastodon-API) account, and a Bluesky account. Bluesky posts can't be edited,
so there only deletes follow.
Each (note, target) pair has a row in `syndications`. Changing a note marks
its rows pending; a background worker then reconciles the remote post with
@@ -16,9 +17,11 @@ the note:
Rows carry a version so an edit made while a send is in flight is not lost.
"""
import io
import re
import threading
from dataclasses import dataclass
from dataclasses import dataclass, field
from datetime import datetime, timezone
from pathlib import Path
from typing import Dict, List, Optional
@@ -108,18 +111,233 @@ class MastodonClient:
except RemoteGone:
pass # already gone
# Interface used by the reconcile loop
can_edit = True
def _prepare(self, post: "Post") -> tuple:
text = compose_text(post.note, post.permalink, post.tags, post.max_chars)
media_ids = [self.upload_media(f["path"], f["mime_type"], f["description"]) for f in post.media]
return text, media_ids
def create(self, post: "Post", key: str, retrying: bool = False) -> dict:
text, media_ids = self._prepare(post)
return self.create_status(text, media_ids, idempotency_key=key)
def update(self, remote_id: str, post: "Post") -> dict:
text, media_ids = self._prepare(post)
return self.update_status(remote_id, text, media_ids)
def delete(self, remote_id: str) -> None:
self.delete_status(remote_id)
BLUESKY_BLOB_LIMIT = 1_000_000 # app.bsky.embed.images maxSize
_TID_CHARS = "234567abcdefghijklmnopqrstuvwxyz"
class BlueskyClient:
"""
Minimal AT Protocol client for posting to Bluesky with an app password
Posts are plain text with link and hashtag facets. Images go in an
images embed; a note without images gets a link card instead.
"""
can_edit = False # Bluesky has no edits; only deletes follow the note
POST = "app.bsky.feed.post"
def __init__(self, service: str, identifier: str, password: str,
http: Optional[httpx.Client] = None):
self.service = service.rstrip("/")
self.identifier = identifier
self.password = password
self.http = http or httpx.Client(timeout=30.0)
self.pds = self.service
self.did: Optional[str] = None
self.handle = identifier
self._access: Optional[str] = None
self._refresh: Optional[str] = None
self._lock = threading.Lock()
# --- XRPC plumbing ---
def _raw(self, method: str, nsid: str, base: str, token: Optional[str], **kwargs) -> httpx.Response:
headers = kwargs.pop("headers", {})
if token:
headers["Authorization"] = f"Bearer {token}"
try:
return self.http.request(method, f"{base}/xrpc/{nsid}", headers=headers, **kwargs)
except httpx.HTTPError as e:
raise SyndicationError(f"{nsid}: {e}")
@staticmethod
def _error_name(response: httpx.Response) -> str:
try:
return response.json().get("error") or ""
except ValueError:
return ""
def _raise_for(self, nsid: str, response: httpx.Response) -> None:
if response.status_code < 400:
return
permanent = 400 <= response.status_code < 500 and response.status_code != 429
raise SyndicationError(
f"{nsid}: HTTP {response.status_code} {response.text[:200]}", permanent=permanent
)
def _login(self) -> None:
response = None
if self._refresh:
response = self._raw("POST", "com.atproto.server.refreshSession", self.service, self._refresh)
if response.status_code >= 400:
response = None
if response is None:
response = self._raw("POST", "com.atproto.server.createSession", self.service, None,
json={"identifier": self.identifier, "password": self.password})
self._raise_for("com.atproto.server.createSession", response)
data = response.json()
self._access, self._refresh = data["accessJwt"], data["refreshJwt"]
self.did = data["did"]
self.handle = data.get("handle") or self.handle
for service in (data.get("didDoc") or {}).get("service", []):
if service.get("id", "").endswith("#atproto_pds") and service.get("serviceEndpoint"):
self.pds = service["serviceEndpoint"].rstrip("/")
def _call(self, method: str, nsid: str, **kwargs) -> httpx.Response:
with self._lock:
if not self._access:
self._login()
response = self._raw(method, nsid, self.pds, self._access, **kwargs)
if response.status_code == 401 or self._error_name(response) == "ExpiredToken":
self._access = None
self._login()
response = self._raw(method, nsid, self.pds, self._access, **kwargs)
self._raise_for(nsid, response)
return response
# --- Posts ---
def upload_blob(self, data: bytes, mime_type: str) -> dict:
response = self._call("POST", "com.atproto.repo.uploadBlob", content=data,
headers={"Content-Type": mime_type})
return response.json()["blob"]
def _image(self, media: dict) -> dict:
data, mime_type, width, height = _fit_image(media["path"], media["mime_type"], BLUESKY_BLOB_LIMIT)
image = {"image": self.upload_blob(data, mime_type), "alt": media["description"] or ""}
if width and height:
image["aspectRatio"] = {"width": width, "height": height}
return image
def _record(self, post: "Post") -> dict:
text = compose_text(post.note, post.permalink, post.tags, post.max_chars,
body=plain_text(post.note.content))
record = {
"$type": self.POST,
"text": text,
"createdAt": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z",
}
facets = bluesky_facets(text)
if facets:
record["facets"] = facets
if post.media:
record["embed"] = {"$type": "app.bsky.embed.images",
"images": [self._image(m) for m in post.media]}
else:
record["embed"] = {"$type": "app.bsky.embed.external", "external": {
"uri": post.permalink,
"title": post.note.title[:300],
"description": plain_text(post.note.content)[:300],
}}
return record
def _web_url(self, uri: str) -> str:
rkey = uri.rsplit("/", 1)[1]
return f"https://bsky.app/profile/{self.handle or self.did}/post/{rkey}"
def _find_existing(self, permalink: str) -> Optional[dict]:
"""A recent post that already links to this note (an earlier send whose reply was lost)"""
response = self._call("GET", "com.atproto.repo.listRecords",
params={"repo": self.did, "collection": self.POST, "limit": 25})
for item in response.json().get("records", []):
if permalink in (item.get("value") or {}).get("text", ""):
return {"id": item["uri"], "url": self._web_url(item["uri"])}
return None
def create(self, post: "Post", key: str, retrying: bool = False) -> dict:
if retrying:
if not self.did:
with self._lock:
self._login()
existing = self._find_existing(post.permalink)
if existing:
return existing
record = self._record(post)
response = self._call("POST", "com.atproto.repo.createRecord",
json={"repo": self.did or self.identifier, "collection": self.POST,
"record": record})
uri = response.json()["uri"]
return {"id": uri, "url": self._web_url(uri)}
def update(self, remote_id: str, post: "Post") -> dict:
raise NotImplementedError("Bluesky posts can't be edited")
def delete(self, remote_id: str) -> None:
# at://<did>/app.bsky.feed.post/<rkey>; deleting a missing record succeeds
repo, collection, rkey = remote_id[len("at://"):].split("/", 2)
self._call("POST", "com.atproto.repo.deleteRecord",
json={"repo": repo, "collection": collection, "rkey": rkey})
def _fit_image(path: Path, mime_type: str, limit: int) -> tuple:
"""Image bytes no bigger than `limit`, re-encoded as JPEG if needed. Returns (data, mime, w, h)."""
from PIL import Image
data = Path(path).read_bytes()
with Image.open(io.BytesIO(data)) as img:
width, height = img.size
if len(data) <= limit:
return data, mime_type, width, height
img = img.convert("RGB")
for max_side, quality in ((2000, 85), (2000, 75), (1600, 70), (1200, 65), (1000, 60)):
copy = img.copy()
copy.thumbnail((max_side, max_side))
buf = io.BytesIO()
copy.save(buf, format="JPEG", quality=quality, optimize=True)
if buf.tell() <= limit:
return buf.getvalue(), "image/jpeg", copy.size[0], copy.size[1]
raise SyndicationError(f"{Path(path).name}: image too large for Bluesky", permanent=True)
@dataclass
class Target:
id: str # stored in syndications.target
uid: str # Micropub syndicate-to uid
name: str # shown in the editor and Micropub clients
client: MastodonClient
client: object # MastodonClient or BlueskyClient
max_chars: int = 5000
max_media: int = 4
_client_cache: Dict[str, MastodonClient] = {}
@dataclass
class Post:
"""What a client needs to publish a note"""
note: object
permalink: str
tags: List[str]
max_chars: int
media: List[dict] = field(default_factory=list)
_client_cache: Dict[str, object] = {}
def targets_configured(config) -> bool:
"""Whether any crossposting target has credentials (used to start the worker)"""
return bool(
(config.get("GOTOSOCIAL_URL") and config.get("GOTOSOCIAL_ACCESS_TOKEN"))
or (config.get("BLUESKY_HANDLE") and config.get("BLUESKY_APP_PASSWORD"))
)
def get_targets() -> Dict[str, Target]:
@@ -142,6 +360,24 @@ def get_targets() -> Dict[str, Target]:
max_chars=int(config.get("GOTOSOCIAL_MAX_CHARS", 5000)),
max_media=int(config.get("GOTOSOCIAL_MAX_MEDIA", 4)),
)
handle = (config.get("BLUESKY_HANDLE") or "").lstrip("@")
password = config.get("BLUESKY_APP_PASSWORD") or ""
if handle and password:
service = (config.get("BLUESKY_SERVICE") or "https://bsky.social").rstrip("/")
key = f"bluesky:{service}:{handle}"
client = _client_cache.get(key)
if client is None:
client = BlueskyClient(service, handle, password)
_client_cache[key] = client
targets["bluesky"] = Target(
id="bluesky",
uid=f"https://bsky.app/profile/{handle}",
name=config.get("BLUESKY_NAME", "Bluesky"),
client=client,
max_chars=int(config.get("BLUESKY_MAX_CHARS", 300)),
max_media=4,
)
return targets
@@ -242,17 +478,75 @@ def _hashtag(display_name: str) -> str:
return f"#{word}" if word else ""
def compose_text(note, permalink: str, tags: List[str], max_chars: int) -> str:
"""Full note as Markdown, then the permalink and hashtags; shortened if too long"""
hashtags = " ".join(h for h in (_hashtag(t) for t in tags) if h)
def compose_text(note, permalink: str, tags: List[str], max_chars: int,
body: Optional[str] = None) -> str:
"""
Full note (Markdown unless `body` is given), then the permalink and
hashtags; shortened at a word boundary if too long. On short targets the
hashtags may use at most a third of the space.
"""
hashtags = ""
for h in (_hashtag(t) for t in tags):
if h and len(hashtags) + len(h) + 1 <= max(max_chars // 3, 1):
hashtags = f"{hashtags} {h}".strip()
tail = f"\n\n{permalink}" + (f"\n\n{hashtags}" if hashtags else "")
body = note.content.strip()
body = (note.content if body is None else body).strip()
if len(body) + len(tail) > max_chars:
room = max_chars - len(tail) - 1
body = body[:room].rsplit(" ", 1)[0].rstrip() + "…"
return body + tail
_BLOCKS = ["p", "h1", "h2", "h3", "h4", "h5", "h6", "pre", "blockquote", "ul", "ol", "hr", "table"]
def plain_text(markdown_text: str) -> str:
"""Markdown as readable plain text (for targets without Markdown)"""
import markdown
from bs4 import BeautifulSoup
soup = BeautifulSoup(markdown.markdown(markdown_text, extensions=["fenced_code"]), "html.parser")
for img in soup.find_all("img"):
img.decompose()
for node in soup.find_all(string=True):
if not node.strip() and "\n" in node and node.parent.name != "pre":
node.extract() # layout newlines between tags; we add our own
for br in soup.find_all("br"):
br.replace_with("\n")
for li in soup.find_all("li"):
li.insert(0, "• ")
li.append("\n")
for block in soup.find_all(_BLOCKS):
block.append("\n\n")
text = soup.get_text()
text = re.sub(r"[ \t]+\n", "\n", text)
return re.sub(r"\n{3,}", "\n\n", text).strip()
_URL_RE = re.compile(r"https?://[^\s<>\"]+")
_TAG_RE = re.compile(r"(?<![\w#])#(\w*[^\W\d]\w*)")
def bluesky_facets(text: str) -> List[dict]:
"""Link and hashtag facets (UTF-8 byte ranges) for a Bluesky post"""
def span(start: int, end: int) -> dict:
return {"byteStart": len(text[:start].encode()), "byteEnd": len(text[:end].encode())}
facets = []
for m in _URL_RE.finditer(text):
url = m.group(0).rstrip(".,;:!?)\"'…")
facets.append({"index": span(m.start(), m.start() + len(url)),
"features": [{"$type": "app.bsky.richtext.facet#link", "uri": url}]})
urls = [(f["index"]["byteStart"], f["index"]["byteEnd"]) for f in facets]
for m in _TAG_RE.finditer(text):
index = span(m.start(), m.end())
if any(a <= index["byteStart"] < b for a, b in urls):
continue # a #fragment inside a URL
facets.append({"index": index,
"features": [{"$type": "app.bsky.richtext.facet#tag", "tag": m.group(1)}]})
return facets
def _media_files(note_id: int, limit: int) -> List[dict]:
"""Image files for a note: the 'large' variant when there is one"""
from starpunk.media import get_note_media
@@ -331,26 +625,30 @@ def _reconcile(row, target: Target) -> tuple:
if not wanted:
if row["remote_id"]:
target.client.delete_status(row["remote_id"])
target.client.delete(row["remote_id"])
return None, None
if row["remote_id"] and not target.client.can_edit:
return row["remote_id"], row["remote_url"] # posted already; edits don't follow
site = current_app.config["SITE_URL"].rstrip("/")
tags = [t["display_name"] for t in get_note_tags(note.id)]
text = compose_text(note, f"{site}/note/{note.slug}", tags, target.max_chars)
media_ids = [
target.client.upload_media(f["path"], f["mime_type"], f["description"])
for f in _media_files(note.id, target.max_media)
]
post = Post(
note=note,
permalink=f"{site}/note/{note.slug}",
tags=[t["display_name"] for t in get_note_tags(note.id)],
max_chars=target.max_chars,
media=_media_files(note.id, target.max_media),
)
if row["remote_id"]:
try:
result = target.client.update_status(row["remote_id"], text, media_ids)
result = target.client.update(row["remote_id"], post)
return result["id"], result["url"]
except RemoteGone:
pass # deleted on the remote side; post it again
result = target.client.create_status(
text, media_ids, idempotency_key=f"starpunk-{row['id']}-{row['version']}"
result = target.client.create(
post, key=f"starpunk-{row['id']}-{row['version']}", retrying=row["attempts"] > 0
)
return result["id"], result["url"]
+85 -25
View File
@@ -1,36 +1,75 @@
/* StarPunk CSS - Minimal responsive stylesheet */
:root {
--color-text: #333; --color-text-light: #666; --color-bg: #fff; --color-bg-alt: #f5f5f5;
--color-link: #0066cc; --color-link-hover: #004499; --color-border: #ddd;
--color-text: #1f2328; --color-text-light: #59636e; --color-bg: #fff; --color-bg-alt: #f4f5f7;
--color-link: #0a5cc2; --color-link-hover: #083f85; --color-border: #e3e6ea; --color-accent-soft: #e8f0fb;
--color-success: #28a745; --color-error: #dc3545; --color-warning: #ffc107; --color-info: #17a2b8;
--font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Arial, sans-serif;
--font-mono: 'SF Mono', Monaco, Consolas, 'Courier New', monospace;
--font-body: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
--font-reading: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, 'Noto Serif', Georgia, serif;
--font-mono: ui-monospace, 'SF Mono', Monaco, Consolas, 'Liberation Mono', monospace;
--spacing-xs: 0.25rem; --spacing-sm: 0.5rem; --spacing-md: 1rem; --spacing-lg: 2rem; --spacing-xl: 4rem;
--max-width: 42rem; --border-radius: 4px;
--max-width: 40rem; --border-radius: 6px;
}
@media (prefers-color-scheme: dark) {
:root {
--color-text: #e4e6e9; --color-text-light: #9aa3ad; --color-bg: #121417; --color-bg-alt: #1c1f24;
--color-link: #74b0ff; --color-link-hover: #a8ceff; --color-border: #2b3038; --color-accent-soft: #1a2738;
}
}
* { box-sizing: border-box; margin: 0; padding: 0; }
body { font-family: var(--font-body); font-size: 1rem; line-height: 1.6; color: var(--color-text); background: var(--color-bg); padding: var(--spacing-md); }
body {
font-family: var(--font-body); font-size: 1rem; line-height: 1.6; color: var(--color-text); background: var(--color-bg);
padding: var(--spacing-md); min-height: 100vh; display: flex; flex-direction: column;
-webkit-font-smoothing: antialiased;
}
h1, h2, h3 { margin-bottom: var(--spacing-md); line-height: 1.2; font-weight: 600; }
h1 { font-size: 2rem; } h2 { font-size: 1.5rem; } h3 { font-size: 1.25rem; }
h1, h2, h3 { margin-bottom: var(--spacing-md); line-height: 1.25; font-weight: 650; letter-spacing: -0.01em; }
h1 { font-size: 1.75rem; } h2 { font-size: 1.375rem; } h3 { font-size: 1.125rem; }
p { margin-bottom: var(--spacing-md); }
a { color: var(--color-link); text-decoration: none; }
a:hover { color: var(--color-link-hover); text-decoration: underline; }
:focus-visible { outline: 2px solid var(--color-link); outline-offset: 2px; border-radius: 2px; }
code, pre { font-family: var(--font-mono); background: var(--color-bg-alt); padding: 0.125rem 0.25rem; border-radius: var(--border-radius); font-size: 0.875rem; }
code, pre { font-family: var(--font-mono); background: var(--color-bg-alt); padding: 0.125rem 0.3rem; border-radius: var(--border-radius); font-size: 0.875em; }
pre { padding: var(--spacing-md); overflow-x: auto; margin-bottom: var(--spacing-md); }
pre code { padding: 0; background: none; }
header, main, footer { max-width: var(--max-width); margin: 0 auto; }
header { margin-bottom: var(--spacing-lg); padding-bottom: var(--spacing-md); border-bottom: 2px solid var(--color-border); }
header h1 { margin-bottom: var(--spacing-sm); }
header h1 a { color: var(--color-text); text-decoration: none; }
nav { display: flex; gap: var(--spacing-md); flex-wrap: wrap; }
nav a { padding: var(--spacing-sm) var(--spacing-md); border-radius: var(--border-radius); transition: background 0.2s; }
nav a:hover { background: var(--color-bg-alt); text-decoration: none; }
main { min-height: 60vh; margin-bottom: var(--spacing-lg); }
footer { padding-top: var(--spacing-lg); border-top: 1px solid var(--color-border); text-align: center; color: var(--color-text-light); font-size: 0.875rem; }
.visually-hidden { position: absolute !important; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); clip-path: inset(50%); white-space: nowrap; }
/* Page frame */
.site-header, main, .site-footer { width: 100%; max-width: var(--max-width); margin-left: auto; margin-right: auto; }
main { flex: 1; margin-bottom: var(--spacing-xl); }
.site-header {
display: flex; flex-wrap: wrap; align-items: baseline; justify-content: space-between; gap: var(--spacing-sm) var(--spacing-lg);
padding: var(--spacing-md) 0 var(--spacing-md); margin-bottom: var(--spacing-lg); border-bottom: 1px solid var(--color-border);
}
.site-title { font-size: 1.375rem; font-weight: 700; letter-spacing: -0.02em; color: var(--color-text); }
.site-title:hover { color: var(--color-link); text-decoration: none; }
.site-nav { display: flex; align-items: center; flex-wrap: wrap; gap: var(--spacing-md); font-size: 0.9375rem; }
.site-nav > a { color: var(--color-text-light); }
.site-nav > a:hover { color: var(--color-link); text-decoration: none; }
.site-search { display: flex; }
.site-search input[type="search"] {
width: 10rem; padding: 0.3rem 0.6rem; font: inherit; font-size: 0.875rem; color: var(--color-text);
background: var(--color-bg-alt); border: 1px solid var(--color-border); border-right: 0; border-radius: var(--border-radius) 0 0 var(--border-radius);
}
.site-search button {
padding: 0.3rem 0.6rem; font: inherit; font-size: 0.875rem; cursor: pointer; color: var(--color-text-light);
background: var(--color-bg-alt); border: 1px solid var(--color-border); border-radius: 0 var(--border-radius) var(--border-radius) 0;
}
.site-search button:hover { color: var(--color-link); }
.site-footer { padding: var(--spacing-md) 0; border-top: 1px solid var(--color-border); color: var(--color-text-light); font-size: 0.8125rem; }
.site-footer p { margin: 0; }
.site-footer a { color: var(--color-text-light); text-decoration: underline; text-decoration-color: var(--color-border); }
.site-footer a:hover { color: var(--color-link); }
.page-title { font-size: 1.375rem; margin-bottom: var(--spacing-lg); }
.tag-name { color: var(--color-link); }
.tag-name::before { content: "#"; }
.dev-mode-warning { background: var(--color-error); color: white; padding: var(--spacing-md); text-align: center; font-weight: bold; margin: calc(-1 * var(--spacing-md)); margin-bottom: var(--spacing-lg); }
@@ -40,17 +79,35 @@ footer { padding-top: var(--spacing-lg); border-top: 1px solid var(--color-borde
.flash-warning { background: #fff3cd; border-color: var(--color-warning); color: #856404; }
.flash-info { background: #d1ecf1; border-color: var(--color-info); color: #0c5460; }
/* Notes */
.h-entry { margin-bottom: var(--spacing-lg); padding-bottom: var(--spacing-lg); border-bottom: 1px solid var(--color-border); }
.h-entry:last-child { border-bottom: none; }
.note-preview .e-content { margin-bottom: var(--spacing-md); }
.note-meta { color: var(--color-text-light); font-size: 0.875rem; }
.h-entry > .p-name a { color: var(--color-text); }
.h-entry > .p-name a:hover { color: var(--color-link); }
.e-content, .p-summary { font-family: var(--font-reading); font-size: 1.125rem; line-height: 1.65; overflow-wrap: anywhere; }
.e-content > :last-child, .p-summary > :last-child { margin-bottom: 0; }
.e-content a { text-decoration: underline; text-decoration-thickness: 1px; text-underline-offset: 2px; text-decoration-color: color-mix(in srgb, currentColor 40%, transparent); }
.e-content a:hover { text-decoration-color: currentColor; }
.e-content blockquote { margin: 0 0 var(--spacing-md); padding-left: var(--spacing-md); border-left: 3px solid var(--color-border); color: var(--color-text-light); }
.e-content ul, .e-content ol { margin: 0 0 var(--spacing-md) 1.25rem; }
.e-content img { max-width: 100%; height: auto; }
.e-content h1, .e-content h2, .e-content h3 { font-family: var(--font-body); }
.read-more { margin: var(--spacing-sm) 0 0; font-size: 0.9375rem; }
.note-meta { display: flex; flex-wrap: wrap; align-items: baseline; gap: 0 0.4rem; margin-top: var(--spacing-sm); color: var(--color-text-light); font-size: 0.8125rem; }
.note-meta a { color: var(--color-text-light); }
.note-nav { margin-top: var(--spacing-md); }
.note-meta a:hover { color: var(--color-link); }
.note-meta > :not(.visually-hidden) + :not(.visually-hidden)::before { content: "·"; margin-right: 0.4rem; color: var(--color-text-light); }
.note-tags { display: inline-flex; flex-wrap: wrap; gap: 0 0.4rem; }
.note-meta > .note-tags::before { margin-right: 0; }
.note-tags .p-category::before { content: "#"; opacity: 0.7; }
.h-entry:not(.note-preview) .note-meta { margin-top: var(--spacing-md); }
.note-nav { margin-top: var(--spacing-lg); font-size: 0.9375rem; }
.empty-state { text-align: center; padding: var(--spacing-xl); color: var(--color-text-light); }
.form-group { margin-bottom: var(--spacing-md); }
label { display: block; margin-bottom: var(--spacing-sm); font-weight: 600; }
input[type="text"], input[type="url"], input[type="email"], textarea { width: 100%; padding: var(--spacing-sm); border: 1px solid var(--color-border); border-radius: var(--border-radius); font-family: inherit; font-size: 1rem; }
input[type="text"], input[type="url"], input[type="email"], input[type="search"], textarea { color: var(--color-text); background: var(--color-bg); width: 100%; padding: var(--spacing-sm); border: 1px solid var(--color-border); border-radius: var(--border-radius); font-family: inherit; font-size: 1rem; }
textarea { font-family: var(--font-mono); resize: vertical; min-height: 10rem; }
small { display: block; margin-top: var(--spacing-xs); color: var(--color-text-light); font-size: 0.875rem; }
.form-checkbox { display: flex; align-items: center; gap: var(--spacing-sm); }
@@ -171,11 +228,14 @@ small { display: block; margin-top: var(--spacing-xs); color: var(--color-text-l
}
@media (min-width: 768px) {
body { padding: var(--spacing-lg); }
h1 { font-size: 2.5rem; } h2 { font-size: 2rem; } h3 { font-size: 1.5rem; }
body { padding: var(--spacing-md) var(--spacing-lg); }
h1 { font-size: 2rem; } h2 { font-size: 1.5rem; } h3 { font-size: 1.25rem; }
}
@media (max-width: 767px) {
.site-nav { width: 100%; }
.site-search { flex: 1; justify-content: flex-end; }
.site-search input[type="search"] { width: 100%; max-width: 12rem; }
.note-table { font-size: 0.875rem; }
.note-table th, .note-table td { padding: var(--spacing-sm); }
.note-actions .button { font-size: 0.75rem; padding: 0.25rem 0.5rem; }
@@ -426,7 +486,7 @@ small { display: block; margin-top: var(--spacing-xs); color: var(--color-text-l
.content-preview {
padding: var(--spacing-sm);
background: white;
background: var(--color-bg);
border: 1px solid var(--color-border);
border-radius: 4px;
margin-top: var(--spacing-xs);
+15 -21
View File
@@ -3,7 +3,8 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}StarPunk{% endblock %}</title>
<title>{% block title %}{{ config.SITE_NAME }}{% endblock %}</title>
<meta name="color-scheme" content="light dark">
<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
<link rel="alternate" type="application/rss+xml" title="{{ config.SITE_NAME }} RSS Feed" href="{{ absolute_url_for('public.feed') }}">
<link rel="alternate" type="application/xml+opml" title="{{ config.SITE_NAME }} Feed Subscription List" href="{{ absolute_url_for('public.opml') }}">
@@ -33,29 +34,20 @@
</div>
{% endif %}
<header>
<h1><a href="/">StarPunk</a></h1>
<nav>
<header class="site-header">
<a class="site-title" href="/">{{ config.SITE_NAME }}</a>
<nav class="site-nav">
<a href="/">Home</a>
<a href="{{ url_for('public.feed') }}">RSS</a>
{% if g.me %}
<a href="{{ url_for('admin.dashboard') }}">Dashboard</a>
<a href="{{ url_for('admin.dashboard') }}">Admin</a>
{% else %}
<a href="{{ url_for('auth.login_form') }}">Login</a>
<a href="{{ url_for('auth.login_form') }}">Log in</a>
{% endif %}
<form action="/search" method="get" role="search" style="margin-left: auto; display: flex; gap: var(--spacing-sm);">
<input
type="search"
name="q"
placeholder="Search..."
aria-label="Search"
value="{{ request.args.get('q', '') }}"
minlength="2"
maxlength="100"
required
style="width: 200px; padding: var(--spacing-xs) var(--spacing-sm);"
>
<button type="submit" class="button button-small" style="padding: var(--spacing-xs) var(--spacing-sm);">🔍</button>
<form class="site-search" action="/search" method="get" role="search">
<input type="search" name="q" placeholder="Search" aria-label="Search"
value="{{ request.args.get('q', '') }}" minlength="2" maxlength="100" required>
<button type="submit" aria-label="Search">Search</button>
</form>
</nav>
</header>
@@ -72,8 +64,10 @@
{% block content %}{% endblock %}
</main>
<footer>
<p>StarPunk v{{ config.get('VERSION', '0.5.0') }}</p>
<footer class="site-footer">
<p>
Powered by <a href="https://git.thesatelliteoflove.com/phil/StarPunk">StarPunk</a> v{{ config.get('VERSION', '0.5.0') }}
</p>
</footer>
</body>
</html>
+4 -47
View File
@@ -1,12 +1,12 @@
{% extends "base.html" %}
{% from "partials/media.html" import display_media %}
{% from "partials/note_preview.html" import note_preview %}
{% block title %}StarPunk - Home{% endblock %}
{% block title %}{{ config.SITE_NAME }}{% endblock %}
{% block content %}
<div class="h-feed">
{# h-feed required properties per microformats.org/wiki/h-feed #}
<h2 class="p-name">{{ config.SITE_NAME or 'Recent Notes' }}</h2>
<h1 class="p-name visually-hidden">{{ config.SITE_NAME or 'Recent Notes' }}</h1>
{# u-url for feed (self-reference) #}
<a class="u-url" href="{{ absolute_url_for('public.index') }}" style="display: none;">Feed URL</a>
@@ -34,50 +34,7 @@
{% if notes %}
{% for note in notes %}
<article class="h-entry note-preview">
{# Detect if note has explicit title (starts with # heading) - per Q22 #}
{% set has_explicit_title = note.content.strip().startswith('#') %}
{# p-name only if note has explicit title (per Q22) #}
{% if has_explicit_title %}
<h3 class="p-name">{{ note.title }}</h3>
{% endif %}
{# Media preview (if available) #}
{{ display_media(note.media) }}
{# e-content: note content (preview) #}
<div class="e-content">
{{ note.html[:300]|safe }}{% if note.html|length > 300 %}...{% endif %}
</div>
<footer class="note-meta">
{# u-url for permalink #}
<a class="u-url" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y') }}
</time>
</a>
{# Tags in preview #}
{% if note.tags %}
<span class="note-tags">
{% for tag in note.tags %}
<a class="p-category" rel="tag" href="{{ url_for('public.tag', tag=tag.name) }}">{{ tag.display_name }}</a>
{% endfor %}
</span>
{% endif %}
{# Author h-card nested in each h-entry (per Q20) #}
{% if author %}
<div class="p-author h-card">
<a class="p-name u-url" href="{{ author.url or author.me }}">
{{ author.name or author.url or author.me }}
</a>
</div>
{% endif %}
</footer>
</article>
{{ note_preview(note, author) }}
{% endfor %}
{% else %}
<p class="empty-state">No notes published yet. Check back soon!</p>
+18 -38
View File
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% from "partials/media.html" import display_media %}
{% block title %}{{ note.slug }} - StarPunk{% endblock %}
{% block title %}{% if note.content.strip().startswith('#') %}{{ note.title }}{% else %}{{ note.excerpt|truncate(60) }}{% endif %} · {{ config.SITE_NAME }}{% endblock %}
{% block content %}
<article class="h-entry">
@@ -49,52 +49,32 @@
<footer class="note-meta">
{# u-url and u-uid same for notes (per Q23) #}
{% for s in syndications if s.remote_url %}
<a class="u-syndication" href="{{ s.remote_url }}" rel="syndication">Also on {{ s.name }}</a>
{% endfor %}
<a class="u-url u-uid" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y at %I:%M %p') }}
</time>
</a>
{# dt-updated if note was modified #}
<a class="u-url u-uid" href="{{ absolute_url_for('public.note', slug=note.slug) }}"><time class="dt-published" datetime="{{ note.created_at.isoformat() }}">{{ note.created_at.strftime('%B %-d, %Y · %-I:%M %p') }}</time></a>
{% if note.updated_at and note.updated_at != note.created_at %}
<span class="updated">
(Updated: <time class="dt-updated" datetime="{{ note.updated_at.isoformat() }}">{{ note.updated_at.strftime('%B %d, %Y') }}</time>)
<span class="updated">Updated <time class="dt-updated" datetime="{{ note.updated_at.isoformat() }}">{{ note.updated_at.strftime('%b %-d, %Y') }}</time></span>
{% endif %}
{# rel="tag" per microformats2 p-category #}
{% if note.tags %}
<span class="note-tags">
{% for tag in note.tags %}<a class="p-category" rel="tag" href="{{ url_for('public.tag', tag=tag.name) }}">{{ tag.display_name }}</a>{% endfor %}
</span>
{% endif %}
{# Tags / Categories #}
{# rel="tag" per microformats2 p-category specification #}
{% if note.tags %}
<div class="note-tags">
{% for tag in note.tags %}
<a class="p-category" rel="tag" href="{{ url_for('public.tag', tag=tag.name) }}">
{{ tag.display_name }}
</a>
{% endfor %}
</div>
{% set synced = (syndications or [])|selectattr('remote_url')|list %}
{% if synced %}
<span class="syndication">Also on {% for s in synced %}<a class="u-syndication" href="{{ s.remote_url }}" rel="syndication">{{ s.name }}</a>{% if not loop.last %}, {% endif %}{% endfor %}</span>
{% endif %}
{# Author h-card (nested within h-entry per Q20) #}
{# Author h-card (nested within h-entry per Q20); hidden on a single-author site #}
{% if author %}
<div class="p-author h-card">
{% if author.photo %}
<img class="u-photo" src="{{ author.photo }}" alt="{{ author.name or 'Author' }}" width="48" height="48">
{% endif %}
<a class="p-name u-url" href="{{ author.url or author.me }}">
{{ author.name or author.url or author.me }}
</a>
{% if author.note %}
<span class="p-note" style="display: none;">{{ author.note }}</span>
{% endif %}
</div>
<span class="p-author h-card visually-hidden">
{% if author.photo %}<img class="u-photo" src="{{ author.photo }}" alt="">{% endif %}
<a class="p-name u-url" href="{{ author.url or author.me }}">{{ author.name or author.url or author.me }}</a>
{% if author.note %}<span class="p-note">{{ author.note }}</span>{% endif %}
</span>
{% endif %}
</footer>
<nav class="note-nav">
<a href="/">Back to all notes</a>
<a href="/">← All notes</a>
</nav>
{# Webmentions section (v1.6.0 Phase 5) - only shown if approved webmentions exist #}
+38
View File
@@ -0,0 +1,38 @@
{# One note in a list (home, tag pages). v2.3.0 #}
{% from "partials/media.html" import display_media %}
{% macro note_preview(note, author) %}
<article class="h-entry note-preview">
{# Notes starting with a # heading have a title (Q22) #}
{% set has_explicit_title = note.content.strip().startswith('#') %}
{% if has_explicit_title %}
<h2 class="p-name"><a href="{{ absolute_url_for('public.note', slug=note.slug) }}">{{ note.title }}</a></h2>
{% endif %}
{{ display_media(note.media) }}
{% if has_explicit_title %}
{# Titled notes are articles: show a summary and link through #}
<div class="p-summary">
<p>{{ note.excerpt }}</p>
</div>
<p class="read-more"><a href="{{ absolute_url_for('public.note', slug=note.slug) }}">Read more →</a></p>
{% else %}
<div class="e-content">
{{ note.html|safe }}
</div>
{% endif %}
<footer class="note-meta">
<a class="u-url" href="{{ absolute_url_for('public.note', slug=note.slug) }}"><time class="dt-published" datetime="{{ note.created_at.isoformat() }}">{{ note.created_at.strftime('%b %-d, %Y') }}</time></a>
{% if note.tags %}
<span class="note-tags">
{% for tag in note.tags %}<a class="p-category" rel="tag" href="{{ url_for('public.tag', tag=tag.name) }}">{{ tag.display_name }}</a>{% endfor %}
</span>
{% endif %}
{% if author %}
{# Single-author site: keep the h-card for parsers, hide it from readers #}
<span class="p-author h-card visually-hidden"><a class="p-name u-url" href="{{ author.url or author.me }}">{{ author.name or author.url or author.me }}</a></span>
{% endif %}
</footer>
</article>
{% endmacro %}
+1 -1
View File
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block title %}{% if query %}Search: {{ query }}{% else %}Search{% endif %} - StarPunk{% endblock %}
{% block title %}{% if query %}Search: {{ query }}{% else %}Search{% endif %} · {{ config.SITE_NAME }}{% endblock %}
{% block content %}
<div class="search-container">
+5 -48
View File
@@ -1,65 +1,22 @@
{% extends "base.html" %}
{% from "partials/media.html" import display_media %}
{% from "partials/note_preview.html" import note_preview %}
{% block title %}{{ tag.display_name }} - StarPunk{% endblock %}
{% block title %}{{ tag.display_name }} · {{ config.SITE_NAME }}{% endblock %}
{% block content %}
<div class="h-feed">
<h1 class="p-name">Notes tagged "{{ tag.display_name }}"</h1>
<h1 class="p-name page-title">Notes tagged <span class="tag-name">{{ tag.display_name }}</span></h1>
{% if notes %}
{% for note in notes %}
<article class="h-entry note-preview">
{# Detect if note has explicit title (starts with # heading) - per Q22 #}
{% set has_explicit_title = note.content.strip().startswith('#') %}
{# p-name only if note has explicit title (per Q22) #}
{% if has_explicit_title %}
<h3 class="p-name">{{ note.title }}</h3>
{% endif %}
{# Media preview (if available) #}
{{ display_media(note.media) }}
{# e-content: note content (preview) #}
<div class="e-content">
{{ note.html[:300]|safe }}{% if note.html|length > 300 %}...{% endif %}
</div>
<footer class="note-meta">
{# u-url for permalink #}
<a class="u-url" href="{{ absolute_url_for('public.note', slug=note.slug) }}">
<time class="dt-published" datetime="{{ note.created_at.isoformat() }}">
{{ note.created_at.strftime('%B %d, %Y') }}
</time>
</a>
{# Tags in preview #}
{% if note.tags %}
<span class="note-tags">
{% for tag in note.tags %}
<a class="p-category" rel="tag" href="{{ url_for('public.tag', tag=tag.name) }}">{{ tag.display_name }}</a>
{% endfor %}
</span>
{% endif %}
{# Author h-card nested in each h-entry (per Q20) #}
{% if author %}
<div class="p-author h-card">
<a class="p-name u-url" href="{{ author.url or author.me }}">
{{ author.name or author.url or author.me }}
</a>
</div>
{% endif %}
</footer>
</article>
{{ note_preview(note, author) }}
{% endfor %}
{% else %}
<p class="empty-state">No notes with this tag.</p>
{% endif %}
<nav class="note-nav">
<a href="/">Back to all notes</a>
<a href="/">← All notes</a>
</nav>
</div>
{% endblock %}
+69
View File
@@ -0,0 +1,69 @@
"""Public page markup from the v2.3.0 style pass"""
import markdown
import pytest
from starpunk import create_app
from starpunk.models import MARKDOWN_EXTENSIONS
from starpunk.notes import create_note
def md(text):
return markdown.markdown(text, extensions=MARKDOWN_EXTENSIONS)
@pytest.mark.parametrize("text, expected", [
("see https://sqlite.org/x.html.", '<a href="https://sqlite.org/x.html">https://sqlite.org/x.html</a>.'),
("(https://a.example/p)", '(<a href="https://a.example/p">https://a.example/p</a>)'),
("[label](https://a.example)", '<a href="https://a.example">label</a>'),
("`https://code.example`", "<code>https://code.example</code>"),
])
def test_bare_urls_are_linked(text, expected):
assert expected in md(text)
def test_url_as_link_label_is_not_nested():
assert md("[https://b.example](https://b.example)").count("<a ") == 1
@pytest.fixture
def app(tmp_path):
data = tmp_path / "data"
return create_app({
"TESTING": True, "SITE_URL": "https://blog.example.com", "SITE_NAME": "My Notes",
"ADMIN_ME": "https://example.com", "SESSION_SECRET": "x",
"DATA_PATH": data, "NOTES_PATH": data / "notes", "DATABASE_PATH": data / "starpunk.db",
})
def test_home_shows_full_notes_and_site_name(app):
long_text = "word " * 120 + "THE-END"
with app.app_context():
create_note(content=long_text, published=True, tags=["thoughts"])
html = app.test_client().get("/").data.decode()
assert "THE-END" in html # not cut at 300 characters
assert '<a class="site-title" href="/">My Notes</a>' in html
assert 'class="p-category" rel="tag"' in html
# Notes' metadata is not styled as the page footer
assert html.count('<footer class="site-footer">') == 1
assert '<footer class="note-meta">' in html
nav = html.split('class="site-nav"', 1)[1].split("</nav>", 1)[0]
assert 'href="/auth/login"' in nav # login is in the top bar
def test_note_page_meta_line(app):
with app.app_context():
note = create_note(content="Hello", published=True)
html = app.test_client().get(f"/note/{note.slug}").data.decode()
assert "<title>Hello · My Notes</title>" in html
assert 'class="u-url u-uid"' in html
def test_nav_shows_admin_when_logged_in(app):
from starpunk.auth import create_session
client = app.test_client()
with app.test_request_context():
client.set_cookie("starpunk_session", create_session("https://example.com"))
nav = client.get("/").data.decode().split('class="site-nav"', 1)[1].split("</nav>", 1)[0]
assert ">Admin</a>" in nav
assert "/auth/login" not in nav
+2 -1
View File
@@ -274,7 +274,8 @@ class TestVersionDisplay:
"""Test version number appears in footer"""
response = client.get("/")
assert response.status_code == 200
assert b"0.5.0" in response.data or b"StarPunk v" in response.data
from starpunk import __version__
assert f"v{__version__}".encode() in response.data
# OAuth metadata endpoint tests removed in Phase 1 of IndieAuth server removal
+274
View File
@@ -0,0 +1,274 @@
"""
Tests for crossposting to Bluesky (starpunk/syndication.py, v2.2.0)
A fake PDS (httpx.MockTransport) records what StarPunk sends.
"""
import io
import json
import httpx
import pytest
from PIL import Image
from starpunk import create_app, syndication
from starpunk.notes import create_note, delete_note, update_note
from starpunk.syndication import (
BlueskyClient,
bluesky_facets,
get_note_syndications,
plain_text,
process_due,
select_targets,
)
SERVICE = "https://bsky.example"
PDS = "https://pds.example"
DID = "did:plc:abc123"
class FakePDS:
def __init__(self):
self.records = {}
self.blobs = []
self.calls = []
self.logins = 0
self.expire_next = False
self.lose_next_reply = False
self.fail_next = None
def _json(self, code, body):
return httpx.Response(code, json=body)
def __call__(self, request: httpx.Request) -> httpx.Response:
nsid = request.url.path.removeprefix("/xrpc/")
self.calls.append((request.url.host, nsid))
if nsid == "com.atproto.server.createSession":
body = json.loads(request.content)
if body["password"] != "app-pass":
return self._json(401, {"error": "AuthenticationRequired"})
self.logins += 1
return self._json(200, {
"did": DID, "handle": "phil.example", "accessJwt": f"access{self.logins}",
"refreshJwt": "refresh",
"didDoc": {"service": [{"id": "#atproto_pds", "serviceEndpoint": PDS}]},
})
if nsid == "com.atproto.server.refreshSession":
self.logins += 1
return self._json(200, {"did": DID, "handle": "phil.example",
"accessJwt": f"access{self.logins}", "refreshJwt": "refresh"})
assert request.url.host == "pds.example"
if request.headers.get("Authorization") != f"Bearer access{self.logins}" or self.expire_next:
self.expire_next = False
return self._json(400, {"error": "ExpiredToken"})
if self.fail_next:
code, self.fail_next = self.fail_next, None
return self._json(code, {"error": "Nope"})
if nsid == "com.atproto.repo.uploadBlob":
self.blobs.append(len(request.content))
assert len(request.content) <= 1_000_000
return self._json(200, {"blob": {"$type": "blob", "ref": {"$link": f"b{len(self.blobs)}"},
"mimeType": request.headers["Content-Type"],
"size": len(request.content)}})
if nsid == "com.atproto.repo.createRecord":
body = json.loads(request.content)
uri = f"at://{DID}/app.bsky.feed.post/r{len(self.records) + 1}"
self.records[uri] = body["record"]
if self.lose_next_reply:
self.lose_next_reply = False
raise httpx.ReadTimeout("lost reply")
return self._json(200, {"uri": uri, "cid": "c"})
if nsid == "com.atproto.repo.listRecords":
return self._json(200, {"records": [{"uri": u, "value": v} for u, v in self.records.items()]})
if nsid == "com.atproto.repo.deleteRecord":
body = json.loads(request.content)
self.records.pop(f"at://{body['repo']}/{body['collection']}/{body['rkey']}", None)
return self._json(200, {})
return self._json(500, {"error": "unknown"})
@pytest.fixture
def pds():
return FakePDS()
@pytest.fixture
def app(tmp_path, pds):
data = tmp_path / "data"
app = create_app({
"TESTING": True,
"SITE_URL": "https://blog.example.com",
"ADMIN_ME": "https://example.com",
"SESSION_SECRET": "test-secret",
"DATA_PATH": data,
"NOTES_PATH": data / "notes",
"DATABASE_PATH": data / "starpunk.db",
"BLUESKY_HANDLE": "phil.example",
"BLUESKY_APP_PASSWORD": "app-pass",
"BLUESKY_SERVICE": SERVICE,
})
syndication._client_cache[f"bluesky:{SERVICE}:phil.example"] = BlueskyClient(
SERVICE, "phil.example", "app-pass", http=httpx.Client(transport=httpx.MockTransport(pds))
)
yield app
syndication._client_cache.clear()
def publish(app, content="Hello Bluesky", tags=None):
with app.test_request_context():
note = create_note(content=content, published=True, tags=tags)
select_targets(note.id, ["bluesky"])
process_due()
return note
def only_record(pds):
(record,) = pds.records.values()
return record
def row(app, note):
with app.app_context():
(r,) = get_note_syndications(note.id)
return r
class TestText:
def test_markdown_becomes_plain_text(self):
md = "# Title\n\nSome *emphasis* and a [link](https://x.example).\n\n- one\n- two\n\n![pic](/m.jpg)"
assert plain_text(md) == "Title\n\nSome emphasis and a link.\n\n• one\n• two"
def test_facets_use_utf8_byte_offsets(self):
text = "Café ☕ https://blog.example.com/note/x #IndieWeb"
link, tag = bluesky_facets(text)
raw = text.encode()
assert raw[link["index"]["byteStart"]:link["index"]["byteEnd"]] == b"https://blog.example.com/note/x"
assert raw[tag["index"]["byteStart"]:tag["index"]["byteEnd"]] == b"#IndieWeb"
assert tag["features"][0]["tag"] == "IndieWeb"
def test_fragment_in_url_is_not_a_tag(self):
facets = bluesky_facets("see https://x.example/page#section and #42 too")
assert [f["features"][0]["$type"] for f in facets] == ["app.bsky.richtext.facet#link"]
class TestLifecycle:
def test_publish_posts_with_link_card(self, app, pds):
note = publish(app, content="Hello **Bluesky**", tags=["IndieWeb"])
record = only_record(pds)
permalink = f"https://blog.example.com/note/{note.slug}"
assert record["text"] == f"Hello Bluesky\n\n{permalink}\n\n#IndieWeb"
assert record["embed"]["external"]["uri"] == permalink
kinds = {f["features"][0]["$type"] for f in record["facets"]}
assert kinds == {"app.bsky.richtext.facet#link", "app.bsky.richtext.facet#tag"}
r = row(app, note)
assert r["state"] == "synced"
assert r["remote_id"] == f"at://{DID}/app.bsky.feed.post/r1"
assert r["remote_url"] == "https://bsky.app/profile/phil.example/post/r1"
def test_long_note_fits_300(self, app, pds):
note = publish(app, content="word " * 500)
text = only_record(pds)["text"]
assert len(text) <= 300
assert text.endswith(f"https://blog.example.com/note/{note.slug}")
def test_edit_leaves_post_alone(self, app, pds):
note = publish(app, content="first")
with app.test_request_context():
update_note(id=note.id, content="second")
process_due()
assert only_record(pds)["text"].startswith("first")
assert row(app, note)["state"] == "synced"
def test_delete_and_unpublish_remove_post(self, app, pds):
note = publish(app)
with app.test_request_context():
update_note(id=note.id, published=False)
process_due()
assert pds.records == {}
update_note(id=note.id, published=True)
process_due()
assert len(pds.records) == 1
delete_note(id=note.id)
process_due()
assert pds.records == {}
class TestSession:
def test_logs_in_once_and_uses_pds(self, app, pds):
publish(app, content="one")
publish(app, content="two")
assert pds.logins == 1
assert ("bsky.example", "com.atproto.server.createSession") in pds.calls
assert ("pds.example", "com.atproto.repo.createRecord") in pds.calls
def test_expired_token_is_refreshed(self, app, pds):
publish(app, content="one")
pds.expire_next = True
publish(app, content="two")
assert len(pds.records) == 2
assert ("bsky.example", "com.atproto.server.refreshSession") in pds.calls
def test_bad_password_fails_permanently(self, app, pds):
syndication._client_cache[f"bluesky:{SERVICE}:phil.example"].password = "wrong"
note = publish(app)
r = row(app, note)
assert r["state"] == "failed" and "401" in r["last_error"]
def test_lost_reply_does_not_double_post(self, app, pds):
pds.lose_next_reply = True
note = publish(app)
assert row(app, note)["state"] == "pending"
with app.test_request_context():
from starpunk.syndication import retry
retry(row(app, note)["id"])
# retry() resets attempts; simulate the scheduled retry instead
from starpunk.database import get_db
get_db(app).execute("UPDATE syndications SET attempts = 1")
get_db(app).commit()
process_due()
assert len(pds.records) == 1
assert row(app, note)["state"] == "synced"
def test_server_error_retries(self, app, pds):
publish(app, content="warm up") # log in first
pds.fail_next = 502
note = publish(app, content="later")
assert row(app, note)["state"] == "pending"
class TestMedia:
def test_large_image_is_shrunk_with_alt_and_aspect_ratio(self, app, pds):
from starpunk.media import attach_media_to_note, save_media
import os
img = Image.frombytes("RGB", (2400, 1800), os.urandom(2400 * 1800 * 3))
buf = io.BytesIO()
img.save(buf, format="PNG")
assert buf.tell() > 1_000_000
with app.test_request_context():
note = create_note(content="noisy", published=True)
media = save_media(buf.getvalue(), "noise.png")
attach_media_to_note(note.id, [media["id"]], ["Static"])
select_targets(note.id, ["bluesky"])
process_due()
record = only_record(pds)
(image,) = record["embed"]["images"]
assert record["embed"]["$type"] == "app.bsky.embed.images"
assert image["alt"] == "Static"
assert image["aspectRatio"]["width"] > 0
def test_both_targets_listed_for_micropub(tmp_path):
data = tmp_path / "d"
app = create_app({
"TESTING": True, "SITE_URL": "https://b.example", "ADMIN_ME": "https://e.example",
"SESSION_SECRET": "x", "DATA_PATH": data, "NOTES_PATH": data / "notes",
"DATABASE_PATH": data / "s.db",
"GOTOSOCIAL_URL": "https://social.example", "GOTOSOCIAL_ACCESS_TOKEN": "t",
"BLUESKY_HANDLE": "phil.example", "BLUESKY_APP_PASSWORD": "p",
})
with app.app_context():
from starpunk.syndication import get_targets, resolve_targets
assert set(get_targets()) == {"gotosocial", "bluesky"}
assert resolve_targets(["https://bsky.app/profile/phil.example"]) == ["bluesky"]
syndication._client_cache.clear()