nodebb-plugin-ezoic-infinite 0.8.9 → 0.9.1

package/library.js

@@ -2,96 +2,36 @@
 
 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';
-const plugin = {};
+const Plugin = {};
 
-function normalizeExcludedGroups(value) {
-  if (!value) return [];
-  if (Array.isArray(value)) return value;
-  return String(value).split(',').map(s => s.trim()).filter(Boolean);
-}
-
-function parseBool(v, def = false) {
-  if (v === undefined || v === null || v === '') return def;
-  if (typeof v === 'boolean') return v;
-  const s = String(v).toLowerCase();
-  return s === '1' || s === 'true' || s === 'on' || s === 'yes';
-}
-
-async function getAllGroups() {
-  const names = await db.getSortedSetRange('groups:createtime', 0, -1);
-  const filtered = names.filter(name => !groups.isPrivilegeGroup(name));
-  const data = await groups.getGroupsData(filtered);
-  // Sort alphabetically for ACP usability
-  data.sort((a, b) => String(a.name).localeCompare(String(b.name), 'fr', { sensitivity: 'base' }));
-  return data;
-}
-async function getSettings() {
-  const s = await meta.settings.get(SETTINGS_KEY);
-  return {
-    // Between-post ads (simple blocks)
-    enableBetweenAds: parseBool(s.enableBetweenAds, true),
-    placeholderIds: (s.placeholderIds || '').trim(),
-    intervalPosts: Math.max(1, parseInt(s.intervalPosts, 10) || 6),
-
-    // "Ad message" between replies (looks like a post)
-    enableMessageAds: parseBool(s.enableMessageAds, false),
-    messagePlaceholderIds: (s.messagePlaceholderIds || '').trim(),
-    messageIntervalPosts: Math.max(1, parseInt(s.messageIntervalPosts, 10) || 3),
+Plugin.init = async function (params) {
+  const { router, middleware } = params;
 
-    excludedGroups: normalizeExcludedGroups(s.excludedGroups),
-  };
-}
+  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, renderAdmin);
+  router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
+};
 
-async function isUserExcluded(uid, excludedGroups) {
-  if (!uid || !excludedGroups.length) return false;
-  const userGroups = await groups.getUserGroups([uid]);
-  return (userGroups[0] || []).some(g => excludedGroups.includes(g.name));
+async function renderAdmin(req, res) {
+  const settings = await meta.settings.get('ezoic-infinite');
+  // groups list for exclusions
+  const groupList = await groups.getGroups('groups:visible:createtime', 0, -1);
+  groupList.sort((a, b) => (a.name || '').localeCompare(b.name || '', undefined, { sensitivity: 'base' }));
+  res.render('admin/plugins/ezoic-infinite', {
+    title: 'Ezoic Infinite',
+    settings,
+    groups: groupList,
+  });
 }
 
-plugin.addAdminNavigation = async (header) => {
+Plugin.addAdminNavigation = async function (header) {
   header.plugins = header.plugins || [];
   header.plugins.push({
     route: '/plugins/ezoic-infinite',
-    icon: 'fa-ad',
-    name: 'Ezoic Infinite Ads'
+    icon: 'fa-bullhorn',
+    name: 'Ezoic Infinite',
   });
   return header;
 };
 
-plugin.init = async ({ router, middleware }) => {
-  async function render(req, res) {
-    const settings = await getSettings();
-    const allGroups = await getAllGroups();
-
-    res.render('admin/plugins/ezoic-infinite', {
-      title: 'Ezoic Infinite Ads',
-      ...settings,
-      enableBetweenAds_checked: settings.enableBetweenAds ? 'checked' : '',
-      enableMessageAds_checked: settings.enableMessageAds ? 'checked' : '',
-      allGroups,
-    });
-  }
-
-  router.get('/admin/plugins/ezoic-infinite', middleware.admin.buildHeader, render);
-  router.get('/api/admin/plugins/ezoic-infinite', render);
-
-  router.get('/api/plugins/ezoic-infinite/config', middleware.buildHeader, async (req, res) => {
-    const settings = await getSettings();
-    const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
-
-    res.json({
-      excluded,
-      enableBetweenAds: settings.enableBetweenAds,
-      placeholderIds: settings.placeholderIds,
-      intervalPosts: settings.intervalPosts,
-      enableMessageAds: settings.enableMessageAds,
-      messagePlaceholderIds: settings.messagePlaceholderIds,
-      messageIntervalPosts: settings.messageIntervalPosts,
-    });
-  });
-};
-
-module.exports = plugin;
+module.exports = Plugin;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.8.9",
-  "description": "Ezoic ads with infinite scroll using a pool of placeholder IDs",
+  "version": "0.9.1",
+  "description": "Ezoic ads injection for NodeBB infinite scroll (topics list + topic posts) using a pool of placeholder IDs.",
   "main": "library.js",
   "license": "MIT",
   "keywords": [
@@ -11,9 +11,6 @@
     "ads",
     "infinite-scroll"
   ],
-  "engines": {
-    "node": ">=18"
-  },
   "nbbpm": {
     "compatibility": "^4.0.0"
   }

package/plugin.json

@@ -22,8 +22,8 @@
   "scripts": [
     "public/client.js"
   ],
-  "templates": "public/templates",
   "css": [
     "public/style.css"
-  ]
+  ],
+  "templates": "public/templates"
 }

