Merge pull request #108 from eurofurence/spike/notification-channels

add special notification channels to assign to messages

Author: Requinard

src/components/Managers/NotificationChannel.tsx

@@ -5,12 +5,40 @@ import { captureNotificationException } from "../../sentryHelpers";
 
 // Import globally at index, this code runs the method on import.
 
+export type NotificationChannels = "default" | "event_reminders" | "announcements" | "private_messages";
 // Setup default channel.
 setNotificationChannelAsync("default", {
-    name: "default",
+    name: "Miscellaneous",
     importance: Notifications.AndroidImportance.MIN,
     lightColor: "#006459",
 }).then(
-    () => console.log("Assigned notification channel"),
+    () => console.log("Assigned default notification channel"),
+    (e) => captureNotificationException("Failed to assign notification channel:", e)
+);
+
+setNotificationChannelAsync("event_reminders", {
+    name: "Event Reminders",
+    importance: Notifications.AndroidImportance.HIGH,
+    lightColor: "#006459",
+}).then(
+    () => console.log("Assigned Event Reminders notification channel"),
+    (e) => captureNotificationException("Failed to assign notification channel:", e)
+);
+
+setNotificationChannelAsync("announcements", {
+    name: "Announcements",
+    importance: Notifications.AndroidImportance.DEFAULT,
+    lightColor: "#006459",
+}).then(
+    () => console.log("Assigned Announcements notification channel"),
+    (e) => captureNotificationException("Failed to assign notification channel:", e)
+);
+
+setNotificationChannelAsync("private_messages", {
+    name: "Private Messages",
+    importance: Notifications.AndroidImportance.DEFAULT,
+    lightColor: "#006459",
+}).then(
+    () => console.log("Assigned Private Messages notification channel"),
     (e) => captureNotificationException("Failed to assign notification channel:", e)
 );

src/components/Managers/NotificationReceivedManager.tsx

@@ -1,4 +1,4 @@
-import { addNotificationReceivedListener, Notification, removeNotificationSubscription, scheduleNotificationAsync } from "expo-notifications";
+import { addNotificationReceivedListener, Notification, NotificationChannel, removeNotificationSubscription, scheduleNotificationAsync } from "expo-notifications";
 import moment from "moment";
 import { useEffect } from "react";
 
@@ -9,16 +9,19 @@ import { useAppDispatch } from "../../store";
 import { logFCMMessage } from "../../store/background.slice";
 import { FirebaseNotificationTrigger, isTrigger, isTriggerWithData, isTriggerWithNotification } from "../../types/NotificationTrigger";
 import { useSynchronizer } from "../Synchronization/SynchronizationProvider";
+import { NotificationChannels } from "./NotificationChannel";
 
-const scheduleNotificationFromTrigger = (source: FirebaseNotificationTrigger) =>
+const scheduleNotificationFromTrigger = (source: FirebaseNotificationTrigger, channelId: NotificationChannels = "default") =>
     scheduleNotificationAsync({
         identifier: source.remoteMessage.messageId ?? undefined,
         content: {
             title: source.remoteMessage.notification.title ?? undefined,
             body: source.remoteMessage.notification.body ?? undefined,
             data: source.remoteMessage.data,
         },
-        trigger: null,
+        trigger: {
+            channelId,
+        },
     });
 
 /**
@@ -69,13 +72,13 @@ export const NotificationReceivedManager = () => {
                     console.log("Synchronized for remote Sync request");
                 } else if (event === "Announcement" && isTriggerWithNotification(trigger)) {
                     // Schedule it.
-                    scheduleNotificationFromTrigger(trigger).then(
+                    scheduleNotificationFromTrigger(trigger, "announcements").then(
                         () => console.log("Announcement scheduled"),
                         (e) => captureNotificationException("Unable to schedule announcement", e)
                     );
                 } else if (event === "Notification" && isTriggerWithNotification(trigger)) {
                     // Schedule it.
-                    scheduleNotificationFromTrigger(trigger).then(
+                    scheduleNotificationFromTrigger(trigger, "private_messages").then(
                         () => console.log("Personal message scheduled"),
                         (e) => captureNotificationException("Unable to schedule personal message", e)
                     );

src/hooks/useEventReminder.tsx

@@ -28,7 +28,10 @@ export const useEventReminder = (event: EventRecord) => {
                     title: event.Title,
                     subtitle: "This event is starting soon!",
                 },
-                trigger: scheduleDate.toDate(),
+                trigger: {
+                    date: scheduleDate.toDate(),
+                    channelId: "event_reminders",
+                },
             });
         }