nodebb-plugin-niki-loyalty 1.2.8 → 1.3.0

package/library.js

@@ -73,24 +73,35 @@ async function awardDailyAction(uid, actionKey) {
     const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
     const rule = ACTIONS[actionKey];
 
-    if (!rule) return;
+    if (!rule) {
+      console.log(`[Niki-Loyalty] Bilinmeyen aksiyon: ${actionKey}`);
+      return { success: false, reason: 'unknown_action' };
+    }
 
     // 1. Genel Günlük Limit Kontrolü
     const dailyScoreKey = `niki:daily:${uid}:${today}`;
     const currentDailyScore = parseFloat((await db.getObjectField(dailyScoreKey, 'score')) || 0);
-    if (currentDailyScore >= SETTINGS.dailyCap) return;
+    if (currentDailyScore >= SETTINGS.dailyCap) {
+      console.log(`[Niki-Loyalty] Günlük limit doldu. UID: ${uid}, Score: ${currentDailyScore}`);
+      return { success: false, reason: 'daily_cap_reached' };
+    }
 
     // 2. Eylem Bazlı Limit Kontrolü
     const actionCountKey = `niki:daily:${uid}:${today}:counts`;
     const currentActionCount = parseInt((await db.getObjectField(actionCountKey, actionKey)) || 0, 10);
-    if (currentActionCount >= rule.limit) return;
+    if (currentActionCount >= rule.limit) {
+      console.log(`[Niki-Loyalty] Aksiyon limiti doldu. UID: ${uid}, Action: ${actionKey}, Count: ${currentActionCount}/${rule.limit}`);
+      return { success: false, reason: 'action_limit_reached' };
+    }
 
     // 3. Puan Hesapla
     let pointsToGive = rule.points;
     if (currentDailyScore + pointsToGive > SETTINGS.dailyCap) {
       pointsToGive = SETTINGS.dailyCap - currentDailyScore;
     }
-    if (pointsToGive <= 0) return;
+    if (pointsToGive <= 0) {
+      return { success: false, reason: 'no_points_to_give' };
+    }
 
     // 4. DB Güncellemeleri
     await user.incrementUserFieldBy(uid, 'niki_points', pointsToGive);
@@ -100,17 +111,30 @@ async function awardDailyAction(uid, actionKey) {
     // Logla
     await addUserLog(uid, 'earn', pointsToGive, rule.name);
 
-    // ✅ YENİ EKLENEN KISIM: Kullanıcıya Bildirim Gönder (Socket Emit)
-    if (socketHelpers && socketHelpers.server) {
-      socketHelpers.server.sockets.in('uid_' + uid).emit('event:niki_award', {
-        title: 'Tebrikler! 🥳',
-        message: `${rule.name} işleminden <strong style="color:#ffd700">+${pointsToGive} Puan</strong> kazandın!`,
-        newTotal: parseFloat((await user.getUserField(uid, 'niki_points')) || 0)
-      });
+    console.log(`[Niki-Loyalty] ✅ PUAN VERİLDİ! UID: ${uid}, Action: ${actionKey}, Points: +${pointsToGive}`);
+
+    // ✅ Kullanıcıya Bildirim Gönder (Socket Emit) - Güçlendirilmiş
+    try {
+      if (socketHelpers && socketHelpers.server && socketHelpers.server.sockets) {
+        const newTotal = parseFloat((await user.getUserField(uid, 'niki_points')) || 0);
+        socketHelpers.server.sockets.in('uid_' + uid).emit('event:niki_award', {
+          title: 'Tebrikler! 🥳',
+          message: `${rule.name} işleminden <strong style="color:#ffd700">+${pointsToGive} Puan</strong> kazandın!`,
+          newTotal: newTotal
+        });
+        console.log(`[Niki-Loyalty] 📢 Socket bildirim gönderildi. UID: ${uid}`);
+      } else {
+        console.log(`[Niki-Loyalty] ⚠️ Socket server hazır değil, bildirim gönderilemedi.`);
+      }
+    } catch (socketErr) {
+      console.error(`[Niki-Loyalty] Socket emit hatası:`, socketErr.message);
     }
 
+    return { success: true, points: pointsToGive };
+
   } catch (err) {
     console.error(`[Niki-Loyalty] Error awarding points for ${actionKey}:`, err);
+    return { success: false, reason: 'error', error: err.message };
   }
 }
 
@@ -144,39 +168,70 @@ Plugin.onPostCreate = async function (data) {
   await awardDailyAction(data.post.uid, 'reply');
 };
 
-// 4. BEĞENİ (Like Atma ve Alma) - Spam Korumalı
+// 4. BEĞENİ (Like Atma ve Alma) - Spam Korumalı + Debug Loglı
+// NodeBB upvote hook'u { pid, uid, ... } formatında data gönderir (post nesnesi değil!)
 Plugin.onUpvote = async function (data) {
-  // data = { post: { pid, uid, ... }, uid: <like atan>, ... }
-  const pid = data.post && data.post.pid;
-  if (!pid) return;
+  console.log('[Niki-Loyalty] 👍 Upvote hook tetiklendi. Raw Data:', JSON.stringify(data));
+
+  // NodeBB bazen farklı formatlar gönderebilir, hepsini kontrol et
+  const pid = data.pid || (data.post && data.post.pid);
+  const voterUid = data.uid || (data.current && data.current.uid);
+
+  if (!pid) {
+    console.log('[Niki-Loyalty] ⚠️ Post PID bulunamadı, işlem iptal.');
+    return;
+  }
+
+  if (!voterUid) {
+    console.log('[Niki-Loyalty] ⚠️ Voter UID bulunamadı, işlem iptal.');
+    return;
+  }
+
+  // Post sahibini bul (NodeBB upvote hook'u post sahibini göndermez!)
+  let postOwnerUid;
+  try {
+    postOwnerUid = await posts.getPostField(pid, 'uid');
+    console.log(`[Niki-Loyalty] Post sahibi bulundu: PID=${pid}, Owner UID=${postOwnerUid}`);
+  } catch (err) {
+    console.log('[Niki-Loyalty] ⚠️ Post sahibi bulunamadı:', err.message);
+    return;
+  }
+
+  if (!postOwnerUid) {
+    console.log('[Niki-Loyalty] ⚠️ Post sahibi UID boş, işlem iptal.');
+    return;
+  }
 
   const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
 
   // Like Atan Kazanır:
-  if (data.uid) {
-    // Bu postu bugün zaten beğenmiş mi?
-    const likeGivenKey = `niki:liked:${data.uid}:${today}`;
-    const alreadyLiked = await db.isSetMember(likeGivenKey, pid.toString());
-
-    if (!alreadyLiked) {
-      await awardDailyAction(data.uid, 'like_given');
-      await db.setAdd(likeGivenKey, pid.toString());
-      // 24 saat sonra expire olsun
-      await db.expire(likeGivenKey, 86400);
-    }
+  const likeGivenKey = `niki:liked:${voterUid}:${today}`;
+  const alreadyLiked = await db.isSetMember(likeGivenKey, pid.toString());
+
+  console.log(`[Niki-Loyalty] Like Atan: UID=${voterUid}, PID=${pid}, Daha önce beğenmiş mi=${alreadyLiked}`);
+
+  if (!alreadyLiked) {
+    const result = await awardDailyAction(voterUid, 'like_given');
+    console.log('[Niki-Loyalty] like_given sonuç:', result);
+    await db.setAdd(likeGivenKey, pid.toString());
+    await db.expire(likeGivenKey, 86400);
   }
 
-  // Like Alan Kazanır (Post sahibi):
-  if (data.post && data.post.uid && data.post.uid !== data.uid) {
-    // Bu post için bugün zaten puan almış mı?
-    const likeTakenKey = `niki:liked_taken:${data.post.uid}:${today}`;
+  // Like Alan Kazanır (Post sahibi - kendine beğeni atamaz):
+  if (postOwnerUid && postOwnerUid !== voterUid) {
+    const likeTakenKey = `niki:liked_taken:${postOwnerUid}:${today}`;
     const alreadyTaken = await db.isSetMember(likeTakenKey, pid.toString());
 
+    console.log(`[Niki-Loyalty] Like Alan: UID=${postOwnerUid}, PID=${pid}, Daha önce puan almış mı=${alreadyTaken}`);
+
     if (!alreadyTaken) {
-      await awardDailyAction(data.post.uid, 'like_taken');
+      const result = await awardDailyAction(postOwnerUid, 'like_taken');
+      console.log('[Niki-Loyalty] like_taken sonuç:', result);
       await db.setAdd(likeTakenKey, pid.toString());
       await db.expire(likeTakenKey, 86400);
     }
+  } else {
+    console.log('[Niki-Loyalty] ⚠️ Kullanıcı kendi postunu beğenmiş veya post sahibi bulunamadı. Post owner:', postOwnerUid, 'Voter:', voterUid);
   }
 };
 
@@ -264,37 +319,113 @@ Plugin.init = async function (params) {
     }
   });
 
-  // 3) KASA HISTORY 
+  // 3) KASA HISTORY - GELİŞMİŞ VERSİYON (Filtre + İstatistik)
   router.get('/api/niki-loyalty/kasa-history', middleware.ensureLoggedIn, async (req, res) => {
-    // ... (Mevcut kodunun aynısı - sadece yetki kontrolü var)
     try {
       const isAdmin = await user.isAdministrator(req.uid);
       const isMod = await user.isGlobalModerator(req.uid);
-      if (!isAdmin && !isMod) return res.status(403).json([]);
+      if (!isAdmin && !isMod) return res.status(403).json({ error: 'Yetkisiz' });
+
+      // Query parametreleri
+      const { startDate, endDate, search, rewardType, exportAll } = req.query;
 
       const raw = await db.getListRange('niki:kasa:history', 0, -1);
-      const rows = (raw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+      let rows = (raw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+
+      // Personel bilgilerini de al
+      const staffUids = [...new Set(rows.map(r => parseInt(r.staff, 10)).filter(n => Number.isFinite(n) && n > 0))];
+      const custUids = rows.map(r => parseInt(r.cuid, 10)).filter(n => Number.isFinite(n) && n > 0);
+      const allUids = [...new Set([...staffUids, ...custUids])];
 
-      // Kullanıcı detaylarını doldurma (Map logic)
-      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 usersData = await user.getUsersFields(allUids, ['uid', 'username', 'userslug', 'picture', 'icon:bgColor']);
       const userMap = {};
-      (users || []).forEach(u => userMap[u.uid] = u);
+      (usersData || []).forEach(u => userMap[u.uid] = u);
 
       const rp = nconf.get('relative_path') || '';
-      const enriched = rows.map(r => {
-        const u = userMap[r.cuid] || {};
+
+      // Zenginleştir
+      let enriched = rows.map(r => {
+        const custUser = userMap[r.cuid] || {};
+        const staffUser = userMap[r.staff] || {};
         return {
           ...r,
-          cust: u.username || r.cust || 'Bilinmeyen',
-          picture: u.picture || '',
-          iconBg: u['icon:bgColor'] || '#4b5563',
-          profileUrl: u.userslug ? `${rp}/user/${u.userslug}` : '',
-          reward: r.reward || 'İşlem'
+          cust: custUser.username || r.cust || 'Bilinmeyen',
+          picture: custUser.picture || '',
+          iconBg: custUser['icon:bgColor'] || '#4b5563',
+          profileUrl: custUser.userslug ? `${rp}/user/${custUser.userslug}` : '',
+          reward: r.reward || 'İşlem',
+          staffName: staffUser.username || 'Personel',
+          staffPicture: staffUser.picture || '',
+          date: new Date(r.ts).toISOString().slice(0, 10) // YYYY-MM-DD
         };
       });
-      return res.json(enriched);
-    } catch (e) { return res.status(500).json([]); }
+
+      // FİLTRELEME
+      // 1. Tarih aralığı
+      if (startDate) {
+        const start = new Date(startDate).getTime();
+        enriched = enriched.filter(r => r.ts >= start);
+      }
+      if (endDate) {
+        const end = new Date(endDate).getTime() + 86400000; // gün sonu
+        enriched = enriched.filter(r => r.ts < end);
+      }
+
+      // 2. Arama (kullanıcı adı)
+      if (search && search.trim()) {
+        const q = search.toLowerCase().trim();
+        enriched = enriched.filter(r =>
+          (r.cust && r.cust.toLowerCase().includes(q)) ||
+          (r.staffName && r.staffName.toLowerCase().includes(q))
+        );
+      }
+
+      // 3. Ödül tipi
+      if (rewardType && rewardType !== 'all') {
+        enriched = enriched.filter(r => r.reward === rewardType);
+      }
+
+      // İSTATİSTİKLER
+      const stats = {
+        totalTransactions: enriched.length,
+        totalPoints: enriched.reduce((sum, r) => sum + (parseFloat(r.amt) || 0), 0),
+        byReward: {},
+        byStaff: {},
+        byDate: {}
+      };
+
+      enriched.forEach(r => {
+        // Ödül bazında
+        stats.byReward[r.reward] = (stats.byReward[r.reward] || 0) + 1;
+        // Personel bazında
+        stats.byStaff[r.staffName] = (stats.byStaff[r.staffName] || 0) + 1;
+        // Gün bazında (son 7 gün için chart)
+        stats.byDate[r.date] = (stats.byDate[r.date] || 0) + 1;
+      });
+
+      // Benzersiz ödül tipleri (filter dropdown için)
+      const rewardTypes = [...new Set(rows.map(r => r.reward || 'İşlem'))];
+
+      // Export all için sayfalama yok
+      if (exportAll === 'true') {
+        return res.json({
+          data: enriched,
+          stats,
+          rewardTypes
+        });
+      }
+
+      // Normal görünüm (son 100 işlem)
+      return res.json({
+        data: enriched.slice(0, 100),
+        stats,
+        rewardTypes,
+        hasMore: enriched.length > 100
+      });
+    } catch (e) {
+      console.error('[Niki-Loyalty] Kasa history error:', e);
+      return res.status(500).json({ error: 'Sunucu hatası' });
+    }
   });
 
   // 4) QR OLUŞTURMA
@@ -529,10 +660,147 @@ Plugin.adminManagePoints = async function (socket, data) {
   const newPoints = await user.getUserField(targetUid, 'niki_points');
   return { success: true, newPoints: parseFloat(newPoints) };
 };
+// 4) KULLANICI DETAY (Admin için)
+Plugin.adminGetUserDetail = async function (socket, data) {
+  const uid = socket.uid;
+  if (!uid) throw new Error('Giriş yapmalısınız.');
+
+  const isAdmin = await user.isAdministrator(uid);
+  const isMod = await user.isGlobalModerator(uid);
+  if (!isAdmin && !isMod) throw new Error('Yetkisiz Erişim');
+
+  const targetUid = data.uid;
+  if (!targetUid) throw new Error('Kullanıcı ID gerekli.');
+
+  // Kullanıcı bilgileri
+  const userData = await user.getUserFields(targetUid, [
+    'uid', 'username', 'userslug', 'picture', 'email',
+    'niki_points', 'icon:bgColor', 'joindate', 'lastonline'
+  ]);
+
+  if (!userData || !userData.uid) throw new Error('Kullanıcı bulunamadı.');
+
+  // Aktivite geçmişi
+  const activityRaw = await db.getListRange(`niki:activity:${targetUid}`, 0, -1);
+  const activities = (activityRaw || []).map(safeParseMaybeJson).filter(Boolean).reverse();
+
+  // Kazanılan ve harcanan puanları ayır
+  let totalEarned = 0;
+  let totalSpent = 0;
+  const earnHistory = [];
+  const spendHistory = [];
+
+  activities.forEach(a => {
+    if (a.type === 'earn' || a.type === 'admin_adjust') {
+      if (a.type === 'admin_adjust' && a.txt && a.txt.includes('-')) {
+        totalSpent += parseFloat(a.amt) || 0;
+        spendHistory.push(a);
+      } else {
+        totalEarned += parseFloat(a.amt) || 0;
+        earnHistory.push(a);
+      }
+    } else if (a.type === 'spend') {
+      totalSpent += parseFloat(a.amt) || 0;
+      spendHistory.push(a);
+    }
+  });
+
+  // Günlük limit durumu
+  const today = new Date().toISOString().slice(0, 10).replace(/-/g, '');
+  const dailyData = await db.getObject(`niki:daily:${targetUid}:${today}`);
+  const actionCounts = await db.getObject(`niki:daily:${targetUid}:${today}:counts`);
+
+  // Bu kullanıcının kasa işlemleri (harcamaları)
+  const kasaRaw = await db.getListRange('niki:kasa:history', 0, -1);
+  const userKasaHistory = (kasaRaw || [])
+    .map(safeParseMaybeJson)
+    .filter(k => k && String(k.cuid) === String(targetUid))
+    .reverse()
+    .slice(0, 20);
+
+  const rp = require.main.require('nconf').get('relative_path') || '';
+
+  return {
+    user: {
+      uid: userData.uid,
+      username: userData.username,
+      userslug: userData.userslug,
+      picture: userData.picture || '',
+      email: userData.email || '',
+      iconBg: userData['icon:bgColor'] || '#4b5563',
+      points: parseFloat(userData.niki_points || 0),
+      joindate: userData.joindate,
+      lastonline: userData.lastonline,
+      profileUrl: userData.userslug ? `${rp}/user/${userData.userslug}` : ''
+    },
+    stats: {
+      totalEarned,
+      totalSpent,
+      currentPoints: parseFloat(userData.niki_points || 0),
+      todayScore: parseFloat(dailyData?.score || 0),
+      todayCounts: actionCounts || {}
+    },
+    earnHistory: earnHistory.slice(0, 30),
+    spendHistory: spendHistory.slice(0, 30),
+    kasaHistory: userKasaHistory,
+    actions: ACTIONS
+  };
+};
+
+// 5) GENEL İSTATİSTİKLER (Dashboard için)
+Plugin.adminGetStats = async function (socket, data) {
+  const uid = socket.uid;
+  if (!uid) throw new Error('Giriş yapmalısınız.');
+
+  const isAdmin = await user.isAdministrator(uid);
+  const isMod = await user.isGlobalModerator(uid);
+  if (!isAdmin && !isMod) throw new Error('Yetkisiz Erişim');
+
+  // Tüm kullanıcıları al
+  const uids = await db.getSortedSetRange('users:joindate', 0, 499);
+  if (!uids || uids.length === 0) return { users: 0, totalPoints: 0, avgPoints: 0 };
+
+  const usersData = await user.getUsersFields(uids, ['niki_points']);
+
+  let totalPoints = 0;
+  let usersWithPoints = 0;
+
+  usersData.forEach(u => {
+    const pts = parseFloat(u.niki_points || 0);
+    if (pts > 0) {
+      totalPoints += pts;
+      usersWithPoints++;
+    }
+  });
+
+  // Kasa geçmişinden toplam harcama
+  const kasaRaw = await db.getListRange('niki:kasa:history', 0, -1);
+  const kasaData = (kasaRaw || []).map(safeParseMaybeJson).filter(Boolean);
+  const totalRedeemed = kasaData.reduce((sum, k) => sum + (parseFloat(k.amt) || 0), 0);
+
+  // Bugünkü işlemler
+  const today = new Date().toISOString().slice(0, 10);
+  const todayTransactions = kasaData.filter(k => {
+    const d = new Date(k.ts).toISOString().slice(0, 10);
+    return d === today;
+  }).length;
+
+  return {
+    usersWithPoints,
+    totalPoints: Math.floor(totalPoints),
+    avgPoints: usersWithPoints > 0 ? Math.floor(totalPoints / usersWithPoints) : 0,
+    totalRedeemed: Math.floor(totalRedeemed),
+    totalTransactions: kasaData.length,
+    todayTransactions
+  };
+};
+
 // Soket'e kaydet (Client: socket.emit('plugins.niki.getUsers', ...))
 if (SocketPlugins) {
   SocketPlugins.niki = {
     getUsers: Plugin.adminGetUsers,
+    getUserDetail: Plugin.adminGetUserDetail,
+    getStats: Plugin.adminGetStats,
     scanQR: Plugin.socketScanQR,
     getKasaHistory: Plugin.socketKasaHistory,
     managePoints: Plugin.adminManagePoints

package/package.json

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

package/plugin.json

@@ -5,14 +5,38 @@
     "url": "https://forum.ieu.app",
     "library": "./library.js",
     "hooks": [
-        { "hook": "static:app.load", "method": "init" },
-        { "hook": "filter:navigation.available", "method": "addNavigation" },
-        { "hook": "filter:scripts.get", "method": "addScripts" },
-        
-        { "hook": "action:user.loggedIn", "method": "onLogin" },
-        { "hook": "action:topic.save", "method": "onTopicCreate" },
-        { "hook": "action:post.save", "method": "onPostCreate" },
-        { "hook": "action:post.upvote", "method": "onUpvote" }
+        {
+            "hook": "static:app.load",
+            "method": "init"
+        },
+        {
+            "hook": "filter:navigation.available",
+            "method": "addNavigation"
+        },
+        {
+            "hook": "filter:scripts.get",
+            "method": "addScripts"
+        },
+        {
+            "hook": "action:user.loggedIn",
+            "method": "onLogin"
+        },
+        {
+            "hook": "action:topic.save",
+            "method": "onTopicCreate"
+        },
+        {
+            "hook": "action:post.save",
+            "method": "onPostCreate"
+        },
+        {
+            "hook": "action:post.upvote",
+            "method": "onUpvote"
+        },
+        {
+            "hook": "action:post.updatePostVoteCount",
+            "method": "onUpvote"
+        }
     ],
     "staticDirs": {
         "static": "./static"

package/static/lib/client.js

@@ -284,7 +284,7 @@ $(document).ready(function () {
 
             let dailyScore = parseFloat(data.dailyScore);
             let scoreText = Number.isInteger(dailyScore) ? dailyScore : dailyScore.toFixed(1);
-            $('#widget-daily-text').text(scoreText + ' / 28');
+            $('#widget-daily-text').text(scoreText + ' / 35');
 
             // 3. DETAYLI SAYAÇLAR (Counts)
             const c = data.counts || {}; // Backend'den gelen sayaç objesi
@@ -304,10 +304,10 @@ $(document).ready(function () {
                 }
             }
 
-            // Tek Tek Güncelle
+            // Tek Tek Güncelle (library.js ACTIONS ile eşleştirildi)
             setProgress('w-count-new_topic', c.new_topic, 1, 'item-new-topic');
             setProgress('w-count-reply', c.reply, 2, 'item-reply');
-            setProgress('w-count-read', c.read, 8, 'item-read');
+            setProgress('w-count-read', c.read, 10, 'item-read');
 
             // Like (Alma ve Atma toplamı 4 limit demiştik, burada basitleştirip toplamı gösteriyoruz)
             // Backend'de like_given ve like_taken ayrı tutuluyor, ikisini toplayalım: