nodebb-plugin-niki-loyalty 1.2.7 → 1.2.9

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,52 @@ 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ı
 Plugin.onUpvote = async function (data) {
-  // data = { post: { pid, uid, ... }, uid: <like atan>, ... }
+  console.log('[Niki-Loyalty] 👍 Upvote hook tetiklendi. Data:', JSON.stringify({
+    voterUid: data.uid,
+    postPid: data.post?.pid,
+    postOwnerUid: data.post?.uid
+  }));
+
   const pid = data.post && data.post.pid;
-  if (!pid) return;
+  if (!pid) {
+    console.log('[Niki-Loyalty] ⚠️ Post PID bulunamadı, 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());
 
+    console.log(`[Niki-Loyalty] Like Atan: UID=${data.uid}, PID=${pid}, Daha önce beğenmiş mi=${alreadyLiked}`);
+
     if (!alreadyLiked) {
-      await awardDailyAction(data.uid, 'like_given');
+      const result = await awardDailyAction(data.uid, 'like_given');
+      console.log('[Niki-Loyalty] like_given sonuç:', result);
       await db.setAdd(likeGivenKey, pid.toString());
-      // 24 saat sonra expire olsun
       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}`;
     const alreadyTaken = await db.isSetMember(likeTakenKey, pid.toString());
 
+    console.log(`[Niki-Loyalty] Like Alan: UID=${data.post.uid}, PID=${pid}, Daha önce puan almış mı=${alreadyTaken}`);
+
     if (!alreadyTaken) {
-      await awardDailyAction(data.post.uid, 'like_taken');
+      const result = await awardDailyAction(data.post.uid, '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] ⚠️ Like alan kontrol edilemedi. Post owner:', data.post?.uid, 'Voter:', data.uid);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-niki-loyalty",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "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

@@ -14,19 +14,39 @@ $(document).ready(function () {
     }
 
     // -------------------------------------------------------------
-    // 🔔 NİKİ TOAST BİLDİRİM FONKSİYONU (Sol Alt - Logo ile)
+    // 🔔 NİKİ TOAST BİLDİRİM FONKSİYONU (Sol Alt - Inline Stiller)
     // -------------------------------------------------------------
     function showNikiToast(message) {
         // Mevcut toast'ı kaldır
         $('.niki-toast').remove();
 
         // Logo yolunu al (plugin'in static klasöründen)
-        const logoUrl = config.relative_path + '/plugins/nodebb-plugin-niki-loyalty/static/logo.png';
+        const logoUrl = (config && config.relative_path ? config.relative_path : '') + '/plugins/nodebb-plugin-niki-loyalty/static/logo.png';
 
-        // Toast HTML'i oluştur
+        // Toast HTML'i oluştur (Inline stiller ile)
         const toastHtml = `
-            <div class="niki-toast">
-                <img src="${logoUrl}" alt="Niki" style="width: 28px; height: 28px; border-radius: 50%; object-fit: cover;">
+            <div class="niki-toast" style="
+                position: fixed;
+                bottom: 90px;
+                left: 25px;
+                background: linear-gradient(135deg, #4E342E 0%, #3E2723 100%);
+                color: #fff;
+                padding: 12px 20px;
+                border-radius: 16px;
+                font-size: 14px;
+                font-weight: 600;
+                box-shadow: 0 8px 25px rgba(0,0,0,0.3);
+                display: flex;
+                align-items: center;
+                gap: 12px;
+                z-index: 9999;
+                opacity: 0;
+                transform: translateY(20px) scale(0.9);
+                transition: all 0.4s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+                font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+                border: 1px solid rgba(255,255,255,0.1);
+            ">
+                <img src="${logoUrl}" alt="Niki" style="width: 32px; height: 32px; border-radius: 50%; object-fit: cover; border: 2px solid rgba(255,255,255,0.2);">
                 <span>${message}</span>
             </div>
         `;
@@ -34,24 +54,35 @@ $(document).ready(function () {
         // Body'ye ekle
         $('body').append(toastHtml);
 
-        // Animasyon için kısa gecikme
+        // Animasyon için kısa gecikme - görünür yap
         setTimeout(function () {
-            $('.niki-toast').addClass('show');
+            $('.niki-toast').css({
+                'opacity': '1',
+                'transform': 'translateY(0) scale(1)'
+            });
         }, 50);
 
         // 4 saniye sonra kaldır
         setTimeout(function () {
-            $('.niki-toast').removeClass('show');
+            $('.niki-toast').css({
+                'opacity': '0',
+                'transform': 'translateY(20px) scale(0.9)'
+            });
             setTimeout(function () {
                 $('.niki-toast').remove();
-            }, 300);
+            }, 400);
         }, 4000);
 
         // Widget'ı da bounce animasyonu ile canlandır
-        $('#niki-floating-widget .niki-widget-content').addClass('niki-bounce');
-        setTimeout(function () {
-            $('#niki-floating-widget .niki-widget-content').removeClass('niki-bounce');
-        }, 500);
+        const $widget = $('#niki-floating-widget .niki-widget-content');
+        if ($widget.length) {
+            $widget.css('transform', 'scale(1.1)');
+            setTimeout(function () {
+                $widget.css('transform', 'scale(1)');
+            }, 300);
+        }
+
+        console.log('[Niki-Loyalty] Toast gösterildi:', message);
     }
 
     // Fonksiyonu global yap (Konsoldan test için)
@@ -253,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
@@ -273,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: