danog/telegram-tt
1
0
Fork 0
mirror of https://github.com/danog/telegram-tt.git synced 2024-11-30 04:39:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Message: Show correct message sender when forwarding (#1784)"

Browse Source 
This reverts commit 754ef496220dbbf6580d3a77d705578cd8cfb645.
This commit is contained in:
Alexander Zinchuk 2022-04-09 03:45:51 +02:00
parent 8881cdf77d
commit b5ae6d3205
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/common/EmbeddedMessage.tsx
View File

@ -54,7 +54,7 @@ const EmbeddedMessage: FC<OwnProps> = ({
const lang = useLang();
const senderTitle = message?.forwardInfo?.hiddenUserName || (sender && getSenderTitle(lang, sender));
const senderTitle = sender && getSenderTitle(lang, sender);
return (
<div

9
src/components/middle/composer/ComposerEmbeddedMessage.tsx
View File

@ -148,9 +148,10 @@ export default memo(withGlobal<OwnProps>(
}
let sender: ApiChat | ApiUser | undefined;
if ((isForwarding || replyingToId) && message) {
if (replyingToId && message) {
const { forwardInfo } = message;
const isChatWithSelf = chatId === currentUserId;
if (forwardInfo && (forwardInfo.isChannelPost || isChatWithSelf)) {
sender = selectForwardedSender(global, message);
}
@ -158,10 +159,8 @@ export default memo(withGlobal<OwnProps>(
if (!sender) {
sender = selectSender(global, message);
}
if (!sender) {
sender = isUserId(fromChatId!) ? selectUser(global, fromChatId!) : selectChat(global, fromChatId!);
}
} else if (isForwarding) {
sender = isUserId(fromChatId!) ? selectUser(global, fromChatId!) : selectChat(global, fromChatId!);
}
return {