From 18ecb0008cc560779866f8149f389d7f1119c593 Mon Sep 17 00:00:00 2001 From: avashilling <165050625+avashilling@users.noreply.github.com> Date: Mon, 10 Nov 2025 12:17:28 -0500 Subject: [PATCH 1/2] add display name to activity summary --- .../activity_sessions/activity_room_extension.dart | 9 +++++++++ .../activity_summary/activity_summary_request_model.dart | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/lib/pangea/activity_sessions/activity_room_extension.dart b/lib/pangea/activity_sessions/activity_room_extension.dart index df5bc9fef..ebbb97b71 100644 --- a/lib/pangea/activity_sessions/activity_room_extension.dart +++ b/lib/pangea/activity_sessions/activity_room_extension.dart @@ -238,9 +238,17 @@ extension ActivityRoomExtension on Room { continue; } + final sender = getParticipants().firstWhereOrNull( + (user) => user.id == event.senderId, + ); + final displayName = sender?.calcDisplayname() ?? + event.senderId.localpart ?? + event.senderId; + final activityMessage = event.messageType == MessageTypes.Text ? ActivitySummaryResultsMessage( userId: event.senderId, + displayName: displayName, sent: pangeaMessage.originalSent?.text ?? event.body, written: pangeaMessage.originalWrittenContent, time: event.originServerTs, @@ -253,6 +261,7 @@ extension ActivityRoomExtension on Room { ) : ActivitySummaryResultsMessage( userId: event.senderId, + displayName: displayName, sent: pangeaMessage.getSpeechToTextLocal()!.transcript.text.trim(), written: diff --git a/lib/pangea/activity_summary/activity_summary_request_model.dart b/lib/pangea/activity_summary/activity_summary_request_model.dart index 0334be896..2979aba06 100644 --- a/lib/pangea/activity_summary/activity_summary_request_model.dart +++ b/lib/pangea/activity_summary/activity_summary_request_model.dart @@ -7,6 +7,7 @@ import 'package:fluffychat/pangea/activity_summary/activity_summary_response_mod class ActivitySummaryResultsMessage { final String userId; + final String displayName; final String sent; final String? written; final List tool; @@ -14,6 +15,7 @@ class ActivitySummaryResultsMessage { ActivitySummaryResultsMessage({ required this.userId, + required this.displayName, required this.sent, this.written, required this.tool, @@ -23,6 +25,7 @@ class ActivitySummaryResultsMessage { factory ActivitySummaryResultsMessage.fromJson(Map json) { return ActivitySummaryResultsMessage( userId: json['user_id'] as String, + displayName: json['display_name'] as String, sent: json['sent'] as String, written: json['written'] as String?, tool: (json['tool'] as List).map((e) => e as String).toList(), @@ -33,6 +36,7 @@ class ActivitySummaryResultsMessage { Map toJson() { return { 'user_id': userId, + 'display_name': displayName, 'sent': sent, if (written != null) 'written': written, 'tool': tool, From b06356f8c0703b8626dd92914f97817b7ed5a004 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Tue, 11 Nov 2025 14:01:59 -0500 Subject: [PATCH 2/2] client-side replacement --- .../activity_sessions/activity_room_extension.dart | 9 --------- .../activity_user_summaries_widget.dart | 6 +++++- .../activity_summary/activity_summary_request_model.dart | 4 ---- .../activity_summary_response_model.dart | 3 +++ 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/pangea/activity_sessions/activity_room_extension.dart b/lib/pangea/activity_sessions/activity_room_extension.dart index ebbb97b71..df5bc9fef 100644 --- a/lib/pangea/activity_sessions/activity_room_extension.dart +++ b/lib/pangea/activity_sessions/activity_room_extension.dart @@ -238,17 +238,9 @@ extension ActivityRoomExtension on Room { continue; } - final sender = getParticipants().firstWhereOrNull( - (user) => user.id == event.senderId, - ); - final displayName = sender?.calcDisplayname() ?? - event.senderId.localpart ?? - event.senderId; - final activityMessage = event.messageType == MessageTypes.Text ? ActivitySummaryResultsMessage( userId: event.senderId, - displayName: displayName, sent: pangeaMessage.originalSent?.text ?? event.body, written: pangeaMessage.originalWrittenContent, time: event.originServerTs, @@ -261,7 +253,6 @@ extension ActivityRoomExtension on Room { ) : ActivitySummaryResultsMessage( userId: event.senderId, - displayName: displayName, sent: pangeaMessage.getSpeechToTextLocal()!.transcript.text.trim(), written: diff --git a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart index 3a4e69884..959c404b7 100644 --- a/lib/pangea/activity_sessions/activity_user_summaries_widget.dart +++ b/lib/pangea/activity_sessions/activity_user_summaries_widget.dart @@ -159,7 +159,11 @@ class ButtonControlledCarouselView extends StatelessWidget { Flexible( child: SingleChildScrollView( child: Text( - p.feedback, + p.displayFeedback( + user?.calcDisplayname() ?? + p.participantId.localpart ?? + p.participantId, + ), style: const TextStyle(fontSize: 12.0), ), ), diff --git a/lib/pangea/activity_summary/activity_summary_request_model.dart b/lib/pangea/activity_summary/activity_summary_request_model.dart index 2979aba06..0334be896 100644 --- a/lib/pangea/activity_summary/activity_summary_request_model.dart +++ b/lib/pangea/activity_summary/activity_summary_request_model.dart @@ -7,7 +7,6 @@ import 'package:fluffychat/pangea/activity_summary/activity_summary_response_mod class ActivitySummaryResultsMessage { final String userId; - final String displayName; final String sent; final String? written; final List tool; @@ -15,7 +14,6 @@ class ActivitySummaryResultsMessage { ActivitySummaryResultsMessage({ required this.userId, - required this.displayName, required this.sent, this.written, required this.tool, @@ -25,7 +23,6 @@ class ActivitySummaryResultsMessage { factory ActivitySummaryResultsMessage.fromJson(Map json) { return ActivitySummaryResultsMessage( userId: json['user_id'] as String, - displayName: json['display_name'] as String, sent: json['sent'] as String, written: json['written'] as String?, tool: (json['tool'] as List).map((e) => e as String).toList(), @@ -36,7 +33,6 @@ class ActivitySummaryResultsMessage { Map toJson() { return { 'user_id': userId, - 'display_name': displayName, 'sent': sent, if (written != null) 'written': written, 'tool': tool, diff --git a/lib/pangea/activity_summary/activity_summary_response_model.dart b/lib/pangea/activity_summary/activity_summary_response_model.dart index 9954ad59a..497fa1846 100644 --- a/lib/pangea/activity_summary/activity_summary_response_model.dart +++ b/lib/pangea/activity_summary/activity_summary_response_model.dart @@ -29,6 +29,9 @@ class ParticipantSummaryModel { 'superlatives': superlatives, }; } + + String displayFeedback(String displayName) => + feedback.replaceAll(participantId, displayName); } class ActivitySummaryResponseModel {