diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf7b46..0b97e62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.16.0] - 2026-11-11 + +Articles as the IndieWeb defines them: titles and summaries stored apart from the text (ADR-076). + +**Before upgrading, back up the database and the `data` folder (notes and `.trash`).** Migration 023 moves each note's `# Heading` title out of its Markdown file into the database. + +### Added + +- Notes have a title and a summary of their own. A note with a title is an article. The editor has Title and Summary fields, and an article may have no body text +- Micropub `summary` is stored when sent with `content`, can be replaced and deleted, and comes back from `q=source`. A summary on its own is still the content, as Post Type Discovery reads it. The MCP `create_note` and `update_note` tools take a `summary` +- Article pages mark up the summary as `p-summary`; Atom entries have `` and JSON Feed items `summary` + +### Changed + +- A `# Heading` at the top of a note is now just a heading, not a title. Micropub `name` is stored as the title instead of being added to the text; a heading that repeats it is dropped +- Feed items have a title only for articles. RSS items and JSON Feed items for notes have none, and Atom entries an empty one, so feed readers no longer show notes as headlines +- On the homepage and tag pages an article shows its title, its summary (or the start of its text) and "Read more", without its images +- Micropub content sent as both `html` and `text` is stored as the HTML. The text is usually a plain fallback, so articles lost their images, links and headings +- Images embedded in Micropub content from other sites are copied into the media library and the text points at the copies, so an article doesn't break when the client's or a CDN's host goes away. Best effort: an image that can't be fetched keeps its URL (up to 20 per post) +- Articles are crossposted to GoToSocial, Bluesky and Threads as title, summary (or the start of the text), link and hashtags, without images. On Bluesky the link card is the article. Notes are crossposted in full as before + +### Fixed + +- Feeds showed an article's title twice: as the item title and again at the top of the content +- A line starting with a hashtag (`#indieweb is fun`) was shown as a heading on pages and in feeds, and crossposted without its `#`. Only `#` followed by a space starts a heading now, as in CommonMark +- HTML content from Micropub is sanitized as is instead of going through Markdown, which added stray line breaks and empty paragraphs +- Previews, image alt text and crosspost teasers showed raw Markdown (`**bold**`, `[link](url)`); the excerpt is now plain text ## [2.15.0] - 2026-11-11 MCP server for AI clients (ADR-075). diff --git a/docs/decisions/ADR-014-rss-feed-implementation.md b/docs/decisions/ADR-014-rss-feed-implementation.md index 150aad8..be87d94 100644 --- a/docs/decisions/ADR-014-rss-feed-implementation.md +++ b/docs/decisions/ADR-014-rss-feed-implementation.md @@ -6,6 +6,8 @@ Accepted > Its deferral of WebSub is superseded by ADR-071 (v2.10.0), and "no feed caching" by the feed cache added in v1.1.2. RSS is now one of three feed formats (ADR-038) and is served at `/feed.rss` (`/feed.xml` still works). (status updated 2026-11-03) +> Item titles: since v2.16.0 only articles (notes with a title) have one; notes have none, and no first-line or date title is made up (ADR-076). + ## Context Phase 5 requires implementing RSS feed generation for syndicating published notes. We need to decide on the implementation approach, feed format, caching strategy, and technical details for generating a standards-compliant RSS feed. diff --git a/docs/decisions/ADR-040-microformats2-compliance.md b/docs/decisions/ADR-040-microformats2-compliance.md index d7ea1b5..eb3a9a0 100644 --- a/docs/decisions/ADR-040-microformats2-compliance.md +++ b/docs/decisions/ADR-040-microformats2-compliance.md @@ -3,6 +3,8 @@ ## Status Accepted (implemented in v1.3.0, reviewed in v2.8.0; was: Proposed) +> Since v2.16.0 `p-name` is the stored title and `p-summary` the author's summary or, in previews, the start of the text (ADR-076). + ## Context StarPunk currently implements basic microformats2 markup: - h-entry on note articles diff --git a/docs/decisions/ADR-076-note-title-and-summary-columns.md b/docs/decisions/ADR-076-note-title-and-summary-columns.md new file mode 100644 index 0000000..bcf6f47 --- /dev/null +++ b/docs/decisions/ADR-076-note-title-and-summary-columns.md @@ -0,0 +1,72 @@ +# ADR-076: Article titles and summaries stored apart from the text + +## Status + +Accepted (v2.16.0, 2026-11-11) + +Supersedes the v2.3.3 design ([micropub-title-and-source-url](../design/v2.3.3/2026-10-31-micropub-title-and-source-url.md)) +and Q22's "a note has a title when its content starts with `#`". Amends +ADR-014 (feed item titles) and ADR-040 (`p-name` and `p-summary`). + +## Context + +An IndieWeb article is an h-entry with a `name` that isn't just the start of +its content (W3C Post Type Discovery). Since v1.2.0, StarPunk marked an article +by a `# Heading` first line in the Markdown, and v2.3.3 stored a Micropub `name` +as that heading. A review against IndieWeb practice found four gaps: + +1. Feeds repeated an article's title: the item title, then the same heading + rendered at the top of the content. +2. Every feed item had a title, made from a note's first line (or the date), + so feed readers showed notes as headlines and couldn't tell them from + articles. +3. Micropub `summary` was used only when `content` was missing; sent + together with content, it was dropped. +4. Any note that happened to start with a heading became an article, and its + `q=source` changed from what the client sent. Micropub and mf2 treat `name` + and `content` as separate properties. + +## Decision + +- **Columns.** `notes.title` and `notes.summary` (migration 023). A note with + a title is an article; its Markdown file holds only the body. A heading in + the body is just a heading. +- **Moving existing titles.** Migration 023 has a Python data step + (`migrations.DATA_MIGRATIONS`) that runs once, in the migration's + transaction: for each note whose file starts with a heading (`split_title`, + trashed files included), it moves the heading into `title`, rewrites the file + and updates `content_hash`, then empties `notes_fts` so startup rebuilds it. + If anything fails, the changed files are written back and the transaction is + rolled back, so 023 is retried on the next start. Tying it to the migration + matters: run on every start it would turn new notes' headings into titles. +- **Micropub.** `name` → `title`; `summary` → `summary` when `content` is also + sent. A summary on its own is still stored as the content, which is how Post + Type Discovery reads it. `summary` can be replaced and deleted; `q=source` + returns `name` and `summary` when set. If the content starts with a heading + equal to `name`, that heading is dropped so it isn't shown twice. +- **Feeds.** Only articles have a title: RSS leaves `` out (an item + needs a title or a description, and every item has a description), JSON Feed + leaves `title` out, and Atom, which requires `<title>`, has an empty one. + Atom `<summary>` and JSON Feed `summary` carry the author's summary. Content + no longer contains the title, so it isn't repeated. +- **Pages.** The article page has `p-name`, `p-summary` (when set) and the body + as `e-content`. On the homepage and tag pages an article shows its title, + summary (or the start of its text) and "Read more", without images. The + photos stay in the markup as hidden `u-photo` values so parsers read the same + post type there as on the article page. +- **Crossposting.** Articles go to GoToSocial, Bluesky and Threads as title, + summary (or the start of the text), link and hashtags, without images, the + usual POSSE form for articles. On Bluesky the link card is the article + itself. Notes are posted in full as before. +- **Editor.** Title and Summary fields; a titled note may have no body. + +## Consequences + +- The migration rewrites note files. Back up the database *and* `data/notes` + (and `.trash`) before deploying. +- `Note.title` is `None` for notes. Places that need a name for any post use + `Note.label` (title, else excerpt, else slug): notifications and the + Bluesky card. `Note.has_title` and `Note.body_html` are gone. +- Search indexes the title column; untitled notes are still listed by their + first line. +- A crossposted article that is edited is re-posted as a teaser. diff --git a/docs/decisions/INDEX.md b/docs/decisions/INDEX.md index 1b20727..fcebdc8 100644 --- a/docs/decisions/INDEX.md +++ b/docs/decisions/INDEX.md @@ -5,8 +5,8 @@ records one decision: its context, what was decided, and the consequences. Superseded ADRs are kept as history; their Status line names the ADR that replaced them. -**Total ADR files**: 71 (70 numbers: ADR-001 to ADR-044 and ADR-050 to -ADR-075, with two files numbered ADR-012). See [Numbering](#numbering). +**Total ADR files**: 72 (71 numbers: ADR-001 to ADR-044 and ADR-050 to +ADR-076, with two files numbered ADR-012). See [Numbering](#numbering). Status values: **Accepted** (in force), **Superseded** (replaced by a later ADR), **Deprecated** (withdrawn, nothing replaces it; none at present), @@ -58,7 +58,7 @@ See also [database architecture](../architecture/database.md). | ADR | Title | Status | Summary | |---|---|---|---| -| [014](ADR-014-rss-feed-implementation.md) | RSS Feed Implementation Strategy | Accepted* | RSS 2.0 feed; its WebSub deferral is superseded by ADR-071. | +| [014](ADR-014-rss-feed-implementation.md) | RSS Feed Implementation Strategy | Accepted* | RSS 2.0 feed; its WebSub deferral is superseded by ADR-071, and item titles by ADR-076. | | [038](ADR-038-syndication-formats.md) | Multiple Syndication Format Support | Accepted | RSS, Atom and JSON Feed side by side (v1.1.2). | | [071](ADR-071-websub.md) | WebSub publishing with a built-in hub | Accepted | Built-in WebSub hub at `/websub` for StarPunk's own feeds (v2.10.0, amended v2.10.1). | | [059](ADR-059-full-feed-media-standardization.md) | Full Feed Media Standardization (Option 3) | Proposed | Full Media RSS, podcasts, video and thumbnails in feeds; not scheduled. | @@ -67,7 +67,8 @@ See also [database architecture](../architecture/database.md). | ADR | Title | Status | Summary | |---|---|---|---| -| [040](ADR-040-microformats2-compliance.md) | Strict Microformats2 Compliance | Accepted | Full h-entry, h-card and h-feed markup (v1.3.0, reviewed v2.8.0). | +| [040](ADR-040-microformats2-compliance.md) | Strict Microformats2 Compliance | Accepted* | Full h-entry, h-card and h-feed markup (v1.3.0, reviewed v2.8.0); `p-name`/`p-summary` per ADR-076. | +| [076](ADR-076-note-title-and-summary-columns.md) | Article titles and summaries stored apart from the text | Accepted | `notes.title`/`summary` columns; feeds title only articles; article previews and crossposts are title + summary (v2.16.0). | | [061](ADR-061-author-discovery.md) | Author Profile Discovery from IndieAuth | Accepted | The author h-card is read from `ADMIN_ME` and cached. | | [063](ADR-063-webmention-implementation.md) | Webmention Implementation | Accepted | Async receiving (202) and sending via a background worker, SSRF guard, rate limits, moderation (v1.6.0, revised up to v2.10.1). *Reconstructed.* | | [028](ADR-028-micropub-implementation.md) | Micropub Implementation Strategy | Accepted* | `/micropub` endpoint for creating posts (v1.0.0-rc.1); tokens now per ADR-064. | @@ -203,5 +204,5 @@ was carried out and is not itself superseded. --- -**Last Updated**: 2026-11-10 -**Total ADR files**: 70 +**Last Updated**: 2026-11-11 +**Total ADR files**: 72 diff --git a/docs/design/v1.2.0/2025-11-28-v1.2.0-phase2-author-microformats.md b/docs/design/v1.2.0/2025-11-28-v1.2.0-phase2-author-microformats.md index fa26da5..8535084 100644 --- a/docs/design/v1.2.0/2025-11-28-v1.2.0-phase2-author-microformats.md +++ b/docs/design/v1.2.0/2025-11-28-v1.2.0-phase2-author-microformats.md @@ -343,6 +343,8 @@ Priority order: 3. First h-card found (fallback) ### p-name Only With Explicit Title +> Superseded in v2.16.0 (ADR-076): the title is `notes.title`, not a `#` first line. p-name still appears only for titled notes. + **Per Q22**: - Detected by checking if content starts with `#` - Matches note model's title extraction logic diff --git a/docs/design/v2.16.0/2026-11-11-article-titles-and-summaries.md b/docs/design/v2.16.0/2026-11-11-article-titles-and-summaries.md new file mode 100644 index 0000000..a3e5643 --- /dev/null +++ b/docs/design/v2.16.0/2026-11-11-article-titles-and-summaries.md @@ -0,0 +1,42 @@ +# v2.16.0: Article titles and summaries + +Implements ADR-076. Prompted by a review of how StarPunk handles IndieWeb +articles: titles were repeated in feeds, every feed item had a made-up title, +Micropub `summary` was dropped, and any note starting with a heading became an +article. + +## What changed + +| Area | Change | +|---|---| +| Storage | Migration 023 adds `notes.title` and `notes.summary`; `create_note`/`update_note` take `title` and `summary` (`UNCHANGED` sentinel on update; `None`/"" clears) | +| Migration data step | `migrations.DATA_MIGRATIONS["023_note_titles.sql"] = _move_note_titles`; `run_migrations(..., data_dir=)` gets `DATA_PATH` from `init_db`. Moves `# Heading` first lines (via `split_title`) into `title`, finds trashed files with `utils.find_trashed_file` (shared with `undelete_note`), updates `content_hash`, empties `notes_fts`. Files are restored if the migration fails | +| Model | `Note.title`/`summary` fields; `Note.label` for places that need some name; `has_title`, `body_html` and the first-line `title` property removed | +| Micropub | `name` → title, `summary` → summary (only with content), `summary` updatable, `q=source` returns both; a heading repeating `name` is dropped (`drop_title_heading`) | +| Feeds | Titles only for articles (RSS none, JSON none, Atom empty); Atom/JSON summaries | +| Templates | Article page: `p-name`, `p-summary`, `e-content` without the title. Previews: title, summary or excerpt, "Read more", no images (hidden `u-photo` data kept for Post Type Discovery) | +| Crossposting | `compose_text` posts articles as title + `article_teaser` (summary, or 200 characters of plain text) + link + hashtags; no images for articles; Bluesky card is the article | +| Editor | Title and Summary fields on new/edit; content not required when titled | +| Search | FTS indexes `title`; untitled notes still use their first line | +| MCP | `create_note`/`update_note` take `summary`; note summaries include it | + +## Fixes found along the way + +- **Hashtag lines.** Python-Markdown made `#indieweb is fun` an `<h1>`; CommonMark needs a space after `#`. `markdown_ext.HashtagLineExtension` escapes the first `#` of a line where `#`s run straight into text, after fenced code and raw HTML are set aside. It is used for pages and feeds (`MARKDOWN_EXTENSIONS`) and crosspost plain text (`syndication._note_soup`), so the hashtag also reaches Bluesky as a tag. Search's first-line label keeps hashtags too. +- **Plain-text excerpt.** `Note.excerpt` only stripped `#` marks, so previews showed `**bold**` and `[link](url)`. It is now `syndication.plain_text` of the content, cut to 200 characters with `…`; `article_teaser` is the summary or this excerpt. + +- **Inline images in Micropub articles.** (1) `extract_content` prefers `html` over `text` and marks it `content_format = 'html'`: clients send `text` as a plain fallback, so images, links and headings were lost. (2) `localize_inline_images` copies images from other sites (Markdown `![]()` or `<img>`) into the media library through the SSRF-checked fetcher used for `photo`, on create and on content replace, and rewrites their URLs; failures keep the original URL, at most 20 per post. Images stay inline (not `u-photo`), so the post remains an article. (3) `Note.html` sanitizes HTML content with nh3 directly instead of passing it through Markdown. + +## Choices made with the owner + +- Title column rather than an editor-only field, as the most standards-compliant option. +- Atom entries for notes keep an empty `<title>` (required by RFC 4287). +- Homepage and tag pages: articles show title and summary without images. +- Crossposts: articles as title + summary + link, no images. + +## Tests + +- `tests/test_articles.py` (new): feeds per format, article page mf2, homepage and tag-page previews, admin create/edit/clear, title-only article. +- `tests/test_migration_023.py` (new): titles moved (including trashed notes), hashtag first line untouched, hashes and FTS, runs once, files restored on failure, schema-only without `data_dir`. +- Updated for the new behaviour: `test_feed.py`, `test_feeds_{atom,json,rss}.py`, `test_routes_feed.py`, `test_models.py`, `test_microformats.py`, `test_microformats_v280.py`, `test_micropub.py`, `test_micropub_v240.py` (plus new summary and empty-body tests), `test_syndication.py` and `test_syndication_bluesky.py` (article crossposts). +- Locally: the 35 affected test files, 872+ tests, pass. CI runs the full suite on the tag. diff --git a/docs/design/v2.3.3/2026-10-31-micropub-title-and-source-url.md b/docs/design/v2.3.3/2026-10-31-micropub-title-and-source-url.md index 51b97a8..64c329e 100644 --- a/docs/design/v2.3.3/2026-10-31-micropub-title-and-source-url.md +++ b/docs/design/v2.3.3/2026-10-31-micropub-title-and-source-url.md @@ -1,5 +1,7 @@ # v2.3.3: Micropub titles, q=source URL, single title display +> Superseded in v2.16.0 by ADR-076: titles are stored in `notes.title`, not as a `# Heading` in the content, and `split_title` is used only to move old headings and drop a heading that repeats `name`. + Found while building tuipub, a terminal Micropub client, against StarPunk. ## Problems diff --git a/migrations/023_note_titles.sql b/migrations/023_note_titles.sql new file mode 100644 index 0000000..e3876c0 --- /dev/null +++ b/migrations/023_note_titles.sql @@ -0,0 +1,6 @@ +-- Migration 023: Note titles and summaries (v2.16.0, ADR-076) +-- An article's title moves out of its Markdown ('# Heading' first line) into +-- notes.title; migrations.py moves existing headings right after this runs. +-- notes.summary holds an author-written summary (Micropub 'summary'). +ALTER TABLE notes ADD COLUMN title TEXT; +ALTER TABLE notes ADD COLUMN summary TEXT; diff --git a/starpunk/__init__.py b/starpunk/__init__.py index c24d3af..4596854 100644 --- a/starpunk/__init__.py +++ b/starpunk/__init__.py @@ -468,5 +468,5 @@ def create_app(config=None): # Package version (Semantic Versioning 2.0.0) # See docs/standards/versioning-strategy.md for details -__version__ = "2.15.0" -__version_info__ = (2, 15, 0) +__version__ = "2.16.0" +__version_info__ = (2, 16, 0) diff --git a/starpunk/database/init.py b/starpunk/database/init.py index aa3498f..dc5d24f 100644 --- a/starpunk/database/init.py +++ b/starpunk/database/init.py @@ -17,10 +17,12 @@ def init_db(app=None): if app: db_path = app.config["DATABASE_PATH"] logger = app.logger + data_dir = app.config.get("DATA_PATH") else: # Fallback to default path db_path = Path("./data/starpunk.db") logger = None + data_dir = None # Ensure parent directory exists db_path.parent.mkdir(parents=True, exist_ok=True) @@ -41,4 +43,4 @@ def init_db(app=None): # Run migrations from starpunk.migrations import run_migrations - run_migrations(db_path, logger=logger) + run_migrations(db_path, logger=logger, data_dir=data_dir) diff --git a/starpunk/feeds/atom.py b/starpunk/feeds/atom.py index d253274..830ee5f 100644 --- a/starpunk/feeds/atom.py +++ b/starpunk/feeds/atom.py @@ -161,7 +161,10 @@ def generate_atom_streaming( # Required elements yield f' <id>{_escape_xml(permalink)}</id>\n' - yield f' <title>{_escape_xml(note.title)}\n' + # atom:title is required but may be empty: untitled notes (ADR-076) + yield f' {_escape_xml(note.title or "")}\n' + if note.summary: + yield f' {_escape_xml(note.summary)}\n' # Use created_at for both published and updated # (Note model doesn't have updated_at tracking yet) diff --git a/starpunk/feeds/json_feed.py b/starpunk/feeds/json_feed.py index bbcd161..28d823a 100644 --- a/starpunk/feeds/json_feed.py +++ b/starpunk/feeds/json_feed.py @@ -229,8 +229,12 @@ def _build_item_object(site_url: str, note: Note) -> Dict[str, Any]: "url": permalink, } - # Add title - item["title"] = note.title + # Title and summary only when the note has them: untitled notes have + # no title (JSON Feed 1.1; v2.16.0, ADR-076) + if note.title: + item["title"] = note.title + if note.summary: + item["summary"] = note.summary # Add image field (URL of first/main image) - per JSON Feed 1.1 spec # Per Q7: Field should be absent (not null) when no media diff --git a/starpunk/feeds/rss.py b/starpunk/feeds/rss.py index 3f383d5..40f91ab 100644 --- a/starpunk/feeds/rss.py +++ b/starpunk/feeds/rss.py @@ -108,7 +108,9 @@ def generate_rss( # Set required item elements fe.id(permalink) - fe.title(get_note_title(note)) + title = get_note_title(note) + if title: # untitled notes have only a description (RSS 2.0, ADR-076) + fe.title(title) fe.link(href=permalink) fe.guid(permalink, permalink=True) @@ -263,8 +265,8 @@ def generate_rss_streaming( html_content += clean_html_for_rss(note.feed_html) # Build item XML - item_xml = f""" - {_escape_xml(title)} + title_xml = f"\n {_escape_xml(title)}" if title else "" + item_xml = f""" {title_xml} {_escape_xml(permalink)} {_escape_xml(permalink)} {pub_date_str}""" @@ -494,48 +496,23 @@ def format_rfc822_date(dt: datetime) -> str: return dt.strftime("%a, %d %b %Y %H:%M:%S %z") -def get_note_title(note: Note) -> str: +def get_note_title(note: Note) -> Optional[str]: """ - Extract title from note content + An item's title: the note's title (articles), cut to 100 characters - Attempts to extract a meaningful title from the note. Uses the first - line of content (stripped of markdown heading syntax) or falls back - to a formatted timestamp if content is unavailable. - - Algorithm: - 1. Try note.title property (first line, stripped of # syntax) - 2. Fall back to timestamp if title is unavailable + Untitled notes get none (v2.16.0, ADR-076), so readers can tell notes + from articles; RSS 2.0 lets an item have just a description. Args: note: Note object Returns: - Title string (max 100 chars, truncated if needed) - - Examples: - >>> # Note with heading - >>> note = Note(...) # content: "# My First Note\\n\\n..." - >>> get_note_title(note) - 'My First Note' - - >>> # Note without heading (timestamp fallback) - >>> note = Note(...) # content: "Just some text" - >>> get_note_title(note) - 'November 18, 2024 at 12:00 PM' + Title string, or None for an untitled note """ - try: - # Use Note's title property (handles extraction logic) - title = note.title - - # Truncate to 100 characters for RSS compatibility - if len(title) > 100: - title = title[:100].strip() + "..." - - return title - - except (FileNotFoundError, OSError, AttributeError): - # If title extraction fails, use timestamp - return note.created_at.strftime("%B %d, %Y at %I:%M %p") + title = note.title + if title and len(title) > 100: + title = title[:100].strip() + "..." + return title or None def clean_html_for_rss(html: str) -> str: diff --git a/starpunk/markdown_ext.py b/starpunk/markdown_ext.py index e30b800..9c843f4 100644 --- a/starpunk/markdown_ext.py +++ b/starpunk/markdown_ext.py @@ -1,7 +1,12 @@ """ -Markdown extension: turn bare URLs into links (v2.3.0) +Markdown extensions for notes -Python-Markdown only links ; notes often contain pasted URLs. +BareUrlExtension: turn bare URLs into links (v2.3.0). Python-Markdown only +links ; notes often contain pasted URLs. + +HashtagLineExtension: a line starting with a hashtag stays text (v2.16.0). +Python-Markdown makes '#indieweb is fun' a heading; CommonMark (and every +other Markdown a client may use) needs a space after the '#'. """ import re @@ -9,6 +14,7 @@ import xml.etree.ElementTree as etree from markdown.extensions import Extension from markdown.inlinepatterns import InlineProcessor +from markdown.preprocessors import Preprocessor from markdown.treeprocessors import Treeprocessor from markdown.util import AtomicString @@ -40,3 +46,20 @@ class BareUrlExtension(Extension): # Below links (160) and (120), so those win md.inlinePatterns.register(_BareUrl(BARE_URL_RE, md), "bare_url", 105) md.treeprocessors.register(_UnnestLinks(md), "unnest_links", 0) + + +# Up to 3 spaces, then '#'s straight followed by text: a hashtag, not a heading +_HASHTAG_LINE_RE = re.compile(r"^( {0,3})(?=#+[^\s#])") + + +class _HashtagLines(Preprocessor): + """Escape the first '#' of such a line, so it renders as text""" + + def run(self, lines): + return [_HASHTAG_LINE_RE.sub(r"\1\\", line) for line in lines] + + +class HashtagLineExtension(Extension): + def extendMarkdown(self, md): + # After fenced code (25) and raw HTML (20) are set aside, so code is untouched + md.preprocessors.register(_HashtagLines(md), "hashtag_lines", 15) diff --git a/starpunk/mcp_server/tools.py b/starpunk/mcp_server/tools.py index 3367369..71c2d3e 100644 --- a/starpunk/mcp_server/tools.py +++ b/starpunk/mcp_server/tools.py @@ -73,6 +73,7 @@ def _summary(note) -> dict: "url": _note_url(note.slug), "slug": note.slug, "title": note.title, + "summary": note.summary, "kind": note.kind, "status": "published" if note.published else "draft", "published": iso_utc(note.created_at), @@ -217,6 +218,7 @@ def register_tools(server: MCPServer, app: Flask) -> None: async def create_note( content: str = "", title: Optional[str] = None, + summary: Optional[str] = None, tags: Optional[list[str]] = None, draft: bool = True, photos: Optional[list[Photo]] = None, @@ -230,7 +232,8 @@ def register_tools(server: MCPServer, app: Flask) -> None: ) -> dict: """Create a note (Markdown). It is a draft unless draft is false; publishing makes it public and crossposts it to the syndicate_to - targets. A title makes it an article. At most one of like_of, + targets. A title makes it an article; summary is its short summary, + shown on the homepage and in feeds and crossposts. At most one of like_of, repost_of and bookmark_of. published_at is an ISO 8601 date.""" info = _token_info() _require(info, "create", "draft") @@ -240,6 +243,8 @@ def register_tools(server: MCPServer, app: Flask) -> None: props["content"] = [content] if title: props["name"] = [title] + if summary: + props["summary"] = [summary] if tags: props["category"] = list(tags) if photos: @@ -268,6 +273,7 @@ def register_tools(server: MCPServer, app: Flask) -> None: url: str, content: Optional[str] = None, title: Optional[str] = None, + summary: Optional[str] = None, tags: Optional[list[str]] = None, add_tags: Optional[list[str]] = None, remove_tags: Optional[list[str]] = None, @@ -276,7 +282,7 @@ def register_tools(server: MCPServer, app: Flask) -> None: in_reply_to: Optional[str] = None, ) -> dict: """Change a note. Only the fields given change: content replaces the - text, title replaces the title ("" removes it), tags replaces all + text, title replaces the title ("" removes it), summary likewise, tags replaces all tags, add_tags/remove_tags adjust them, photos replaces all photos, draft false publishes a draft (and crossposts it) and true unpublishes. Edits to published notes follow to their crossposts.""" @@ -288,6 +294,8 @@ def register_tools(server: MCPServer, app: Flask) -> None: replace["content"] = [content] if title is not None: replace["name"] = [title] + if summary is not None: + replace["summary"] = [summary] if tags is not None: replace["category"] = list(tags) if draft is not None: diff --git a/starpunk/micropub.py b/starpunk/micropub.py index e8b8444..73df389 100644 --- a/starpunk/micropub.py +++ b/starpunk/micropub.py @@ -7,7 +7,8 @@ interface for creating posts via external clients. Functions: normalize_properties: Convert form/JSON data to Micropub properties format extract_content: Get content from Micropub properties - extract_title: Get the explicit title (name) from Micropub properties + extract_title: Get the title (name) from Micropub properties + extract_summary: Get the author's summary from Micropub properties extract_tags: Get category tags from Micropub properties handle_create: Process Micropub create action handle_update: Process Micropub update action (v2.4.0) @@ -204,10 +205,11 @@ def extract_content(properties: dict) -> str: content = content_list[0] - # Handle structured content ({"html": "...", "text": "..."}) + # Handle structured content ({"html": "...", "text": "..."}). The HTML is + # what was written; clients send text as a plain fallback, which loses + # images, links and headings (v2.16.0; before, text was preferred) if isinstance(content, dict): - # Prefer text over html for markdown storage - content = content.get("text") or content.get("html", "") + content = content.get("html") or content.get("text", "") if not isinstance(content, str) or not content.strip(): raise MicropubValidationError("Content cannot be empty") @@ -216,9 +218,9 @@ def extract_content(properties: dict) -> str: def content_format(properties: dict) -> Optional[str]: - """'html' if the content was sent only as HTML (returned as such by q=source)""" + """'html' if the content was sent as HTML (returned as such by q=source)""" content = _first(properties.get("content")) - if isinstance(content, dict) and content.get("html") and not content.get("text"): + if isinstance(content, dict) and content.get("html"): return "html" return None @@ -235,10 +237,7 @@ def _has_text(content) -> bool: def extract_title(properties: dict) -> Optional[str]: """ - Extract the explicit title (Micropub 'name' property) - - StarPunk has no title field: a note's title is a '# Heading' first line - (see Note.title), so the caller stores the name as that heading. + Extract the title (Micropub 'name' property), stored in notes.title (ADR-076) Args: properties: Normalized Micropub properties dict @@ -252,14 +251,22 @@ def extract_title(properties: dict) -> Optional[str]: return " ".join(name.split()) or None -def add_title_heading(content: str, title: Optional[str]) -> str: - """Prefix content with '# title' unless it already starts with that heading""" - if not title: - return content - first_line = content.lstrip().split("\n", 1)[0] - if first_line.startswith("#") and first_line.lstrip("#").strip() == title: - return content - return f"# {title}\n\n{content}" +def extract_summary(properties: dict) -> Optional[str]: + """The author's summary (Micropub 'summary' property, v2.16.0), as plain text""" + summary = _first(properties.get("summary")) + if isinstance(summary, dict): + summary = summary.get("text") or summary.get("value") or "" + if not isinstance(summary, str): + return None + return summary.strip() or None + + +def drop_title_heading(content: str, title: Optional[str]) -> str: + """Content without a '# heading' first line that only repeats the title""" + heading, rest = split_title(content) + if title and heading == title: + return rest + return content def extract_tags(properties: dict) -> list[str]: @@ -308,7 +315,7 @@ MAX_PHOTOS = 4 # ADR-057 MAX_REMOTE_PHOTO_BYTES = 20 * 1024 * 1024 # Properties we can store, and so can be updated (v2.4.0) -UPDATABLE = {"content", "name", "category", "in-reply-to", "post-status", "photo"} +UPDATABLE = {"content", "name", "summary", "category", "in-reply-to", "post-status", "photo"} def _first(value): @@ -407,9 +414,10 @@ def _public_address(host: str) -> bool: return bool(infos) -def _fetch_remote_photo(url: str) -> Optional[int]: +def _fetch_remote_photo(url: str) -> Optional[dict]: """ - Download a photo hosted elsewhere into the media library. Returns media id. + Download a photo hosted elsewhere into the media library. Returns the + saved media ({'id', 'path', ...}), or None if it couldn't be fetched. Uses the webmention fetcher (v2.9.0): every redirect is checked against private addresses and the connection is pinned to the checked address. @@ -426,7 +434,7 @@ def _fetch_remote_photo(url: str) -> Optional[int]: if result.status_code != 200: raise ValueError(f"HTTP {result.status_code}") name = urlparse(result.url).path.rsplit("/", 1)[-1] or "photo.jpg" - return save_media(result.content, name)["id"] + return save_media(result.content, name) except Exception as e: current_app.logger.warning(f"Could not fetch photo {url}: {e}") return None @@ -446,7 +454,35 @@ def _media_id_for_url(url: str) -> Optional[int]: return row[0] current_app.logger.warning(f"Photo URL not found in media: {url}") return None - return _fetch_remote_photo(url) + media = _fetch_remote_photo(url) + return media["id"] if media else None + + +MAX_INLINE_IMAGES = 20 + + +def localize_inline_images(content: str) -> str: + """ + Copy images embedded in the text from other sites into the media library + and point the text at the copies (v2.16.0), so an article doesn't depend + on the client's or a CDN's host staying up. Best effort: an image that + can't be fetched keeps its URL. + """ + from html import escape + from starpunk.syndication import inline_images + + if not content or " list[dict]: @@ -596,6 +632,10 @@ def handle_create(data: dict, token_info: dict, files=None): if has_content or not (like_of or repost_of or bookmark_of or photos or title) else "" ) + content = localize_inline_images(drop_title_heading(content, title)) + # A summary with content is the author's summary; alone it is the + # content (Post Type Discovery), as extract_content does (v2.16.0) + summary = extract_summary(properties) if _has_text(properties.get("content")) else None tags = extract_tags(properties) published_date = extract_published_date(properties) published = extract_post_status(properties) and not extract_visibility_draft(properties) @@ -615,7 +655,9 @@ def handle_create(data: dict, token_info: dict, files=None): note = None try: note = create_note( - content=add_title_heading(content, title), + content=content, + title=title, + summary=summary, published=published, created_at=published_date, custom_slug=custom_slug, @@ -686,7 +728,7 @@ def handle_update(data: dict, token_info: dict): from starpunk.tags import get_note_tags - title, body = split_title(note.content) + title, summary, body = note.title, note.summary, note.content tags = [t["display_name"] for t in get_note_tags(note.id, entered_order=True)] photos = _note_photos(note) changes = {} @@ -696,6 +738,8 @@ def handle_update(data: dict, token_info: dict): for prop in delete: if prop == "name": title = None + elif prop == "summary": + summary = None elif prop == "content": body = "" elif prop == "category": @@ -719,10 +763,12 @@ def handle_update(data: dict, token_info: dict): if "content" in replace: # Empty text is fine if the note keeps its photos; update_note checks (v2.6.5) - body = extract_content(replace) if _has_text(replace["content"]) else "" + body = localize_inline_images(extract_content(replace)) if _has_text(replace["content"]) else "" changes["content_format"] = content_format(replace) if body else None if "name" in replace: title = extract_title(replace) + if "summary" in replace: + summary = extract_summary(replace) if "category" in replace: tags = extract_tags(replace) if "photo" in replace: @@ -738,17 +784,22 @@ def handle_update(data: dict, token_info: dict): if "photo" in add: photos += extract_photos(add) - # Text may go only if photos stay (or it's a like, repost or bookmark) (v2.6.5) - if not (body or "").strip() and not (photos or note.reacts_to): - raise MicropubValidationError("A post needs text or a photo") + # Text may go only if photos stay, it has a title, or it's a like, repost + # or bookmark (v2.6.5) + if not (body or "").strip() and not (photos or title or note.reacts_to): + raise MicropubValidationError("A post needs text, a title or a photo") # Photos must all resolve before anything changes (v2.9.0) if "photo" in touched: media_ids, captions = _resolve_photos(photos) - new_content = add_title_heading(body, title) - if new_content != note.content: - changes["content"] = new_content + if title != note.title: + changes["title"] = title + if summary != note.summary: + changes["summary"] = summary + body = drop_title_heading(body, title) + if body != note.content: + changes["content"] = body elif "content_format" in changes and changes["content_format"] == note.content_format: del changes["content_format"] if {"category"} & touched: @@ -800,11 +851,11 @@ def note_to_mf2(note, wanted: Optional[list] = None) -> dict: """ A note as Microformats2 JSON, the inverse of create - A '# Heading' first line is the title, returned as name. + The title is returned as name and the author's summary as summary. """ from starpunk.syndication import get_note_syndications - title, content = split_title(note.content) + content = note.content props = { # HTML-authored content comes back as HTML (3.7.2, v2.9.0) "content": [{"html": content} if note.content_format == "html" else content], @@ -812,8 +863,10 @@ def note_to_mf2(note, wanted: Optional[list] = None) -> dict: "url": [absolute_url_for("public.note", slug=note.slug)], "post-status": ["published" if note.published else "draft"], } - if title: - props["name"] = [title] + if note.title: + props["name"] = [note.title] + if note.summary: + props["summary"] = [note.summary] from starpunk.tags import get_note_tags tags = get_note_tags(note.id, entered_order=True) diff --git a/starpunk/migrations.py b/starpunk/migrations.py index 2276b95..7bd3c52 100644 --- a/starpunk/migrations.py +++ b/starpunk/migrations.py @@ -344,7 +344,65 @@ def apply_migration(conn, migration_name, migration_path, logger=None): raise MigrationError(error_msg) -def run_migrations(db_path, logger=None): +def _move_note_titles(conn, data_dir, logger): + """ + Migration 023 data step: move each note's '# Heading' title into notes.title + + Runs once, inside the migration transaction. Rewrites the note files without + the heading and returns [(path, original text)] so a failed migration can + put them back (see _restore_files). + """ + from starpunk.models import split_title + from starpunk.utils import calculate_content_hash, find_trashed_file, write_note_file + + data_dir = Path(data_dir) + written = [] + try: + rows = conn.execute( + "SELECT id, slug, file_path FROM notes WHERE title IS NULL" + ).fetchall() + for note_id, slug, file_path in rows: + path = data_dir / file_path + if not path.exists(): + path = find_trashed_file(data_dir, file_path) + if path is None: + logger.warning(f"Migration 023: no file for note {slug}, title not moved") + continue + text = path.read_text(encoding="utf-8") + title, body = split_title(text) + if title is None: + continue + conn.execute( + "UPDATE notes SET title = ?, content_hash = ? WHERE id = ?", + (title, calculate_content_hash(body), note_id), + ) + write_note_file(path, body) + written.append((path, text)) + if written and table_exists(conn, "notes_fts"): + # Emptied so startup rebuilds it with the titles (starpunk/__init__.py) + conn.execute("DELETE FROM notes_fts") + logger.info(f"Migration 023: moved {len(written)} titles out of note files") + return written + except Exception: + _restore_files(written, logger) + raise + + +def _restore_files(written, logger): + """Put back note files changed by a data step whose migration failed""" + for path, text in written: + try: + path.write_text(text, encoding="utf-8") + except OSError as e: + logger.critical(f"Could not restore {path} after failed migration: {e}") + + +# Python steps run right after a migration's SQL, in the same transaction. +# Each returns [(path, original text)] for files it changed. +DATA_MIGRATIONS = {"023_note_titles.sql": _move_note_titles} + + +def run_migrations(db_path, logger=None, data_dir=None): """ Run all pending database migrations with concurrency protection @@ -374,6 +432,8 @@ def run_migrations(db_path, logger=None): Args: db_path: Path to SQLite database file logger: Optional logger for output + data_dir: Data directory, for migrations that also change note files + (DATA_MIGRATIONS); skipped when None Raises: MigrationError: If any migration fails to apply or lock cannot be acquired @@ -407,6 +467,7 @@ def run_migrations(db_path, logger=None): # BEGIN IMMEDIATE acquires RESERVED lock, preventing other writes # but allowing reads. Escalates to EXCLUSIVE during actual writes. conn.execute("BEGIN IMMEDIATE") + written = [] # note files changed by DATA_MIGRATIONS, restored on failure try: # Ensure migrations tracking table exists @@ -510,6 +571,9 @@ def run_migrations(db_path, logger=None): # Execute migration inside the locked transaction execute_in_transaction(conn, migration_sql) + data_step = DATA_MIGRATIONS.get(migration_name) + if data_step and data_dir is not None: + written += data_step(conn, data_dir, logger) # Record migration as applied conn.execute( @@ -547,6 +611,7 @@ def run_migrations(db_path, logger=None): except MigrationError: # Migration error - rollback and re-raise + _restore_files(written, logger) try: conn.rollback() except Exception as rollback_error: @@ -556,6 +621,7 @@ def run_migrations(db_path, logger=None): except Exception as e: # Unexpected error during migration - rollback and wrap + _restore_files(written, logger) try: conn.rollback() except Exception as rollback_error: diff --git a/starpunk/models.py b/starpunk/models.py index 84a5c06..e8f1fb8 100644 --- a/starpunk/models.py +++ b/starpunk/models.py @@ -36,9 +36,9 @@ DEFAULT_AUTH_STATE_EXPIRY_MINUTES = 5 DEFAULT_TOKEN_EXPIRY_DAYS = 90 # Constants - Markdown rendering -from starpunk.markdown_ext import BareUrlExtension +from starpunk.markdown_ext import BareUrlExtension, HashtagLineExtension -MARKDOWN_EXTENSIONS = ["extra", "codehilite", "nl2br", BareUrlExtension()] +MARKDOWN_EXTENSIONS = ["extra", "codehilite", "nl2br", BareUrlExtension(), HashtagLineExtension()] # Constants - Content limits MAX_TITLE_LENGTH = 200 @@ -76,11 +76,14 @@ EXCERPT_LENGTH = 200 def split_title(content: str) -> tuple[Optional[str], str]: """ - Split a note's '# Heading' first line (its title, per Q22) off its content + Split a '# Heading' first line off Markdown content + + Before v2.16.0 an article's title was its '# Heading' first line (Q22). + Titles now live in notes.title (ADR-076); migration 023 uses this to move + the old headings there, and Micropub to drop a heading that repeats 'name'. The first line must be a Markdown heading: 1-6 '#' then a space and text. - '#indieweb ...' (a hashtag) or a bare '#' is not a title. This is the one - place that decides whether a note has a title (templates use has_title). + '#indieweb ...' (a hashtag) or a bare '#' is not a title. Returns: (title, remaining content); title is None if the note has no heading @@ -171,6 +174,8 @@ class Note: repost_of: Optional[str] = None # v2.5.0: URL reposted (this note is a repost) bookmark_of: Optional[str] = None # v2.9.0: URL bookmarked (this note is a bookmark) content_format: Optional[str] = None # v2.9.0: 'html' if sent as HTML via Micropub + title: Optional[str] = None # v2.16.0: an article's title (p-name), ADR-076 + summary: Optional[str] = None # v2.16.0: author-written summary (p-summary) _cached_content: Optional[str] = field( default=None, repr=False, compare=False, init=False ) @@ -233,6 +238,8 @@ class Note: repost_of=data.get("repost_of"), bookmark_of=data.get("bookmark_of"), content_format=data.get("content_format"), + title=data.get("title"), + summary=data.get("summary"), ) @property @@ -291,8 +298,13 @@ class Note:

