nodebb-plugin-niki-loyalty 1.0.25 → 1.0.28

package/library.js

@@ -8,157 +8,106 @@ const nconf = require.main.require('nconf');
 const Plugin = {};
 
 // =========================
-// AYARLAR
+// SETTINGS & REWARDS
 // =========================
 const SETTINGS = {
   pointsPerHeartbeat: 5,
   dailyCap: 250,
-
-  barMax: 250,
-  rewards: [
-    { id: 'cookie', at: 60,  title: 'Ücretsiz Kurabiye', type: 'free_item', meta: { item: 'cookie' } },
-    { id: 'c35',    at: 120, title: '%35 İndirimli Kahve', type: 'discount',  meta: { product: 'coffee', percent: 35 } },
-    { id: 'c60',    at: 180, title: '%60 İndirimli Kahve', type: 'discount',  meta: { product: 'coffee', percent: 60 } },
-    { id: 'coffee', at: 250, title: 'Ücretsiz Kahve', type: 'free_item', meta: { item: 'coffee' } },
-  ],
-
-  couponTTLSeconds: 10 * 60, // 10 dk
 };
 
+// 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 🍪" }
+];
 
-// ✅ TEST: sınırsız kullanım (puan kontrolünü kapatmak için true)
+// TEST MODE (Set to true to bypass point checks)
 const TEST_MODE_UNLIMITED = false;
 
 // =========================
-// JSON SAFE HELPERS
+// HELPER FUNCTIONS
 // =========================
 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;
-  }
-}
-
-function makeProfileUrl(userslug) {
-  const rp = nconf.get('relative_path') || '';
-  if (!userslug) return '';
-  return `${rp}/user/${userslug}`;
-}
-
-function makeToken() {
-  return Math.random().toString(36).substring(2) + Date.now().toString(36);
-}
-
-function getTodayKey() {
-  return new Date().toISOString().slice(0, 10).replace(/-/g, '');
-}
-
-function findRewardById(id) {
-  return SETTINGS.rewards.find(r => r.id === id) || null;
-}
-
-async function isStaff(uid) {
-  const [isAdmin, isMod] = await Promise.all([
-    user.isAdministrator(uid),
-    user.isGlobalModerator(uid),
-  ]);
-  return isAdmin || isMod;
+  try { return JSON.stringify(obj); } catch (e) { return null; }
 }
 
 // =========================
-// LOG FONKSİYONLARI
+// LOGGING
 // =========================
