@rmdes/indiekit-syndicator-bluesky 1.0.5 → 1.0.7

package/index.js

@@ -8,7 +8,8 @@ const defaults = {
   profileUrl: "https://bsky.app/profile",
   serviceUrl: "https://bsky.social",
   includePermalink: false,
-  syndicateExternalLikes: true, // NEW: Enable syndication of external likes
+  syndicateExternalLikes: true, // Enable syndication of external likes
+  syndicateExternalReposts: true, // Enable syndication of external reposts
   checked: false,
 };
 
@@ -23,6 +24,7 @@ export default class BlueskySyndicator {
    * @param {string} [options.password] - Password
    * @param {boolean} [options.includePermalink] - Include permalink in status
    * @param {boolean} [options.syndicateExternalLikes] - Syndicate likes of external URLs as posts
+   * @param {boolean} [options.syndicateExternalReposts] - Syndicate reposts of external URLs as posts
    * @param {boolean} [options.checked] - Check syndicator in UI
    */
   constructor(options = {}) {
@@ -92,6 +94,7 @@ export default class BlueskySyndicator {
         serviceUrl: this.#serviceUrl,
         includePermalink: this.options.includePermalink,
         syndicateExternalLikes: this.options.syndicateExternalLikes,
+        syndicateExternalReposts: this.options.syndicateExternalReposts,
       });
 
       return await bluesky.post(properties, publication.me);

package/lib/bluesky.js

@@ -6,6 +6,9 @@ import {
   getPostImage,
   getPostText,
   getLikePostText,
+  getRepostPostText,
+  getBookmarkPostText,
+  buildPostText,
   getPostParts,
   uriToPostUrl,
   fetchOpenGraphData,
@@ -22,6 +25,7 @@ export class Bluesky {
    * @param {string} options.serviceUrl - Service URL
    * @param {boolean} [options.includePermalink] - Include permalink in status
    * @param {boolean} [options.syndicateExternalLikes] - Syndicate likes of external URLs
+   * @param {boolean} [options.syndicateExternalReposts] - Syndicate reposts of external URLs
    */
   constructor(options) {
     this.identifier = options.identifier;
@@ -30,6 +34,7 @@ export class Bluesky {
     this.serviceUrl = options.serviceUrl;
     this.includePermalink = options.includePermalink || false;
     this.syndicateExternalLikes = options.syndicateExternalLikes !== false; // Default true
+    this.syndicateExternalReposts = options.syndicateExternalReposts !== false; // Default true
   }
 
   /**
@@ -330,7 +335,15 @@ export class Bluesky {
         if (isSameOrigin(repostUrl, this.profileUrl)) {
           return this.postRepost(repostUrl);
         }
-        // Do not syndicate reposts of other URLs
+
+        // Syndicate reposts of external URLs as posts with link card
+        if (this.syndicateExternalReposts) {
+          const text = getRepostPostText(properties, repostUrl);
+          const richText = await createRichText(client, text);
+          const externalEmbed = await this.createExternalEmbed(repostUrl);
+          return this.postPost(richText, { images, externalEmbed });
+        }
+
         return;
       }
 
@@ -355,26 +368,28 @@ export class Bluesky {
         return;
       }
 
-      // Handle bookmarks - similar to likes but with bookmark-of
+      // Handle bookmarks - OG card shows bookmarked URL, text has commentary + permalink
       const bookmarkOfUrl = properties["bookmark-of"];
       if (bookmarkOfUrl) {
-        const text = getPostText(properties, this.includePermalink);
+        const text = getBookmarkPostText(properties, bookmarkOfUrl);
         const richText = await createRichText(client, text);
-        // Create external embed for the bookmarked URL
         const externalEmbed = await this.createExternalEmbed(bookmarkOfUrl);
         return this.postPost(richText, { images, externalEmbed });
       }
 
-      // Regular post - check for external URL in content to create link card
-      const text = getPostText(properties, this.includePermalink);
+      // Regular post - determine external URL and build text accordingly
+      const externalUrl = getExternalUrl(properties);
+      const text = buildPostText(properties, { externalUrl });
       const richText = await createRichText(client, text);
 
-      // If no images, try to create external embed from URLs in content
+      // Create OG embed:
+      // - External URL exists → use it as OG card (permalink is in text)
+      // - No external URL → use permalink as OG card
       let externalEmbed = null;
       if (!images?.length) {
-        const externalUrl = getExternalUrl(properties);
-        if (externalUrl) {
-          externalEmbed = await this.createExternalEmbed(externalUrl);
+        const embedUrl = externalUrl || properties.url;
+        if (embedUrl) {
+          externalEmbed = await this.createExternalEmbed(embedUrl);
         }
       }
 

package/lib/utils.js

@@ -180,7 +180,7 @@ export const uriToPostUrl = (profileUrl, uri) => {
 };
 
 /**
- * Get post text from given JF2 properties
+ * Get post text from given JF2 properties (legacy, used for likes/bookmarks)
  * @param {object} properties - JF2 properties
  * @param {boolean} [includePermalink] - Include permalink in post
  * @returns {string} Post text
@@ -210,7 +210,92 @@ export const getPostText = (properties, includePermalink) => {
 };
 
 /**
- * Get post text for a like of an external URL
+ * Extract plain text content from properties without appending URLs
+ * @param {object} properties - JF2 properties
+ * @returns {string} Plain text content
+ */
+export function getContentText(properties) {
+  if (properties.name && properties.name !== "") {
+    return properties.name;
+  }
+  if (properties.content?.html) {
+    return htmlToText(properties.content.html, {
+      selectors: [
+        { selector: "a", options: { ignoreHref: true } },
+        { selector: "img", format: "skip" },
+      ],
+      wordwrap: false,
+    });
+  }
+  if (properties.content?.text) {
+    return properties.content.text;
+  }
+  return "";
+}
+
+/**
+ * Remove a URL from text, cleaning up surrounding whitespace and prefixes
+ * @param {string} text - Text containing the URL
+ * @param {string} url - URL to remove
+ * @returns {string} Cleaned text
+ */
+export function removeUrlFromText(text, url) {
+  if (!text || !url) return text;
+  let result = text.replace(url, "");
+  // Clean up common prefixes left behind when URL was at the end
+  result = result.replace(/\s*(Réf|Ref|ref|via|Via|source|Source|link|Link|→|—)\s*$/im, "");
+  // Clean up excessive whitespace
+  result = result.replace(/\n{3,}/g, "\n\n").replace(/[ \t]{2,}/g, " ").trim();
+  return result;
+}
+
+/**
+ * Build post text for Bluesky syndication with proper URL and character handling.
+ *
+ * Two modes:
+ * 1. External URL exists → remove from text (shown as OG card), append permalink as text
+ * 2. No external URL → content only (permalink shown as OG card)
+ *
+ * @param {object} properties - JF2 properties
+ * @param {object} [options] - Options
+ * @param {string} [options.externalUrl] - External URL that will be used as OG card
+ * @returns {string} Post text fitting within 300 chars
+ */
+export function buildPostText(properties, options = {}) {
+  const { externalUrl } = options;
+  const LIMIT = 300;
+
+  let text = getContentText(properties);
+
+  if (externalUrl) {
+    // External URL will be shown as OG card — remove from text to save space
+    text = removeUrlFromText(text, externalUrl);
+
+    // Always append permalink to original post
+    const permalink = properties.url;
+    if (permalink) {
+      const suffix = `\n\n${permalink}`;
+      const available = LIMIT - suffix.length;
+      if (text.length > available) {
+        text = text.slice(0, available - 1).trim() + "\u2026";
+      }
+      return (text + suffix).trim();
+    }
+  }
+
+  // No external URL — permalink will be shown as OG card
+  // No need to duplicate it in text
+  if (text.length > LIMIT) {
+    text = text.slice(0, LIMIT - 1).trim() + "\u2026";
+  }
+
+  return text.trim();
+}
+
+/**
+ * Get post text for a like of an external URL (Bluesky version).
+ * The external URL is shown as an OG card embed, so the text contains
+ * commentary + blog permalink (for webmentions), not the liked URL.
  * @param {object} properties - JF2 properties
  * @param {string} likedUrl - The URL being liked
  * @returns {string} Post text
@@ -225,20 +310,125 @@ export const getLikePostText = (properties, likedUrl) => {
     text = properties.content.text;
   }
 
-  // If there's content, append the liked URL
-  if (text) {
-    // Check if the URL is already in the text
-    if (!text.includes(likedUrl)) {
-      text = `${text}\n\n❤️ ${likedUrl}`;
+  // Remove the liked URL from text if already present (OG card shows it)
+  if (text && likedUrl) {
+    text = text.replace(likedUrl, "").trim();
+  }
+
+  // Append blog permalink for webmentions
+  const permalink = properties.url;
+  if (permalink) {
+    if (text) {
+      text = `${text}\n\n${permalink}`;
+    } else {
+      text = `❤️ ${permalink}`;
     }
-  } else {
-    // No content, just post the liked URL with a heart
+  } else if (!text) {
+    // Fallback: no content, no permalink — use liked URL
     text = `❤️ ${likedUrl}`;
   }
 
   // Truncate if needed (Bluesky limit is 300 chars)
   if (text.length > 300) {
-    const suffix = `\n\n❤️ ${likedUrl}`;
+    const suffix = permalink ? `\n\n${permalink}` : `\n\n❤️ ${likedUrl}`;
+    const maxLen = 300 - suffix.length - 3;
+    const contentPart = text.replace(suffix, "").slice(0, maxLen).trim();
+    text = contentPart + "..." + suffix;
+  }
+
+  return text;
+};
+
+/**
+ * Get post text for a repost of an external URL (Bluesky version).
+ * The external URL is shown as an OG card embed, so the text contains
+ * commentary + blog permalink (for webmentions), not the reposted URL.
+ * @param {object} properties - JF2 properties
+ * @param {string} repostUrl - The URL being reposted
+ * @returns {string} Post text
+ */
+export const getRepostPostText = (properties, repostUrl) => {
+  let text = "";
+
+  // Get the content/comment
+  if (properties.content?.html) {
+    text = htmlToStatusText(properties.content.html);
+  } else if (properties.content?.text) {
+    text = properties.content.text;
+  }
+
+  // Remove the reposted URL from text if already present (OG card shows it)
+  if (text && repostUrl) {
+    text = text.replace(repostUrl, "").trim();
+  }
+
+  // Append blog permalink for webmentions
+  const permalink = properties.url;
+  if (permalink) {
+    if (text) {
+      text = `${text}\n\n${permalink}`;
+    } else {
+      text = `🔁 ${permalink}`;
+    }
+  } else if (!text) {
+    // Fallback: no content, no permalink — use repost URL
+    text = `🔁 ${repostUrl}`;
+  }
+
+  // Truncate if needed (Bluesky limit is 300 chars)
+  if (text.length > 300) {
+    const suffix = permalink ? `\n\n${permalink}` : `\n\n🔁 ${repostUrl}`;
+    const maxLen = 300 - suffix.length - 3;
+    const contentPart = text.replace(suffix, "").slice(0, maxLen).trim();
+    text = contentPart + "..." + suffix;
+  }
+
+  return text;
+};
+
+/**
+ * Get post text for a bookmark of an external URL (Bluesky version).
+ * The external URL is shown as an OG card embed, so the text contains
+ * commentary + blog permalink (for webmentions), not the bookmarked URL.
+ * @param {object} properties - JF2 properties
+ * @param {string} bookmarkUrl - The URL being bookmarked
+ * @returns {string} Post text
+ */
+export const getBookmarkPostText = (properties, bookmarkUrl) => {
+  let text = "";
+
+  // Get the content/comment
+  if (properties.name && properties.name !== "") {
+    text = properties.name;
+  } else if (properties.content?.html) {
+    text = htmlToStatusText(properties.content.html);
+  } else if (properties.content?.text) {
+    text = properties.content.text;
+  }
+
+  // Remove the bookmarked URL from text if already present (OG card shows it)
+  if (text && bookmarkUrl) {
+    text = text.replace(bookmarkUrl, "").trim();
+  }
+
+  // Append blog permalink for webmentions
+  const permalink = properties.url;
+  if (permalink) {
+    if (text) {
+      if (!text.includes(permalink)) {
+        text = `${text}\n\n${permalink}`;
+      }
+    } else {
+      text = `🔖 ${permalink}`;
+    }
+  } else if (!text) {
+    // Fallback: no content, no permalink — use bookmarked URL
+    text = `🔖 ${bookmarkUrl}`;
+  }
+
+  // Truncate if needed (Bluesky limit is 300 chars)
+  if (text.length > 300) {
+    const suffix = permalink ? `\n\n${permalink}` : `\n\n🔖 ${bookmarkUrl}`;
     const maxLen = 300 - suffix.length - 3;
     const contentPart = text.replace(suffix, "").slice(0, maxLen).trim();
     text = contentPart + "..." + suffix;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-syndicator-bluesky",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Bluesky syndicator for Indiekit with external like support",
   "type": "module",
   "main": "index.js",