nodebb-plugin-niki-loyalty 1.0.26 → 1.0.29

package/library.js

@@ -3,214 +3,293 @@
 const db = require.main.require('./src/database');
 const user = require.main.require('./src/user');
 const routeHelpers = require.main.require('./src/controllers/helpers');
+const nconf = require.main.require('nconf');
 
 const Plugin = {};
 
-// --- AYARLAR: ÖDÜL SEVİYELERİ ---
+// =========================
+// SETTINGS & REWARDS
+// =========================
+const SETTINGS = {
+  pointsPerHeartbeat: 5,
+  dailyCap: 250,
+  // coffeeCost: 250, // (eski kodda vardı ama artık tier sistemi var; istersen kullanırız)
+};
+
+// Rewards configuration (Ordered from highest cost to lowest)
 const REWARDS = [
-    { cost: 250, name: "Ücretsiz Kahve ☕" },       // En büyük ödül en üstte olmalı
-    { cost: 180, name: "%60 İndirimli Kahve" },
-    { cost: 120, name: "%30 İndirimli Kahve" },
-    { cost: 60,  name: "1 Kurabiye 🍪" }
+  { cost: 250, name: 'Ücretsiz Kahve ☕' },
+  { cost: 180, name: '%60 İndirimli Kahve' },
+  { cost: 120, name: '%30 İndirimli Kahve' },
+  { cost: 60, name: '1 Kurabiye 🍪' },
 ];
 
-const SETTINGS = {
-    pointsPerHeartbeat: 5,
-    dailyCap: 250
-};
+// TEST MODE (Set to true to bypass point checks)
+const TEST_MODE_UNLIMITED = false;
 
-// --- LOG FONKSİYONLARI ---
-async function addUserLog(uid, type, amount, desc) {
+// =========================
+// HELPER FUNCTIONS
+// =========================
+function safeParseMaybeJson(x) {
+  if (x == null) return null;
+  if (typeof x === 'object') return x;
+  if (typeof x === 'string') {
     try {
-        const logEntry = { ts: Date.now(), type: type, amt: amount, txt: desc };
-        await db.listAppend(`niki:activity:${uid}`, logEntry);
-        await db.listTrim(`niki:activity:${uid}`, -50, -1);
-    } catch (e) { console.error("UserLog Error:", e); }
+      return JSON.parse(x);
+    } catch (e) {
+      return null;
+    }
+  }
+  return null;
+}
+
+function safeStringify(obj) {
+  try {
+    return JSON.stringify(obj);
+  } catch (e) {
+    return null;
+  }
+}
+
+// =========================
+// LOGGING
+// =========================
+async function addUserLog(uid, type, amount, desc) {
+  const logEntry = {
+    ts: Date.now(),
+    type, // 'earn' | 'spend'
+    amt: amount,
+    txt: desc,
+  };
+  const payload = safeStringify(logEntry);
+  if (!payload) return;
+  await db.listAppend(`niki:activity:${uid}`, payload);
+  await db.listTrim(`niki:activity:${uid}`, -50, -1);
 }
 
 async function addKasaLog(staffUid, customerName, customerUid, rewardName, amount) {
-    try {
-        const logEntry = { 
-            ts: Date.now(), 
-            staff: staffUid, 
-            cust: customerName, 
-            cuid: customerUid, 
-            amt: amount,
-            reward: rewardName // Ödülün adını da kaydedelim
-        };
-        await db.listAppend('niki:kasa:history', logEntry);
-        await db.listTrim('niki:kasa:history', -100, -1);
-    } catch (e) { console.error("KasaLog Error:", e); }
+  const logEntry = {
+    ts: Date.now(),
+    staff: staffUid,
+    cust: customerName,
+    cuid: customerUid,
+    amt: amount,
+    reward: rewardName, // Store the specific reward name
+  };
+  const payload = safeStringify(logEntry);
+  if (!payload) return;
+  await db.listAppend('niki:kasa:history', payload);
+  await db.listTrim('niki:kasa:history', -100, -1);
 }
 
