Merge pull request #1526 from omnivore-app/recommend-push-notification

recommend push notification

packages/api/src/services/groups.ts

@@ -221,7 +221,14 @@ export const createLabelAndRuleForGroup = async (
       },
       {
         type: RuleActionType.SendNotification,
-        params: [groupName],
+        params: [
+          `
+            {
+              "title": "New page recommended in ${groupName}",
+              "body": "A new page was added to the group ${groupName}"
+            }
+          `,
+        ],
       },
     ],
     filter: `recommendedBy:"${groupName}"`,

packages/rule-handler/src/filter.ts

@@ -17,6 +17,8 @@ interface Page {
   labels?: Label[] // labels is optional in the API response
   isArchived: boolean
   readingProgressPercent: number
+  title: string
+  image?: string
 }
 
 interface Label {
@@ -41,6 +43,8 @@ export const search = async (
                       }
                       isArchived
                       readingProgressPercent      
+                      title
+                      image
                     }
                   }
                 }

packages/rule-handler/src/notification.ts

@@ -8,13 +8,17 @@ interface RequestData {
   notificationType?: string
 }
 
+export interface NotificationData {
+  body: string
+  title?: string
+  image?: string
+  data?: Record<string, string>
+}
+
 export const sendNotification = async (
   apiEndpoint: string,
   auth: string,
-  body: string,
-  title?: string,
-  image?: string,
-  data?: Record<string, string>
+  { body, title, image, data }: NotificationData
 ) => {
   const requestData: RequestData = {
     body,

packages/rule-handler/src/rule.ts

@@ -1,4 +1,4 @@
-import { sendNotification } from './notification'
+import { NotificationData, sendNotification } from './notification'
 import { getAuthToken, PubSubData } from './index'
 import axios, { AxiosResponse } from 'axios'
 import { setLabels } from './label'
@@ -122,14 +122,25 @@ export const triggerActions = async (
             filteredPage.readingProgressPercent < 100 &&
             actionPromises.push(markPageAsRead(apiEndpoint, authToken, data.id))
           )
-        case RuleActionType.SendNotification:
+        case RuleActionType.SendNotification: {
+          const data: NotificationData = {
+            title: 'New page added to your library',
+            body: filteredPage.title,
+            image: filteredPage.image,
+          }
+
+          const params = action.params
+          if (params.length > 0) {
+            const param = JSON.parse(params[0]) as NotificationData
+            data.body = param.body || data.body
+            data.title = param.title || data.title
+            data.image = param.image || data.image
+          }
+
           return actionPromises.push(
-            sendNotification(
-              apiEndpoint,
-              authToken,
-              'New page added to your feed'
-            )
+            sendNotification(apiEndpoint, authToken, data)
           )
+        }
       }
     })
   }