This is my note content...

""" if self._cached_html is None: - # Render markdown to sanitized HTML (v2.9.0) - html = render_markdown(self.content) # triggers lazy load of content + if self.content_format == "html": + # Sent as HTML via Micropub: sanitize it as is. Through Markdown + # it picked up stray
s and empty paragraphs (v2.16.0) + html = nh3.clean(self.content, tags=ALLOWED_TAGS, attributes=ALLOWED_ATTRIBUTES) + else: + # Render markdown to sanitized HTML (v2.9.0) + html = render_markdown(self.content) # triggers lazy load of content # Cache it object.__setattr__(self, "_cached_html", html) @@ -300,124 +312,40 @@ class Note: return self._cached_html @property - def body_html(self) -> str: - """ - Rendered HTML without the title heading - - Pages show a titled note's title as their own heading, so the body - leaves it out to avoid showing it twice. Untitled notes: same as html. - """ - title, body = split_title(self.content) - if title is None: - return self.html - return render_markdown(body) - - @property - def has_title(self) -> bool: - """True if the note starts with a '# Heading' title (an article)""" - try: - return split_title(self.content)[0] is not None - except (FileNotFoundError, OSError): - return False - - @property - def title(self) -> str: - """ - Extract title from content - - Returns first line of content, or uses slug as fallback. - Strips markdown heading syntax (# ) if present. - - Returns: - Title string - - Examples: - >>> # Content: "# My First Note\\n\\nContent here..." - >>> note.title - 'My First Note' - - >>> # Content: "Just a note without heading" - >>> note.title - 'Just a note without heading' - """ - try: - # Get content (may trigger lazy load) - content = self.content - - # Split into lines and get first non-empty line - lines = content.strip().split("\n") - first_line = "" - for line in lines: - if line.strip(): - first_line = line.strip() - break - - if not first_line: - # No content, use slug - return self.slug - - # Strip markdown heading syntax - if first_line.startswith("#"): - # Remove leading # characters and whitespace - first_line = first_line.lstrip("#").strip() - - # Truncate to max length - if len(first_line) > MAX_TITLE_LENGTH: - first_line = first_line[:MAX_TITLE_LENGTH] - - return first_line if first_line else self.slug - - except (FileNotFoundError, OSError): - # If file doesn't exist, use slug - return self.slug + def label(self) -> str: + """A name for places that always need one: the title, else the excerpt, else the slug""" + return self.title or " ".join(self.excerpt.split())[:MAX_TITLE_LENGTH] or self.slug @property def excerpt(self) -> str: """ Generate short excerpt for previews - Returns first 200 characters of content (plain text, no markdown). - Strips markdown formatting and adds ellipsis if truncated. + The first 200 characters of the note as plain text: Markdown (or + HTML) rendered and stripped, images left out, links as their text + (v2.16.0). Cut at a word boundary with an ellipsis if longer. Returns: Excerpt string Examples: >>> note.excerpt - 'This is my note content. It has some interesting points...' + 'This is my note content. It has some interesting points…' """ + from starpunk.syndication import plain_text + try: - # Leave out the title; previews show it separately - _, content = split_title(self.content) - - # Remove markdown heading syntax - lines = content.split("\n") - cleaned_lines = [] - for line in lines: - if line.strip().startswith("#"): - # Remove heading syntax - cleaned_lines.append(line.lstrip("#").strip()) - else: - cleaned_lines.append(line) - - cleaned_content = "\n".join(cleaned_lines) - - # Take first EXCERPT_LENGTH characters - excerpt = cleaned_content.strip()[:EXCERPT_LENGTH] - - # Truncate to word boundary - if len(cleaned_content.strip()) > EXCERPT_LENGTH: - # Find last space in excerpt + text = " ".join(plain_text(self.content).split()) + if len(text) > EXCERPT_LENGTH: + excerpt = text[:EXCERPT_LENGTH] last_space = excerpt.rfind(" ") - if last_space > 0: - excerpt = excerpt[:last_space] - excerpt += "..." + text = (excerpt[:last_space] if last_space > 0 else excerpt).rstrip() + "…" - if not excerpt and self.reacts_to: + if not text and self.reacts_to: # A like, repost or bookmark with no comment return f"{REACTION_VERBS[self.kind]} {self.reacts_to}" - return excerpt + return text except (FileNotFoundError, OSError): # If file doesn't exist, return slug @@ -533,6 +461,7 @@ class Note: "id": self.id, "slug": self.slug, "title": self.title, + "summary": self.summary, "published": self.published, "created_at": self.created_at.strftime("%Y-%m-%dT%H:%M:%SZ"), "updated_at": self.updated_at.strftime("%Y-%m-%dT%H:%M:%SZ"), diff --git a/starpunk/notes.py b/starpunk/notes.py index b91532d..2e16416 100644 --- a/starpunk/notes.py +++ b/starpunk/notes.py @@ -149,6 +149,8 @@ def create_note( has_media: bool = False, bookmark_of: Optional[str] = None, content_format: Optional[str] = None, + title: Optional[str] = None, + summary: Optional[str] = None, ) -> Note: """ Create a new note @@ -164,6 +166,8 @@ def create_note( custom_slug: Optional custom slug (from Micropub mp-slug property) tags: Optional list of tag display names (v1.3.0) in_reply_to: Optional URL being replied to (v1.6.0) + title: Optional title; a titled note is an article (v2.16.0, ADR-076) + summary: Optional author-written summary (v2.16.0) Returns: Note object with all metadata and content loaded @@ -176,7 +180,7 @@ def create_note( Examples: >>> # Create unpublished draft - >>> note = create_note("# My First Note\\n\\nContent here.", published=False) + >>> note = create_note("Content here.", title="My First Note", published=False) >>> print(note.slug) 'my-first-note' @@ -219,7 +223,9 @@ def create_note( "like_of", like_of, "A note can only be one of a like, repost or bookmark" ) content = content or "" - if not content.strip() and not (like_of or repost_of or bookmark_of or has_media): + title = (title or "").strip() or None + summary = (summary or "").strip() or None + if not content.strip() and not (like_of or repost_of or bookmark_of or has_media or title): raise InvalidNoteDataError( "content", content, "Content cannot be empty or whitespace-only" ) @@ -281,11 +287,12 @@ def create_note( db.execute( """ INSERT INTO notes (slug, file_path, published, created_at, updated_at, content_hash, - in_reply_to, like_of, repost_of, bookmark_of, content_format) - VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + in_reply_to, like_of, repost_of, bookmark_of, content_format, + title, summary) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """, (slug, file_path_rel, published, created_at, updated_at, content_hash, - in_reply_to, like_of, repost_of, bookmark_of, content_format), + in_reply_to, like_of, repost_of, bookmark_of, content_format, title, summary), ) db.commit() except Exception as e: @@ -327,7 +334,7 @@ def create_note( from starpunk.search import update_fts_index, has_fts_table db_path = Path(current_app.config["DATABASE_PATH"]) if has_fts_table(db_path): - update_fts_index(db, note_id, slug, content) + update_fts_index(db, note_id, slug, content, title) db.commit() except Exception as e: # FTS update failure should not prevent note creation @@ -641,11 +648,14 @@ def update_note( in_reply_to: Optional[str] = None, has_media: bool = False, content_format=UNCHANGED, + title=UNCHANGED, + summary=UNCHANGED, ) -> Note: """ Update a note's content and/or published status content_format (v2.9.0): 'html' or None (Markdown); left alone unless given + title, summary (v2.16.0): new value, None or "" to remove; left alone unless given Updates note content and/or metadata, maintaining atomic synchronization between file and database. At least one of content or published must @@ -713,8 +723,15 @@ def update_note( if slug is not None and id is not None: raise ValueError("Cannot provide both slug and id") - if content is None and published is None and tags is None and in_reply_to is None: - raise ValueError("Must provide at least one of content, published, tags, or in_reply_to to update") + if (content is None and published is None and tags is None and in_reply_to is None + and title is UNCHANGED and summary is UNCHANGED): + raise ValueError( + "Must provide at least one of content, published, tags, in_reply_to, title or summary to update" + ) + if title is not UNCHANGED: + title = (title or "").strip() or None + if summary is not UNCHANGED: + summary = (summary or "").strip() or None # Validate content if provided (checked against the note below for # likes/reposts, whose comment may be empty) @@ -729,7 +746,8 @@ def update_note( raise NoteNotFoundError(identifier) old_tag_names = _tag_names(existing_note.id) # for WebSub tag topics (v2.10.0) - if empty_content and not (existing_note.reacts_to or has_media): + new_title = existing_note.title if title is UNCHANGED else title + if empty_content and not (existing_note.reacts_to or has_media or new_title): raise InvalidNoteDataError( "content", content, "Content cannot be empty or whitespace-only" ) @@ -797,6 +815,14 @@ def update_note( update_fields.append("content_format = ?") params.append(content_format) + if title is not UNCHANGED: + update_fields.append("title = ?") + params.append(title) + + if summary is not UNCHANGED: + update_fields.append("summary = ?") + params.append(summary) + # Add WHERE clause parameter if slug is not None: where_clause = "slug = ?" @@ -832,13 +858,14 @@ def update_note( # Tag update failure should not prevent note update current_app.logger.warning(f"Failed to update tags for note {existing_note.slug}: {e}") - # 7. UPDATE FTS INDEX (if available and content changed) - if content is not None: + # 7. UPDATE FTS INDEX (if available and content or title changed) + if content is not None or title is not UNCHANGED: try: from starpunk.search import update_fts_index, has_fts_table db_path = Path(current_app.config["DATABASE_PATH"]) if has_fts_table(db_path): - update_fts_index(db, existing_note.id, existing_note.slug, content) + update_fts_index(db, existing_note.id, existing_note.slug, + existing_note.content if content is None else content, new_title) db.commit() except Exception as e: # FTS update failure should not prevent note update @@ -1129,7 +1156,7 @@ def undelete_note(slug: str) -> Note: NoteNotFoundError: If there is no soft-deleted note with this slug """ import shutil - from starpunk.utils import TRASH_DIR_NAME + from starpunk.utils import find_trashed_file db = get_db(current_app) row = db.execute( @@ -1142,14 +1169,7 @@ def undelete_note(slug: str) -> Note: data_dir = Path(current_app.config["DATA_PATH"]) note_path = data_dir / row["file_path"] if not note_path.exists(): - # delete_note_file put it in .trash/// - parts = Path(row["file_path"]).parts - candidates = [] - if "notes" in parts and len(parts) > parts.index("notes") + 2: - i = parts.index("notes") - candidates.append(data_dir / TRASH_DIR_NAME / parts[i + 1] / parts[i + 2] / note_path.name) - candidates += sorted((data_dir / TRASH_DIR_NAME).glob(f"*/*/{note_path.name}")) - source = next((c for c in candidates if c.exists()), None) + source = find_trashed_file(data_dir, row["file_path"]) if source is None: raise NoteSyncError("undelete", f"Trashed file not found for {slug}", "Cannot restore note file") note_path.parent.mkdir(parents=True, exist_ok=True) diff --git a/starpunk/notifications.py b/starpunk/notifications.py index 1085dae..77d4587 100644 --- a/starpunk/notifications.py +++ b/starpunk/notifications.py @@ -142,7 +142,7 @@ def _note_label(conn, note_id: int) -> str: try: note = get_note(id=note_id, load_content=True) - label = " ".join((note.title or "").split()) if note else "" + label = note.label if note else "" except Exception: label = "" return (label[:57] + "…") if len(label) > 60 else (label or "a note") diff --git a/starpunk/routes/admin.py b/starpunk/routes/admin.py index e58af2e..8a41b99 100644 --- a/starpunk/routes/admin.py +++ b/starpunk/routes/admin.py @@ -128,6 +128,7 @@ def create_note_submit(): media_files: Multiple file upload (v1.2.0 Phase 3) captions[]: Captions for each media file (v1.2.0 Phase 3) tags: Comma-separated tag list (v1.3.0 Phase 3) + title, summary: Optional; a title makes it an article (v2.16.0) Returns: Redirect to dashboard on success, back to form on error @@ -141,17 +142,19 @@ def create_note_submit(): published = "published" in request.form custom_slug = request.form.get("custom_slug", "").strip() tags_input = request.form.get("tags", "") + title = request.form.get("title", "").strip() or None + summary = request.form.get("summary", "").strip() or None - if not content: - flash("Content cannot be empty", "error") + # With photos, WebSub hears about the note once they're attached (v2.10.1) + has_uploads = any(f.filename for f in request.files.getlist('media_files')) + + if not (content or title or has_uploads): + flash("A note needs text, a title or an image", "error") return redirect(url_for("admin.new_note_form")) # Parse tags (v1.3.0 Phase 3) tags = parse_tag_input(tags_input) - # With photos, WebSub hears about the note once they're attached (v2.10.1) - has_uploads = any(f.filename for f in request.files.getlist('media_files')) - try: # Create note first (per Q4) note = create_note( @@ -160,6 +163,8 @@ def create_note_submit(): custom_slug=custom_slug if custom_slug else None, tags=tags if tags else None, has_media=has_uploads, + title=title, + summary=summary, ) # Handle media uploads (v1.2.0 Phase 3) @@ -279,12 +284,14 @@ def update_note_submit(note_id: int): content: Updated markdown content (required) published: Checkbox for published status (optional) tags: Comma-separated tag list (v1.3.0 Phase 3) + title, summary: Empty removes them; a form without the field leaves them (v2.16.0) Returns: Redirect to dashboard on success, back to form on error Decorator: @require_auth """ + from starpunk.notes import UNCHANGED from starpunk.tags import parse_tag_input # Check if note exists first @@ -296,8 +303,12 @@ def update_note_submit(note_id: int): content = request.form.get("content", "").strip() published = "published" in request.form tags_input = request.form.get("tags", "") + title = request.form["title"].strip() if "title" in request.form else UNCHANGED + summary = request.form["summary"].strip() if "summary" in request.form else UNCHANGED + has_title = existing_note.title if title is UNCHANGED else title - if not content and not existing_note.reacts_to: # likes/reposts may have no comment + # Likes/reposts may have no comment, articles no body + if not content and not (existing_note.reacts_to or has_title): flash("Content cannot be empty", "error") return redirect(url_for("admin.edit_note_form", note_id=note_id)) @@ -311,7 +322,9 @@ def update_note_submit(note_id: int): published=published, # An empty Tags field removes all tags (v2.14.1); a form without # the field leaves them alone - tags=tags if "tags" in request.form else None + tags=tags if "tags" in request.form else None, + title=title, + summary=summary, ) if "syndication_form" in request.form: from starpunk.syndication import select_targets diff --git a/starpunk/search.py b/starpunk/search.py index 2b737b0..c2b62c7 100644 --- a/starpunk/search.py +++ b/starpunk/search.py @@ -98,29 +98,32 @@ def has_fts_table(db_path: Path) -> bool: return False -def update_fts_index(conn: sqlite3.Connection, note_id: int, slug: str, content: str): +def _first_line(content: str) -> str: + """A note's first line without heading marks (result label for untitled notes). + A hashtag ('#indieweb ...') is kept.""" + line = content.split('\n', 1)[0].strip() + return re.sub(r'^#{1,6}\s+', '', line) + + +def update_fts_index(conn: sqlite3.Connection, note_id: int, slug: str, content: str, + title: Optional[str] = None): """ Update FTS index for a note (insert or replace) - Extracts title from first line of content and updates the FTS index. - Uses REPLACE to handle both new notes and updates. + Indexes the note's title (articles, v2.16.0) or, for untitled notes, its + first line. Uses REPLACE to handle both new notes and updates. Args: conn: SQLite database connection note_id: Note ID (used as FTS rowid) slug: Note slug - content: Full markdown content + content: Markdown content + title: The note's title, if it has one Raises: sqlite3.Error: If FTS update fails """ - # Extract title from first line - lines = content.split('\n', 1) - title = lines[0].strip() if lines else '' - - # Remove markdown heading syntax (# ## ###) - if title.startswith('#'): - title = title.lstrip('#').strip() + title = title or _first_line(content) # Limit title length if len(title) > 100: @@ -170,7 +173,7 @@ def rebuild_fts_index(db_path: Path, data_dir: Path): # Get all non-deleted notes cursor = conn.execute( - "SELECT id, slug, file_path FROM notes WHERE deleted_at IS NULL" + "SELECT id, slug, file_path, title FROM notes WHERE deleted_at IS NULL" ) indexed_count = 0 @@ -188,7 +191,7 @@ def rebuild_fts_index(db_path: Path, data_dir: Path): content = note_path.read_text(encoding='utf-8') # Update FTS index - update_fts_index(conn, row['id'], row['slug'], content) + update_fts_index(conn, row['id'], row['slug'], content, row['title']) indexed_count += 1 except Exception as e: @@ -408,6 +411,7 @@ def search_notes_fallback( id, slug, file_path, + title, published, created_at FROM notes @@ -446,8 +450,8 @@ def search_notes_fallback( file_path = data_dir / row['file_path'] content = read_note_file(file_path) - # Check if query matches content (case-insensitive) - content_lower = content.lower() + # Check if query matches title or content (case-insensitive) + content_lower = f"{row['title'] or ''}\n{content}".lower() query_lower = query.lower() matches = query_lower in content_lower @@ -456,11 +460,7 @@ def search_notes_fallback( matches = any(term.lower() in content_lower for term in terms) if matches: - # Extract title from first line - lines = content.split('\n', 1) - title = lines[0].strip() if lines else row['slug'] - if title.startswith('#'): - title = title.lstrip('#').strip() + title = row['title'] or _first_line(content) or row['slug'] results.append({ 'id': row['id'], diff --git a/starpunk/syndication.py b/starpunk/syndication.py index 51d7f86..f9c8521 100644 --- a/starpunk/syndication.py +++ b/starpunk/syndication.py @@ -357,7 +357,9 @@ class BlueskyClient: def _record(self, post: "Post", text: Optional[str] = None, embed: Optional[dict] = None, anchors: List[tuple] = ()) -> dict: if text is None: - body, anchors = plain_text_links(post.note.content, links="anchor") + # An article is posted as a teaser (compose_text), so its links aren't in the text + body, anchors = (None, []) if post.note.title else \ + plain_text_links(post.note.content, links="anchor") text = compose_text(post.note, post.permalink, post.tags, post.max_chars, body=body) record = {"$type": self.POST, "text": text, "createdAt": self._now()} facets = bluesky_facets(text, anchors) @@ -368,14 +370,16 @@ class BlueskyClient: elif post.media: record["embed"] = {"$type": "app.bsky.embed.images", "images": [self._image(m) for m in post.media]} - elif note_links(post.note.content): + elif not post.note.title and note_links(post.note.content): # The note links somewhere: the card shows that page, not the note record["embed"] = self._link_card(note_links(post.note.content)[0]) else: + # Articles always get a card for the article itself (v2.16.0) + description = article_teaser(post.note) if post.note.title else plain_text(post.note.content) record["embed"] = {"$type": "app.bsky.embed.external", "external": { "uri": post.permalink, - "title": post.note.title[:300], - "description": plain_text(post.note.content)[:300], + "title": post.note.label[:300], + "description": description[:300], }} return record @@ -1185,19 +1189,30 @@ def _hashtag(display_name: str) -> str: return f"#{word}" if word else "" +def article_teaser(note) -> str: + """An article's summary, or the start of its text (v2.16.0)""" + return note.summary or note.excerpt + + 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. + + An article (a note with a title) is posted as its title and teaser + instead of its full text, the usual POSSE form for articles (v2.16.0). """ 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 if body is None else body).strip() + if getattr(note, "title", None): + body = f"{note.title}\n\n{article_teaser(note)}".strip() + else: + body = (note.content if body is None else body).strip() if getattr(note, "bookmark_of", None): # A bookmark leads with what it bookmarks (v2.9.0) body = f"🔖 {note.bookmark_of}\n\n{body}".strip() @@ -1215,7 +1230,10 @@ def _note_soup(markdown_text: str): import markdown from bs4 import BeautifulSoup - return BeautifulSoup(markdown.markdown(markdown_text, extensions=["fenced_code"]), "html.parser") + from starpunk.markdown_ext import HashtagLineExtension + + html = markdown.markdown(markdown_text, extensions=["fenced_code", HashtagLineExtension()]) + return BeautifulSoup(html, "html.parser") def _clean_url(url: str) -> str: @@ -1509,8 +1527,9 @@ def _reconcile(row, target: Target) -> tuple: permalink=f"{site}/note/{note.slug}", tags=[t["display_name"] for t in get_note_tags(note.id, entered_order=True)], max_chars=target.max_chars, + # Articles are posted as a teaser without images (v2.16.0) media=_media_files(note.id, target.max_media, note.content) - if note.kind == "note" else [], + if note.kind == "note" and not note.title else [], kind=note.kind, target_url=note.reacts_to, target_title=_target_title(note.reacts_to), diff --git a/starpunk/utils.py b/starpunk/utils.py index 4438ddf..4eed0fe 100644 --- a/starpunk/utils.py +++ b/starpunk/utils.py @@ -480,6 +480,27 @@ def validate_note_path(file_path: Path, data_dir: Path) -> bool: # Atomic File Operations +def find_trashed_file(data_dir: Path, file_path: str) -> Optional[Path]: + """ + Where delete_note_file put a note's file: .trash/// + + Args: + data_dir: Data directory + file_path: The note's file_path as stored in the database + + Returns: + Path of the trashed file, or None if it can't be found + """ + parts = Path(file_path).parts + name = Path(file_path).name + candidates = [] + if "notes" in parts and len(parts) > parts.index("notes") + 2: + i = parts.index("notes") + candidates.append(data_dir / TRASH_DIR_NAME / parts[i + 1] / parts[i + 2] / name) + candidates += sorted((data_dir / TRASH_DIR_NAME).glob(f"*/*/{name}")) + return next((c for c in candidates if c.exists()), None) + + def write_note_file(file_path: Path, content: str) -> None: """ Write note content to file atomically diff --git a/templates/admin/dashboard.html b/templates/admin/dashboard.html index d935a55..c76a576 100644 --- a/templates/admin/dashboard.html +++ b/templates/admin/dashboard.html @@ -51,7 +51,7 @@
- {{ note.content[:100] }}{% if note.content|length > 100 %}...{% endif %} + {% if note.title %}{{ note.title }}{% else %}{{ note.content[:100] }}{% if note.content|length > 100 %}...{% endif %}{% endif %}
{{ note.slug }} diff --git a/templates/admin/edit.html b/templates/admin/edit.html index 40b1618..9971145 100644 --- a/templates/admin/edit.html +++ b/templates/admin/edit.html @@ -11,6 +11,12 @@

