From 6a18967baf0f6060ef24fb67665091c64bacf05b Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 24 Jun 2024 15:29:26 -0400 Subject: [PATCH] don't have unk langCode to analytics room, fallback to user's target language --- lib/pangea/controllers/my_analytics_controller.dart | 8 ++++++-- lib/pangea/widgets/igc/pangea_rich_text.dart | 7 ------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index f96f4096a..ea0d06c56 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:developer'; +import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/constants/pangea_event_types.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; @@ -256,9 +257,12 @@ class MyAnalyticsController extends BaseController { // sort those messages by their langCode // langCode is hopefully based on the original sent rep, but if that - // is null, it will be based on the user's current l2 + // is null or unk, it will be based on the user's current l2 for (final msg in recentMsgs) { - final String msgLangCode = msg.originalSent?.langCode ?? userL2; + final String msgLangCode = (msg.originalSent?.langCode != null && + msg.originalSent?.langCode != LanguageKeys.unknownLanguage) + ? msg.originalSent!.langCode + : userL2; langCodeToMsgs[msgLangCode] ??= []; langCodeToMsgs[msgLangCode]!.add(msg); } diff --git a/lib/pangea/widgets/igc/pangea_rich_text.dart b/lib/pangea/widgets/igc/pangea_rich_text.dart index d1a6c205b..bbd6868bf 100644 --- a/lib/pangea/widgets/igc/pangea_rich_text.dart +++ b/lib/pangea/widgets/igc/pangea_rich_text.dart @@ -2,7 +2,6 @@ import 'dart:developer'; import 'dart:ui'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/constants/language_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; @@ -191,12 +190,6 @@ class PangeaRichTextState extends State { : richText; } - bool get areLanguagesSet => - userL2LangCode != null && userL2LangCode != LanguageKeys.unknownLanguage; - - String? get userL2LangCode => - pangeaController.languageController.activeL2Code(); - Future onIgnore() async { debugPrint("PTODO implement onIgnore"); }