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

Chat List: Remove sender from private chat preview (#5938)

Browse Source
This commit is contained in:
zubiden 2025-06-04 20:40:44 +02:00 committed by Alexander Zinchuk
parent 8e2c91064d
commit e7bdc12dfc
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/left/main/hooks/useChatListEntry.tsx
View File

@ -116,7 +116,9 @@ export default function useChatListEntry({
return undefined;
}
const senderName = getMessageSenderName(oldLang, chatId, lastMessageSender);
const senderName = lastMessageSender
? getMessageSenderName(oldLang, chatId, lastMessageSender)
: undefined;
return (
<p className="last-message shared-canvas-container" dir={oldLang.isRtl ? 'auto' : 'ltr'}>

2
src/components/middle/search/MiddleSearchResult.tsx
View File

@ -44,7 +44,7 @@ const MiddleSearchResult = ({
const peer = shouldShowChat ? messageChat : senderPeer;
const senderName = shouldShowChat ? getMessageSenderName(lang, message.chatId, senderPeer) : undefined;
const senderName = shouldShowChat && senderPeer ? getMessageSenderName(lang, message.chatId, senderPeer) : undefined;
const handleClick = useLastCallback(() => {
onClick(message);

10
src/global/helpers/peers.ts
View File

@ -3,6 +3,7 @@ import type { OldLangFn } from '../../hooks/useOldLang';
import type { CustomPeer } from '../../types';
import { SERVICE_NOTIFICATIONS_USER_ID } from '../../config';
import { isUserId } from '../../util/entities/ids';
import { getTranslationFn, type LangFn } from '../../util/localization';
import { prepareSearchWordsForNeedle } from '../../util/searchWords';
import { selectChat, selectPeer, selectUser } from '../selectors';
@ -110,10 +111,9 @@ export function getPeerFullTitle(lang: OldLangFn | LangFn, peer: ApiPeer | Custo
return isApiPeerUser(peer) ? getUserFullName(peer) : getChatTitle(lang, peer);
}
export function getMessageSenderName(lang: OldLangFn, chatId: string, sender?: ApiPeer) {
if (!sender) {
return undefined;
}
export function getMessageSenderName(lang: OldLangFn, chatId: string, sender: ApiPeer) {
// Hide sender name for private chats
if (isUserId(chatId)) return undefined;
if (isApiPeerChat(sender)) {
if (chatId === sender.id) return undefined;
@ -125,5 +125,5 @@ export function getMessageSenderName(lang: OldLangFn, chatId: string, sender?: A
return lang('FromYou');
}
return getUserFirstOrLastName(sender);
return getPeerTitle(lang, sender);
}

3
src/util/notifications.tsx
View File

@ -319,7 +319,8 @@ function getNotificationContent(chat: ApiChat, message: ApiMessage, reaction?: A
const isChat = chat && (isChatChannel(chat) || message.senderId === message.chatId);
// TODO[forums] Support ApiChat
const senderName = getMessageSenderName(oldTranslate, chat.id, isChat ? messageSenderChat : messageSenderUser);
const sender = isChat ? messageSenderChat : messageSenderUser;
const senderName = sender ? getMessageSenderName(oldTranslate, chat.id, sender) : undefined;
let summary = jsxToHtml(<span><MessageSummary message={message} /></span>)[0].textContent || '';
if (hasReaction) {