package/public/admin.js

@@ -1,29 +1,51 @@
-/* globals ajaxify */
+/* global $, app, socket */
 'use strict';
 
-(function () {
-  function init() {
-    const $form = $('.ezoic-infinite-settings');
-    if (!$form.length) return;
-
-    require(['settings', 'alerts'], function (Settings, alerts) {
-      Settings.load('ezoic-infinite', $form);
-
-      $('#save').off('click.ezoicInfinite').on('click.ezoicInfinite', function (e) {
-        e.preventDefault();
-
-        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é');
-          }
-        });
+$(document).ready(function () {
+  const namespace = 'ezoic-infinite';
+
+  function load() {
+    socket.emit('admin.settings.get', { hash: namespace }, function (err, data) {
+      if (err) return;
+      data = data || {};
+
+      const form = $('.ezoic-infinite-settings');
+      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 || '');
+
+      const selected = (data.excludedGroups || '').split(',').map(s => s.trim()).filter(Boolean);
+      form.find('[name="excludedGroups"] 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('Settings saved');
+    });
+  }
+
+  $('.ezoic-infinite-save').on('click', save);
+  load();
+});

package/public/client.js

@@ -1,380 +1,331 @@
+/* global $, ajaxify, app */
 'use strict';
 
-/* globals ajaxify */
-window.ezoicInfiniteLoaded = true;
-
-let cachedConfig;
-let lastFetch = 0;
-let debounceTimer;
-
-let inFlight = false;
-let rerunRequested = false;
-
-// Per-page state (keyed by tid/cid)
-let pageKey = null;
-
-// Topic page state: anchor ads to absolute post number (not DOM index)
-let seenAfterPostNo = new Set();   // post numbers we've already inserted an ad after
-let usedIds = new Set();           // ids currently in DOM
-let fifo = [];                     // [{afterPostNo, id}]
-
-// Category page state: anchor to absolute topic position if available
-let seenAfterTopicPos = new Set(); // topic positions we've inserted after
-let fifoCat = [];                  // [{afterPos, id}]
-
-function resetState() {
-  seenAfterPostNo = new Set();
-  seenAfterTopicPos = new Set();
-  usedIds = new Set();
-  fifo = [];
-  fifoCat = [];
-}
-
-function getPageKey() {
-  try {
-    if (ajaxify && ajaxify.data) {
-      if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
-      if (ajaxify.data.cid) return 'category:' + ajaxify.data.cid;
-    }
-  } catch (e) {}
-  return window.location.pathname;
-}
-
-function parsePool(raw) {
-  if (!raw) return [];
-  return Array.from(new Set(
-    String(raw).split(/[\n,;\s]+/)
-      .map(x => parseInt(x, 10))
-      .filter(n => Number.isFinite(n) && n > 0)
-  ));
-}
-
-async function fetchConfig() {
-  if (cachedConfig && Date.now() - lastFetch < 10000) return cachedConfig;
-  const res = await fetch('/api/plugins/ezoic-infinite/config', { credentials: 'same-origin' });
-  cachedConfig = await res.json();
-  lastFetch = Date.now();
-  return cachedConfig;
-}
-
-function isTopicPage() {
-  return $('[component="post/content"]').length > 0 || $('[component="post"][data-pid]').length > 0;
-}
-
-function isCategoryTopicListPage() {
-  return $('li[component="category/topic"]').length > 0;
-}
-
-function getTopicPosts() {
-  const $primary = $('[component="post"][data-pid]');
-  if ($primary.length) return $primary;
-
-  // fallback: top-level with post/content
-  return $('[data-pid]').filter(function () {
-    const $el = $(this);
-    const hasContent = $el.find('[component="post/content"]').length > 0;
-    const nested = $el.parents('[data-pid]').length > 0;
-    return hasContent && !nested;
-  });
-}
-
-function getCategoryTopicItems() {
-  return $('li[component="category/topic"]');
-}
-
-// If target's parent is UL/OL, wrapper MUST be LI (otherwise browser may move it to top)
-function wrapperTagFor($target) {
-  if (!$target || !$target.length) return 'div';
-  const parentTag = ($target.parent().prop('tagName') || '').toUpperCase();
-  if (parentTag === 'UL' || parentTag === 'OL') return 'li';
-  const selfTag = ($target.prop('tagName') || '').toUpperCase();
-  if (selfTag === 'LI') return 'li';
-  return 'div';
-}
-
-function makeWrapperLike($target, classes, innerHtml, attrs) {
-  const tag = wrapperTagFor($target);
-  const attrStr = attrs ? ' ' + attrs : '';
-  if (tag === 'li') {
-    return '<li class="' + classes + ' list-unstyled"' + attrStr + '>' + innerHtml + '</li>';
-  }
-  return '<div class="' + classes + '"' + attrStr + '>' + innerHtml + '</div>';
-}
+(function () {
+  if (window.ezoicInfiniteLoaded) return;
+  window.ezoicInfiniteLoaded = true;
+
+  const SETTINGS_NS = 'ezoic-infinite';
+
+  let settings = null;
+  let pageKey = null;
 
-function cleanupOnNav() {
-  $('.ezoic-ad-post, .ezoic-ad-topic, .ezoic-ad-between').remove();
-}
+  // Separate pools for category/topic
+  let usedTopic = new Set();
+  let usedCat = new Set();
+  let fifoTopic = []; // [{id, afterNo}]
+  let fifoCat = [];   // [{id, afterPos}]
 
-function pickNextId(pool) {
-  for (const id of pool) {
-    if (!usedIds.has(id)) return id;
+  function parsePool(text) {
+    return String(text || '')
+      .split(/\r?\n/)
+      .map(s => s.trim())
+      .filter(Boolean)
+      .map(s => parseInt(s, 10))
+      .filter(n => Number.isFinite(n) && n > 0);
   }
-  return null;
-}
-
-function removeOldestTopicAd() {
-  fifo.sort((a, b) => a.afterPostNo - b.afterPostNo);
-  const old = fifo.shift();
-  if (!old) return false;
-
-  const sel = '.ezoic-ad-post[data-ezoic-after="' + old.afterPostNo + '"][data-ezoic-id="' + old.id + '"]';
-  const $el = $(sel);
-  if ($el.length) $el.remove();
-
-  usedIds.delete(old.id);
-  // DO NOT delete seenAfterPostNo to prevent re-insertion in the top area
-  return true;
-}
-
-function removeOldestCategoryAd() {
-  fifoCat.sort((a, b) => a.afterPos - b.afterPos);
-  const old = fifoCat.shift();
-  if (!old) return false;
-
-  const sel = '.ezoic-ad-topic[data-ezoic-after="' + old.afterPos + '"][data-ezoic-id="' + old.id + '"]';
-  const $el = $(sel);
-  if ($el.length) $el.remove();
-
-  usedIds.delete(old.id);
-  return true;
-}
-
-function callEzoic(ids) {
-  // ids optional; if omitted, we will scan DOM for unrendered placeholders
-  window.ezstandalone = window.ezstandalone || {};
-  window.ezstandalone.cmd = window.ezstandalone.cmd || [];
-
-  const collect = function () {
-    const list = [];
-    document.querySelectorAll('.ezoic-ad [id^="ezoic-pub-ad-placeholder-"]').forEach(function (ph) {
-      const idStr = ph.id.replace('ezoic-pub-ad-placeholder-', '');
-      const id = parseInt(idStr, 10);
-      if (!Number.isFinite(id) || id <= 0) return;
-
-      const wrap = ph.closest('.ezoic-ad');
-      if (!wrap) return;
-      if (wrap.getAttribute('data-ezoic-rendered') === '1') return;
 
-      list.push(id);
-      wrap.setAttribute('data-ezoic-rendered', '1');
+  function loadSettings(cb) {
+    socket.emit('admin.settings.get', { hash: SETTINGS_NS }, function (err, data) {
+      settings = data || {};
+      cb && cb();
     });
-    // de-dupe
-    return Array.from(new Set(list));
-  };
+  }
 
-  const toShow = (ids && ids.length) ? Array.from(new Set(ids)) : collect();
-  if (!toShow.length) return;
+  function userExcluded() {
+    try {
+      const raw = (settings && settings.excludedGroups) ? String(settings.excludedGroups) : '';
+      if (!raw) return false;
+      const excluded = raw.split(',').map(s => s.trim()).filter(Boolean);
+      if (!excluded.length) return false;
+      const myGroups = (app.user && app.user.groups) ? app.user.groups : [];
+      return excluded.some(g => myGroups.includes(g));
+    } catch (e) {
+      return false;
+    }
+  }
 
-  const run = function () {
+  function getPageKey() {
     try {
-      if (typeof window.ezstandalone.showAds === 'function') {
-        window.ezstandalone.showAds.apply(window.ezstandalone, toShow);
-        return true;
+      if (ajaxify && ajaxify.data) {
+        if (ajaxify.data.tid) return 'topic:' + ajaxify.data.tid;
+        if (ajaxify.data.cid) return 'cid:' + ajaxify.data.cid + ':' + window.location.pathname;
       }
     } catch (e) {}
-    return false;
-  };
-
-  setupAdAutoHeight();
-  window.ezstandalone.cmd.push(function () { run(); });
-
-  // Retry only if showAds isn't available yet
-  let tries = 0;
-  const maxTries = 6;
-  const retry = function () {
-    tries++;
-    const ok = run();
-    if (ok) return;
-    try {
-      if (typeof window.ezstandalone.showAds === 'function') return;
-    } catch (e) {}
-    if (tries < maxTries) setTimeout(retry, 800);
-  };
+    return window.location.pathname;
+  }
+
+  function isTopicPage() {
+    try { if (ajaxify && ajaxify.data && ajaxify.data.tid) return true; } catch (e) {}
+    return /^\/topic\//.test(window.location.pathname);
+  }
+
+  function isCategoryTopicList() {
+    return $('li[component="category/topic"]').length > 0 && !isTopicPage();
+  }
+
+  function cleanupForNewPage() {
+    $('.ezoic-ad').remove();
+    usedTopic = new Set();
+    usedCat = new Set();
+    fifoTopic = [];
+    fifoCat = [];
+  }
 
-  try {
-    if (typeof window.ezstandalone.showAds !== 'function') {
-      setTimeout(retry, 800);
+  function pickNextId(pool, usedSet) {
+    for (const id of pool) {
+      if (!usedSet.has(id)) return id;
     }
-  } catch (e) {
-    setTimeout(retry, 800);
+    return null;
   }
-}
-
-function getPostNumber($post) {
-  const di = parseInt($post.attr('data-index'), 10);
-  if (Number.isFinite(di) && di > 0) return di;
-
-  const txt = ($post.find('a.post-index').first().text() || '').trim();
-  const m = txt.match(/#\s*(\d+)/);
-  if (m) return parseInt(m[1], 10);
-
-  return NaN;
-}
-
-function getTopicPos($item) {
-  const pos = parseInt($item.attr('data-index'), 10);
-  if (Number.isFinite(pos) && pos >= 0) return pos + 1;
-  const schemaPos = parseInt($item.find('meta[itemprop="position"]').attr('content'), 10);
-  if (Number.isFinite(schemaPos) && schemaPos > 0) return schemaPos;
-  return NaN;
-}
-
-function injectTopicMessageAds($posts, pool, interval) {
-  const newIds = [];
-
-  $posts.each(function () {
-    const $p = $(this);
-    // Never insert after the last real post: it can break NodeBB infinite scroll
-    if ($p.is($posts.last())) return;
-    const postNo = getPostNumber($p);
-    if (!Number.isFinite(postNo) || postNo <= 0) return;
-
-    if (postNo % interval !== 0) return;
-    if (seenAfterPostNo.has(postNo)) return;
-
-    let id = pickNextId(pool);
-    if (!id) { return; }
-
-    const inner = '<div class="ezoic-ad-message-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>';
-    const html = makeWrapperLike(
-      $p,
-      'ezoic-ad-post ezoic-ad',
-      inner,
-      'data-ezoic-after="' + postNo + '" data-ezoic-id="' + id + '"'
-    );
 
-    $p.after(html);
+  function destroyPlaceholder(id) {
+    try {
+      window.ezstandalone = window.ezstandalone || {};
+      window.ezstandalone.cmd = window.ezstandalone.cmd || [];
+      if (typeof window.ezstandalone.destroyPlaceholders === 'function') {
+        window.ezstandalone.destroyPlaceholders(id);
+        return;
+      }
+      window.ezstandalone.cmd.push(function () {
+        try { window.ezstandalone.destroyPlaceholders(id); } catch (e) {}
+      });
+    } catch (e) {}
+  }
 
-    seenAfterPostNo.add(postNo);
-    usedIds.add(id);
-    fifo.push({ afterPostNo: postNo, id: id });
-    newIds.push(id);
-  });
+  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(); });
+      // 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) {}
+  }
 
-  return newIds;
-}
+  // Auto height: show wrapper only when placeholder gets children
+  function setupAutoHeight() {
+    if (window.__ezoicAutoHeight) return;
+    window.__ezoicAutoHeight = true;
 
-function injectCategoryBetweenAds($items, pool, interval) {
-  const newIds = [];
+    const mark = function (wrap) {
+      if (!wrap) return;
+      const ph = wrap.querySelector('[id^="ezoic-pub-ad-placeholder-"]');
+      if (ph && ph.children && ph.children.length) {
+        wrap.classList.add('ezoic-filled');
+      }
+    };
 
-  $items.each(function () {
-    const $it = $(this);
-    // Never insert after the last real topic item (keeps NodeBB infinite scroll working)
-    if ($it.is($items.last())) return;
-    const pos = getTopicPos($it);
-    if (!Number.isFinite(pos) || pos <= 0) return;
+    const scan = function () {
+      document.querySelectorAll('.ezoic-ad').forEach(mark);
+    };
 
-    if (pos % interval !== 0) return;
-    if (seenAfterTopicPos.has(pos)) return;
+    scan();
+    setInterval(scan, 1000);
 
-    let id = pickNextId(pool);
-    if (!id) { return; }
+    try {
+      const mo = new MutationObserver(scan);
+      mo.observe(document.body, { childList: true, subtree: true });
+    } catch (e) {}
+  }
 
-    const placeholder = '<div id="ezoic-pub-ad-placeholder-' + id + '"></div>';
-    const html = makeWrapperLike(
-      $it,
-      'ezoic-ad-topic ezoic-ad',
-      placeholder,
-      'data-ezoic-after="' + pos + '" data-ezoic-id="' + id + '"'
+  function insertAfter($target, id, kind, afterVal) {
+    const wrap = $(
+      '<div class="ezoic-ad ezoic-ad-' + kind + '" data-ezoic-id="' + id + '" data-ezoic-after="' + afterVal + '">' +
+        '<div class="ezoic-ad-inner"><div id="ezoic-pub-ad-placeholder-' + id + '"></div></div>' +
+      '</div>'
     );
+    $target.after(wrap);
+    return wrap;
+  }
 
-    $it.after(html);
+  function recycleTopic($posts) {
+    fifoTopic.sort((a,b) => a.afterNo - b.afterNo);
+    while (fifoTopic.length) {
+      const old = fifoTopic.shift();
+      const sel = '.ezoic-ad-topic[data-ezoic-id="' + old.id + '"][data-ezoic-after="' + old.afterNo + '"]';
+      const $el = $(sel);
+      if (!$el.length) continue;
+
+      // don't recycle if this is right before the sentinel (after last post)
+      try {
+        const $last = $posts.last();
+        if ($last.length && $el.prev().is($last)) {
+          fifoTopic.push(old);
+          return null;
+        }
+      } catch (e) {}
 
-    seenAfterTopicPos.add(pos);
-    usedIds.add(id);
-    fifoCat.push({ afterPos: pos, id: id });
-    newIds.push(id);
-  });
+      $el.remove();
+      usedTopic.delete(old.id);
+      destroyPlaceholder(old.id);
+      return old.id;
+    }
+    return null;
+  }
 
-  return newIds;
-}
+  function recycleCat($items) {
+    fifoCat.sort((a,b) => a.afterPos - b.afterPos);
+    while (fifoCat.length) {
+      const old = fifoCat.shift();
+      const sel = '.ezoic-ad-between[data-ezoic-id="' + old.id + '"][data-ezoic-after="' + old.afterPos + '"]';
+      const $el = $(sel);
+      if (!$el.length) continue;
+
+      try {
+        const $last = $items.last();
+        if ($last.length && $el.prev().is($last)) {
+          fifoCat.push(old);
+          return null;
+        }
+      } catch (e) {}
 
-async function refreshAds() {
-  const key = getPageKey();
-  if (pageKey !== key) {
-    pageKey = key;
-    resetState();
-    cleanupOnNav();
+      $el.remove();
+      usedCat.delete(old.id);
+      destroyPlaceholder(old.id);
+      return old.id;
+    }
+    return null;
   }
 
-  if (inFlight) { rerunRequested = true; return; }
-  inFlight = true;
+  function injectInTopic() {
+    if (!(settings && (settings.enableMessageAds === true || settings.enableMessageAds === 'on'))) return;
+    const interval = parseInt(settings.messageIntervalPosts, 10) || 3;
+    const pool = parsePool(settings.messagePlaceholderIds);
+    if (!pool.length) return;
+
+    const $posts = $('[component="post"][data-pid]');
+    if (!$posts.length) return;
 
-  try {
-    const cfg = await fetchConfig();
-    if (!cfg || cfg.excluded) return;
+    const newIds = [];
+    $posts.each(function (idx) {
+      const postNo = idx + 1; // 1-based within loaded set
+      if (postNo % interval !== 0) return;
 
-    const betweenPool = parsePool(cfg.placeholderIds);
-    const betweenInterval = Math.max(1, parseInt(cfg.intervalPosts, 10) || 6);
+      // Do not insert after the last post in DOM (to keep infinite scroll sentinel stable)
+      if (idx === $posts.length - 1) return;
 
-    const messagePool = parsePool(cfg.messagePlaceholderIds);
-    const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
+      const $post = $(this);
+      const existing = $post.next('.ezoic-ad-topic');
+      if (existing.length) return;
 
-    const onTopic = isTopicPage();
-    const onCategory = !onTopic && isCategoryTopicListPage();
+      let id = pickNextId(pool, usedTopic);
+      if (!id) {
+        id = recycleTopic($posts);
+        if (!id) return;
+      }
+      usedTopic.add(id);
+      fifoTopic.push({ id, afterNo: postNo });
+
+      insertAfter($post, id, 'topic', postNo).addClass('ezoic-ad-topic');
+      newIds.push(id);
+    });
+
+    if (newIds.length) callEzoic(newIds);
+  }
+
+  function injectInCategory() {
+    if (!(settings && (settings.enableBetweenAds === true || settings.enableBetweenAds === 'on'))) return;
+    const interval = parseInt(settings.intervalTopics, 10) || 6;
+    const pool = parsePool(settings.placeholderIds);
+    if (!pool.length) return;
+
+    const $items = $('li[component="category/topic"]');
+    if (!$items.length) return;
 
     const newIds = [];
+    $items.each(function (idx) {
+      const pos = idx + 1;
+      if (pos % interval !== 0) return;
 
-    if (onCategory) {
-      const $items = getCategoryTopicItems();
-      if (cfg.enableBetweenAds && betweenPool.length && $items.length) {
-        newIds.push(...injectCategoryBetweenAds($items, betweenPool, betweenInterval));
-      }
-      callEzoic(newIds);
-      callEzoic();
-      return;
-    }
+      if (idx === $items.length - 1) return;
 
-    if (onTopic) {
-      const $posts = getTopicPosts();
-      if (cfg.enableMessageAds && messagePool.length && $posts.length) {
-        newIds.push(...injectTopicMessageAds($posts, messagePool, messageInterval));
+      const $li = $(this);
+      const existing = $li.next('.ezoic-ad-between');
+      if (existing.length) return;
+
+      let id = pickNextId(pool, usedCat);
+      if (!id) {
+        id = recycleCat($items);
+        if (!id) return;
       }
-      callEzoic(newIds);
-      callEzoic();
+      usedCat.add(id);
+      fifoCat.push({ id, afterPos: pos });
+
+      insertAfter($li, id, 'between', pos).addClass('ezoic-ad-between');
+      newIds.push(id);
+    });
+
+    if (newIds.length) callEzoic(newIds);
+  }
+
+  function refresh() {
+    if (!settings) return;
+    if (userExcluded()) return;
+
+    const key = getPageKey();
+    if (pageKey !== key) {
+      pageKey = key;
+      cleanupForNewPage();
     }
-  } finally {
-    inFlight = false;
-    if (rerunRequested) {
-      rerunRequested = false;
-      setTimeout(refreshAds, 160);
+
+    setupAutoHeight();
+
+    if (isTopicPage()) {
+      injectInTopic();
+    } else if (isCategoryTopicList()) {
+      injectInCategory();
     }
   }
-}
-
-function debounceRefresh() {
-  clearTimeout(debounceTimer);
-  debounceTimer = setTimeout(refreshAds, 220);
-}
-
-$(document).ready(debounceRefresh);
-$(window).on('action:ajaxify.end action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', debounceRefresh);
-setTimeout(debounceRefresh, 2200);
-
-// Fallback: some themes/devices don't emit the expected events for infinite scroll.
-// Observe DOM additions and trigger a refresh when new posts/topics are appended/prepended.
-(function setupEzoicObserver() {
-  if (window.__ezoicInfiniteObserver) return;
-  try {
-    const obs = new MutationObserver(function (mutations) {
-      for (const m of mutations) {
-        if (!m.addedNodes || !m.addedNodes.length) continue;
-        for (const n of m.addedNodes) {
-          if (!n || n.nodeType !== 1) continue;
-          // direct match
-          if (n.matches && (n.matches('[component="post"][data-pid]') || n.matches('li[component="category/topic"]'))) {
-            debounceRefresh();
-            return;
-          }
-          // descendant match
-          if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
-            debounceRefresh();
-            return;
-          }
-        }
-      }
+
+  // triggers: hard load + ajaxify + infinite scroll events
+  function boot() {
+    loadSettings(function () {
+      refresh();
+      // extra delayed refresh for late ez init
+      setTimeout(refresh, 1500);
+      setTimeout(refresh, 5000);
+      setTimeout(refresh, 10000);
     });
-    obs.observe(document.body, { childList: true, subtree: true });
-    window.__ezoicInfiniteObserver = obs;
-  } catch (e) {}
+  }
+
+  // Hard load
+  $(document).ready(boot);
+  // Ajaxify nav end
+  $(window).on('action:ajaxify.end', boot);
+  // Infinite scroll loads (varies by view)
+  $(window).on('action:posts.loaded action:topic.loaded action:topics.loaded action:category.loaded', function () {
+    refresh();
+    setTimeout(refresh, 800);
+  });
+
+  // Clean only on real navigation start (not infinite loads)
+  $(window).on('action:ajaxify.start', function (ev, data) {
+    try {
+      const url = data && (data.url || data.href);
+      if (!url) return;
+      const a = document.createElement('a');
+      a.href = url;
+      if (a.pathname && a.pathname === window.location.pathname) return;
+    } catch (e) {}
+    pageKey = null;
+    cleanupForNewPage();
+  });
+
 })();

package/public/style.css

@@ -1,2 +1,4 @@
-.ezoic-ad-post{margin:0.75rem 0;}
-.ezoic-ad-message-inner{padding:0.75rem 0;}
+.ezoic-ad{min-height:0 !important;height:auto !important;padding:0 !important;margin:0.5rem 0;}
+.ezoic-ad:not(.ezoic-filled){display:none !important;}
+.ezoic-ad .ezoic-ad-inner{padding:0;margin:0;}
+.ezoic-ad .ezoic-ad-inner > div{margin:0;padding:0;}

package/public/templates/admin/plugins/ezoic-infinite.tpl

@@ -1,59 +1,59 @@
 <div class="acp-page-container">
-  <h2>Ezoic Infinite Ads</h2>
+  <h1 class="mb-3">Ezoic Infinite</h1>
 
-  <form class="ezoic-infinite-settings" role="form">
-    <h4 class="mt-3">Pubs entre les posts (bloc simple)</h4>
-
-    <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="enableBetweenAds" name="enableBetweenAds" {enableBetweenAds_checked}>
-      <label class="form-check-label" for="enableBetweenAds">Activer les pubs entre les posts</label>
-    </div>
+  <div class="alert alert-info">
+    Placeholders format: <code>&lt;div id="ezoic-pub-ad-placeholder-XXX"&gt;&lt;/div&gt;</code>
+  </div>
 
+  <form role="form" class="ezoic-infinite-settings">
     <div class="mb-3">
-      <label class="form-label" for="placeholderIds">Pool d’IDs Ezoic (entre posts)</label>
-      <textarea id="placeholderIds" name="placeholderIds" class="form-control" rows="4">{placeholderIds}</textarea>
-      <p class="form-text">Un ID par ligne (ou séparé par virgules/espaces). Le nombre d’IDs = nombre max de pubs simultanées.</p>
-    </div>
-
-    <div class="mb-3">
-      <label class="form-label" for="intervalPosts">Afficher une pub tous les N posts</label>
-      <input type="number" id="intervalPosts" name="intervalPosts" class="form-control" value="{intervalPosts}" min="1">
+      <label class="form-label">Exclude groups (ads disabled for members of these groups)</label>
+      <select multiple class="form-select" name="excludedGroups">
+        <!-- BEGIN groups -->
+        <option value="{groups.name}">{groups.name}</option>
+        <!-- END groups -->
+      </select>
+      <div class="form-text">Hold Ctrl/Cmd to select multiple. Groups are sorted alphabetically.</div>
     </div>
 
     <hr/>
 
-    <h4 class="mt-3">Pubs “message” entre les réponses</h4>
-    <p class="form-text">Insère un bloc qui ressemble à un post, toutes les N réponses (dans une page topic).</p>
+    <h3>Between topics in category (topic list)</h3>
 
-    <div class="form-check mb-3">
-      <input class="form-check-input" type="checkbox" id="enableMessageAds" name="enableMessageAds" {enableMessageAds_checked}>
-      <label class="form-check-label" for="enableMessageAds">Activer les pubs “message”</label>
+    <div class="form-check form-switch mb-2">
+      <input class="form-check-input" type="checkbox" name="enableBetweenAds">
+      <label class="form-check-label">Enable between-topic ads</label>
     </div>
 
     <div class="mb-3">
-      <label class="form-label" for="messagePlaceholderIds">Pool d’IDs Ezoic (message)</label>
-      <textarea id="messagePlaceholderIds" name="messagePlaceholderIds" class="form-control" rows="4">{messagePlaceholderIds}</textarea>
-      <p class="form-text">Pool séparé recommandé pour éviter la réutilisation d’IDs. IMPORTANT : ne réutilise pas les mêmes IDs dans les deux pools.</p>
+      <label class="form-label">Interval (insert after every N topics)</label>
+      <input type="number" class="form-control" name="intervalTopics" min="1" step="1">
     </div>
 
     <div class="mb-3">
-      <label class="form-label" for="messageIntervalPosts">Afficher un “message pub” tous les N messages</label>
-      <input type="number" id="messageIntervalPosts" name="messageIntervalPosts" class="form-control" value="{messageIntervalPosts}" min="1">
+      <label class="form-label">Placeholder ID pool (one per line)</label>
+      <textarea class="form-control" name="placeholderIds" rows="6"></textarea>
     </div>
 
     <hr/>
 
-    <h4 class="mt-3">Exclusions</h4>
+    <h3>Inside topics (between posts)</h3>
+
+    <div class="form-check form-switch mb-2">
+      <input class="form-check-input" type="checkbox" name="enableMessageAds">
+      <label class="form-check-label">Enable between-post ads</label>
+    </div>
+
     <div class="mb-3">
-      <label class="form-label" for="excludedGroups">Groupes exclus</label>
-      <select id="excludedGroups" name="excludedGroups" class="form-select" multiple>
-        <!-- BEGIN allGroups -->
-        <option value="{allGroups.name}">{allGroups.name}</option>
-        <!-- END allGroups -->
-      </select>
-      <p class="form-text">Si l’utilisateur appartient à un de ces groupes, aucune pub n’est injectée.</p>
+      <label class="form-label">Interval (insert after every N posts)</label>
+      <input type="number" class="form-control" name="messageIntervalPosts" min="1" step="1">
+    </div>
+
+    <div class="mb-3">
+      <label class="form-label">Message placeholder ID pool (one per line)</label>
+      <textarea class="form-control" name="messagePlaceholderIds" rows="6"></textarea>
     </div>
 
-    <button id="save" class="btn btn-primary">Enregistrer</button>
+    <button type="button" class="btn btn-primary ezoic-infinite-save">Save</button>
   </form>
 </div>