nodebb-plugin-facebook-post 1.0.28 → 1.0.30

package/library.js

@@ -14,7 +14,6 @@ const DEFAULT_SETTINGS = {
   categoriesWhitelist: '',
   minimumReputation: 0,
   maxImages: 4,
-  enablePlaceTagging: true,
 };
 
 function bool(v) {
@@ -51,7 +50,6 @@ async function loadSettings() {
   settings.excerptMaxLen = int(settings.excerptMaxLen, DEFAULT_SETTINGS.excerptMaxLen);
   settings.minimumReputation = int(settings.minimumReputation, 0);
   settings.maxImages = int(settings.maxImages, DEFAULT_SETTINGS.maxImages);
-  settings.enablePlaceTagging = bool(settings.enablePlaceTagging);
   settings.categoriesWhitelist = trimStr(settings.categoriesWhitelist);
 
   const env = readEnv();
@@ -192,14 +190,13 @@ async function uploadPhotoToFacebook(urlAbs) {
   return resp.data && resp.data.id;
 }
 
-async function publishFeedPost({ message, link, photoIds, placeId }) {
+async function publishFeedPost({ message, link, photoIds }) {
   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 }));
@@ -225,8 +222,6 @@ async function postToFacebook(ctx) {
     .filter(isForumHosted)
     .slice(0, Math.max(0, settings.maxImages));
 
-  const placeId = (settings.enablePlaceTagging && trimStr(ctx.post.fbPlaceId)) || null;
-
   const lines = [`\uD83D\uDCDD ${topicTitle}`];
   if (excerpt) lines.push(excerpt);
   lines.push(`\uD83D\uDD17 ${link}`);
@@ -240,7 +235,7 @@ async function postToFacebook(ctx) {
     if (id) photoIds.push(id);
   }
 
-  return publishFeedPost({ message, link, photoIds, placeId });
+  return publishFeedPost({ message, link, photoIds });
 }
 
 const Plugin = {};
@@ -294,42 +289,7 @@ Plugin.init = async function (params) {
     }
   });
 
-  router.get('/api/facebook-post/search-place', middleware.ensureLoggedIn, async (req, res) => {
-    const winston = require.main.require('winston');
-    res.set('Cache-Control', 'no-store');
-    try {
-      await loadSettings();
-      if (!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: 'id,name,location',
-            access_token: settings.fbPageAccessToken,
-            limit: 7,
-          },
-          timeout: 8000,
-        }
-      );
-      const data = (resp.data && resp.data.data) || [];
-      winston.info(`[facebook-post] search-place: q="${q}" → ${data.length} résultat(s)`);
-      const results = data.map(p => ({
-        id: p.id,
-        name: p.name,
-        city: (p.location && (p.location.city || p.location.country)) || '',
-      }));
-      return res.json({ results });
-    } catch (e) {
-      const detail = e?.response?.data ? JSON.stringify(e.response.data) : e?.message;
-      winston.warn(`[facebook-post] search-place erreur: ${detail}`);
-      return res.json({ results: [] });
-    }
-  });
+
 };
 
 Plugin.addAdminNavigation = async function (header) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-facebook-post",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "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,114 +16,45 @@
   }
 
   function injectUI($composer) {
-    if ($composer.find('[data-fbpost-wrap]').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 class="mb-2" data-fbpost-place-wrap style="display:none;">
-          <label class="form-label" style="font-size:12px;opacity:.8;">
-            Lieu – optionnel
-          </label>
-          <div style="position:relative;">
-            <input type="text" class="form-control" data-fbpost-place-query
-                   placeholder="Rechercher un lieu (ville, adresse…)" autocomplete="off">
-            <ul data-fbpost-place-results
-                style="display:none;position:absolute;z-index:9999;background:#fff;
-                       border:1px solid #ccc;border-radius:4px;list-style:none;
-                       margin:0;padding:0;width:100%;max-height:200px;overflow-y:auto;"></ul>
-          </div>
-          <input type="hidden" data-fbpost-place-id>
-        </div>
-      </div>
-    `;
-
-    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);
-    } else {
-      const $target = $composer.find('.composer-body, .composer-content').first();
-      if ($target.length) $target.prepend(html);
-      else $composer.prepend(html);
-    }
-
-    const $enabled = $composer.find('[data-fbpost-enabled]');
-    const $placeWrap = $composer.find('[data-fbpost-place-wrap]');
-
-    $enabled.on('change', function () {
-      $placeWrap.toggle($enabled.is(':checked'));
+    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>
+    `);
+
+    $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');
     });
 
-    let _placeTimer = null;
-    const $query   = $composer.find('[data-fbpost-place-query]');
-    const $results = $composer.find('[data-fbpost-place-results]');
-    const $placeId = $composer.find('[data-fbpost-place-id]');
-
-    function clearPlace() {
-      $placeId.val('');
-    }
-    function selectPlace(id, name, city) {
-      $placeId.val(id);
-      $query.val(name + (city ? ' – ' + city : ''));
-      $results.hide().empty();
+    // 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 {
+      // Fallback : avant la zone de texte
+      $composer.find('.write').first().before($btn);
     }
 
-    $query.on('input', function () {
-      clearPlace();
-      clearTimeout(_placeTimer);
-      const q = $query.val().trim();
-      if (q.length < 2) { $results.hide().empty(); return; }
-      _placeTimer = setTimeout(async function () {
-        try {
-          const res = await fetch('/api/facebook-post/search-place?q=' + encodeURIComponent(q), {
-            credentials: 'same-origin', cache: 'no-store',
-          });
-          if (!res.ok) return;
-          const json = await res.json();
-          $results.empty();
-          if (!json.results || !json.results.length) { $results.hide(); return; }
-          json.results.forEach(function (p) {
-            const label = p.name + (p.city ? ' – ' + p.city : '');
-            $('<li>')
-              .text(label)
-              .css({ padding: '6px 10px', cursor: 'pointer' })
-              .on('mousedown', function (e) {
-                e.preventDefault();
-                selectPlace(p.id, p.name, p.city);
-              })
-              .appendTo($results);
-          });
-          $results.show();
-        } catch { /* ignore */ }
-      }, 350);
-    });
-
-    $query.on('blur', function () {
-      setTimeout(function () { $results.hide(); }, 200);
-    });
-    $query.on('focus', function () {
-      if ($results.children().length) $results.show();
-    });
-
-    // 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;
-        if (enabled) {
-          const placeId = $composer.find('[data-fbpost-place-id]').val();
-          if (placeId) postData.fbPlaceId = placeId;
-        }
       });
   }
 
@@ -141,4 +72,3 @@
     }
   });
 })();
-