ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1518 dont give hidden word activity for html formatted messages (#1520)

Browse source 
* fix: prevent hidden word activities for HTML formatted messages

* fix: add token highlighting for tokens with activities in HTML messages
This commit is contained in:
ggurdin 2025-01-22 12:00:30 -05:00 • committed by GitHub
parent 58cfbdeac9
commit a253809862
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/pages/chat/events/html_message.dart
View file

@ -14,6 +14,7 @@ import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
import 'package:fluffychat/pangea/toolbar/enums/activity_type_enum.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/mxc_image.dart';
import '../../../utils/url_launcher.dart';
@ -374,8 +375,26 @@ class TokenExtension extends HtmlExtension {
final selected =
token != null && isSelected != null ? isSelected!.call(token) : false;
final backgroundColor =
selected ? AppConfig.primaryColor.withAlpha(80) : Colors.transparent;
final shouldDo = token?.shouldDoActivity(
a: ActivityTypeEnum.wordMeaning,
feature: null,
tag: null,
) ??
false;
final didMeaningActivity = token?.didActivitySuccessfully(
ActivityTypeEnum.wordMeaning,
) ??
true;
Color backgroundColor = Colors.transparent;
if (selected) {
backgroundColor = AppConfig.primaryColor.withAlpha(80);
} else if (isSelected != null && shouldDo) {
backgroundColor = !didMeaningActivity
? AppConfig.success.withAlpha(60)
: AppConfig.gold.withAlpha(60);
}
return TextSpan(
recognizer: TapGestureRecognizer()

3
lib/pangea/analytics/controllers/message_analytics_controller.dart
View file

@ -254,7 +254,8 @@ class MessageAnalyticsController {
final bool includeHiddenWordActivities = !pangeaMessageEvent.ownMessage &&
pangeaMessageEvent.messageDisplayRepresentation?.tokens != null &&
pangeaMessageEvent.messageDisplayLangIsL2;
pangeaMessageEvent.messageDisplayLangIsL2 &&
!pangeaMessageEvent.event.isRichMessage;
_cache[key] = MessageAnalyticsEntry(
tokens: tokens,