Bookmarked: ${escapeHtml(label)}
`, + }; + } + + if (likeOf) { + return { + text: `Liked: ${likeOf}`, + html: `Liked: ${escapeHtml(likeOf)}
`, + }; + } + + if (repostOf) { + const label = name || repostOf; + return { + text: `Reposted: ${label}`, + html: `Reposted: ${escapeHtml(label)}
`, + }; + } + + // Article with title but no body + if (name) { + return { text: name, html: `${escapeHtml(name)}
` }; + } + + return raw; +} + +/** + * Normalize content from JF2 properties to { text, html } format. + */ +function normalizeContent(content) { + if (!content) return { text: "", html: "" }; + if (typeof content === "string") return { text: content, html: `${content}
` }; + if (typeof content === "object") { + return { + text: content.text || content.value || "", + html: content.html || content.text || content.value || "", + }; + } + return { text: "", html: "" }; +} + +// ─── Hashtag Handling ───────────────────────────────────────────────────────── + +/** + * Extract hashtags from text content. + * Matches #word patterns, returns lowercase tag names without the # prefix. + */ +function extractHashtags(text) { + if (!text) return []; + const matches = text.match(/(?:^|\s)#([a-zA-Z_]\w*)/g); + if (!matches) return []; + return [...new Set(matches.map((m) => m.trim().slice(1).toLowerCase()))]; +} + +/** + * Merge explicit categories with inline hashtags (deduplicated, case-insensitive). + */ +function mergeCategories(categories, hashtags) { + const seen = new Set(categories.map((c) => c.toLowerCase())); + const result = [...categories]; + for (const tag of hashtags) { + if (!seen.has(tag)) { + seen.add(tag); + result.push(tag); + } + } + return result; +} + +/** + * Rewrite hashtag links in HTML from site-internal (/categories/tag/) to + * Mastodon-compatible format. Mastodon clients use the tag objects, not + * inline links, but having correct href helps with link following. + */ +function rewriteHashtagLinks(content, siteUrl) { + if (!content.html) return content; + // Rewrite /categories/tag/ links to /tags/tag (Mastodon convention) + let html = content.html.replace( + /href="\/categories\/([^/"]+)\/?"/g, + (_, tag) => `href="${siteUrl}/tags/${tag}" class="hashtag" rel="tag"`, + ); + // Also rewrite absolute site category links + if (siteUrl) { + html = html.replace( + new RegExp(`href="${escapeRegex(siteUrl)}/categories/([^/"]+)/?"`, "g"), + (_, tag) => `href="${siteUrl}/tags/${tag}" class="hashtag" rel="tag"`, + ); + } + return { ...content, html }; +} + +// ─── Post Type Mapping ──────────────────────────────────────────────────────── + +/** + * Map Micropub post-type to timeline type. + */ +function mapPostType(postType) { + switch (postType) { + case "article": + return "article"; + case "photo": + case "video": + case "audio": + return "note"; + case "reply": + return "note"; + case "repost": + return "boost"; + case "like": + case "bookmark": + return "note"; + default: + return "note"; + } +} + +// ─── Normalization Helpers ──────────────────────────────────────────────────── + +/** + * Normalize a value to an array of strings. + */ +function normalizeArray(value) { + if (!value) return []; + if (Array.isArray(value)) return value.map(String); + return [String(value)]; +} + +/** + * Normalize media values — resolves relative URLs to absolute. + * + * @param {*} value - String, object with url, or array thereof + * @param {string} siteUrl - Base site URL for resolving relative paths + */ +function normalizeMediaArray(value, siteUrl) { + if (!value) return []; + const arr = Array.isArray(value) ? value : [value]; + return arr.map((item) => { + if (typeof item === "string") return resolveUrl(item, siteUrl); + if (typeof item === "object" && item.url) { + return { ...item, url: resolveUrl(item.url, siteUrl) }; + } + return null; + }).filter(Boolean); +} + +/** + * Resolve a URL — if relative, prepend the site URL. + */ +function resolveUrl(url, siteUrl) { + if (!url) return url; + if (url.startsWith("http://") || url.startsWith("https://")) return url; + if (url.startsWith("/")) return `${siteUrl}${url}`; + return `${siteUrl}/${url}`; +} + +/** + * Escape HTML entities. + */ +function escapeHtml(str) { + return str + .replace(/&/g, "&") + .replace(//g, ">") + .replace(/"/g, """); +} + +/** + * Escape regex special characters. + */ +function escapeRegex(str) { + return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); +} diff --git a/lib/mastodon/routes/statuses.js b/lib/mastodon/routes/statuses.js index 0f5c817..c22102f 100644 --- a/lib/mastodon/routes/statuses.js +++ b/lib/mastodon/routes/statuses.js @@ -219,6 +219,34 @@ router.post("/api/v1/statuses", async (req, res, next) => { const handle = pluginOptions.handle || "user"; const actorUrl = profile?.url || `${publicationUrl}/users/${handle}`; + // Extract hashtags from status text and merge with any Micropub categories + const categories = data.properties.category || []; + const inlineHashtags = (statusText || "").match(/(?:^|\s)#([a-zA-Z_]\w*)/g); + if (inlineHashtags) { + const existing = new Set(categories.map((c) => c.toLowerCase())); + for (const match of inlineHashtags) { + const tag = match.trim().slice(1).toLowerCase(); + if (!existing.has(tag)) { + existing.add(tag); + categories.push(tag); + } + } + } + + // Resolve relative media URLs to absolute + const resolveMedia = (items) => { + if (!items || !items.length) return []; + return items.map((item) => { + if (typeof item === "string") { + return item.startsWith("http") ? item : `${publicationUrl.replace(/\/$/, "")}/${item.replace(/^\//, "")}`; + } + if (item?.url && !item.url.startsWith("http")) { + return { ...item, url: `${publicationUrl.replace(/\/$/, "")}/${item.url.replace(/^\//, "")}` }; + } + return item; + }); + }; + const now = new Date().toISOString(); const timelineItem = await addTimelineItem(collections, { uid: postUrl, @@ -234,16 +262,16 @@ router.post("/api/v1/statuses", async (req, res, next) => { createdAt: now, author: { name: profile?.name || handle, - url: actorUrl, + url: profile?.url || publicationUrl, photo: profile?.icon || "", handle: `@${handle}`, emojis: [], bot: false, }, - photo: data.properties.photo || [], - video: data.properties.video || [], - audio: data.properties.audio || [], - category: data.properties.category || [], + photo: resolveMedia(data.properties.photo || []), + video: resolveMedia(data.properties.video || []), + audio: resolveMedia(data.properties.audio || []), + category: categories, counts: { replies: 0, boosts: 0, likes: 0 }, linkPreviews: [], mentions: [], diff --git a/package.json b/package.json index a913e4e..6681831 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@rmdes/indiekit-endpoint-activitypub", - "version": "3.6.2", + "version": "3.6.3", "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.", "keywords": [ "indiekit",