-async function addUserLog(uid, type, amount, desc, extra) {
+async function addUserLog(uid, type, amount, desc) {
   const logEntry = {
     ts: Date.now(),
     type, // 'earn' | 'spend'
     amt: amount,
     txt: desc,
-    ...(extra ? { extra } : {}),
   };
-
   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, amount, rewardId, rewardTitle) {
+async function addKasaLog(staffUid, customerName, customerUid, rewardName, amount) {
   const logEntry = {
     ts: Date.now(),
     staff: staffUid,
     cust: customerName,
     cuid: customerUid,
     amt: amount,
-    rewardId: rewardId || '',
-    rewardTitle: rewardTitle || '',
+    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);
 }
 
 // =========================
-// INIT
+// PLUGIN INIT
 // =========================
 Plugin.init = async function (params) {
   const router = params.router;
   const middleware = params.middleware;
 
-  // -------------------------
-  // 1) HEARTBEAT (puan kazanma)
-  // -------------------------
+  // 1) HEARTBEAT (Earn Points)
   router.post('/api/niki-loyalty/heartbeat', middleware.ensureLoggedIn, async (req, res) => {
     try {
       const uid = req.uid;
-      const today = getTodayKey();
+      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 (!TEST_MODE_UNLIMITED && currentDailyScore >= SETTINGS.dailyCap) {
+      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);
 
-      const newBalance = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
-
-      await addUserLog(uid, 'earn', SETTINGS.pointsPerHeartbeat, 'Aktiflik Puanı ⚡');
-
+      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 (cüzdan + geçmiş + rewards)
-  // -------------------------
+  // 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 = getTodayKey();
+      const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
 
       const [userData, dailyData, historyRaw] = await Promise.all([
         user.getUserFields(uid, ['niki_points']),
@@ -172,144 +121,36 @@ Plugin.init = async function (params) {
       let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
       if (dailyPercent > 100) dailyPercent = 100;
 
-      const barPercent = Math.min(100, (currentPoints / SETTINGS.barMax) * 100);
-
       const history = (historyRaw || [])
         .map(safeParseMaybeJson)
         .filter(Boolean)
         .reverse();
 
-      const rewards = SETTINGS.rewards.map(r => ({
-        id: r.id,
-        at: r.at,
-        title: r.title,
-        type: r.type,
-        meta: r.meta,
-        unlocked: currentPoints >= r.at,
-      }));
-
       return res.json({
         points: currentPoints,
-
         dailyScore,
         dailyCap: SETTINGS.dailyCap,
         dailyPercent,
-
-        barMax: SETTINGS.barMax,
-        barPercent,
-
-        rewards,
         history,
+        rewards: REWARDS // Send reward tiers to frontend
       });
     } catch (err) {
-      return res.status(500).json({
-        points: 0,
-        dailyScore: 0,
-        dailyCap: SETTINGS.dailyCap,
-        dailyPercent: 0,
-        barMax: SETTINGS.barMax,
-        barPercent: 0,
-        rewards: SETTINGS.rewards.map(r => ({ id: r.id, at: r.at, title: r.title, type: r.type, meta: r.meta, unlocked: false })),
-        history: [],
-      });
+      return res.status(500).json({ points: 0, history: [] });
     }
   });
 
-  // -------------------------
-  // 3) CLAIM REWARD (Seçenek B: claim = puan düşer + kupon token üretir)
-  //    Client bu endpoint'i çağıracak.
-  // -------------------------
-  router.post('/api/niki-loyalty/claim', middleware.ensureLoggedIn, async (req, res) => {
-  try {
-    const uid = req.uid;
-    const rewardId = (req.body && req.body.rewardId) ? String(req.body.rewardId) : '';
-    const reward = findRewardById(rewardId);
-    if (!reward) return res.json({ success: false, message: 'Geçersiz ödül' });
-
-    const points = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
-    if (!TEST_MODE_UNLIMITED && points < reward.at) {
-      return res.json({ success: false, message: 'Yetersiz puan' });
-    }
-
-    // ✅ Aynı ödülden aktif kupon varsa tekrar üretme (spam engeli)
-    const reserveKey = `niki:reserve:${uid}:${reward.id}`;
-    const existingToken = await db.get(reserveKey);
-    if (existingToken) {
-      return res.json({
-        success: true,
-        token: existingToken,
-        reward: { id: reward.id, at: reward.at, title: reward.title, type: reward.type, meta: reward.meta },
-        message: 'Zaten aktif bir kuponun var. Kasada okutabilirsin.',
-      });
-    }
-
-    // ✅ token oluştur
-    const token = makeToken();
-    const couponKey = `niki:coupon:${token}`;
-
-    const couponPayload = safeStringify({
-      token,
-      ts: Date.now(),
-      rewardId: reward.id,
-      cost: reward.at,              // ✅ puan düşülecek tutar
-      title: reward.title,
-      type: reward.type,
-      meta: reward.meta,
-      ownerUid: uid,
-    });
-
-    await db.set(couponKey, couponPayload);
-    await db.expire(couponKey, SETTINGS.couponTTLSeconds);
-
-    // ✅ rezervasyonu da tut
-    await db.set(reserveKey, token);
-    await db.expire(reserveKey, SETTINGS.couponTTLSeconds);
-
-    // user log (claim logu - puan düşmeden)
-    await addUserLog(uid, 'spend', 0, `Kupon oluşturuldu: ${reward.title}`, { rewardId: reward.id, token });
-
-    return res.json({
-      success: true,
-      token,
-      reward: { id: reward.id, at: reward.at, title: reward.title, type: reward.type, meta: reward.meta },
-      message: 'Kupon hazır! Kasada okutunca puanın düşer.',
-    });
-  } catch (err) {
-    return res.status(500).json({ success: false, message: 'Sunucu hatası' });
-  }
-});
-
-
-  // -------------------------
-  // 4) KASA HISTORY (admin/mod)
-  // -------------------------
+  // 3) KASA HISTORY
   router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
     try {
-      const staffOk = await isStaff(req.uid);
-      if (!staffOk) return res.status(403).json([]);
+      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 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();
-
-      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 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; });
 
@@ -319,13 +160,11 @@ Plugin.init = async function (params) {
         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}` : ''),
         };
       });
@@ -336,85 +175,20 @@ Plugin.init = async function (params) {
     }
   });
 
-  // -------------------------
-  // 5) KASA: COUPON SCAN (admin/mod)  ✅ yeni akış
-  //    Claim ile üretilen token kasada okutulur.
-  // -------------------------
-router.post('/api/niki-loyalty/scan-coupon', middleware.ensureLoggedIn, async (req, res) => {
-  try {
-    const token = (req.body && req.body.token) ? String(req.body.token) : '';
-
-    const staffOk = await isStaff(req.uid);
-    if (!staffOk) return res.status(403).json({ success: false, message: 'Yetkisiz' });
-
-    const raw = await db.get(`niki:coupon:${token}`);
-    if (!raw) return res.json({ success: false, message: 'Geçersiz / Süresi dolmuş kupon' });
-
-    const coupon = safeParseMaybeJson(raw);
-    if (!coupon || !coupon.ownerUid || !coupon.rewardId) {
-      await db.delete(`niki:coupon:${token}`);
-      return res.json({ success: false, message: 'Kupon bozuk' });
-    }
-
-    const customerUid = parseInt(coupon.ownerUid, 10);
-    const cost = parseInt(coupon.cost || 0, 10);
-
-    // ✅ puan yeter mi? (scan anında kontrol)
-    const pts = parseInt((await user.getUserField(customerUid, 'niki_points')) || 0, 10);
-    if (!TEST_MODE_UNLIMITED && pts < cost) {
-      return res.json({ success: false, message: 'Yetersiz bakiye (puan değişmiş olabilir)' });
-    }
-
-    // ✅ puan düş (asıl düşüş burada)
-    if (!TEST_MODE_UNLIMITED && cost > 0) {
-      await user.decrementUserFieldBy(customerUid, 'niki_points', cost);
-    }
-
-    // ✅ tek kullanımlık: kuponu sil
-    await db.delete(`niki:coupon:${token}`);
-    // ✅ rezervasyonu da sil
-    await db.delete(`niki:reserve:${customerUid}:${coupon.rewardId}`);
-
-    const customerData = await user.getUserFields(customerUid, ['username', 'picture', 'userslug']);
-
-    // user log (gerçek spend burada)
-    await addUserLog(customerUid, 'spend', cost, `Kullanıldı: ${coupon.title}`, { rewardId: coupon.rewardId });
-
-    // kasa log
-    await addKasaLog(req.uid, customerData?.username || 'Bilinmeyen', customerUid, cost, coupon.rewardId, coupon.title);
-
-    return res.json({
-      success: true,
-      customer: customerData,
-      coupon: {
-        rewardId: coupon.rewardId,
-        title: coupon.title,
-        type: coupon.type,
-        meta: coupon.meta,
-        cost,
-      },
-      message: 'Kupon onaylandı!',
-    });
-  } catch (err) {
-    return res.status(500).json({ success: false, message: 'Sunucu hatası' });
-  }
-});
-
-  // -------------------------
-  // 6) (ESKİ) QR OLUŞTUR / OKUT — opsiyonel uyumluluk
-  //    İstersen tamamen kaldırırız. Şimdilik 250 "Ücretsiz Kahve" gibi düşünebilirsin.
-  // -------------------------
+  // 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);
+      
+      // Get the cost of the cheapest reward
+      const minCost = REWARDS[REWARDS.length - 1].cost;
 
-      if (!TEST_MODE_UNLIMITED && points < SETTINGS.coffeeCost) {
-        return res.json({ success: false, message: 'Yetersiz Puan' });
+      if (!TEST_MODE_UNLIMITED && points < minCost) {
+        return res.json({ success: false, message: `En az ${minCost} puan gerekli.` });
       }
 
-      const token = makeToken();
-
+      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);
 
@@ -423,75 +197,55 @@ router.post('/api/niki-loyalty/scan-coupon', middleware.ensureLoggedIn, async (r
       return res.status(500).json({ success: false, message: 'Sunucu hatası' });
     }
   });
-const TIERS = [60, 120, 180, 250];
-
-function pickTier(points) {
-  // en büyük uygun tier
-  let chosen = 0;
-  for (const t of TIERS) if (points >= t) chosen = t;
-  return chosen; // 0 ise yetersiz
-}
-
-router.post('/api/niki-loyalty/claim-auto', middleware.ensureLoggedIn, async (req, res) => {
-  try {
-    const uid = req.uid;
-    const points = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
-
-    if (TEST_MODE_UNLIMITED) {
-      // testte 250 gibi davran
-      const token = makeToken();
-      await db.set(`niki:coupon:${token}`, safeStringify({ token, ts: Date.now(), ownerUid: uid, cost: 250 }));
-      await db.expire(`niki:coupon:${token}`, 120);
-      return res.json({ success: true, token, cost: 250 });
-    }
-
-    const cost = pickTier(points);
-    if (!cost) return res.json({ success: false, message: 'En az 60 puan gerekli.' });
-
-    const token = makeToken();
-    await db.set(`niki:coupon:${token}`, safeStringify({
-      token,
-      ts: Date.now(),
-      ownerUid: uid,
-      cost, // ✅ kasada düşülecek miktar
-    }));
-    await db.expire(`niki:coupon:${token}`, 120); // ✅ 2 dk
-
-    return res.json({ success: true, token, cost });
-  } catch (e) {
-    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 staffOk = await isStaff(req.uid);
-      if (!staffOk) return res.status(403).json({ success: false, message: 'Yetkisiz' });
+      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);
-      if (!TEST_MODE_UNLIMITED && pts < SETTINGS.coffeeCost) {
-        return res.json({ success: false, message: 'Yetersiz Bakiye' });
+      
+      // 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' });
+          }
+      } else {
+          // Default for test mode
+          selectedReward = REWARDS[0];
       }
 
+      // Deduct Points
       if (!TEST_MODE_UNLIMITED) {
-        await user.decrementUserFieldBy(customerUid, 'niki_points', SETTINGS.coffeeCost);
+        await user.decrementUserFieldBy(customerUid, 'niki_points', selectedReward.cost);
       }
 
       await db.delete(`niki:qr:${token}`);
 
       const customerData = await user.getUserFields(customerUid, ['username', 'picture', 'userslug']);
 
-      await addUserLog(customerUid, 'spend', SETTINGS.coffeeCost, 'Kahve Keyfi ☕');
-      await addKasaLog(req.uid, customerData?.username || 'Bilinmeyen', customerUid, SETTINGS.coffeeCost, 'coffee', 'Ücretsiz Kahve (QR)');
+      // 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) {
@@ -499,41 +253,23 @@ router.post('/api/niki-loyalty/claim-auto', middleware.ensureLoggedIn, async (re
     }
   });
 
-  // -------------------------
-  // 7) SAYFA ROTASI (kasa sayfası)
-  // -------------------------
+  // 6) PAGE ROUTES
   routeHelpers.setupPageRoute(router, '/niki-kasa', middleware, [], async (req, res) => {
-    const staffOk = await isStaff(req.uid);
-    if (!staffOk) return res.render('403', {});
+    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.json'da action:topic.get -> checkTopicVisit vardı.
-// Method yoksa NodeBB şikayet eder. Şimdilik NO-OP koydum.
-// Sonra istersen gerçekten "topic view" ile puan ekleriz.
-// -------------------------
-Plugin.checkTopicVisit = async function () {
-  return;
-};
-
-// client.js inject
 Plugin.addScripts = async function (scripts) {
   scripts.push('plugins/nodebb-plugin-niki-loyalty/static/lib/client.js');
   return scripts;
 };
 
-// navigation
 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.25",
+  "version": "1.0.28",
   "description": "Niki The Cat Coffee Loyalty System - Earn points while studying on IEU Forum.",
   "main": "library.js",
   "nbbpm": {