Skip to content
Snippets Groups Projects
Unverified Commit 3aec130d authored by Henrique Guimarães Ribeiro's avatar Henrique Guimarães Ribeiro Committed by GitHub
Browse files

refactor: Remove userStatusManuallySet and meteor functions (#35484)

parent 21f413d6
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,7 @@ import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; ...@@ -9,6 +9,7 @@ import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
import { callbacks } from '../../../../../lib/callbacks'; import { callbacks } from '../../../../../lib/callbacks';
import MarkdownText from '../../../../components/MarkdownText'; import MarkdownText from '../../../../components/MarkdownText';
import { UserStatus } from '../../../../components/UserStatus'; import { UserStatus } from '../../../../components/UserStatus';
import { useFireGlobalEvent } from '../../../../hooks/useFireGlobalEvent';
import { userStatuses } from '../../../../lib/userStatuses'; import { userStatuses } from '../../../../lib/userStatuses';
import type { UserStatusDescriptor } from '../../../../lib/userStatuses'; import type { UserStatusDescriptor } from '../../../../lib/userStatuses';
import { useStatusDisabledModal } from '../../../../views/admin/customUserStatus/hooks/useStatusDisabledModal'; import { useStatusDisabledModal } from '../../../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
...@@ -30,11 +31,13 @@ export const useStatusItems = (): GenericMenuItemProps[] => { ...@@ -30,11 +31,13 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
const { t } = useTranslation(); const { t } = useTranslation();
const fireGlobalStatusEvent = useFireGlobalEvent('user-status-manually-set');
const setStatus = useEndpoint('POST', '/v1/users.setStatus'); const setStatus = useEndpoint('POST', '/v1/users.setStatus');
const setStatusMutation = useMutation({ const setStatusMutation = useMutation({
mutationFn: async (status: UserStatusDescriptor) => { mutationFn: async (status: UserStatusDescriptor) => {
void setStatus({ status: status.statusType, message: userStatuses.isValidType(status.id) ? '' : status.name }); void setStatus({ status: status.statusType, message: userStatuses.isValidType(status.id) ? '' : status.name });
void callbacks.run('userStatusManuallySet', status); void callbacks.run('userStatusManuallySet', status);
await fireGlobalStatusEvent.mutateAsync(status);
}, },
}); });
......
...@@ -9,6 +9,7 @@ import { useCustomStatusModalHandler } from './useCustomStatusModalHandler'; ...@@ -9,6 +9,7 @@ import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
import { callbacks } from '../../../../lib/callbacks'; import { callbacks } from '../../../../lib/callbacks';
import MarkdownText from '../../../components/MarkdownText'; import MarkdownText from '../../../components/MarkdownText';
import { UserStatus } from '../../../components/UserStatus'; import { UserStatus } from '../../../components/UserStatus';
import { useFireGlobalEvent } from '../../../hooks/useFireGlobalEvent';
import { userStatuses } from '../../../lib/userStatuses'; import { userStatuses } from '../../../lib/userStatuses';
import type { UserStatusDescriptor } from '../../../lib/userStatuses'; import type { UserStatusDescriptor } from '../../../lib/userStatuses';
import { useStatusDisabledModal } from '../../../views/admin/customUserStatus/hooks/useStatusDisabledModal'; import { useStatusDisabledModal } from '../../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
...@@ -30,11 +31,13 @@ export const useStatusItems = (): GenericMenuItemProps[] => { ...@@ -30,11 +31,13 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
const { t } = useTranslation(); const { t } = useTranslation();
const fireGlobalStatusEvent = useFireGlobalEvent('user-status-manually-set');
const setStatus = useEndpoint('POST', '/v1/users.setStatus'); const setStatus = useEndpoint('POST', '/v1/users.setStatus');
const setStatusMutation = useMutation({ const setStatusMutation = useMutation({
mutationFn: async (status: UserStatusDescriptor) => { mutationFn: async (status: UserStatusDescriptor) => {
void setStatus({ status: status.statusType, message: userStatuses.isValidType(status.id) ? '' : status.name }); void setStatus({ status: status.statusType, message: userStatuses.isValidType(status.id) ? '' : status.name });
void callbacks.run('userStatusManuallySet', status); void callbacks.run('userStatusManuallySet', status);
await fireGlobalStatusEvent.mutateAsync(status);
}, },
}); });
......
...@@ -23,4 +23,3 @@ import './startup'; ...@@ -23,4 +23,3 @@ import './startup';
import './streamMessage'; import './streamMessage';
import './unread'; import './unread';
import './userRoles'; import './userRoles';
import './userStatusManuallySet';
import type { UserStatus } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import { callbacks } from '../../lib/callbacks';
import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
/* fire user state change globally, to listen on desktop electron client */
Meteor.startup(() => {
callbacks.add('userStatusManuallySet', (status: UserStatus) => {
fireGlobalEvent('user-status-manually-set', status);
});
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment