-
Notifications
You must be signed in to change notification settings - Fork 10.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: remove meteor.startup from unfollow message action (#34078)
Co-authored-by: Tasso Evangelista <[email protected]>
- Loading branch information
1 parent
6423a2c
commit 6cfc6ce
Showing
7 changed files
with
98 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| import './messageAction/follow'; | ||
| import './messageAction/unfollow'; | ||
| import './messageAction/replyInThread'; | ||
| import './threads.css'; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
apps/meteor/client/components/message/toolbar/useUnFollowMessageAction.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings'; | ||
| import { isOmnichannelRoom } from '@rocket.chat/core-typings'; | ||
| import { useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; | ||
| import { useQueryClient } from '@tanstack/react-query'; | ||
| import { useEffect } from 'react'; | ||
|
|
||
| import { Messages } from '../../../../app/models/client'; | ||
| import { MessageAction } from '../../../../app/ui-utils/client'; | ||
| import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction'; | ||
| import { t } from '../../../../app/utils/lib/i18n'; | ||
| import { useReactiveQuery } from '../../../hooks/useReactiveQuery'; | ||
| import { roomsQueryKeys } from '../../../lib/queryKeys'; | ||
| import { useToggleFollowingThreadMutation } from '../../../views/room/contextualBar/Threads/hooks/useToggleFollowingThreadMutation'; | ||
|
|
||
| export const useUnFollowMessageAction = ( | ||
| message: IMessage, | ||
| { room, user, context }: { room: IRoom; user: IUser | undefined; context: MessageActionContext }, | ||
| ) => { | ||
| const threadsEnabled = useSetting('Threads_enabled'); | ||
|
|
||
| const dispatchToastMessage = useToastMessageDispatch(); | ||
|
|
||
| const queryClient = useQueryClient(); | ||
|
|
||
| const { mutate: toggleFollowingThread } = useToggleFollowingThreadMutation({ | ||
| onSuccess: () => { | ||
| dispatchToastMessage({ | ||
| type: 'success', | ||
| message: t('You_unfollowed_this_message'), | ||
| }); | ||
| }, | ||
| }); | ||
|
|
||
| const { tmid, _id } = message; | ||
| const messageQuery = useReactiveQuery( | ||
| roomsQueryKeys.message(message.rid, message._id), | ||
| () => Messages.findOne({ _id: tmid || _id }, { fields: { replies: 1 } }) ?? null, | ||
| ); | ||
|
|
||
| useEffect(() => { | ||
| if (!message || !threadsEnabled || isOmnichannelRoom(room)) { | ||
| return; | ||
| } | ||
|
|
||
| let { replies } = message; | ||
|
|
||
| if (tmid || context) { | ||
| const parentMessage = messageQuery.data; | ||
| if (parentMessage) { | ||
| replies = parentMessage.replies || []; | ||
| } | ||
| } | ||
|
|
||
| if (!user?._id) { | ||
| return; | ||
| } | ||
|
|
||
| if (!replies?.includes(user._id)) { | ||
| return; | ||
| } | ||
|
|
||
| MessageAction.addButton({ | ||
| id: 'unfollow-message', | ||
| icon: 'bell-off', | ||
| label: 'Unfollow_message', | ||
| type: 'interaction', | ||
| context: ['message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'], | ||
| action() { | ||
| toggleFollowingThread({ tmid: tmid || _id, follow: false, rid: room._id }); | ||
| }, | ||
| order: 1, | ||
| group: 'menu', | ||
| }); | ||
|
|
||
| return () => MessageAction.removeButton('unfollow-message'); | ||
| }, [_id, context, message, messageQuery.data, queryClient, room, threadsEnabled, tmid, toggleFollowingThread, user]); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters