refactor: use packet event for message notifications

Author: Rexogamer

src/MainView.tsx

@@ -6,7 +6,7 @@ import {
 } from 'react';
 import {StatusBar, StyleSheet, View} from 'react-native';
 
-import type {Channel, Server} from 'revolt.js';
+import type {API, Channel, Server} from 'revolt.js';
 
 import {app, randomizeRemark, setFunction} from '@clerotri/Generic';
 import {client} from '@clerotri/lib/client';
@@ -162,6 +162,60 @@ function AppViews({state}: {state: any}) {
   );
 }
 
+async function handleMessageNotification(
+  state: any,
+  msg: API.Message,
+  notifeeChannel: string,
+) {
+  console.log(`[APP] Handling message ${msg._id}`);
+
+  const channel = client.channels.get(msg.channel);
+
+  let channelNotif =
+    state.state.channelNotifications && channel
+      ? state.state.channelNotifications[channel?._id]
+      : undefined;
+  let serverNotif =
+    state.state.serverNotifications && channel?.server
+      ? state.state.serverNotifications[channel?.server?._id]
+      : undefined;
+
+  const isMuted =
+    (channelNotif && channelNotif === 'none') ||
+    channelNotif === 'muted' ||
+    (serverNotif && serverNotif === 'none') ||
+    serverNotif === 'muted';
+
+  const alwaysNotif =
+    channelNotif === 'all' || (!isMuted && serverNotif === 'all');
+
+  const mentionsUser =
+    (msg.mentions?.includes(client.user?._id!) &&
+      (app.settings.get('app.notifications.notifyOnSelfPing') ||
+        msg.author !== client.user?._id)) ||
+    channel?.channel_type === 'DirectMessage';
+
+  const shouldNotif =
+    (alwaysNotif &&
+      (app.settings.get('app.notifications.notifyOnSelfPing') ||
+        msg.author !== client.user?._id)) ||
+    (!isMuted && mentionsUser);
+
+  console.log(
+    `[NOTIFICATIONS] Should notify for ${msg._id}: ${shouldNotif} (channel/server muted? ${isMuted}, notifications for all messages enabled? ${alwaysNotif}, message mentions the user? ${mentionsUser})`,
+  );
+
+  if (app.settings.get('app.notifications.enabled') && shouldNotif) {
+    console.log(`[NOTIFICATIONS] Pushing notification for message ${msg._id}`);
+    if (state.state.currentChannel !== msg.channel) {
+      state.setState({notificationMessage: msg});
+      await sleep(5000);
+      state.setState({notificationMessage: null});
+    }
+
+    await sendNotifeeNotification(msg, client, notifeeChannel);
+  }
+}
 export class MainView extends ReactComponent {
   constructor(props) {
     super(props);
@@ -250,56 +304,10 @@ export class MainView extends ReactComponent {
       this.setState({network: 'dropped'});
     });
 
-    client.on('message', async msg => {
-      console.log(`[APP] Handling message ${msg._id}`);
-
-      let channelNotif = this.state.channelNotifications
-        ? this.state.channelNotifications[msg.channel?._id]
-        : undefined;
-      let serverNotif = this.state.serverNotifications
-        ? this.state.serverNotifications[msg.channel?.server?._id]
-        : undefined;
-
-      const isMuted =
-        (channelNotif && channelNotif === 'none') ||
-        channelNotif === 'muted' ||
-        (serverNotif && serverNotif === 'none') ||
-        serverNotif === 'muted';
-
-      const alwaysNotif =
-        channelNotif === 'all' || (!isMuted && serverNotif === 'all');
-
-      const mentionsUser =
-        (msg.mention_ids?.includes(client.user?._id!) &&
-          (app.settings.get('app.notifications.notifyOnSelfPing') ||
-            msg.author?._id !== client.user?._id)) ||
-        msg.channel?.channel_type === 'DirectMessage';
-
-      const shouldNotif =
-        (alwaysNotif &&
-          (app.settings.get('app.notifications.notifyOnSelfPing') ||
-            msg.author?._id !== client.user?._id)) ||
-        (!isMuted && mentionsUser);
-
-      console.log(
-        `[NOTIFICATIONS] Should notify for ${msg._id}: ${shouldNotif} (channel/server muted? ${isMuted}, notifications for all messages enabled? ${alwaysNotif}, message mentions the user? ${mentionsUser})`,
-      );
-
-      if (app.settings.get('app.notifications.enabled') && shouldNotif) {
-        console.log(
-          `[NOTIFICATIONS] Pushing notification for message ${msg._id}`,
-        );
-        if (this.state.currentChannel !== msg.channel) {
-          this.setState({notificationMessage: msg});
-          await sleep(5000);
-          this.setState({notificationMessage: null});
-        }
-
-        await sendNotifeeNotification(msg, client, defaultNotif);
-      }
-    });
-
     client.on('packet', async p => {
+      if (p.type === 'Message') {
+        await handleMessageNotification(this, p, defaultNotif);
+      }
       if (p.type === 'UserSettingsUpdate') {
         console.log('[WEBSOCKET] Synced settings updated');
         try {

src/lib/notifications/notifee.ts

@@ -1,6 +1,6 @@
 import notifee, {EventType} from '@notifee/react-native';
 
-import type {Client, Message} from 'revolt.js';
+import type {API, Client} from 'revolt.js';
 
 export async function createChannel() {
   const channel = (await notifee.getChannel('clerotri'))
@@ -32,30 +32,33 @@ export function setUpNotifeeListener(client: Client, setState: any) {
 }
 
 export async function sendNotifeeNotification(
-  msg: Message,
+  msg: API.Message,
   client: Client,
   defaultNotif: string,
 ) {
+  const channel = client.channels.get(msg.channel);
+  const author = client.users.get(msg.author);
+
   let notifs = (await notifee.getDisplayedNotifications()).filter(
-    n => n.id === msg.channel?._id,
+    n => n.id === msg.channel,
   );
   const title = `${
-    msg.channel?.server?.name
-      ? `#${msg.channel.name} (${msg.channel.server.name})`
-      : msg.channel?.channel_type === 'Group'
-        ? `${msg.channel.name}`
-        : `@${msg.channel?.recipient?.username}`
+    channel?.server?.name
+      ? `#${channel.name} (${channel.server.name})`
+      : channel?.channel_type === 'Group'
+        ? `${channel.name}`
+        : `@${channel?.recipient?.username}`
   }`;
 
   try {
     notifee.displayNotification({
       title: title,
       data: {
-        channel: msg.channel?._id ?? 'UNKNOWN',
+        channel: channel?._id ?? 'UNKNOWN',
         messageID: msg._id,
       },
       body:
-        `<b>${msg.author?.username}</b>: ` +
+        `<b>${author?.username}</b>: ` +
         msg.content
           ?.replaceAll(
             '<@' + client.user?._id + '>',
@@ -87,15 +90,14 @@ export async function sendNotifeeNotification(
         color: '#1AD4B2',
         smallIcon: 'ic_launcher_monochrome',
         largeIcon:
-          msg.channel?.server?.generateIconURL() ||
-          msg.author?.generateAvatarURL(),
+          channel?.server?.generateIconURL() || author?.generateAvatarURL(),
         pressAction: {
           id: 'default',
           launchActivity: 'app.upryzing.clerotri.MainActivity',
         },
         channelId: defaultNotif,
       },
-      id: msg.channel?._id,
+      id: channel?._id,
     });
   } catch (notifErr) {
     console.log(`[NOTIFEE] Error sending notification: ${notifErr}`);