ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Message: Fix redundant focusing to message from sender name

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-01-13 01:11:45 +01:00
parent 9251b468a5
commit 7f74b8cd99
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/middle/message/Message.tsx
View File

@ -357,7 +357,8 @@ const Message: FC<OwnProps & StateProps> = ({
chatId, chatId,
threadId, threadId,
isInDocumentGroup, isInDocumentGroup,
Boolean(isScheduled), asForwarded,
isScheduled,
isRepliesChat, isRepliesChat,
album, album,
avatarPeer, avatarPeer,

7
src/components/middle/message/hooks/useInnerHandlers.ts
View File

@ -15,6 +15,7 @@ export default function useInnerHandlers(
chatId: string, chatId: string,
threadId: number, threadId: number,
isInDocumentGroup: boolean, isInDocumentGroup: boolean,
asForwarded?: boolean,
isScheduled?: boolean, isScheduled?: boolean,
isChatWithRepliesBot?: boolean, isChatWithRepliesBot?: boolean,
album?: IAlbum, album?: IAlbum,
@ -50,14 +51,16 @@ export default function useInnerHandlers(
return; return;
} }
if (forwardInfo?.channelPostId) { if (asForwarded && forwardInfo?.channelPostId) {
focusMessage({ chatId: senderPeer.id, messageId: forwardInfo.channelPostId }); focusMessage({ chatId: senderPeer.id, messageId: forwardInfo.channelPostId });
} else if (isUserId(senderPeer.id)) { } else if (isUserId(senderPeer.id)) {
openUserInfo({ id: senderPeer.id }); openUserInfo({ id: senderPeer.id });
} else { } else {
openChat({ id: senderPeer.id }); openChat({ id: senderPeer.id });
} }
}, [focusMessage, forwardInfo?.channelPostId, lang, openChat, openUserInfo, senderPeer, showNotification]); }, [
asForwarded, focusMessage, forwardInfo, lang, openChat, openUserInfo, senderPeer, showNotification,
]);
const handleViaBotClick = useCallback(() => { const handleViaBotClick = useCallback(() => {
if (!botSender) { if (!botSender) {