nodebb-plugin-facebook-post 1.0.30 → 1.0.32

package/library.js

@@ -14,6 +14,7 @@ const DEFAULT_SETTINGS = {
   categoriesWhitelist: '',
   minimumReputation: 0,
   maxImages: 4,
+  enablePlaceTagging: false,
 };
 
 function bool(v) {
@@ -51,6 +52,7 @@ async function loadSettings() {
   settings.minimumReputation = int(settings.minimumReputation, 0);
   settings.maxImages = int(settings.maxImages, DEFAULT_SETTINGS.maxImages);
   settings.categoriesWhitelist = trimStr(settings.categoriesWhitelist);
+  settings.enablePlaceTagging = bool(settings.enablePlaceTagging);
 
   const env = readEnv();
   settings.fbGraphVersion = env.fbGraphVersion;
@@ -73,16 +75,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 [];
@@ -190,13 +209,14 @@ async function uploadPhotoToFacebook(urlAbs) {
   return resp.data && resp.data.id;
 }
 
-async function publishFeedPost({ message, link, photoIds }) {
+async function publishFeedPost({ message, link, photoIds, placeId }) {
   const endpoint = `https://graph.facebook.com/${settings.fbGraphVersion}/${settings.fbPageId}/feed`;
 
   const form = new URLSearchParams();
   form.append('message', String(message || ''));
   form.append('access_token', String(settings.fbPageAccessToken));
   if (link) form.append('link', String(link));
+  if (placeId) form.append('place', String(placeId));
   if (Array.isArray(photoIds) && photoIds.length) {
     photoIds.forEach((id, idx) => {
       form.append(`attached_media[${idx}]`, JSON.stringify({ media_fbid: id }));
@@ -212,7 +232,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;
 
@@ -235,7 +255,7 @@ async function postToFacebook(ctx) {
     if (id) photoIds.push(id);
   }
 
-  return publishFeedPost({ message, link, photoIds });
+  return publishFeedPost({ message, link, photoIds, placeId: trimStr(ctx.post.fbPlaceId) });
 }
 
 const Plugin = {};
@@ -283,12 +303,36 @@ Plugin.init = async function (params) {
       const allowedGroups = parseAllowedGroupsList();
       if (!allowedGroups.length) return res.json({ allowed: false, reason: 'no_groups_configured' });
       const ok = await userIsAllowed(uid);
-      return res.json({ allowed: ok, reason: ok ? 'ok' : 'not_in_group' });
+      return res.json({ allowed: ok, reason: ok ? 'ok' : 'not_in_group', enablePlaceTagging: settings.enablePlaceTagging });
     } catch {
       return res.json({ allowed: false, reason: 'error' });
     }
   });
 
+  router.get('/api/facebook-post/search-place', middleware.ensureLoggedIn, async (req, res) => {
+    res.set('Cache-Control', 'no-store');
+    try {
+      await loadSettings();
+      if (!settings.enabled || !settings.enablePlaceTagging || !settings.fbPageAccessToken) {
+        return res.json({ results: [] });
+      }
+      const q = trimStr(req.query.q);
+      if (q.length < 2) return res.json({ results: [] });
+      const resp = await axios.get(`https://graph.facebook.com/${settings.fbGraphVersion}/search`, {
+        params: {
+          type: 'place',
+          q,
+          fields: 'name,location,id',
+          access_token: settings.fbPageAccessToken,
+          limit: 8,
+        },
+        timeout: 8000,
+      });
+      return res.json({ results: (resp.data && resp.data.data) || [] });
+    } catch {
+      return res.json({ results: [] });
+    }
+  });
 
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-facebook-post",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "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

@@ -2,6 +2,8 @@
 'use strict';
 
 (function () {
+  const DEBOUNCE_MS = 400;
+
   async function canPost() {
     try {
       const res = await fetch('/api/facebook-post/can-post?_=' + Date.now(), {
@@ -10,51 +12,164 @@
       });
       if (!res.ok) return { allowed: false };
       return await res.json();
-    } catch (err) {
+    } catch {
       return { allowed: false };
     }
   }
 
-  function injectUI($composer) {
+  async function searchPlace(q) {
+    try {
+      const res = await fetch('/api/facebook-post/search-place?q=' + encodeURIComponent(q), {
+        credentials: 'same-origin',
+        cache: 'no-store',
+      });
+      if (!res.ok) return [];
+      const data = await res.json();
+      return data.results || [];
+    } catch {
+      return [];
+    }
+  }
+
+  function resetPlace($panel) {
+    $panel.find('.fb-place-search').removeClass('d-none').val('');
+    $panel.find('.fb-place-id').val('');
+    $panel.find('.fb-place-selected').removeClass('d-inline-flex').addClass('d-none');
+    $panel.find('.fb-place-results').hide().empty();
+  }
+
+  function injectUI($composer, perm) {
     if ($composer.find('[data-fbpost-btn]').length) return;
 
-    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 showPlace = !!perm.enablePlaceTagging;
+
+    // ── Bouton dans la toolbar — même structure que les boutons natifs ──
+    const $li = $(`
+      <li aria-label="Publier sur Facebook" data-bs-original-title="Publier sur Facebook" data-fbpost-btn>
+        <button type="button" class="btn btn-sm btn-link text-reset position-relative"
+          aria-label="Publier sur Facebook" style="opacity:0.45;">
+          <i class="fab fa-facebook-f"></i>
+        </button>
+      </li>
     `);
+    const $btn = $li.find('button');
 
+    // ── Panneau lieu (affiché sous la toolbar quand FB est actif) ──
+    const $placePanel = $(`
+      <div class="fb-place-panel d-none align-items-center gap-2 px-2 py-1"
+        style="font-size:0.85em; border-top:1px solid rgba(128,128,128,.2);">
+        <i class="fab fa-facebook-f" style="color:#1877F2; flex-shrink:0;"></i>
+        <span class="text-muted">Publier sur Facebook</span>
+        ${showPlace ? `
+          <div class="position-relative flex-grow-1 ms-2">
+            <input type="text" class="form-control form-control-sm fb-place-search"
+              placeholder="Lieu (optionnel)…" autocomplete="off">
+            <ul class="fb-place-results dropdown-menu p-1"
+              style="display:none; position:absolute; z-index:9999; top:100%; left:0;
+                     min-width:220px; max-height:200px; overflow-y:auto;"></ul>
+          </div>
+          <span class="fb-place-selected d-none align-items-center gap-1 text-nowrap">
+            <i class="fa fa-map-marker" style="color:#1877F2;"></i>
+            <span class="fb-place-name fw-semibold"></span>
+            <a href="#" class="fb-place-clear ms-1 text-danger" title="Effacer">
+              <i class="fa fa-times"></i>
+            </a>
+          </span>
+          <input type="hidden" class="fb-place-id" value="">
+        ` : ''}
+      </div>
+    `);
+
+    // ── Toggle actif/inactif ──
     $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');
+      const active = !$(this).data('fbpost-active');
+      $(this).data('fbpost-active', active);
+      if (active) {
+        $(this).css({ color: '#1877F2', opacity: '1' });
+        $placePanel.removeClass('d-none').addClass('d-flex');
+      } else {
+        $(this).css({ color: '', opacity: '0.45' });
+        $placePanel.removeClass('d-flex').addClass('d-none');
+        if (showPlace) resetPlace($placePanel);
+      }
     });
 
-    // Injecter dans la barre d'outils du composeur
-    const $toolbar = $composer.find('.toolbar, .formatting-bar, [data-toolbar]').first();
+    // ── Recherche de lieu avec debounce ──
+    if (showPlace) {
+      let debounceTimer;
+
+      $placePanel.find('.fb-place-search').on('input', function () {
+        const q = $(this).val().trim();
+        const $results = $placePanel.find('.fb-place-results');
+        clearTimeout(debounceTimer);
+        if (q.length < 2) { $results.hide().empty(); return; }
+
+        debounceTimer = setTimeout(async () => {
+          const places = await searchPlace(q);
+          $results.empty();
+          if (!places.length) { $results.hide(); return; }
+
+          places.forEach(p => {
+            const loc = p.location
+              ? [p.location.city, p.location.country].filter(Boolean).join(', ')
+              : '';
+            $('<li>').append(
+              $('<a href="#" class="dropdown-item rounded-1 py-1">')
+                .attr({ 'data-place-id': p.id, 'data-place-name': p.name })
+                .append($('<div class="fw-semibold lh-sm">').text(p.name))
+                .append(loc ? $('<div class="text-muted small lh-sm">').text(loc) : null)
+                .on('click', function (e) {
+                  e.preventDefault();
+                  $placePanel.find('.fb-place-id').val($(this).data('place-id'));
+                  $placePanel.find('.fb-place-name').text($(this).data('place-name'));
+                  $placePanel.find('.fb-place-selected').removeClass('d-none').addClass('d-inline-flex');
+                  $placePanel.find('.fb-place-search').addClass('d-none');
+                  $results.hide().empty();
+                })
+            ).appendTo($results);
+          });
+          $results.show();
+        }, DEBOUNCE_MS);
+      });
+
+      $placePanel.find('.fb-place-clear').on('click', function (e) {
+        e.preventDefault();
+        $placePanel.find('.fb-place-id').val('');
+        $placePanel.find('.fb-place-selected').removeClass('d-inline-flex').addClass('d-none');
+        $placePanel.find('.fb-place-search').removeClass('d-none').val('').trigger('focus');
+      });
+
+      // Fermer le dropdown si clic ailleurs
+      $(document).off('click.fbpost').on('click.fbpost', function (e) {
+        if (!$(e.target).closest('.fb-place-panel').length) {
+          $placePanel.find('.fb-place-results').hide().empty();
+        }
+      });
+    }
+
+    // ── Injection dans la toolbar ──
+    const $toolbar = $composer.find('ul.formatting-group').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);
-      }
+      $toolbar.append($li);
+      $toolbar.after($placePanel);
     } else {
       // Fallback : avant la zone de texte
-      $composer.find('.write').first().before($btn);
+      const $write = $composer.find('.write').first();
+      $write.before($placePanel);
+      $placePanel.before($li);
     }
 
+    // ── Hook submit ──
     $(window).off('action:composer.submit.fbpost')
       .on('action:composer.submit.fbpost', function (ev2, data) {
-        const enabled = !!$composer.find('[data-fbpost-btn]').data('fbpost-active');
+        const enabled = !!$btn.data('fbpost-active');
         const postData = (data && data.composerData) || (data && data.postData) || data;
         if (!postData || typeof postData !== 'object') return;
         postData.fbPostEnabled = enabled;
+        if (enabled && showPlace) {
+          const placeId = $placePanel.find('.fb-place-id').val();
+          if (placeId) postData.fbPlaceId = placeId;
+        }
       });
   }
 
@@ -62,12 +177,10 @@
     try {
       const $composer = data && data.composer ? $(data.composer) : $('.composer');
       if (!$composer || !$composer.length) return;
-
       const perm = await canPost();
       if (!perm.allowed) return;
-
-      injectUI($composer);
-    } catch (err) {
+      injectUI($composer, perm);
+    } catch {
       // ignore
     }
   });