Nexus/nexus
Nexus/nexus
Watch
2
5
Fork
You've already forked nexus
 7
Code Issues 29 Pull requests Releases Activity

fall back to filename when body is empty

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

11
lib/helpers/extensions/get_filename.dart Normal file
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,
};
}

169
lib/widgets/renderers/message.dart
View file

@ -4,6 +4,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
import "package:linkify/linkify.dart"; import "package:linkify/linkify.dart";
import "package:nexus/controllers/client_state.dart"; import "package:nexus/controllers/client_state.dart";
import "package:nexus/controllers/event.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/encrypted.dart";
import "package:nexus/models/content/message.dart"; import "package:nexus/models/content/message.dart";
import "package:nexus/models/content/sticker.dart"; import "package:nexus/models/content/sticker.dart";
@ -52,97 +53,95 @@ class const MessageRenderer(
), ),
// TODO: Handle locations // TODO: Handle locations
// LocationMessageContent(:final body , :final geoUri) => // LocationMessageContent(:final body , :final geoUri) =>
TextMessageContent(:final body, :final formattedBody, :final format) || MessageContent content => switch (content) {
NoticeMessageContent(:final body, :final formattedBody, :final format) || TextMessageContent(:final body, :final formattedBody, :final format) ||
EmoteMessageContent(:final body, :final formattedBody, :final format) || NoticeMessageContent(
ImageMessageContent(:final body, :final formattedBody, :final format) || :final body,
VideoMessageContent(:final body, :final formattedBody, :final format) || :final formattedBody,
AudioMessageContent(:final body, :final formattedBody, :final format) || :final format,
FileMessageContent( ) ||
:final body, EmoteMessageContent(:final body, :final formattedBody, :final format) ||
:final formattedBody, ImageMessageContent(:final body, :final formattedBody, :final format) ||
:final format, VideoMessageContent(:final body, :final formattedBody, :final format) ||
) => Column( AudioMessageContent(:final body, :final formattedBody, :final format) ||
crossAxisAlignment: .start, FileMessageContent(
children: [ :final body,
format == .html && !textOnly :final formattedBody,
? Html( :final format,
roomId: event.roomId, ) => Column(
textStyle: textStyle, crossAxisAlignment: .start,
formattedBody!.replaceAllMapped( children: [
RegExp( format == .html && !textOnly
r"(<a\b[^>]*>.*?<\/a>)|(\bhttps?:\/\/[^\s<]+)", ? Html(
caseSensitive: false, roomId: event.roomId,
dotAll: true, textStyle: textStyle,
formattedBody!.replaceAllMapped(
RegExp(
r"(<a\b[^>]*>.*?<\/a>)|(\bhttps?:\/\/[^\s<]+)",
caseSensitive: false,
dotAll: true,
),
(m) {
// If it's already an <a> tag, leave it unchanged
if (m.group(1) != null) {
return m.group(1)!;
}
// Otherwise, wrap the bare URL
final url = m.group(2)!;
return "<a href=\"$url\">$url</a>";
},
), ),
(m) { )
// If it's already an <a> tag, leave it unchanged : LinkifiedText(
if (m.group(1) != null) { body.isEmpty ? content.filename ?? "" : body,
return m.group(1)!; style: textStyle,
} maxLines: maxLines,
// Otherwise, wrap the bare URL
final url = m.group(2)!;
return "<a href=\"$url\">$url</a>";
},
), ),
)
: LinkifiedText(body, style: textStyle, maxLines: maxLines),
if (!textOnly) ...[ if (!textOnly) ...[
if (event.content if (event.content
case ImageMessageContent(:final url) || case ImageMessageContent(:final url) ||
FileMessageContent(:final url) || FileMessageContent(:final url) ||
VideoMessageContent(:final url) || VideoMessageContent(:final url) ||
AudioMessageContent(:final url)) AudioMessageContent(:final url))
ConstrainedBox( ConstrainedBox(
constraints: .loose(.square(500)), constraints: .loose(.square(500)),
child: switch (event.content) { child: switch (event.content) {
VideoMessageContent(:final info, :final file) => VideoPlayer( VideoMessageContent(:final info, :final file) =>
url, VideoPlayer(url, info, encrypted: file != null),
info, AudioMessageContent(:final info, :final file) =>
encrypted: file != null, AudioPlayer(url, info, encrypted: file != null),
), FileMessageContent(:final info, :final filename) =>
AudioMessageContent(:final info, :final file) => AudioPlayer( FileCard(url, info, filename: filename),
url, ImageMessageContent(:final info, :final file) =>
info, MessageImage(url, info: info, encrypted: file != null),
_ => SizedBox.shrink(),
},
),
encrypted: file != null, if (event.lastEditRowId != 0)
), Text("(edited)", style: theme.textTheme.labelSmall),
FileMessageContent(:final info, :final filename) => FileCard(
url,
info,
filename: filename,
),
ImageMessageContent(:final info, :final file) => MessageImage(
url,
info: info,
encrypted: file != null,
),
_ => SizedBox.shrink(),
},
),
if (event.lastEditRowId != 0) if (linkify(body)
Text("(edited)", style: theme.textTheme.labelSmall), .firstWhereOrNull((element) => element is UrlElement)
case final UrlElement link?)
if (linkify(body) if (Uri.tryParse(link.url) case final Uri url?) UrlPreview(url),
.firstWhereOrNull((element) => element is UrlElement) ],
case final UrlElement link?)
if (Uri.tryParse(link.url) case final Uri url?) UrlPreview(url),
], ],
], ),
), LocationMessageContent(:final String? body) ||
MessageContent(:final body) => UnknownMessageContent(:final body) =>
body == null body == null
? Text("This message is redacted", style: errorStyle) ? Text("This message is redacted", style: errorStyle)
: Wrap( : Wrap(
spacing: 8, spacing: 8,
children: [ children: [
Text("Unknown message type:", style: errorStyle), Text("Unknown message type:", style: errorStyle),
Text(body), Text(body),
], ],
), ),
},
_ => throw Exception("This is impossible"), _ => throw Exception("This is impossible"),
}; };