Merge branch 'main' into tests/add-services-tests

weni-ai · Jan 9, 2025 · 1b12945 · 1b12945
2 parents a6bad02 + 208a9a3
commit 1b12945
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/src/services/api/websocket/listeners/discussion/message/create.js b/src/services/api/websocket/listeners/discussion/message/create.js
@@ -28,11 +28,15 @@ export default (message, { app }) => {
 
     if (document.hidden) {
       const { first_name, last_name } = message.user;
-      sendWindowNotification({
-        title: `${first_name} ${last_name}`,
-        message: message.text,
-        image: message.media?.[0]?.url,
-      });
+      try {
+        sendWindowNotification({
+          title: `${first_name} ${last_name}`,
+          message: message.text,
+          image: message.media?.[0]?.url,
+        });
+      } catch (error) {
+        console.log(error);
+      }
     }
 
     const isCurrentDiscussion = activeDiscussion?.uuid === message.discussion;

diff --git a/src/services/api/websocket/listeners/room/message/create.js b/src/services/api/websocket/listeners/room/message/create.js
@@ -22,11 +22,15 @@ export default async (message, { app }) => {
     notification.notify();
 
     if (document.hidden) {
-      sendWindowNotification({
-        title: message.contact.name,
-        message: message.text,
-        image: message.media?.[0]?.url,
-      });
+      try {
+        sendWindowNotification({
+          title: message.contact.name,
+          message: message.text,
+          image: message.media?.[0]?.url,
+        });
+      } catch (error) {
+        console.log(error);
+      }
     }
 
     const isCurrentRoom =

diff --git a/src/utils/__tests__/notifications.spec.js b/src/utils/__tests__/notifications.spec.js
@@ -6,7 +6,7 @@ import isMobile from 'is-mobile';
 
 vi.mock('@/plugins/i18n', () => ({
   default: {
-    t: vi.fn((key) => key),
+    global: { t: vi.fn((key) => key) },
   },
 }));
 
@@ -98,7 +98,7 @@ describe('sendWindowNotification', () => {
       image: 'Test Image',
     });
 
-    expect(i18n.t).toHaveBeenCalledWith('media');
+    expect(i18n.global.t).toHaveBeenCalledWith('media');
     expect(iframessa.emit).toHaveBeenCalledWith('notification', [
       'Test Title',
       {

diff --git a/src/utils/notifications.js b/src/utils/notifications.js
@@ -14,7 +14,7 @@ export function sendWindowNotification({
     silent: true,
     badge: logo,
     icon: logo,
-    body: image ? `${i18n.t('media')}\n${message}` : message,
+    body: image ? `${i18n.global.t('media')}\n${message}` : message,
     tag: title,
   };