nodebb-plugin-ezoic-infinite 0.9.15 → 0.9.16

package/library.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const meta = require.main.require('./src/meta');
+const db = require.main.require('./src/database');
 const groups = require.main.require('./src/groups');
 
 const Plugin = {};
@@ -12,19 +13,40 @@ Plugin.init = async function (params) {
   router.get('/api/admin/plugins/ezoic-infinite', renderAdmin);
 };
 
-async function renderAdmin(req, res) {
-  const settings = await meta.settings.get('ezoic-infinite');
+async function getAllGroupNames() {
+  const keys = [
+    'groups:createtime',
+    'groups:visible:createtime',
+    'groups:system:createtime',
+    'groups:alphabetical',
+    'groups:visible:alphabetical',
+  ];
+
+  for (const key of keys) {
+    try {
+      const names = await db.getSortedSetRange(key, 0, -1);
+      if (Array.isArray(names) && names.length) {
+        return names;
+      }
+    } catch (e) {}
+  }
 
-  let groupNames = [];
-  // NodeBB versions differ on which sorted set exists; 0.9.6 style used these successfully
-  const candidates = ['groups:createtime', 'groups:visible:createtime', 'groups:system:createtime'];
+  // Last resort: ask groups module for any known set
+  const candidates = ['groups:createtime', 'groups:visible:createtime'];
   for (const set of candidates) {
     try {
-      groupNames = await groups.getGroupsFromSet(set, 0, -1);
-      if (Array.isArray(groupNames) && groupNames.length) break;
+      const names = await groups.getGroupsFromSet(set, 0, -1);
+      if (Array.isArray(names) && names.length) return names;
     } catch (e) {}
   }
 
+  return [];
+}
+
+async function renderAdmin(req, res) {
+  const settings = await meta.settings.get('ezoic-infinite');
+
+  const groupNames = await getAllGroupNames();
   let groupList = [];
   try {
     groupList = await groups.getGroupsData(groupNames);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-ezoic-infinite",
-  "version": "0.9.15",
+  "version": "0.9.16",
   "description": "Injection de publicités Ezoic entre les topics et entre les messages avec infinite scroll (NodeBB 4.x).",
   "main": "library.js",
   "license": "MIT",