nodebb-plugin-niki-loyalty 1.0.18 → 1.0.20

package/library.js

@@ -160,45 +160,64 @@ Plugin.init = async function (params) {
   });
 
   // 3) KASA HISTORY (admin/mod)
-  router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
-    try {
-      const isAdmin = await user.isAdministrator(req.uid);
-      const isMod = await user.isGlobalModerator(req.uid);
-      if (!isAdmin && !isMod) return res.status(403).json([]);
+router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
+  try {
+    const isAdmin = await user.isAdministrator(req.uid);
+    const isMod = await user.isGlobalModerator(req.uid);
+    if (!isAdmin && !isMod) return res.status(403).json([]);
 
-      const raw = await db.getListRange('niki:kasa:history', 0, -1);
+    const raw = await db.getListRange('niki:kasa:history', 0, -1);
 
-      const rows = (raw || [])
-        .map(safeParseMaybeJson)
-        .filter(Boolean)
-        .reverse();
-
-      const enriched = await Promise.all(rows.map(async (item) => {
-        if (!item || !item.cuid) return item;
-
-        try {
-          // ✅ userslug + username + picture al
-          const uData = await user.getUserFields(item.cuid, ['username', 'userslug', 'picture']);
-          const userslug = uData?.userslug;
-
-          return {
-            ...item,
-            cust: item.cust || uData?.username || 'Bilinmeyen',
-            picture: item.picture || uData?.picture || '',
-            userslug: userslug || item.userslug || '',
-            profileUrl: makeProfileUrl(userslug || item.userslug),
-          };
-        } catch (e) {
-          // tek item patlasa bile endpoint düşmesin
-          return item;
+    // Kayıtlar bazen JSON string, bazen bozuk olabilir → güvenli parse
+    const rows = (raw || [])
+      .map((x) => {
+        if (!x) return null;
+        if (typeof x === 'object') return x;
+        if (typeof x === 'string') {
+          try { return JSON.parse(x); } catch (e) { return null; }
         }
-      }));
+        return null;
+      })
+      .filter(Boolean)
+      .reverse();
+
+    // cuid’lerden uid listesi çıkar
+    const uids = rows
+      .map(r => parseInt(r.cuid, 10))
+      .filter(n => Number.isFinite(n) && n > 0);
+
+    // NodeBB core user datası (profile-looks mantığı)
+    const users = await user.getUsersFields(uids, [
+      'uid', 'username', 'userslug', 'picture', 'icon:bgColor',
+    ]);
+
+    const userMap = {};
+    (users || []).forEach(u => { userMap[u.uid] = u; });
+
+    const rp = nconf.get('relative_path') || '';
+
+    const enriched = rows.map(r => {
+      const uid = parseInt(r.cuid, 10);
+      const u = userMap[uid];
+      if (!u) return r;
+
+      return {
+        ...r,
+        cust: u.username || r.cust || 'Bilinmeyen',
+        userslug: u.userslug || r.userslug || '',
+        picture: u.picture || r.picture || '',
+        iconBg: u['icon:bgColor'] || r.iconBg || '#4b5563',
+        profileUrl: (u.userslug ? `${rp}/user/${u.userslug}` : ''),
+      };
+    });
+
+    return res.json(enriched);
+  } catch (err) {
+    return res.status(500).json([]);
+  }
+});
+
 
-      return res.json(enriched);
-    } catch (err) {
-      return res.status(500).json([]);
-    }
-  });
 
   // 4) QR OLUŞTUR
   router.post('/api/niki-loyalty/generate-qr', middleware.ensureLoggedIn, async (req, res) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-niki-loyalty",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Niki The Cat Coffee Loyalty System - Earn points while studying on IEU Forum.",
   "main": "library.js",
   "nbbpm": {