@plusscommunities/pluss-core-aws 1.2.5 → 1.2.6

package/helper/audience/filterByAudienceType.js

@@ -0,0 +1,38 @@
+const _ = require("lodash");
+const getSessionUser = require("../auth/getSessionUser");
+const getMatchingAudienceTypes = require("./getMatchingAudienceTypes");
+const getMatchingTags = require("./getMatchingTags");
+const isValidAudience = require("./isValidAudience");
+
+module.exports = async (items, authkey, site) => {
+  const validTypes = await getMatchingAudienceTypes(authkey);
+  let validTags = [];
+  if (site) {
+    const userId = await getSessionUser(authkey);
+    validTags = await getMatchingTags(userId, site);
+  }
+
+  return _.filter(items, (item) => {
+    if (!item.AudienceType) return true;
+
+    if (item.AudienceType === "Custom") {
+      return _.some(item.AudienceTypeSelection, (at) =>
+        isValidAudience(
+          site,
+          at.AudienceType,
+          at.AudienceTypeSelection,
+          validTypes,
+          validTags
+        )
+      );
+    }
+
+    return isValidAudience(
+      site,
+      item.AudienceType,
+      item.AudienceTypeSelection,
+      validTypes,
+      validTags
+    );
+  });
+};

package/helper/audience/getAudience.js

@@ -132,6 +132,9 @@ module.exports = async (site, audienceType, audienceTypeSelection) => {
         site
       );
 
+      // console.log("categoryMatches", categoryMatches);
+      // console.log("typeMatches", typeMatches);
+      // console.log("tagMatches", tagMatches);
       return _.unionBy(categoryMatches, typeMatches, tagMatches, "id");
     case "Category":
       return await getCategoryMatches(users, audienceTypeSelection, site);

package/notification/prepNotification.js

@@ -14,6 +14,11 @@ module.exports = (noti) => {
       thisNoti.Subtext = noti.Data.title || noti.Data.description;
       thisNoti.Icon = "wrench";
       break;
+    case "EntityCommented":
+      thisNoti.Text = noti.Data.comment;
+      thisNoti.Subtext = noti.Data.title || noti.Data.description;
+      thisNoti.Icon = "commenting";
+      break;
     case "EventRepChange":
       let eventChangeText = "";
       if (noti.Data.LocationChanged && noti.Data.TimeChanged) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "patch": "npm version patch",