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

Message: Fix wrong emoji background in forwards (#5281)

Browse Source
This commit is contained in:
zubiden 2024-12-06 19:44:31 +04:00 committed by Alexander Zinchuk
parent 00d4df6dec
commit 0cf0bf8c32
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,12 +575,13 @@ const Message: FC<OwnProps & StateProps> = ({
const messageSender = canShowSender ? sender : undefined; const messageSender = canShowSender ? sender : undefined;
const noUserColors = isOwn && !isCustomShape;
const shouldPreferOriginSender = forwardInfo const shouldPreferOriginSender = forwardInfo
&& (isChatWithSelf || isRepliesChat || isAnonymousForwards || !messageSender); && (isChatWithSelf || isRepliesChat || isAnonymousForwards || !messageSender);
const avatarPeer = shouldPreferOriginSender ? originSender : messageSender; const avatarPeer = shouldPreferOriginSender ? originSender : messageSender;
const messageColorPeer = originSender || sender;
const messageColorPeer = asForwarded ? originSender : sender;
const noUserColors = isOwn && !isCustomShape;
const senderPeer = (forwardInfo || storyData) ? originSender : messageSender; const senderPeer = (forwardInfo || storyData) ? originSender : messageSender;
const hasTtl = hasMessageTtl(message); const hasTtl = hasMessageTtl(message);
@ -777,7 +778,7 @@ const Message: FC<OwnProps & StateProps> = ({
hasReactions, hasReactions,
isGeoLiveActive: location?.mediaType === 'geoLive' && !isGeoLiveExpired(message), isGeoLiveActive: location?.mediaType === 'geoLive' && !isGeoLiveExpired(message),
withVoiceTranscription, withVoiceTranscription,
peerColorClass: getPeerColorClass(messageColorPeer, noUserColors), peerColorClass: getPeerColorClass(messageColorPeer, noUserColors, true),
hasOutsideReactions, hasOutsideReactions,
}); });
@ -1395,7 +1396,7 @@ const Message: FC<OwnProps & StateProps> = ({
theme={theme} theme={theme}
story={webPageStory} story={webPageStory}
isConnected={isConnected} isConnected={isConnected}
backgroundEmojiId={sender?.color?.backgroundEmojiId} backgroundEmojiId={messageColorPeer?.color?.backgroundEmojiId}
shouldWarnAboutSvg={shouldWarnAboutSvg} shouldWarnAboutSvg={shouldWarnAboutSvg}
autoLoadFileMaxSizeMb={autoLoadFileMaxSizeMb} autoLoadFileMaxSizeMb={autoLoadFileMaxSizeMb}
onAudioPlay={handleAudioPlay} onAudioPlay={handleAudioPlay}

2
src/components/middle/message/WebPage.scss
View File

@ -71,7 +71,7 @@
.WebPage--content { .WebPage--content {
position: relative; position: relative;
margin-inline-start: 0.25rem; margin-inline-start: 0.375rem;
&.is-story { &.is-story {
display: flex; display: flex;