nodebb-plugin-niki-loyalty 1.0.21 → 1.0.23

package/library.js

@@ -13,9 +13,19 @@ const Plugin = {};
 const SETTINGS = {
   pointsPerHeartbeat: 5,
   dailyCap: 250,
-  coffeeCost: 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
 };
 
+
 // ✅ TEST: sınırsız kullanım (puan kontrolünü kapatmak için true)
 const TEST_MODE_UNLIMITED = false;
 
@@ -24,15 +34,12 @@ const TEST_MODE_UNLIMITED = false;
 // =========================
 function safeParseMaybeJson(x) {
   if (x == null) return null;
-
-  // bazı DB’lerde object dönebilir
   if (typeof x === 'object') return x;
 
   if (typeof x === 'string') {
     try {
       return JSON.parse(x);
     } catch (e) {
-      // "[object Object]" gibi bozuk kayıtları atla
       return null;
     }
   }
@@ -53,15 +60,36 @@ function makeProfileUrl(userslug) {
   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;
+}
+
 // =========================
 // LOG FONKSİYONLARI
 // =========================
-async function addUserLog(uid, type, amount, desc) {
+async function addUserLog(uid, type, amount, desc, extra) {
   const logEntry = {
     ts: Date.now(),
     type, // 'earn' | 'spend'
     amt: amount,
     txt: desc,
+    ...(extra ? { extra } : {}),
   };
 
   const payload = safeStringify(logEntry);
@@ -71,13 +99,15 @@ async function addUserLog(uid, type, amount, desc) {
   await db.listTrim(`niki:activity:${uid}`, -50, -1);
 }
 
-async function addKasaLog(staffUid, customerName, customerUid) {
+async function addKasaLog(staffUid, customerName, customerUid, amount, rewardId, rewardTitle) {
   const logEntry = {
     ts: Date.now(),
     staff: staffUid,
-    cust: customerName,     // bazen eski kayıtlarda boş olabilir, endpoint tamamlayacak
+    cust: customerName,
     cuid: customerUid,
-    amt: SETTINGS.coffeeCost,
+    amt: amount,
+    rewardId: rewardId || '',
+    rewardTitle: rewardTitle || '',
   };
 
   const payload = safeStringify(logEntry);
@@ -94,34 +124,41 @@ 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 today = getTodayKey();
       const dailyKey = `niki:daily:${uid}:${today}`;
 
       const currentDailyScore = parseInt((await db.getObjectField(dailyKey, 'score')) || 0, 10);
 
-      if (currentDailyScore >= SETTINGS.dailyCap) {
+      if (!TEST_MODE_UNLIMITED && 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');
+      const newBalance = parseInt((await user.getUserField(uid, 'niki_points')) || 0, 10);
+
+      await addUserLog(uid, 'earn', SETTINGS.pointsPerHeartbeat, 'Aktiflik Puanı ⚡');
+
       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ş)
+  // -------------------------
+  // 2) WALLET DATA (cüzdan + geçmiş + rewards)
+  // -------------------------
   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 today = getTodayKey();
 
       const [userData, dailyData, historyRaw] = await Promise.all([
         user.getUserFields(uid, ['niki_points']),
@@ -135,17 +172,33 @@ Plugin.init = async function (params) {
       let dailyPercent = (dailyScore / SETTINGS.dailyCap) * 100;
       if (dailyPercent > 100) dailyPercent = 100;
 
-      // ✅ history parse güvenli
+      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,
       });
     } catch (err) {
@@ -154,72 +207,203 @@ Plugin.init = async function (params) {
         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: [],
       });
     }
   });
 
-  // 3) KASA HISTORY (admin/mod)
-router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
+  // -------------------------
+  // 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 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);
-
-    // 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}` : ''),
-      };
+    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,
     });
 
-    return res.json(enriched);
+    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([]);
+    return res.status(500).json({ success: false, message: 'Sunucu hatası' });
   }
 });
 
 
+  // -------------------------
+  // 4) KASA HISTORY (admin/mod)
+  // -------------------------
+  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 raw = await db.getListRange('niki:kasa:history', 0, -1);
+
+      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 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([]);
+    }
+  });
+
+  // -------------------------
+  // 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' });
 
-  // 4) QR OLUŞTUR
+    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.
+  // -------------------------
   router.post('/api/niki-loyalty/generate-qr', middleware.ensureLoggedIn, async (req, res) => {
     try {
       const uid = req.uid;
@@ -229,7 +413,7 @@ router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (r
         return res.json({ success: false, message: 'Yetersiz Puan' });
       }
 
-      const token = Math.random().toString(36).substring(2) + Date.now().toString(36);
+      const token = makeToken();
 
       await db.set(`niki:qr:${token}`, uid);
       await db.expire(`niki:qr:${token}`, 120);
@@ -240,14 +424,12 @@ router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (r
     }
   });
 
-  // 5) QR OKUT (admin/mod)
   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 staffOk = await isStaff(req.uid);
+      if (!staffOk) 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' });
@@ -257,22 +439,16 @@ router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (r
         return res.json({ success: false, message: 'Yetersiz Bakiye' });
       }
 
-      // ✅ puan düşür
       if (!TEST_MODE_UNLIMITED) {
         await user.decrementUserFieldBy(customerUid, 'niki_points', SETTINGS.coffeeCost);
       }
 
-      // token tek kullanımlık
       await db.delete(`niki:qr:${token}`);
 
-      // müşteri bilgisi
       const customerData = await user.getUserFields(customerUid, ['username', 'picture', 'userslug']);
 
-      // user log
       await addUserLog(customerUid, 'spend', SETTINGS.coffeeCost, 'Kahve Keyfi ☕');
-
-      // kasa log
-      await addKasaLog(req.uid, customerData?.username || 'Bilinmeyen', customerUid);
+      await addKasaLog(req.uid, customerData?.username || 'Bilinmeyen', customerUid, SETTINGS.coffeeCost, 'coffee', 'Ücretsiz Kahve (QR)');
 
       return res.json({
         success: true,
@@ -284,15 +460,25 @@ router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (r
     }
   });
 
-  // 6) SAYFA ROTASI (kasa sayfası)
+  // -------------------------
+  // 7) SAYFA ROTASI (kasa sayfası)
+  // -------------------------
   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', {});
+    const staffOk = await isStaff(req.uid);
+    if (!staffOk) 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');

package/package.json

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