+// =========================
+// PLUGIN INIT
+// =========================
 Plugin.init = async function (params) {
-    const router = params.router;
-    const middleware = params.middleware;
-
-    // 1. HEARTBEAT (Puan Kazanma)
-    router.post('/api/niki-loyalty/heartbeat', middleware.ensureLoggedIn, async (req, res) => {
-        try {
-            const uid = req.uid;
-            const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
-            const dailyKey = `niki:daily:${uid}:${today}`;
-            
-            const currentDailyScore = await db.getObjectField(dailyKey, 'score') || 0;
-
-            if (parseInt(currentDailyScore) >= SETTINGS.dailyCap) {
-                return res.json({ earned: false, reason: 'daily_cap' });
-            }
-
-            await user.incrementUserFieldBy(uid, 'niki_points', SETTINGS.pointsPerHeartbeat);
-            await db.incrObjectFieldBy(dailyKey, 'score', SETTINGS.pointsPerHeartbeat);
-
-            const newBalance = await user.getUserField(uid, 'niki_points');
-            return res.json({ earned: true, points: SETTINGS.pointsPerHeartbeat, total: newBalance });
-        } catch (e) { return res.json({ earned: false }); }
-    });
-
-    // 2. WALLET DATA
-    router.get('/api/niki-loyalty/wallet-data', middleware.ensureLoggedIn, async (req, res) => {
-        try {
-            const uid = req.uid;
-            const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
-            
-            const [userData, dailyData, rawHistory] = await Promise.all([
-                user.getUserFields(uid, ['niki_points']),
-                db.getObject(`niki:daily:${uid}:${today}`),
-                db.getListRange(`niki:activity:${uid}`, 0, -1)
-            ]);
-
-            const history = (rawHistory || []).map(item => {
-                if (typeof item === 'string') { try { return JSON.parse(item); } catch { return null; } }
-                return item;
-            }).filter(item => item !== null).reverse();
-
-            const currentPoints = parseInt(userData.niki_points) || 0;
-            const dailyScore = parseInt(dailyData ? dailyData.score : 0) || 0;
-            
-            // Yüzdeyi en büyük hedefe (250) göre hesapla
-            let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
-            if (dailyPercent > 100) dailyPercent = 100;
-
-            res.json({
-                points: currentPoints,
-                dailyScore: dailyScore,
-                dailyCap: SETTINGS.dailyCap,
-                dailyPercent: dailyPercent,
-                history: history,
-                rewards: REWARDS // Frontend'e ödül listesini gönder
-            });
-        } catch (e) {
-            res.json({ points: 0, dailyScore: 0, dailyCap: 250, dailyPercent: 0, history: [] });
+  const router = params.router;
+  const middleware = params.middleware;
+
+  // 1) HEARTBEAT (Earn Points) + ✅ EARN LOG (2. koddaki özellik)
+  router.post('/api/niki-loyalty/heartbeat', middleware.ensureLoggedIn, async (req, res) => {
+    try {
+      const uid = req.uid;
+      const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+      const dailyKey = `niki:daily:${uid}:${today}`;
+
+      const currentDailyScore = parseInt((await db.getObjectField(dailyKey, 'score')) || 0, 10);
+
+      if (currentDailyScore >= SETTINGS.dailyCap) {
+        return res.json({ earned: false, reason: 'daily_cap' });
+      }
+
+      await user.incrementUserFieldBy(uid, 'niki_points', SETTINGS.pointsPerHeartbeat);
+      await db.incrObjectFieldBy(dailyKey, 'score', SETTINGS.pointsPerHeartbeat);
+
+      // ✅ Log: Cüzdan geçmişinde "kazanım" görünsün
+      await addUserLog(uid, 'earn', SETTINGS.pointsPerHeartbeat, 'Ders Çalışma 📚');
+
+      const newBalance = await user.getUserField(uid, 'niki_points');
+      return res.json({ earned: true, points: SETTINGS.pointsPerHeartbeat, total: newBalance });
+    } catch (err) {
+      return res.status(500).json({ earned: false, reason: 'server_error' });
+    }
+  });
+
+  // 2) WALLET DATA (Data + History + Rewards Info)
+  router.get('/api/niki-loyalty/wallet-data', middleware.ensureLoggedIn, async (req, res) => {
+    try {
+      const uid = req.uid;
+      const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+
+      const [userData, dailyData, historyRaw] = await Promise.all([
+        user.getUserFields(uid, ['niki_points']),
+        db.getObject(`niki:daily:${uid}:${today}`),
+        db.getListRange(`niki:activity:${uid}`, 0, -1),
+      ]);
+
+      const currentPoints = parseInt(userData?.niki_points || 0, 10);
+      const dailyScore = parseInt(dailyData?.score || 0, 10);
+
+      let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
+      if (dailyPercent > 100) dailyPercent = 100;
+
+      const history = (historyRaw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+
+      return res.json({
+        points: currentPoints,
+        dailyScore,
+        dailyCap: SETTINGS.dailyCap,
+        dailyPercent,
+        history,
+        rewards: REWARDS,
+      });
+    } catch (err) {
+      return res.status(500).json({ points: 0, history: [] });
+    }
+  });
+
+  // 3) KASA HISTORY (+ ✅ iconBg + reward fallback (2. koddaki özellik))
+  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 rows = (raw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+
+      const uids = rows.map(r => parseInt(r.cuid, 10)).filter(n => Number.isFinite(n) && n > 0);
+      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) {
+          // yine de reward fallback yapalım
+          return { ...r, reward: r.reward || 'İşlem' };
+        }
+        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}` : '',
+          reward: r.reward || 'İşlem',
+        };
+      });
+
+      return res.json(enriched);
+    } catch (err) {
+      return res.status(500).json([]);
+    }
+  });
+
+  // 4) GENERATE QR (Check if user has enough for MINIMUM reward)
+  router.post('/api/niki-loyalty/generate-qr', middleware.ensureLoggedIn, async (req, res) => {
+    try {
+      const uid = req.uid;
+      const points = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
+
+      const minCost = REWARDS[REWARDS.length - 1].cost;
+
+      if (!TEST_MODE_UNLIMITED && points < minCost) {
+        return res.json({ success: false, message: `En az ${minCost} puan gerekli.` });
+      }
+
+      const token = Math.random().toString(36).substring(2) + Date.now().toString(36);
+      await db.set(`niki:qr:${token}`, uid);
+      await db.expire(`niki:qr:${token}`, 120);
+
+      return res.json({ success: true, token });
+    } catch (err) {
+      return res.status(500).json({ success: false, message: 'Sunucu hatası' });
+    }
+  });
+
+  // 5) SCAN QR (Determine Reward & Deduct Points)
+  router.post('/api/niki-loyalty/scan-qr', middleware.ensureLoggedIn, async (req, res) => {
+    try {
+      const token = req.body && req.body.token ? String(req.body.token) : '';
+      const isAdmin = await user.isAdministrator(req.uid);
+      const isMod = await user.isGlobalModerator(req.uid);
+      if (!isAdmin && !isMod) return res.status(403).json({ success: false, message: 'Yetkisiz' });
+
+      const customerUid = await db.get(`niki:qr:${token}`);
+      if (!customerUid) return res.json({ success: false, message: 'Geçersiz Kod' });
+
+      const pts = parseInt((await user.getUserField(customerUid, 'niki_points')) || 0, 10);
+
+      // Calculate best possible reward
+      let selectedReward = null;
+      if (!TEST_MODE_UNLIMITED) {
+        for (const reward of REWARDS) {
+          if (pts >= reward.cost) {
+            selectedReward = reward;
+            break;
+          }
         }
-    });
-
-    // 3. KASA GEÇMİŞİ
-    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 rawHistory = await db.getListRange('niki:kasa:history', 0, -1);
-            const enrichedHistory = await Promise.all((rawHistory || []).reverse().map(async (item) => {
-                try {
-                    if (typeof item === 'string') { try { item = JSON.parse(item); } catch (e) { return null; } }
-                    if (!item || !item.cuid) return null;
-                    const uData = await user.getUserFields(item.cuid, ['picture']);
-                    item.picture = uData ? uData.picture : null;
-                    return item;
-                } catch (err) { return null; }
-            }));
-            res.json(enrichedHistory.filter(i => i !== null));
-        } catch (e) { res.json([]); }
-    });
-
-    // 4. QR OLUŞTUR (En düşük ödül seviyesi kadar puanı var mı?)
-    router.post('/api/niki-loyalty/generate-qr', middleware.ensureLoggedIn, async (req, res) => {
-        try {
-            const uid = req.uid;
-            const points = parseInt(await user.getUserField(uid, 'niki_points')) || 0;
-            
-            // En ucuz ödül (60 puan) kadar bile puanı yoksa izin verme
-            const minCost = REWARDS[REWARDS.length - 1].cost;
-            if (points < minCost) return res.json({ success: false, message: `En az ${minCost} puan gerekli.` });
-
-            const token = Math.random().toString(36).substring(2) + Date.now().toString(36);
-            await db.set(`niki:qr:${token}`, uid);
-            await db.expire(`niki:qr:${token}`, 120);
-
-            return res.json({ success: true, token: token });
-        } catch (e) { return res.json({ success: false, message: "Hata" }); }
-    });
-
-    // 5. QR OKUT (OTOMATİK ÖDÜL SEÇİMİ)
-    router.post('/api/niki-loyalty/scan-qr', middleware.ensureLoggedIn, async (req, res) => {
-        try {
-            const { token } = req.body;
-            const isAdmin = await user.isAdministrator(req.uid);
-            const isMod = await user.isGlobalModerator(req.uid);
-            if (!isAdmin && !isMod) return res.status(403).json({ success: false, message: 'Yetkisiz' });
-
-            const customerUid = await db.get(`niki:qr:${token}`);
-            if (!customerUid) return res.json({ success: false, message: 'Geçersiz Kod' });
-
-            const pts = parseInt(await user.getUserField(customerUid, 'niki_points')) || 0;
-            
-            // --- HANGİ ÖDÜLÜ ALABİLİR? ---
-            let selectedReward = null;
-            
-            // Ödülleri pahalıdan ucuza tara, ilk yeteni seç
-            for (const reward of REWARDS) {
-                if (pts >= reward.cost) {
-                    selectedReward = reward;
-                    break; // En büyüğü bulduk, döngüden çık
-                }
-            }
-
-            if (!selectedReward) {
-                return res.json({ success: false, message: 'Puan Yetersiz (Min: 60)' });
-            }
-
-            // İŞLEM
-            await user.decrementUserFieldBy(customerUid, 'niki_points', selectedReward.cost);
-            await db.delete(`niki:qr:${token}`);
-
-            // LOGLAR
-            const customerData = await user.getUserFields(customerUid, ['username', 'picture']);
-            
-            await addUserLog(customerUid, 'spend', selectedReward.cost, selectedReward.name);
-            await addKasaLog(req.uid, customerData.username, customerUid, selectedReward.name, selectedReward.cost);
-
-            // Frontend'e hangi ödülün verildiğini söyle
-            return res.json({ 
-                success: true, 
-                customer: customerData, 
-                rewardName: selectedReward.name, 
-                cost: selectedReward.cost 
-            });
-
-        } catch (e) {
-            return res.json({ success: false, message: "İşlem Hatası" });
+        if (!selectedReward) {
+          return res.json({ success: false, message: 'Puan Yetersiz' });
         }
-    });
-
-    routeHelpers.setupPageRoute(router, '/niki-kasa', middleware, [], async (req, res) => {
-        const isAdmin = await user.isAdministrator(req.uid);
-        const isMod = await user.isGlobalModerator(req.uid);
-        if (!isAdmin && !isMod) return res.render('403', {});
-        res.render('niki-kasa', { title: 'Niki Kasa' });
-    });
+      } else {
+        selectedReward = REWARDS[0];
+      }
+
+      // Deduct Points
+      if (!TEST_MODE_UNLIMITED) {
+        await user.decrementUserFieldBy(customerUid, 'niki_points', selectedReward.cost);
+      }
+
+      await db.delete(`niki:qr:${token}`);
+
+      const customerData = await user.getUserFields(customerUid, ['username', 'picture', 'userslug']);
+
+      // Logs
+      await addUserLog(customerUid, 'spend', selectedReward.cost, selectedReward.name);
+      await addKasaLog(req.uid, customerData?.username || 'Bilinmeyen', customerUid, selectedReward.name, selectedReward.cost);
+
+      return res.json({
+        success: true,
+        customer: customerData,
+        rewardName: selectedReward.name,
+        cost: selectedReward.cost,
+        message: 'Onaylandı!',
+      });
+    } catch (err) {
+      return res.status(500).json({ success: false, message: 'Sunucu hatası' });
+    }
+  });
+
+  // 6) PAGE ROUTES
+  routeHelpers.setupPageRoute(router, '/niki-kasa', middleware, [], async (req, res) => {
+    const isAdmin = await user.isAdministrator(req.uid);
+    const isMod = await user.isGlobalModerator(req.uid);
+    if (!isAdmin && !isMod) return res.render('403', {});
+    return res.render('niki-kasa', { title: 'Niki Kasa' });
+  });
 };
 
 Plugin.addScripts = async function (scripts) {
-    scripts.push('plugins/nodebb-plugin-niki-loyalty/static/lib/client.js');
-    return scripts;
+  scripts.push('plugins/nodebb-plugin-niki-loyalty/static/lib/client.js');
+  return scripts;
 };
 
 Plugin.addNavigation = async function (nav) {
-    nav.push({ route: "/niki-wallet", title: "Niki Cüzdan", enabled: true, iconClass: "fa-coffee", text: "Niki Cüzdan" });
-    return nav;
+  nav.push({
+    route: '/niki-wallet',
+    title: 'Niki Cüzdan',
+    enabled: true,
+    iconClass: 'fa-coffee',
+    text: 'Niki Cüzdan',
+  });
+  return nav;
 };
 
-module.exports = Plugin;
+module.exports = Plugin;

package/package.json

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