nodebb-plugin-facebook-post 1.0.29 → 1.0.31

package/library.js

@@ -73,16 +73,33 @@ function absolutizeUrl(url) {
   return `${base}/${url}`;
 }
 
+function getApexDomain(hostname) {
+  const parts = hostname.split('.');
+  return parts.length <= 2 ? hostname : parts.slice(-2).join('.');
+}
+
 function isForumHosted(urlAbs) {
   const base = getForumBaseUrl();
   if (!base) return false;
   try {
-    return new URL(urlAbs).host === new URL(base).host;
+    const imgHost = new URL(urlAbs).host;
+    const forumHost = new URL(base).host;
+    return imgHost === forumHost || getApexDomain(imgHost) === getApexDomain(forumHost);
   } catch {
     return false;
   }
 }
 
+function decodeHtmlEntities(str) {
+  return str
+    .replace(/&amp;/g, '&')
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&quot;/g, '"')
+    .replace(/&#x([0-9a-fA-F]+);/gi, (_, hex) => String.fromCharCode(parseInt(hex, 16)))
+    .replace(/&#(\d+);/g, (_, dec) => String.fromCharCode(Number(dec)));
+}
+
 function extractImageUrlsFromContent(rawContent) {
   const urls = new Set();
   if (!rawContent) return [];
@@ -212,7 +229,7 @@ async function publishFeedPost({ message, link, photoIds }) {
 
 async function postToFacebook(ctx) {
   const rawContent = ctx.post.content || '';
-  const topicTitle = ctx.topic.title || 'Nouveau sujet';
+  const topicTitle = decodeHtmlEntities(ctx.topic.title || 'Nouveau sujet');
   const author = ctx.user.username || 'Quelqu\u2019un';
   const link = ctx.topicUrlAbs;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-facebook-post",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "description": "Auto-post new NodeBB topics to a fixed Facebook Page (text + NodeBB uploads + place id).",
   "main": "library.js",
   "dependencies": {

package/static/lib/composer.js

@@ -16,34 +16,42 @@
   }
 
   function injectUI($composer) {
-    if ($composer.find('[data-fbpost-wrap]').length) return;
+    if ($composer.find('[data-fbpost-btn]').length) return;
 
-    const html = `
-      <div class="mb-2" data-fbpost-wrap>
-        <div class="form-check mb-2">
-          <input type="checkbox" class="form-check-input" id="fbPostEnabled" data-fbpost-enabled>
-          <label class="form-check-label" for="fbPostEnabled">Publier ce nouveau topic sur Facebook (et Insta si activé)</label>
-        </div>
-      </div>
-    `;
+    const $btn = $(`
+      <button type="button" class="btn btn-sm btn-link" data-fbpost-btn
+        title="Publier ce topic sur Facebook (cliquer pour activer)"
+        style="opacity:0.4; color:#1877F2; font-size:1.2em; padding:2px 6px;">
+        <i class="fab fa-facebook-f"></i>
+      </button>
+    `);
 
-    const $write = $composer.find('.write').first();
-    if ($write.is('textarea')) {
-      // .write est la textarea elle-même — injecter après son conteneur parent
-      $write.parent().after(html);
-    } else if ($write.length) {
-      $write.prepend(html);
+    $btn.on('click', function () {
+      const active = $(this).data('fbpost-active');
+      $(this).data('fbpost-active', !active)
+        .attr('title', !active
+          ? 'Publier sur Facebook (actif — cliquer pour désactiver)'
+          : 'Publier ce topic sur Facebook (cliquer pour activer)')
+        .css('opacity', !active ? '1' : '0.4');
+    });
+
+    // Injecter dans la barre d'outils du composeur
+    const $toolbar = $composer.find('.toolbar, .formatting-bar, [data-toolbar]').first();
+    if ($toolbar.length) {
+      // Si la toolbar contient des <li>, on enveloppe
+      if ($toolbar.find('li').length) {
+        $toolbar.append($('<li>').append($btn));
+      } else {
+        $toolbar.append($btn);
+      }
     } else {
-      const $target = $composer.find('.composer-body, .composer-content').first();
-      if ($target.length) $target.prepend(html);
-      else $composer.prepend(html);
+      // Fallback : avant la zone de texte
+      $composer.find('.write').first().before($btn);
     }
 
-    // NodeBB 4.x fires 'action:composer.submit' with { composerData } (the object
-    // sent to the socket). Modifying composerData by reference is enough.
     $(window).off('action:composer.submit.fbpost')
       .on('action:composer.submit.fbpost', function (ev2, data) {
-        const enabled = $enabled.is(':checked');
+        const enabled = !!$composer.find('[data-fbpost-btn]').data('fbpost-active');
         const postData = (data && data.composerData) || (data && data.postData) || data;
         if (!postData || typeof postData !== 'object') return;
         postData.fbPostEnabled = enabled;
@@ -64,4 +72,3 @@
     }
   });
 })();
-