nodebb-plugin-facebook-post 1.0.32 → 1.0.34

package/library.js

@@ -14,7 +14,6 @@ const DEFAULT_SETTINGS = {
   categoriesWhitelist: '',
   minimumReputation: 0,
   maxImages: 4,
-  enablePlaceTagging: false,
 };
 
 function bool(v) {
@@ -52,7 +51,6 @@ 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;
@@ -153,7 +151,7 @@ async function userIsAllowed(uid) {
       const ok = await Groups.isMember(uid, groupName);
       if (ok) return true;
     } catch {
-      // ignore
+      // ignore individual group check errors
     }
   }
   return false;
@@ -209,14 +207,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 }));
@@ -255,7 +252,7 @@ async function postToFacebook(ctx) {
     if (id) photoIds.push(id);
   }
 
-  return publishFeedPost({ message, link, photoIds, placeId: trimStr(ctx.post.fbPlaceId) });
+  return publishFeedPost({ message, link, photoIds });
 }
 
 const Plugin = {};
@@ -303,37 +300,11 @@ 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', enablePlaceTagging: settings.enablePlaceTagging });
+      return res.json({ allowed: ok, reason: ok ? 'ok' : 'not_in_group' });
     } 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: [] });
-    }
-  });
-
 };
 
 Plugin.addAdminNavigation = async function (header) {
@@ -347,94 +318,43 @@ Plugin.addAdminNavigation = async function (header) {
 };
 
 Plugin.onPostCreate = async function (hookData) {
-  const winston = require.main.require('winston');
-  try {
-    if (!hookData?.post || !hookData?.data) {
-      winston.info('[facebook-post] onPostCreate: hookData manquant (post ou data absent)');
-      return hookData;
-    }
-    hookData.post.fbPostEnabled = bool(hookData.data.fbPostEnabled);
-    const fbPlaceId = trimStr(hookData.data.fbPlaceId);
-    if (fbPlaceId) hookData.post.fbPlaceId = fbPlaceId;
-    winston.info(`[facebook-post] onPostCreate: pid=${hookData.post.pid} fbPostEnabled=${hookData.post.fbPostEnabled} fbPlaceId=${hookData.post.fbPlaceId || '(none)'}`);
-  } catch (e) {
-    winston.error(`[facebook-post] onPostCreate erreur: ${e?.message || e}`);
-  }
+  if (!hookData?.post || !hookData?.data) return hookData;
+  hookData.post.fbPostEnabled = bool(hookData.data.fbPostEnabled);
   return hookData;
 };
 
 Plugin.onPostSave = async function (hookData) {
   const winston = require.main.require('winston');
-  winston.info('[facebook-post] onPostSave: hook déclenché');
   try {
     await loadSettings();
-    winston.info(`[facebook-post] onPostSave: settings.enabled=${settings.enabled} fbPageId=${settings.fbPageId ? 'défini' : 'MANQUANT'} fbPageAccessToken=${settings.fbPageAccessToken ? 'défini' : 'MANQUANT'}`);
-
-    if (!settings.enabled) {
-      winston.info('[facebook-post] onPostSave: abandon — plugin désactivé dans les paramètres');
-      return;
-    }
+    if (!settings.enabled) return;
 
     const rawPost = hookData && hookData.post ? hookData.post : hookData;
-    winston.info(`[facebook-post] onPostSave: données brutes reçues — pid=${rawPost?.pid} fbPostEnabled=${rawPost?.fbPostEnabled}`);
-
     const ctx = await getPostContext(rawPost);
-    if (!ctx) {
-      winston.warn('[facebook-post] onPostSave: abandon — impossible de récupérer le contexte du post (pid invalide ?)');
-      return;
-    }
+    if (!ctx) return;
 
-    // Restore ephemeral fields set by onPostCreate (not persisted to DB)
+    // Restore ephemeral field set by onPostCreate (not persisted to DB)
     ctx.post.fbPostEnabled = rawPost.fbPostEnabled;
-    if (rawPost.fbPlaceId) ctx.post.fbPlaceId = rawPost.fbPlaceId;
 
-    winston.info(`[facebook-post] onPostSave: contexte récupéré — pid=${ctx.post.pid} tid=${ctx.topic.tid} cid=${ctx.topic.cid} uid=${ctx.user.uid} isMainPost=${ctx.post.isMainPost} index=${ctx.post.index} mainPid=${ctx.topic.mainPid} reputation=${ctx.user.reputation}`);
-
-    const allowed = await userIsAllowed(ctx.post.uid);
-    if (!allowed) {
-      const groups = parseAllowedGroupsList();
-      winston.info(`[facebook-post] onPostSave: abandon — uid=${ctx.post.uid} n'est pas dans les groupes autorisés: [${groups.join(', ')}]`);
-      return;
-    }
-    winston.info(`[facebook-post] onPostSave: uid=${ctx.post.uid} autorisé par les groupes`);
-
-    const process = shouldProcessPost(ctx);
-    if (!process) {
-      const isFirstPost = (ctx.post.isMainPost === true) || (ctx.post.index === 0) || (String(ctx.post.pid) === String(ctx.topic.mainPid));
-      const fbEnabled = bool(ctx.post.fbPostEnabled);
-      const repOk = (ctx.user.reputation || 0) >= settings.minimumReputation;
-      const whitelist = parseCsvInts(settings.categoriesWhitelist);
-      const catOk = whitelist.length === 0 || whitelist.includes(parseInt(ctx.topic.cid, 10));
-      winston.info(`[facebook-post] onPostSave: abandon — shouldProcessPost=false. Détail: isFirstPost=${isFirstPost} fbPostEnabled=${fbEnabled} reputationOk=${repOk}(${ctx.user.reputation}>=${settings.minimumReputation}) categoryOk=${catOk}(cid=${ctx.topic.cid} whitelist=[${whitelist}])`);
-      return;
-    }
-    winston.info('[facebook-post] onPostSave: shouldProcessPost=true, publication en cours…');
+    if (!(await userIsAllowed(ctx.post.uid))) return;
+    if (!shouldProcessPost(ctx)) return;
 
     const Posts = require.main.require('./src/posts');
 
     const already = await Posts.getPostField(ctx.post.pid, 'fbPostedId');
-    if (already) {
-      winston.info(`[facebook-post] onPostSave: abandon — déjà publié (fbPostedId=${already})`);
-      return;
-    }
-
-    const imageUrls = extractImageUrlsFromContent(ctx.post.content || '').filter(isForumHosted);
-    winston.info(`[facebook-post] onPostSave: images hébergées sur le forum trouvées: ${imageUrls.length} [${imageUrls.join(', ')}]`);
+    if (already) return;
 
     const fbId = await postToFacebook(ctx);
     if (fbId) {
       await Posts.setPostField(ctx.post.pid, 'fbPostedId', fbId);
       await Posts.setPostField(ctx.post.pid, 'fbPostedAt', Date.now());
-      winston.info(`[facebook-post] onPostSave: publication réussie — fbId=${fbId} pid=${ctx.post.pid}`);
+      winston.info(`[facebook-post] published pid=${ctx.post.pid} fbId=${fbId}`);
     } else {
-      winston.warn('[facebook-post] onPostSave: postToFacebook a retourné un fbId vide (pas d\'erreur levée)');
+      winston.warn(`[facebook-post] postToFacebook returned no id for pid=${ctx.post.pid}`);
     }
   } catch (e) {
     const detail = e?.response ? JSON.stringify(e.response.data) : (e?.message || e);
-    winston.error(`[facebook-post] onPostSave: ERREUR: ${detail}`);
-    if (e?.response?.config?.url) {
-      winston.error(`[facebook-post] onPostSave: URL appelée: ${e.response.config.url} — status: ${e.response.status}`);
-    }
+    winston.error(`[facebook-post] onPostSave error: ${detail}`);
   }
 };
 

package/package.json

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

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "nodebb-plugin-facebook-post",
   "name": "Facebook Post",
-  "description": "Publie automatiquement les nouveaux topics NodeBB sur une Page Facebook fixe (images uploads + place).",
+  "description": "Publie automatiquement les nouveaux topics NodeBB sur une Page Facebook fixe (images uploads).",
   "url": "https://example.invalid/nodebb-plugin-facebook-post",
   "hooks": [
     {

package/static/lib/composer.js

@@ -1,9 +1,7 @@
-/* global $, app */
+/* global $ */
 'use strict';
 
 (function () {
-  const DEBOUNCE_MS = 400;
-
   async function canPost() {
     try {
       const res = await fetch('/api/facebook-post/can-post?_=' + Date.now(), {
@@ -17,36 +15,12 @@
     }
   }
 
-  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) {
+  function injectUI($composer) {
     if ($composer.find('[data-fbpost-btn]').length) return;
 
-    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"
+        <button type="button" class="btn btn-sm btn-link text-reset"
           aria-label="Publier sur Facebook" style="opacity:0.45;">
           <i class="fab fa-facebook-f"></i>
         </button>
@@ -54,122 +28,24 @@
     `);
     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);
-      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);
-      }
+      $(this).css({ color: active ? '#1877F2' : '', opacity: active ? '1' : '0.45' });
     });
 
-    // ── 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) {
       $toolbar.append($li);
-      $toolbar.after($placePanel);
     } else {
-      // Fallback : avant la zone de texte
-      const $write = $composer.find('.write').first();
-      $write.before($placePanel);
-      $placePanel.before($li);
+      $composer.find('.write').first().before($li);
     }
 
-    // ── Hook submit ──
     $(window).off('action:composer.submit.fbpost')
-      .on('action:composer.submit.fbpost', function (ev2, data) {
-        const enabled = !!$btn.data('fbpost-active');
+      .on('action:composer.submit.fbpost', function (ev, data) {
         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;
-        }
+        postData.fbPostEnabled = !!$btn.data('fbpost-active');
       });
   }
 
@@ -179,7 +55,7 @@
       if (!$composer || !$composer.length) return;
       const perm = await canPost();
       if (!perm.allowed) return;
-      injectUI($composer, perm);
+      injectUI($composer);
     } catch {
       // ignore
     }

package/static/templates/admin/facebook-post.tpl

@@ -1,5 +1,5 @@
 <div class="acp-page-container">
-  <h2>Facebook/Instagram Post (Worker)</h2>
+  <h2>Facebook Post</h2>
 
   <form class="facebook-post-settings" role="form">
     <div class="form-check mb-3">
@@ -7,15 +7,10 @@
       <label class="form-check-label" for="enabled">Activer</label>
     </div>
 
-    <div class="form-check mb-3">
-      <input type="checkbox" class="form-check-input" id="publishInstagram" name="publishInstagram">
-      <label class="form-check-label" for="publishInstagram">Publier aussi sur Instagram (uniquement si une image est présente)</label>
-    </div>
-
     <hr/>
 
     <h4>Accès</h4>
-    <p class="text-muted">Sélectionne les groupes autorisés à voir la case “Publier sur Facebook” dans le composer.</p>
+    <p class="text-muted">Sélectionne les groupes autorisés à voir la case "Publier sur Facebook" dans le composer.</p>
 
     <div class="mb-3">
       <label class="form-label" for="allowedGroupsSelect">Groupes autorisés</label>
@@ -25,7 +20,7 @@
         <!-- END allGroups -->
       </select>
       <input type="hidden" id="allowedGroups" name="allowedGroups" value="">
-      <p class="form-text">Sans fallback : si aucun groupe n’est sélectionné, personne ne verra la case.</p>
+      <p class="form-text">Sans fallback : si aucun groupe n'est sélectionné, personne ne verra la case.</p>
     </div>
 
     <hr/>
@@ -38,7 +33,7 @@
     </div>
 
     <div class="mb-3">
-      <label class="form-label" for="excerptMaxLen">Longueur max de l’extrait</label>
+      <label class="form-label" for="excerptMaxLen">Longueur max de l'extrait</label>
       <input type="number" class="form-control" id="excerptMaxLen" name="excerptMaxLen" min="50" max="5000">
     </div>
 
@@ -62,19 +57,10 @@
     <h4>Images</h4>
 
     <div class="mb-3">
-      <label class="form-label" for="maxImages">Nombre max d’images (uploads du forum)</label>
+      <label class="form-label" for="maxImages">Nombre max d'images (uploads du forum)</label>
       <input type="number" class="form-control" id="maxImages" name="maxImages" min="0" max="20">
     </div>
 
-    <hr/>
-
-    <h4>Lieu / Géolocalisation</h4>
-
-    <div class="form-check mb-3">
-      <input type="checkbox" class="form-check-input" id="enablePlaceTagging" name="enablePlaceTagging">
-      <label class="form-check-label" for="enablePlaceTagging">Activer le tag de lieu (Place ID / location_id)</label>
-    </div>
-
-    <button type="button" id="save" class="btn btn-primary">Enregistrer</button>
+    <button type="button" id="save" class="btn btn-primary mt-2">Enregistrer</button>
   </form>
 </div>