@plusscommunities/pluss-core-aws 2.0.23-beta.2 → 2.0.23

package/notification/sendNotifications.js

@@ -122,58 +122,13 @@ module.exports = async (
     config,
   });
 
-  // Notification deduplication to prevent duplicate push notifications
-  // Use a 5-minute deduplication window to prevent the same notification
-  // from being sent multiple times for the same recipients and entity
-
-  // Use MD5 hash of sorted recipients for consistent, size-limited identifier
-  const recipientHash = crypto
-    .createHash("md5")
-    .update(receiverKeys.sort().join(","))
-    .digest("hex")
-    .substring(0, 8); // 8 hex chars = 4.3 billion combinations
-
-  // Generate content hash from the entire value object for precise deduplication
+  // Generate content hash from the entire value object for per-user deduplication
   const contentHash = crypto
     .createHash("md5")
     .update(JSON.stringify(value))
     .digest("hex")
     .substring(0, 8); // 8 hex chars for content uniqueness
 
-  // Combine both hashes for exact duplicate detection
-  const notificationKey = getMultiRowId([
-    "notification",
-    recipientHash, // Fixed 8-character recipient identifier
-    contentHash, // Fixed 8-character content identifier
-    type,
-    key,
-  ]);
-
-  // log("sendNotifications - core", "notificationKey", notificationKey, logId);
-  const canSend = await checkRateLimit(
-    notificationKey,
-    300000, // 5 minutes in milliseconds
-    1, // Allow only 1 notification in the timeframe
-    false // Save this check to prevent duplicates
-  );
-
-  if (!canSend) {
-    log(
-      "sendNotifications",
-      "duplicateSkipped",
-      {
-        notificationKey,
-        recipientHash,
-        contentHash,
-        type,
-        entityKey: key,
-        recipientCount: receiverKeys.length,
-      },
-      logId
-    );
-    return; // Skip sending duplicate notification
-  }
-
   const tokens = [];
   const promises = [];
   receiverKeys.forEach((uid) => {
@@ -182,8 +137,24 @@ module.exports = async (
         getUser(uid)
           .then(async (user) => {
             try {
+              // User-level rate limiting: check if this specific user can receive this notification
+              // Use user ID + content hash + notification type/key for fine-grained deduplication
+              const userNotificationKey = getMultiRowId([
+                "notification",
+                user.Id, // User-specific identifier
+                contentHash, // Content hash for this notification
+                type,
+                key,
+              ]);
+              const canSend = await checkRateLimit(
+                userNotificationKey,
+                86400000, // 24 hours in milliseconds
+                1, // Allow only 1 notification in the timeframe
+                false // Save this check to prevent duplicates
+              );
+
               const isMuted = await checkMuted(user.Id, config);
-              if (!isMuted) {
+              if (!isMuted && canSend) {
                 if (!user.tokens) {
                   if (user.token) {
                     tokens.push(user.token);
@@ -193,6 +164,18 @@ module.exports = async (
                     tokens.push(entry.Token);
                   });
                 }
+              } else {
+                log(
+                  "sendNotifications",
+                  "userSkipped",
+                  {
+                    userId: user.Id,
+                    isMuted,
+                    canSend,
+                    userNotificationKey,
+                  },
+                  logId
+                );
               }
             } catch (error) {
               log("sendNotifications", "error", error.toString());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "2.0.23-beta.2",
+  "version": "2.0.23",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "betapatch": "npm version prepatch --preid=beta",