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

Various fixes (#4836)

Browse Source
This commit is contained in:
zubiden 2024-08-06 20:06:35 +02:00 committed by Alexander Zinchuk
parent 629f979c5a
commit eddce446de
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/gramjs/methods/client.ts
View File

@ -24,7 +24,7 @@ import { buildApiMessage, setMessageBuilderCurrentUserId } from '../apiBuilders/
import { buildApiPeerId } from '../apiBuilders/peers'; import { buildApiPeerId } from '../apiBuilders/peers';
import { buildApiStory } from '../apiBuilders/stories'; import { buildApiStory } from '../apiBuilders/stories';
import { buildApiUser, buildApiUserFullInfo } from '../apiBuilders/users'; import { buildApiUser, buildApiUserFullInfo } from '../apiBuilders/users';
import { buildInputPeerFromLocalDb } from '../gramjsBuilders'; import { buildInputPeerFromLocalDb, getEntityTypeById } from '../gramjsBuilders';
import { import {
addEntitiesToLocalDb, addMessageToLocalDb, addStoryToLocalDb, addUserToLocalDb, isResponseUpdate, log, addEntitiesToLocalDb, addMessageToLocalDb, addStoryToLocalDb, addUserToLocalDb, isResponseUpdate, log,
} from '../helpers'; } from '../helpers';
@ -465,10 +465,11 @@ export async function repairFileReference({
} }
async function repairMessageMedia(peerId: string, messageId: number) { async function repairMessageMedia(peerId: string, messageId: number) {
const type = getEntityTypeById(peerId);
const peer = buildInputPeerFromLocalDb(peerId); const peer = buildInputPeerFromLocalDb(peerId);
if (!peer) return false; if (!peer) return false;
const result = await invokeRequest( const result = await invokeRequest(
peer type === 'channel'
? new GramJs.channels.GetMessages({ ? new GramJs.channels.GetMessages({
channel: peer, channel: peer,
id: [new GramJs.InputMessageID({ id: messageId })], id: [new GramJs.InputMessageID({ id: messageId })],

4
src/components/common/MessageText.tsx
View File

@ -31,6 +31,7 @@ interface OwnProps {
forcePlayback?: boolean; forcePlayback?: boolean;
focusedQuote?: string; focusedQuote?: string;
isInSelectMode?: boolean; isInSelectMode?: boolean;
canBeEmpty?: boolean;
} }
const MIN_CUSTOM_EMOJIS_FOR_SHARED_CANVAS = 3; const MIN_CUSTOM_EMOJIS_FOR_SHARED_CANVAS = 3;
@ -52,6 +53,7 @@ function MessageText({
forcePlayback, forcePlayback,
focusedQuote, focusedQuote,
isInSelectMode, isInSelectMode,
canBeEmpty,
}: OwnProps) { }: OwnProps) {
// eslint-disable-next-line no-null/no-null // eslint-disable-next-line no-null/no-null
const sharedCanvasRef = useRef<HTMLCanvasElement>(null); const sharedCanvasRef = useRef<HTMLCanvasElement>(null);
@ -80,7 +82,7 @@ function MessageText({
return customEmojisCount >= MIN_CUSTOM_EMOJIS_FOR_SHARED_CANVAS; return customEmojisCount >= MIN_CUSTOM_EMOJIS_FOR_SHARED_CANVAS;
}, [entities]) || 0; }, [entities]) || 0;
if (!text) { if (!text && !canBeEmpty) {
return <span className="content-unsupported">{CONTENT_NOT_SUPPORTED}</span>; return <span className="content-unsupported">{CONTENT_NOT_SUPPORTED}</span>;
} }

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

@ -107,7 +107,7 @@ const StickerView: FC<OwnProps> = ({
const thumbData = customColor ? thumbDataUri : (previewMediaData || thumbDataUri); const thumbData = customColor ? thumbDataUri : (previewMediaData || thumbDataUri);
const shouldForcePreview = isUnsupportedVideo || (isStatic && isSmall); const shouldForcePreview = isUnsupportedVideo || (isStatic && isSmall);
fullMediaHash ||= shouldForcePreview ? previewMediaHash : `sticker${id}`; fullMediaHash = shouldForcePreview ? previewMediaHash : (fullMediaHash || `sticker${id}`);
// If preloaded preview is forced, it will render as thumb, so no need to load it again // If preloaded preview is forced, it will render as thumb, so no need to load it again
const shouldSkipFullMedia = Boolean(fullMediaHash === previewMediaHash && previewMediaData); const shouldSkipFullMedia = Boolean(fullMediaHash === previewMediaHash && previewMediaData);

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

@ -980,6 +980,7 @@ const Message: FC<OwnProps & StateProps> = ({
observeIntersectionForPlaying={observeIntersectionForPlaying} observeIntersectionForPlaying={observeIntersectionForPlaying}
withTranslucentThumbs={isCustomShape} withTranslucentThumbs={isCustomShape}
isInSelectMode={isInSelectMode} isInSelectMode={isInSelectMode}
canBeEmpty={hasFactCheck}
/> />
); );
} }