nodebb-plugin-ezoic-infinite 0.9.7 → 0.9.9

package/library.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const meta = require.main.require('./src/meta');
-const groups = require.main.require('./src/groups');
 const db = require.main.require('./src/database');
 
 const SETTINGS_KEY = 'ezoic-infinite';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.7",
+  "version": "0.9.9",
   "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
   "main": "library.js",
   "license": "MIT",

package/public/admin.js

@@ -1,29 +1,75 @@
-/* globals ajaxify */
+/* global $, app, socket */
 'use strict';
 
-(function () {
-  function init() {
-    const $form = $('.ezoic-infinite-settings');
-    if (!$form.length) return;
+$(document).ready(function () {
+  const namespace = 'ezoic-infinite';
 
-    require(['settings', 'alerts'], function (Settings, alerts) {
-      Settings.load('ezoic-infinite', $form);
+  function load() {
+    socket.emit('admin.settings.get', { hash: namespace }, function (err, data) {
+      if (err) return;
+      data = data || {};
 
-      $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', function (e) {
-        e.preventDefault();
+      const form = $('.ezoic-infinite-settings');
 
-        Settings.save('ezoic-infinite', $form, function () {
-          // Toast vert (NodeBB core)
-          if (alerts && typeof alerts.success === 'function') {
-            alerts.success('Enregistré');
-          } else if (window.app && typeof window.app.alertSuccess === 'function') {
-            window.app.alertSuccess('Enregistré');
-          }
+      form.find('[name="enableBetweenAds"]').prop('checked', data.enableBetweenAds === true || data.enableBetweenAds === 'on');
+      form.find('[name="intervalTopics"]').val(parseInt(data.intervalTopics, 10) || 6);
+      form.find('[name="placeholderIds"]').val(data.placeholderIds || '');
+
+      form.find('[name="enableMessageAds"]').prop('checked', data.enableMessageAds === true || data.enableMessageAds === 'on');
+      form.find('[name="messageIntervalPosts"]').val(parseInt(data.messageIntervalPosts, 10) || 3);
+      form.find('[name="messagePlaceholderIds"]').val(data.messagePlaceholderIds || '');
+
+      // NodeBB 4.x: charger les groupes via socket côté ACP
+      socket.emit('groups.getGroups', {}, function (err2, groups) {
+        const $select = form.find('[name="excludedGroups"]');
+        $select.empty();
+
+        if (!err2 && Array.isArray(groups)) {
+          groups
+            .map(g => g && g.name)
+            .filter(Boolean)
+            .sort((a, b) => a.localeCompare(b, 'fr', { sensitivity: 'base' }))
+            .forEach((name) => {
+              $select.append($('<option>').val(name).text(name));
+            });
+        }
+
+        const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
+        $select.find('option').each(function () {
+          $(this).prop('selected', selected.includes($(this).val()));
         });
       });
     });
   }
 
-  $(document).ready(init);
-  $(window).on('action:ajaxify.end', init);
-})();
+  function save() {
+    const form = $('.ezoic-infinite-settings');
+    const payload = {
+      enableBetweenAds: form.find('[name="enableBetweenAds"]').is(':checked'),
+      intervalTopics: parseInt(form.find('[name="intervalTopics"]').val(), 10) || 6,
+      placeholderIds: form.find('[name="placeholderIds"]').val() || '',
+
+      enableMessageAds: form.find('[name="enableMessageAds"]').is(':checked'),
+      messageIntervalPosts: parseInt(form.find('[name="messageIntervalPosts"]').val(), 10) || 3,
+      messagePlaceholderIds: form.find('[name="messagePlaceholderIds"]').val() || '',
+
+      excludedGroups: (form.find('[name="excludedGroups"]').val() || []).join(','),
+    };
+
+    socket.emit('admin.settings.set', { hash: namespace, values: payload }, function (err) {
+      if (err) {
+        app.alertError(err.message || err);
+        return;
+      }
+      app.alertSuccess('Paramètres enregistrés');
+    });
+  }
+
+  $(document).off('click.ezoicInfiniteSave', '.ezoic-infinite-save')
+    .on('click.ezoicInfiniteSave', '.ezoic-infinite-save', function (e) {
+      e.preventDefault();
+      save();
+    });
+
+  load();
+});

package/public/client.js

@@ -92,62 +92,19 @@ function pickNextId(pool) {
   }
   return null;
 }
-  function callEzoic(ids) {
-    if (!ids || !ids.length) return;
 
-    const key = ids.slice().sort((a, b) => a - b).join(',');
-    const now = Date.now();
-    if (window.__ezoicLastShowKey === key && now - (window.__ezoicLastShowAt || 0) < 1200) return;
-    window.__ezoicLastShowKey = key;
-    window.__ezoicLastShowAt = now;
+function callEzoic(ids) {
+  if (!ids || !ids.length) return;
 
-    try {
-      window.ezstandalone = window.ezstandalone || {};
-      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-
-      const run = function () {
-        try {
-          if (typeof window.ezstandalone.showAds === 'function') {
-            window.ezstandalone.showAds.apply(window.ezstandalone, ids);
-            return true;
-          }
-        } catch (e) {}
-        return false;
-      };
-
-      window.ezstandalone.cmd.push(function () { run(); });
-
-      let tries = 0;
-      const tick = function () {
-        tries++;
-        if (run() || tries >= 10) return;
-        setTimeout(tick, 800);
-      };
-      setTimeout(tick, 800);
-    } catch (e) {}
-  }
+  window.ezstandalone = window.ezstandalone || {};
+  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
 
-          if (typeof window.ezstandalone.showAds === 'function') {
-            window.ezstandalone.showAds.apply(window.ezstandalone, ids);
-            return true;
-          }
-        } catch (e) {}
-        return false;
-      };
-
-      // Ensure destroy->show runs AFTER ezstandalone is ready
-      window.ezstandalone.cmd.push(function () { run(); });
-
-      // retries in case ez loads late
-      let tries = 0;
-      const tick = function () {
-        tries++;
-        if (run() || tries >= 10) return;
-        setTimeout(tick, 800);
-      };
-      setTimeout(tick, 800);
-    } catch (e) {}
-  }
+  const run = function () {
+    try {
+      if (typeof window.ezstandalone.showAds === 'function') {
+        window.ezstandalone.showAds.apply(window.ezstandalone, ids);
+        return true;
+      }
     } catch (e) {}
     return false;
   };