+
+ + +
+
{% if note.reacts_to %}

{{ {'like': '★ Like of', 'repost': '🔁 Repost of', 'bookmark': '🔖 Bookmark of'}[note.kind] }} {{ note.reacts_to }}

@@ -20,12 +26,18 @@ id="content" name="content" rows="{{ 6 if note.reacts_to else 20 }}" - {% if not note.reacts_to %}required{% endif %} autofocus >{{ note.content }} Use Markdown syntax for formatting
+
+ + + Articles only. Leave blank to use the start of the text. +
+
Create New Note +
+ + +
+
Use Markdown syntax for formatting
+
+ + + Articles only. Leave blank to use the start of the text. +
+
- {# Notes starting with a '# Heading' have a title (Q22; Note.has_title) #} - {% set has_explicit_title = note.has_title %} - - {# p-name only if note has explicit title (per Q22) #} - {% if has_explicit_title %} + {# Titled notes are articles: p-name only then, so notes get no implied name (ADR-076) #} + {% if note.title %}

{{ note.title }}

{% endif %} + {% if note.summary %} +

{{ note.summary }}

+ {% endif %} {# Reply context (v1.6.0 Phase 4) - displayed if this is a reply post #} {% if note.in_reply_to %} @@ -49,7 +49,7 @@ {# e-content: note content BELOW media (per ADR-057) #}
- {{ note.body_html|safe }} + {{ note.html|safe }}