nodebb-plugin-ezoic-infinite 1.5.18 → 1.5.21

package/library.js

@@ -9,7 +9,11 @@ const plugin = {};
 
 function normalizeExcludedGroups(value) {
   if (!value) return [];
-  if (Array.isArray(value)) return value;
+  // NodeBB settings may return arrays, strings, or objects like {0:'a',1:'b'}
+  if (Array.isArray(value)) return value.map(String).map(s => s.trim()).filter(Boolean);
+  if (typeof value === 'object') {
+    return Object.values(value).map(String).map(s => s.trim()).filter(Boolean);
+  }
   return String(value).split(',').map(s => s.trim()).filter(Boolean);
 }
 
@@ -66,9 +70,19 @@ async function getSettings() {
 }
 
 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));
+  const list = (excludedGroups || []).map(g => String(g).toLowerCase());
+  const id = Number(uid) || 0;
+
+  if (!list.length) return false;
+
+  // Guests (uid=0) are not in groups.getUserGroups; treat explicitly if configured
+  if (id === 0) {
+    return list.includes('guests') || list.includes('guest');
+  }
+
+  const userGroups = await groups.getUserGroups([id]);
+  const names = (userGroups[0] || []).map(g => (g && g.name) ? g.name : String(g));
+  return names.some(name => list.includes(String(name).toLowerCase()));
 }
 
 plugin.onSettingsSet = function (data) {
@@ -107,7 +121,11 @@ plugin.init = async ({ router, middleware }) => {
 
   router.get('/api/plugins/ezoic-infinite/config', async (req, res) => {
     const settings = await getSettings();
-    const excluded = await isUserExcluded(req.uid, settings.excludedGroups);
+    const uid = (typeof req.uid !== 'undefined' && req.uid !== null) ? req.uid
+      : (req.user && req.user.uid) ? req.user.uid
+      : (res.locals && res.locals.uid) ? res.locals.uid
+      : 0;
+    const excluded = await isUserExcluded(uid, settings.excludedGroups);
 
     res.json({
       excluded,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "1.5.18",
+  "version": "1.5.21",
   "description": "Production-ready Ezoic infinite ads integration for NodeBB 4.x",
   "main": "library.js",
   "license": "MIT",