Merge pull request #267 from dozro/fix/broken-message-fallback

Enhance UnsupportedContent and BrokenContent to display message body
This commit is contained in:
7w1 authored and GitHub committed 2026-03-08 20:02:30 -05:00
commit 26cd844ba4
4 files changed
+50 -27

No files matched your search

@@ -0,0 +1,5 @@
---
sable: patch
---
Enhance UnsupportedContent and BrokenContent to display message body
+1 -1
View File
@@ -366,7 +366,7 @@ function RenderMessageContentInternal({
mentionedUserIds={content?.['m.mentions']?.user_ids}
/>
);
return <UnsupportedContent />;
return <UnsupportedContent body={content?.body} />;
}
export const RenderMessageContent = memo(RenderMessageContentInternal);
+23 -14
View File
@@ -52,18 +52,22 @@ export function RedactedContent({ reason }: RedactedContentProps) {
);
}
export function UnsupportedContent() {
type BrokenContentProps = {
body?: string;
};
export function UnsupportedContent({ body }: BrokenContentProps) {
return (
<Text>
<MessageUnsupportedContent />
<MessageUnsupportedContent body={body} />
</Text>
);
}
export function BrokenContent() {
export function BrokenContent({ body }: BrokenContentProps) {
return (
<Text>
<MessageBrokenContent />
<MessageBrokenContent body={body} />
</Text>
);
}
@@ -117,7 +121,7 @@ export function MText({ edited, content, renderBody, renderUrlsPreview, style }:
return true;
}, [trimmedBody, safeCustomBody]);
if (!body) return <BrokenContent />;
if (!body) return <BrokenContent body={customBody ?? body} />;
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
@@ -170,7 +174,9 @@ export function MEmote({
const { body, formatted_body: customBody } = content;
const [jumboEmojiSize] = useSetting(settingsAtom, 'jumboEmojiSize');
if (typeof body !== 'string') return <BrokenContent />;
if (typeof body !== 'string') {
return <BrokenContent body={typeof customBody === 'string' ? customBody : undefined} />;
}
const trimmedBody = trimReplyFromBody(body);
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
@@ -205,7 +211,9 @@ export function MNotice({ edited, content, renderBody, renderUrlsPreview }: MNot
const { body, formatted_body: customBody } = content;
const [jumboEmojiSize] = useSetting(settingsAtom, 'jumboEmojiSize');
if (typeof body !== 'string') return <BrokenContent />;
if (typeof body !== 'string') {
return <BrokenContent body={typeof customBody === 'string' ? customBody : undefined} />;
}
const trimmedBody = trimReplyFromBody(body);
const urlsMatch = renderUrlsPreview && trimmedBody.match(URL_REG);
const urls = urlsMatch ? [...new Set(urlsMatch)] : undefined;
@@ -248,7 +256,7 @@ export function MImage({ content, renderImageContent, outlined }: MImageProps) {
const imgInfo = content?.info;
const mxcUrl = content.file?.url ?? content.url;
if (typeof mxcUrl !== 'string') {
return <BrokenContent />;
return <BrokenContent body={content.body ?? content.filename} />;
}
const MAX_SIZE = 400;
const imgW = imgInfo?.w ?? MAX_SIZE;
@@ -310,7 +318,7 @@ export function MVideo({ content, renderAsFile, renderVideoContent, outlined }:
if (mxcUrl) {
return renderAsFile();
}
return <BrokenContent />;
return <BrokenContent body={content.body ?? content.filename} />;
}
const height = Math.min(scaleYDimension(videoInfo.w || 400, 400, videoInfo.h || 400), 400);
@@ -379,7 +387,7 @@ export function MAudio({ content, renderAsFile, renderAudioContent, outlined }:
if (mxcUrl) {
return renderAsFile();
}
return <BrokenContent />;
return <BrokenContent body={content.body ?? content.filename} />;
}
const filename = content.filename ?? content.body ?? 'Audio';
@@ -430,7 +438,7 @@ export function MFile({ content, renderFileContent, outlined }: MFileProps) {
const mxcUrl = content.file?.url ?? content.url;
if (typeof mxcUrl !== 'string') {
return <BrokenContent />;
return <BrokenContent body={content.body ?? content.filename} />;
}
return (
@@ -461,8 +469,9 @@ type MLocationProps = {
};
export function MLocation({ content }: MLocationProps) {
const geoUri = content.geo_uri;
if (typeof geoUri !== 'string') return <BrokenContent />;
if (typeof geoUri !== 'string') {
return <BrokenContent body={typeof content.body === 'string' ? content.body : undefined} />;
}
const location = parseGeoUri(geoUri);
if (!location) return <BrokenContent />;
@@ -493,7 +502,7 @@ export function MSticker({ content, renderImageContent }: MStickerProps) {
const imgInfo = content?.info;
const mxcUrl = content.file?.url ?? content.url;
if (typeof mxcUrl !== 'string') {
return <MessageBrokenContent />;
return <MessageBrokenContent body={content.body} />;
}
const height = scaleYDimension(imgInfo?.w || 152, 152, imgInfo?.h || 152);
@@ -16,12 +16,16 @@ export const MessageDeletedContent = as<'div', { children?: never; reason?: stri
)
);
export const MessageUnsupportedContent = as<'div', { children?: never }>(({ ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>
<Icon size="50" src={Icons.Warning} />
<i>Unsupported message</i>
</Box>
));
export const MessageUnsupportedContent = as<'div', { children?: never; body?: string }>(
({ body, ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>
<Icon size="50" src={Icons.Warning} />
<i>Unsupported message</i>
{body && `: ${body}`}
{!body && ' (no body)'}
</Box>
)
);
export const MessageFailedContent = as<'div', { children?: never }>(({ ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>
@@ -44,12 +48,17 @@ export const MessageNotDecryptedContent = as<'div', { children?: never }>(({ ...
</Box>
));
export const MessageBrokenContent = as<'div', { children?: never }>(({ ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>
<Icon size="50" src={Icons.Warning} />
<i>Broken message</i>
</Box>
));
// display body of the message if it is available, as it may give some clue about why the message is broken
export const MessageBrokenContent = as<'div', { children?: never; body?: string }>(
({ body, ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>
<Icon size="50" src={Icons.Warning} />
<i>Broken message</i>
{body && `: ${body}`}
{!body && ' (no body)'}
</Box>
)
);
export const MessageEmptyContent = as<'div', { children?: never }>(({ ...props }, ref) => (
<Box as="span" alignItems="Center" gap="100" style={criticalStyle} {...props} ref={ref}>