Skip to content

refactor: remove KonchatNotification newRoom from meteor #35567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 3 commits into from
Mar 20, 2025
Merged

refactor: remove KonchatNotification newRoom from meteor #35567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
162cac0
refactor: create `useNotifyNewRoom`
juliajforesti Mar 20, 2025
77739e1
refactor: replace `KonchatNotification.newRoom()` with `useNotifyNewR…
juliajforesti Mar 20, 2025
d260af6
chore: remove deprecated `newRoom` method
juliajforesti Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions apps/meteor/app/ui/client/lib/KonchatNotification.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { router } from '../../../../client/providers/RouterProvider';
import { stripTags } from '../../../../lib/utils/stringUtils';
import { CustomSounds } from '../../../custom-sounds/client/lib/CustomSounds';
import { e2e } from '../../../e2e/client';
import { Subscriptions, Users } from '../../../models/client';
import { Subscriptions } from '../../../models/client';
import { getUserPreference } from '../../../utils/client';
import { getUserAvatarURL } from '../../../utils/client/getUserAvatarURL';
import { getUserNotificationsSoundVolume } from '../../../utils/client/getUserNotificationsSoundVolume';
Expand Down Expand Up @@ -206,31 +206,6 @@ class KonchatNotification {
// do nothing
}
}

public newRoom() {
Tracker.nonreactive(() => {
const uid = Meteor.userId();
if (!uid) {
return;
}
const user = Users.findOne(uid, {
fields: {
'settings.preferences.newRoomNotification': 1,
'settings.preferences.notificationsSoundVolume': 1,
},
});
const newRoomNotification = getUserPreference<string>(user, 'newRoomNotification');
const audioVolume = getUserNotificationsSoundVolume(user?._id);

if (!newRoomNotification) {
return;
}

void CustomSounds.play(newRoomNotification, {
volume: Number((audioVolume / 100).toPrecision(2)),
});
});
}
}

const instance = new KonchatNotification();
Expand Down
22 changes: 22 additions & 0 deletions apps/meteor/client/hooks/useNotifyNewRoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { useUserPreference } from '@rocket.chat/ui-contexts';
import { useCallback } from 'react';

import { useUserSoundPreferences } from './useUserSoundPreferences';
import { CustomSounds } from '../../app/custom-sounds/client/lib/CustomSounds';

export const useNotifyNewRoom = () => {
const newRoomNotification = useUserPreference<string>('newRoomNotification');
const { notificationsSoundVolume } = useUserSoundPreferences();

const notifyNewRoom = useCallback(() => {
if (!newRoomNotification) {
return;
}

void CustomSounds.play(newRoomNotification, {
volume: Number((notificationsSoundVolume / 100).toPrecision(2)),
});
}, [newRoomNotification, notificationsSoundVolume]);

return notifyNewRoom;
};
4 changes: 3 additions & 1 deletion apps/meteor/client/hooks/useNotifyUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useRouter, useStream, useUser, useUserPreference } from '@rocket.chat/u
import { useEffect } from 'react';

import { useEmbeddedLayout } from './useEmbeddedLayout';
import { useNotifyNewRoom } from './useNotifyNewRoom';
import { CachedChatSubscription } from '../../app/models/client';
import { KonchatNotification } from '../../app/ui/client/lib/KonchatNotification';
import { RoomManager } from '../lib/RoomManager';
Expand All @@ -15,14 +16,15 @@ export const useNotifyUser = () => {
const isLayoutEmbedded = useEmbeddedLayout();
const notifyUserStream = useStream('notify-user');
const muteFocusedConversations = useUserPreference('muteFocusedConversations');
const newRoomNotification = useNotifyNewRoom();

const notifyNewRoom = useEffectEvent(async (sub: AtLeast<ISubscription, 'rid'>): Promise<void> => {
if (!user || user.status === 'busy') {
return;
}

if ((!router.getRouteParameters().name || router.getRouteParameters().name !== sub.name) && !sub.ls && sub.alert === true) {
KonchatNotification.newRoom();
newRoomNotification();
}
});

Expand Down
8 changes: 5 additions & 3 deletions apps/meteor/client/providers/OmnichannelProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import { useState, useEffect, useMemo, useCallback, memo, useRef } from 'react';
import { LivechatInquiry } from '../../app/livechat/client/collections/LivechatInquiry';
import { initializeLivechatInquiryStream } from '../../app/livechat/client/lib/stream/queueManager';
import { getOmniChatSortQuery } from '../../app/livechat/lib/inquiries';
import { KonchatNotification } from '../../app/ui/client/lib/KonchatNotification';
import { ClientLogger } from '../../lib/ClientLogger';
import type { OmnichannelContextValue } from '../contexts/OmnichannelContext';
import { OmnichannelContext } from '../contexts/OmnichannelContext';
import { useHasLicenseModule } from '../hooks/useHasLicenseModule';
import { useNotifyNewRoom } from '../hooks/useNotifyNewRoom';
import { useOmnichannelContinuousSoundNotification } from '../hooks/useOmnichannelContinuousSoundNotification';
import { useReactiveValue } from '../hooks/useReactiveValue';
import { useShouldPreventAction } from '../hooks/useShouldPreventAction';
Expand Down Expand Up @@ -76,6 +76,8 @@ const OmnichannelProvider = ({ children }: OmnichannelProviderProps) => {
const isPrioritiesEnabled = isEnterprise && accessible;
const enabled = accessible && !!user && !!routeConfig;

const notifyNewRoom = useNotifyNewRoom();

const {
data: { priorities = [] } = {},
isLoading: isLoadingPriorities,
Expand Down Expand Up @@ -158,10 +160,10 @@ const OmnichannelProvider = ({ children }: OmnichannelProviderProps) => {

useEffect(() => {
if (lastQueueSize.current < (queue?.length ?? 0)) {
KonchatNotification.newRoom();
notifyNewRoom();
}
lastQueueSize.current = queue?.length ?? 0;
}, [queue?.length]);
}, [notifyNewRoom, queue?.length]);

useOmnichannelContinuousSoundNotification(queue ?? []);

Expand Down
Loading