nodebb-plugin-ezoic-infinite 0.7.4 → 0.7.5

package/package.json

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

package/public/client.js

@@ -61,8 +61,7 @@ function isTopicPage() {
   try {
     if (ajaxify && ajaxify.data && ajaxify.data.tid) return true;
   } catch (e) {}
-  if (/^\/topic\//.test(window.location.pathname)) return true;
-  return $('[component="post/content"]').length > 0;
+  return /^\/topic\//.test(window.location.pathname);
 }
 
 function isCategoryTopicListPage() {
@@ -342,9 +341,10 @@ async function refreshAds() {
     const messagePool = parsePool(cfg.messagePlaceholderIds);
     const messageInterval = Math.max(1, parseInt(cfg.messageIntervalPosts, 10) || 3);
 
-    const onTopic = isTopicPage();
     const hasTopicList = isCategoryTopicListPage();
-    const onCategory = !onTopic && hasTopicList;
+    const onTopic = isTopicPage();
+    // If a topic-list is present, we are on a category-like page even if other post-like widgets exist.
+    const onCategory = hasTopicList && !onTopic;
 
     const newIds = [];
 
@@ -393,11 +393,15 @@ setTimeout(function(){ setupAdAutoHeight(); debounceRefresh(); }, 2200);
         for (const n of m.addedNodes) {
           if (!n || n.nodeType !== 1) continue;
           // direct match
+          const inContent = (n.closest && n.closest('#content')) || (n.querySelector && n.querySelector('#content'));
+          if (!inContent && !document.querySelector('#content')) { /* if #content missing, proceed */ }
+          if (document.querySelector('#content') && !(n.closest && n.closest('#content'))) { continue; }
           if (n.matches && (n.matches('[component="post"][data-pid]') || n.matches('li[component="category/topic"]'))) {
             debounceRefresh();
             return;
           }
           // descendant match
+          if (document.querySelector('#content') && !(n.closest && n.closest('#content'))) { continue; }
           if (n.querySelector && (n.querySelector('[component="post"][data-pid]') || n.querySelector('li[component="category/topic"]'))) {
             debounceRefresh();
             return;