Skip to content

Commit

Permalink
Merge pull request #1662 from nextcloud/fix/neon_talk/system-messages…
Browse files Browse the repository at this point in the history
…-previews-hide-user-name
  • Loading branch information
provokateurin authored Feb 27, 2024
2 parents 8c19800 + b518e61 commit 8b33f8d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 4 deletions.
10 changes: 6 additions & 4 deletions packages/neon/neon_talk/lib/src/widgets/message_preview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ class TalkMessagePreview extends StatelessWidget {
@override
Widget build(BuildContext context) {
String? actorName;
if (chatMessage.actorId == actorId) {
actorName = TalkLocalizations.of(context).actorSelf;
} else if (!roomType.isSingleUser) {
actorName = chatMessage.actorDisplayName;
if (chatMessage.messageType != spreed.MessageType.system.name) {
if (chatMessage.actorId == actorId) {
actorName = TalkLocalizations.of(context).actorSelf;
} else if (!roomType.isSingleUser) {
actorName = chatMessage.actorDisplayName;
}
}

return RichText(
Expand Down
22 changes: 22 additions & 0 deletions packages/neon/neon_talk/test/message_preview_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ void main() {
final chatMessage = MockChatMessage();
when(() => chatMessage.actorId).thenReturn('test');
when(() => chatMessage.message).thenReturn('message');
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment.name);

await tester.pumpWidget(
wrapWidget(
Expand All @@ -37,6 +38,7 @@ void main() {
when(() => chatMessage.actorId).thenReturn('test');
when(() => chatMessage.actorDisplayName).thenReturn('Test');
when(() => chatMessage.message).thenReturn('message');
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment.name);

await tester.pumpWidget(
wrapWidget(
Expand All @@ -54,6 +56,7 @@ void main() {
final chatMessage = MockChatMessage();
when(() => chatMessage.actorId).thenReturn('test');
when(() => chatMessage.message).thenReturn('message');
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment.name);

await tester.pumpWidget(
wrapWidget(
Expand All @@ -71,6 +74,7 @@ void main() {
final chatMessage = MockChatMessage();
when(() => chatMessage.actorId).thenReturn('test');
when(() => chatMessage.message).thenReturn('message');
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.comment.name);

await tester.pumpWidget(
wrapWidget(
Expand All @@ -83,4 +87,22 @@ void main() {
);
expect(find.text('message', findRichText: true), findsOne);
});

testWidgets('System', (tester) async {
final chatMessage = MockChatMessage();
when(() => chatMessage.actorId).thenReturn('test');
when(() => chatMessage.message).thenReturn('message');
when(() => chatMessage.messageType).thenReturn(spreed.MessageType.system.name);

await tester.pumpWidget(
wrapWidget(
TalkMessagePreview(
actorId: 'abc',
roomType: spreed.RoomType.group,
chatMessage: chatMessage,
),
),
);
expect(find.text('message', findRichText: true), findsOne);
});
}

0 comments on commit 8b33f8d

Please sign in to comment.