nodebb-plugin-niki-loyalty 1.0.28 → 1.0.29

package/library.js

@@ -13,14 +13,15 @@ const Plugin = {};
 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 ☕" },
-    { 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 🍪' },
 ];
 
 // TEST MODE (Set to true to bypass point checks)
@@ -33,13 +34,21 @@ function safeParseMaybeJson(x) {
   if (x == null) return null;
   if (typeof x === 'object') return x;
   if (typeof x === 'string') {
-    try { return JSON.parse(x); } catch (e) { return null; }
+    try {
+      return JSON.parse(x);
+    } catch (e) {
+      return null;
+    }
   }
   return null;
 }
 
 function safeStringify(obj) {
-  try { return JSON.stringify(obj); } catch (e) { return null; }
+  try {
+    return JSON.stringify(obj);
+  } catch (e) {
+    return null;
+  }
 }
 
 // =========================
@@ -65,7 +74,7 @@ async function addKasaLog(staffUid, customerName, customerUid, rewardName, amoun
     cust: customerName,
     cuid: customerUid,
     amt: amount,
-    reward: rewardName // Store the specific reward name
+    reward: rewardName, // Store the specific reward name
   };
   const payload = safeStringify(logEntry);
   if (!payload) return;
@@ -80,7 +89,7 @@ Plugin.init = async function (params) {
   const router = params.router;
   const middleware = params.middleware;
 
-  // 1) HEARTBEAT (Earn Points)
+  // 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;
@@ -96,6 +105,9 @@ Plugin.init = async function (params) {
       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) {
@@ -121,10 +133,7 @@ Plugin.init = async function (params) {
       let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
       if (dailyPercent > 100) dailyPercent = 100;
 
-      const history = (historyRaw || [])
-        .map(safeParseMaybeJson)
-        .filter(Boolean)
-        .reverse();
+      const history = (historyRaw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
 
       return res.json({
         points: currentPoints,
@@ -132,14 +141,14 @@ Plugin.init = async function (params) {
         dailyCap: SETTINGS.dailyCap,
         dailyPercent,
         history,
-        rewards: REWARDS // Send reward tiers to frontend
+        rewards: REWARDS,
       });
     } catch (err) {
       return res.status(500).json({ points: 0, history: [] });
     }
   });
 
-  // 3) KASA 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);
@@ -152,20 +161,27 @@ Plugin.init = async function (params) {
       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; });
+      (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;
+        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 || '',
-          profileUrl: (u.userslug ? `${rp}/user/${u.userslug}` : ''),
+          iconBg: u['icon:bgColor'] || r.iconBg || '#4b5563',
+          profileUrl: u.userslug ? `${rp}/user/${u.userslug}` : '',
+          reward: r.reward || 'İşlem',
         };
       });
 
@@ -180,8 +196,7 @@ Plugin.init = async function (params) {
     try {
       const uid = req.uid;
       const points = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
-      
-      // Get the cost of the cheapest reward
+
       const minCost = REWARDS[REWARDS.length - 1].cost;
 
       if (!TEST_MODE_UNLIMITED && points < minCost) {
@@ -201,7 +216,7 @@ Plugin.init = async function (params) {
   // 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 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' });
@@ -210,22 +225,21 @@ Plugin.init = async function (params) {
       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; 
-              }
-          }
-          if (!selectedReward) {
-              return res.json({ success: false, message: 'Puan Yetersiz' });
+        for (const reward of REWARDS) {
+          if (pts >= reward.cost) {
+            selectedReward = reward;
+            break;
           }
+        }
+        if (!selectedReward) {
+          return res.json({ success: false, message: 'Puan Yetersiz' });
+        }
       } else {
-          // Default for test mode
-          selectedReward = REWARDS[0];
+        selectedReward = REWARDS[0];
       }
 
       // Deduct Points
@@ -268,8 +282,14 @@ Plugin.addScripts = async function (scripts) {
 };
 
 Plugin.addNavigation = async function (nav) {
-  nav.push({ route: '/niki-wallet', title: 'Niki Cüzdan', enabled: true, iconClass: 'fa-coffee', text: 'Niki Cüzdan' });
+  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.28",
+  "version": "1.0.29",
   "description": "Niki The Cat Coffee Loyalty System - Earn points while studying on IEU Forum.",
   "main": "library.js",
   "nbbpm": {