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

Replies Bot: Fix reply display (#3961)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-11-10 13:55:27 +04:00
parent e59b002b5f
commit 1eea365bb2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1486,11 +1486,11 @@ export default memo(withGlobal<OwnProps>(
? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId) ? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId)
: undefined; : undefined;
const forwardHeader = forwardInfo || replyFrom; const forwardHeader = forwardInfo || replyFrom;
const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage) : forwardHeader const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage) : forwardHeader && !isRepliesChat
? selectSenderFromHeader(global, forwardHeader) : undefined; ? selectSenderFromHeader(global, forwardHeader) : undefined;
const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage); const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage);
const replyMessageChat = replyToPeerId ? selectChat(global, replyToPeerId) : undefined; const replyMessageChat = replyToPeerId ? selectChat(global, replyToPeerId) : undefined;
const isReplyPrivate = replyMessageChat && !isChatPublic(replyMessageChat) const isReplyPrivate = !isRepliesChat && replyMessageChat && !isChatPublic(replyMessageChat)
&& (replyMessageChat.isNotJoined || replyMessageChat.isRestricted); && (replyMessageChat.isNotJoined || replyMessageChat.isRestricted);
const isReplyToTopicStart = replyMessage?.content.action?.type === 'topicCreate'; const isReplyToTopicStart = replyMessage?.content.action?.type === 'topicCreate';
const replyStory = storyReplyId && storyReplyUserId const replyStory = storyReplyId && storyReplyUserId

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

@ -85,7 +85,7 @@ export default function useInnerHandlers(
focusMessage({ focusMessage({
chatId: replyToPeerId || chatId, chatId: replyToPeerId || chatId,
threadId, threadId: replyToTopId || threadId,
messageId: replyToMsgId, messageId: replyToMsgId,
replyMessageId: replyToPeerId ? undefined : messageId, replyMessageId: replyToPeerId ? undefined : messageId,
noForumTopicPanel: !replyToPeerId ? true : undefined, // Open topic panel for cross-chat replies noForumTopicPanel: !replyToPeerId ? true : undefined, // Open topic panel for cross-chat replies