Prevent notification triggers when replaying chat history

Author: MarkH817

src/stores/channel.ts

@@ -37,7 +37,6 @@ const useChannelStore = defineStore('channel', () => {
   }
 
   const activeTarget = ref('#general');
-
   function changeActiveChannel(channel: string) {
     activeTarget.value = channel;
   }
@@ -55,10 +54,14 @@ const useChannelStore = defineStore('channel', () => {
     }
 
     irc.client.part(channel);
-    channelMap.delete(channel);
+    const otherChannels = channelList.value.filter((c) => c !== channel);
+    if (otherChannels.length > 0) {
+      changeActiveChannel(otherChannels[0]);
+      channelMap.delete(channel);
+    }
   }
 
-  async function addMessageNotification(channelName: string, message: Message) {
+  async function sendMessageNotification(channelName: string, message: Message) {
     const user = userList.getUser(message.nick);
     const channel = getChannel(channelName);
     channel.hasNotification = true;
@@ -163,13 +166,17 @@ const useChannelStore = defineStore('channel', () => {
           log.debug('new message:', newMessage);
           channel.messages.push(newMessage);
 
+          if (typeof newMessage.tags.batch === 'string') {
+            // Don't trigger notifications on chat history playback
+            return;
+          }
           // If the user has allows for notifications on channel or keywords
           // Display/send notifications if user is in another channel or has browser blurred
           // Otherwise mark channel as read if user is actively viewing the channel
           const isOtherChannel = channel.name !== activeTarget.value;
           if (!isFocusedWindow || isOtherChannel) {
             if (channel.notificationsEnabled) {
-              addMessageNotification(channel.name, newMessage);
+              sendMessageNotification(channel.name, newMessage);
 
               if (
                 message.toLocaleLowerCase().includes(irc.currentUser.username.toLocaleLowerCase())
@@ -179,7 +186,7 @@ const useChannelStore = defineStore('channel', () => {
             } else if (
               notifications.notificationKeywords.some((keyword) => message.includes(keyword))
             ) {
-              addMessageNotification(channel.name, newMessage);
+              sendMessageNotification(channel.name, newMessage);
             }
           } else {
             markAsRead(channel.name);
@@ -188,6 +195,7 @@ const useChannelStore = defineStore('channel', () => {
     },
   );
 
+  // TODO: Add addSystemMessage method
   return {
     channelList,
     activeChannel: computed(() => readonly(getChannel(activeTarget.value))),

src/stores/index.ts

@@ -1,6 +1,8 @@
 export { default as useChannelStore } from './channel';
 export { default as useChatStore } from './chat';
 export { default as useIrcStore } from './irc';
+export { default as useLayoutStore } from './layout';
 export { default as useNotificationsStore } from './notifications';
+export { default as useOperatorStore } from './operator';
 export { default as useSettingsStore } from './settings';
 export { default as useUserListStore } from './user-list';

src/stores/layout.ts

@@ -0,0 +1,8 @@
+import { defineStore } from 'pinia';
+
+const useLayoutStore = defineStore('layout', () => {
+  // TODO: Track chat layout settings here
+  return {};
+});
+
+export default useLayoutStore;

src/stores/operator.ts

@@ -1,12 +1,12 @@
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 
-const userOperatorStore = defineStore('operator', () => {
+const useOperatorStore = defineStore('operator', () => {
   const isOperator = ref(false);
   // TODO: Add operator authentication, saving credentials, and operator actions here
   return {
     isOperator: computed(() => isOperator),
   };
 });
 
-export default userOperatorStore;
+export default useOperatorStore;

src/utils/user.spec.ts

@@ -10,7 +10,7 @@ describe('user', () => {
 
   it('parses UID from ident or former nick format', () => {
     expect(parseUid('AnotherUser', 'anon')).toBe('0');
-    expect(parseUid('Someone', '~987')).toBe('987');
+    expect(parseUid('UnverifiedUser', '~987')).toBe('987');
     expect(parseUid('Anonymous^456', '67890')).toBe('67890');
     expect(parseUid('Chatter__123^1', 'anon')).toBe('123');
   });