fall back to filename when body is empty

This commit is contained in:
Henry Hiles 2026-10-04 10:25:29 -04:00
commit 1fd9810b83
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
2 changed files with 95 additions and 85 deletions

View file

@ -0,0 +1,11 @@
import "package:nexus/models/content/message.dart";
extension GetFilename on MessageContent {
String? get filename => switch (this) {
ImageMessageContent(:final filename) ||
VideoMessageContent(:final filename) ||
AudioMessageContent(:final filename) ||
FileMessageContent(:final filename) => filename,
_ => null,
};
}

View file

@ -4,6 +4,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:linkify/linkify.dart";
import "package:nexus/controllers/client_state.dart";
import "package:nexus/controllers/event.dart";
import "package:nexus/helpers/extensions/get_filename.dart";
import "package:nexus/models/content/encrypted.dart";
import "package:nexus/models/content/message.dart";
import "package:nexus/models/content/sticker.dart";
@ -52,8 +53,13 @@ class const MessageRenderer(
),
// TODO: Handle locations
// LocationMessageContent(:final body , :final geoUri) =>
MessageContent content => switch (content) {
TextMessageContent(:final body, :final formattedBody, :final format) ||
NoticeMessageContent(:final body, :final formattedBody, :final format) ||
NoticeMessageContent(
:final body,
:final formattedBody,
:final format,
) ||
EmoteMessageContent(:final body, :final formattedBody, :final format) ||
ImageMessageContent(:final body, :final formattedBody, :final format) ||
VideoMessageContent(:final body, :final formattedBody, :final format) ||
@ -87,7 +93,11 @@ class const MessageRenderer(
},
),
)
: LinkifiedText(body, style: textStyle, maxLines: maxLines),
: LinkifiedText(
body.isEmpty ? content.filename ?? "" : body,
style: textStyle,
maxLines: maxLines,
),
if (!textOnly) ...[
if (event.content
@ -98,27 +108,14 @@ class const MessageRenderer(
ConstrainedBox(
constraints: .loose(.square(500)),
child: switch (event.content) {
VideoMessageContent(:final info, :final file) => VideoPlayer(
url,
info,
encrypted: file != null,
),
AudioMessageContent(:final info, :final file) => AudioPlayer(
url,
info,
encrypted: file != null,
),
FileMessageContent(:final info, :final filename) => FileCard(
url,
info,
filename: filename,
),
ImageMessageContent(:final info, :final file) => MessageImage(
url,
info: info,
encrypted: file != null,
),
VideoMessageContent(:final info, :final file) =>
VideoPlayer(url, info, encrypted: file != null),
AudioMessageContent(:final info, :final file) =>
AudioPlayer(url, info, encrypted: file != null),
FileMessageContent(:final info, :final filename) =>
FileCard(url, info, filename: filename),
ImageMessageContent(:final info, :final file) =>
MessageImage(url, info: info, encrypted: file != null),
_ => SizedBox.shrink(),
},
),
@ -133,7 +130,8 @@ class const MessageRenderer(
],
],
),
MessageContent(:final body) =>
LocationMessageContent(:final String? body) ||
UnknownMessageContent(:final body) =>
body == null
? Text("This message is redacted", style: errorStyle)
: Wrap(
@ -143,6 +141,7 @@ class const MessageRenderer(
Text(body),
],
),
},
_ => throw Exception("This is impossible"),
};