From f69ab79c9d7cdf36acb8c16964931b3f0c69d313 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Wed, 10 Jul 2024 16:55:52 -0400 Subject: [PATCH 1/9] made matrix profile save one json value instead of one value per field, added documentation to user controller and user model --- lib/pages/chat_list/space_view.dart | 6 +- .../controllers/alternative_translator.dart | 25 +- .../controllers/choreographer.dart | 9 +- .../widgets/it_feedback_card.dart | 14 +- lib/pangea/constants/local.key.dart | 8 - lib/pangea/constants/model_keys.dart | 6 + lib/pangea/controllers/class_controller.dart | 6 +- .../contextual_definition_controller.dart | 17 +- .../controllers/it_feedback_controller.dart | 11 +- .../language_detection_controller.dart | 16 +- lib/pangea/controllers/local_settings.dart | 34 -- .../message_analytics_controller.dart | 4 - .../controllers/message_data_controller.dart | 20 +- .../controllers/my_analytics_controller.dart | 5 - lib/pangea/controllers/pangea_controller.dart | 7 +- .../controllers/permissions_controller.dart | 35 +- .../speech_to_text_controller.dart | 14 +- .../controllers/subscription_controller.dart | 22 +- .../text_to_speech_controller.dart | 14 +- lib/pangea/controllers/user_controller.dart | 569 ++++++++---------- .../controllers/word_net_controller.dart | 19 +- .../pangea_message_event.dart | 19 +- lib/pangea/models/space_model.dart | 16 + lib/pangea/models/user_model.dart | 196 ++++-- .../pages/find_partner/find_partner.dart | 13 +- lib/pangea/pages/p_user_age/p_user_age.dart | 2 +- .../settings_learning_view.dart | 46 +- lib/pangea/utils/p_store.dart | 148 ++--- lib/pangea/widgets/chat/message_toolbar.dart | 9 +- .../chat/message_translation_card.dart | 10 +- lib/pangea/widgets/class/join_with_link.dart | 3 +- lib/pangea/widgets/igc/span_card.dart | 38 +- .../p_settings_switch_list_tile.dart | 35 +- lib/widgets/matrix.dart | 7 +- 34 files changed, 740 insertions(+), 663 deletions(-) delete mode 100644 lib/pangea/controllers/local_settings.dart diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart index f3f9749a1..b57e4bdd6 100644 --- a/lib/pages/chat_list/space_view.dart +++ b/lib/pages/chat_list/space_view.dart @@ -50,10 +50,7 @@ class _SpaceViewState extends State { final String _chatCountsKey = 'chatCounts'; Map get chatCounts => Map.from( - widget.controller.pangeaController.pStoreService.read( - _chatCountsKey, - local: true, - ) ?? + widget.controller.pangeaController.pStoreService.read(_chatCountsKey) ?? {}, ); // Pangea# @@ -550,7 +547,6 @@ class _SpaceViewState extends State { await widget.controller.pangeaController.pStoreService.save( _chatCountsKey, updatedChatCounts, - local: true, ); } diff --git a/lib/pangea/choreographer/controllers/alternative_translator.dart b/lib/pangea/choreographer/controllers/alternative_translator.dart index 4221a3479..ccba733e2 100644 --- a/lib/pangea/choreographer/controllers/alternative_translator.dart +++ b/lib/pangea/choreographer/controllers/alternative_translator.dart @@ -1,15 +1,14 @@ import 'dart:developer'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; - -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:http/http.dart' as http; - import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart'; import 'package:fluffychat/pangea/choreographer/controllers/error_service.dart'; import 'package:fluffychat/pangea/repo/full_text_translation_repo.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:http/http.dart' as http; + import '../../repo/similarity_repo.dart'; class AlternativeTranslator { @@ -90,9 +89,19 @@ class AlternativeTranslator { final String? goldRouteTranslation = choreographer.itController.goldRouteTracker.fullTranslation; + final accessToken = await choreographer.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + m: "accessToken null in setTranslationFeedback", + s: StackTrace.current, + ); + translationFeedbackKey = FeedbackKey.loadingPleaseWait; + return; + } + final FullTextTranslationResponseModel results = await FullTextTranslationRepo.translate( - accessToken: await choreographer.accessToken, + accessToken: accessToken, request: FullTextTranslationRequestModel( text: choreographer.itController.sourceText!, tgtLang: choreographer.l2LangCode!, @@ -118,7 +127,7 @@ class AlternativeTranslator { } similarityResponse = await SimilarityRepo.get( - accessToken: await choreographer.accessToken, + accessToken: accessToken, request: SimilarityRequestModel( benchmark: results.bestTranslation, toCompare: [userTranslation!], diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 24756f7a6..db317cd4e 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -407,7 +407,8 @@ class Choreographer { PangeaTextController get textController => _textController; - Future get accessToken => pangeaController.userController.accessToken; + Future get accessToken => + pangeaController.userController.accessToken; clear() { choreoMode = ChoreoMode.igc; @@ -514,11 +515,7 @@ class Choreographer { chatController.room, ); - bool get itAutoPlayEnabled => - pangeaController.pStoreService.read( - MatrixProfile.itAutoPlay.title, - ) ?? - false; + bool get itAutoPlayEnabled => MatrixProfile.itAutoPlay; bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( diff --git a/lib/pangea/choreographer/widgets/it_feedback_card.dart b/lib/pangea/choreographer/widgets/it_feedback_card.dart index 5424310a8..840843ed5 100644 --- a/lib/pangea/choreographer/widgets/it_feedback_card.dart +++ b/lib/pangea/choreographer/widgets/it_feedback_card.dart @@ -72,8 +72,18 @@ class ITFeedbackCardController extends State { setState(() { isTranslating = true; }); + + final String? accessToken = await controller.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + m: "Cannot translate feedback because accessToken is null", + ); + error = "Cannot translate feedback because accessToken is null"; + return; + } + FullTextTranslationRepo.translate( - accessToken: await controller.userController.accessToken, + accessToken: accessToken, request: FullTextTranslationRequestModel( text: res!.text, tgtLang: controller.languageController.userL1?.langCode ?? @@ -197,7 +207,7 @@ class TranslateButton extends StatelessWidget { return TextButton( onPressed: loading ? null : onPress, style: ButtonStyle( - backgroundColor: MaterialStateProperty.all( + backgroundColor: WidgetStateProperty.all( AppConfig.primaryColor.withOpacity(0.1), ), ), diff --git a/lib/pangea/constants/local.key.dart b/lib/pangea/constants/local.key.dart index 40dd393c5..b8c1a4f5d 100644 --- a/lib/pangea/constants/local.key.dart +++ b/lib/pangea/constants/local.key.dart @@ -1,16 +1,8 @@ class PLocalKey { static const String user = 'user'; - - static const String classes = 'classes'; - static const String cachedClassCodeToJoin = "cachedclasscodetojoin"; static const String beganWebPayment = "beganWebPayment"; - - // making this a random string so that it's harder to guess - static const String activatedTrialKey = '7C4EuKIsph'; static const String dismissedPaywall = 'dismissedPaywall'; static const String paywallBackoff = 'paywallBackoff'; - static const String autoPlayMessages = 'autoPlayMessages'; - static const String itAutoPlay = 'itAutoPlay'; static const String messagesSinceUpdate = 'messagesSinceLastUpdate'; } diff --git a/lib/pangea/constants/model_keys.dart b/lib/pangea/constants/model_keys.dart index 372e72606..08164d9f6 100644 --- a/lib/pangea/constants/model_keys.dart +++ b/lib/pangea/constants/model_keys.dart @@ -17,6 +17,12 @@ class ModelKey { static const String publicProfile = 'public'; static const String userId = 'user_id'; + // matrix profile keys + // making this a random string so that it's harder to guess + static const String activatedTrialKey = '7C4EuKIsph'; + static const String autoPlayMessages = 'autoPlayMessages'; + static const String itAutoPlay = 'itAutoPlay'; + static const String clientClassCity = "city"; static const String clientClassCountry = "country"; static const String clientClassDominantLanguage = "dominantLanguage"; diff --git a/lib/pangea/controllers/class_controller.dart b/lib/pangea/controllers/class_controller.dart index 64a8340ae..5fa59622d 100644 --- a/lib/pangea/controllers/class_controller.dart +++ b/lib/pangea/controllers/class_controller.dart @@ -48,15 +48,13 @@ class ClassController extends BaseController { Future checkForClassCodeAndSubscription(BuildContext context) async { final String? classCode = _pangeaController.pStoreService.read( PLocalKey.cachedClassCodeToJoin, - addClientIdToKey: false, - local: true, + isAccountData: false, ); if (classCode != null) { await _pangeaController.pStoreService.delete( PLocalKey.cachedClassCodeToJoin, - addClientIdToKey: false, - local: true, + isAccountData: false, ); await joinClasswithCode( context, diff --git a/lib/pangea/controllers/contextual_definition_controller.dart b/lib/pangea/controllers/contextual_definition_controller.dart index c13a428b8..ecc08a234 100644 --- a/lib/pangea/controllers/contextual_definition_controller.dart +++ b/lib/pangea/controllers/contextual_definition_controller.dart @@ -1,12 +1,11 @@ import 'dart:convert'; -import 'package:flutter/foundation.dart'; - import 'package:collection/collection.dart'; -import 'package:http/http.dart'; - import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:flutter/foundation.dart'; +import 'package:http/http.dart'; + import '../constants/model_keys.dart'; import '../network/requests.dart'; import '../network/urls.dart'; @@ -50,9 +49,17 @@ class ContextualDefinitionController { ContextualDefinitionRequestModel request, ) async { try { + final accessToken = await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in contextual definition controller", + s: StackTrace.current, + ); + return null; + } final ContextualDefinitionResponseModel res = await _ContextualDefinitionRepo.define( - await _pangeaController.userController.accessToken, + accessToken, request, ); return res; diff --git a/lib/pangea/controllers/it_feedback_controller.dart b/lib/pangea/controllers/it_feedback_controller.dart index ffef9123f..c2cd96cad 100644 --- a/lib/pangea/controllers/it_feedback_controller.dart +++ b/lib/pangea/controllers/it_feedback_controller.dart @@ -51,8 +51,17 @@ class ITFeedbackController { ITFeedbackRequestModel request, ) async { try { + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in it feedback controller", + s: StackTrace.current, + ); + return null; + } final ITFeedbackResponseModel res = await _ITFeedbackRepo.get( - await _pangeaController.userController.accessToken, + accessToken, request, ); return res; diff --git a/lib/pangea/controllers/language_detection_controller.dart b/lib/pangea/controllers/language_detection_controller.dart index a3e07b0a3..5ba0f8879 100644 --- a/lib/pangea/controllers/language_detection_controller.dart +++ b/lib/pangea/controllers/language_detection_controller.dart @@ -6,6 +6,7 @@ import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/language_detection_model.dart'; import 'package:fluffychat/pangea/network/urls.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:http/http.dart' as http; import '../network/requests.dart'; @@ -125,7 +126,7 @@ class LanguageDetectionController { _cacheClearTimer?.cancel(); } - Future detectLanguage( + Future detectLanguage( String fullText, String? userL2, String? userL1, @@ -138,14 +139,23 @@ class LanguageDetectionController { return get(params); } - Future get( + Future get( LanguageDetectionRequest params, ) async { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in language detection controller", + s: StackTrace.current, + ); + return null; + } final Future response = _fetchResponse( - await _pangeaController.userController.accessToken, + accessToken, params, ); _cache[params] = _LanguageDetectionCacheItem(data: response); diff --git a/lib/pangea/controllers/local_settings.dart b/lib/pangea/controllers/local_settings.dart deleted file mode 100644 index 95b88ae14..000000000 --- a/lib/pangea/controllers/local_settings.dart +++ /dev/null @@ -1,34 +0,0 @@ -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/models/space_model.dart'; - -class LocalSettings { - late PangeaController _pangeaController; - - LocalSettings(PangeaController pangeaController) : super() { - _pangeaController = pangeaController; - } - - bool userLanguageToolSetting(ToolSetting setting) { - final profileSetting = - _pangeaController.pStoreService.read(setting.toString()); - if (profileSetting != null) { - return profileSetting; - } - return setting == ToolSetting.immersionMode ? false : true; - } - - // bool get userEnableIT => - // _pangeaController.pStoreService.read(ToolSetting.interactiveTranslator.toString()) ?? true; - - // bool get userEnableIGC => - // _pangeaController.pStoreService.read(ToolSetting.interactiveGrammar.toString()) ?? true; - - // bool get userImmersionMode => - // _pangeaController.pStoreService.read(ToolSetting.immersionMode.toString()) ?? true; - - // bool get userTranslationsTool => - // _pangeaController.pStoreService.read(ToolSetting.translations.toString()) ?? true; - - // bool get userDefinitionsTool => - // _pangeaController.pStoreService.read(ToolSetting.definitions.toString()) ?? true; -} diff --git a/lib/pangea/controllers/message_analytics_controller.dart b/lib/pangea/controllers/message_analytics_controller.dart index 3739b2596..f58a56698 100644 --- a/lib/pangea/controllers/message_analytics_controller.dart +++ b/lib/pangea/controllers/message_analytics_controller.dart @@ -42,7 +42,6 @@ class AnalyticsController extends BaseController { try { final String? str = _pangeaController.pStoreService.read( _analyticsTimeSpanKey, - local: true, ); return str != null ? TimeSpan.values.firstWhere((e) { @@ -60,7 +59,6 @@ class AnalyticsController extends BaseController { await _pangeaController.pStoreService.save( _analyticsTimeSpanKey, timeSpan.toString(), - local: true, ); setState(); } @@ -72,7 +70,6 @@ class AnalyticsController extends BaseController { try { final String? str = _pangeaController.pStoreService.read( _analyticsSpaceLangKey, - local: true, ); return str != null ? PangeaLanguage.byLangCode(str) @@ -88,7 +85,6 @@ class AnalyticsController extends BaseController { await _pangeaController.pStoreService.save( _analyticsSpaceLangKey, lang.langCode, - local: true, ); setState(); } diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index 7b3a3e6d2..7ad3a748f 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -44,6 +44,14 @@ class MessageDataController extends BaseController { ) async { final accessToken = await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in _getTokens", + s: StackTrace.current, + ); + return null; + } + final TokensResponseModel igcTextData = await TokensRepo.tokenize(accessToken, req); @@ -193,9 +201,19 @@ class MessageDataController extends BaseController { ); try { + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in _getPangeaRepresentation", + s: StackTrace.current, + ); + return null; + } + final FullTextTranslationResponseModel res = await FullTextTranslationRepo.translate( - accessToken: await _pangeaController.userController.accessToken, + accessToken: accessToken, request: req, ); diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index f7017ad0e..058bad359 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -121,7 +121,6 @@ class MyAnalyticsController { _pangeaController.pStoreService.save( PLocalKey.messagesSinceUpdate, currentCache, - local: true, ); } @@ -155,7 +154,6 @@ class MyAnalyticsController { _pangeaController.pStoreService.save( PLocalKey.messagesSinceUpdate, [], - local: true, ); } @@ -167,14 +165,12 @@ class MyAnalyticsController { Logs().d('Reading messages since update from local storage'); final dynamic locallySaved = _pangeaController.pStoreService.read( PLocalKey.messagesSinceUpdate, - local: true, ); if (locallySaved == null) { Logs().d('No locally saved messages found, initializing empty list.'); _pangeaController.pStoreService.save( PLocalKey.messagesSinceUpdate, [], - local: true, ); return []; } @@ -201,7 +197,6 @@ class MyAnalyticsController { _pangeaController.pStoreService.save( PLocalKey.messagesSinceUpdate, [], - local: true, ); return []; } diff --git a/lib/pangea/controllers/pangea_controller.dart b/lib/pangea/controllers/pangea_controller.dart index 7fbf91fd0..7e24fa955 100644 --- a/lib/pangea/controllers/pangea_controller.dart +++ b/lib/pangea/controllers/pangea_controller.dart @@ -9,7 +9,6 @@ import 'package:fluffychat/pangea/controllers/contextual_definition_controller.d import 'package:fluffychat/pangea/controllers/language_controller.dart'; import 'package:fluffychat/pangea/controllers/language_detection_controller.dart'; import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; -import 'package:fluffychat/pangea/controllers/local_settings.dart'; import 'package:fluffychat/pangea/controllers/message_data_controller.dart'; import 'package:fluffychat/pangea/controllers/my_analytics_controller.dart'; import 'package:fluffychat/pangea/controllers/permissions_controller.dart'; @@ -47,7 +46,6 @@ class PangeaController { late AnalyticsController analytics; late MyAnalyticsController myAnalytics; late WordController wordNet; - late LocalSettings localSettings; late MessageDataController messageData; late ContextualDefinitionController definitions; late ITFeedbackController itFeedback; @@ -60,7 +58,7 @@ class PangeaController { late PracticeGenerationController practiceGenerationController; ///store Services - late PLocalStore pStoreService; + late PStore pStoreService; final pLanguageStore = PangeaLanguage(); ///Matrix Variables @@ -89,10 +87,9 @@ class PangeaController { /// Initialize controllers _addRefInObjects() { - pStoreService = PLocalStore(pangeaController: this); + pStoreService = PStore(pangeaController: this); userController = UserController(this); languageController = LanguageController(this); - localSettings = LocalSettings(this); classController = ClassController(this); permissionsController = PermissionsController(this); analytics = AnalyticsController(this); diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index 363accf8e..3932eb7d2 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -31,14 +31,11 @@ class PermissionsController extends BaseController { } /// Returns false if user is null - bool isUser18() { - final dob = _pangeaController.pStoreService.read( - MatrixProfile.dateOfBirth.title, - ); - return dob != null - ? DateTime.parse(dob).isAtLeastYearsOld(AgeLimits.toAccessFeatures) - : false; - } + bool isUser18() => + MatrixProfile.dateOfBirth?.isAtLeastYearsOld( + AgeLimits.toAccessFeatures, + ) ?? + false; /// A user can private chat if /// 1) they are 18 and outside a class context or @@ -99,18 +96,32 @@ class PermissionsController extends BaseController { return classPermission == 0; } - bool userToolSetting(ToolSetting setting) => - _pangeaController.localSettings.userLanguageToolSetting(setting); + bool userToolSetting(MatrixProfileEnum setting) { + switch (setting.asToolSetting) { + case ToolSetting.interactiveTranslator: + return MatrixProfile.interactiveTranslator; + case ToolSetting.interactiveGrammar: + return MatrixProfile.interactiveGrammar; + case ToolSetting.immersionMode: + return MatrixProfile.immersionMode; + case ToolSetting.definitions: + return MatrixProfile.definitions; + case ToolSetting.autoIGC: + return MatrixProfile.autoIGC; + default: + return false; + } + } bool isToolEnabled(ToolSetting setting, Room? room) { if (room?.isSpaceAdmin ?? false) { - return userToolSetting(setting); + return userToolSetting(setting.asMatrixProfileField); } final int? classPermission = room != null ? classLanguageToolPermission(room, setting) : 1; if (classPermission == 0) return false; if (classPermission == 2) return true; - return userToolSetting(setting); + return userToolSetting(setting.asMatrixProfileField); } bool isWritingAssistanceEnabled(Room? room) { diff --git a/lib/pangea/controllers/speech_to_text_controller.dart b/lib/pangea/controllers/speech_to_text_controller.dart index 67462bcef..3daeada07 100644 --- a/lib/pangea/controllers/speech_to_text_controller.dart +++ b/lib/pangea/controllers/speech_to_text_controller.dart @@ -44,7 +44,7 @@ class SpeechToTextController { _cacheClearTimer?.cancel(); } - Future get( + Future get( SpeechToTextRequestModel requestModel, ) async { final int cacheKey = requestModel.hashCode; @@ -52,8 +52,18 @@ class SpeechToTextController { if (_cache.containsKey(cacheKey)) { return _cache[cacheKey]!.data; } else { + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: 'null accessToken in speech to text controller', + s: StackTrace.current, + ); + return null; + } + final Future response = _fetchResponse( - accessToken: await _pangeaController.userController.accessToken, + accessToken: accessToken, requestModel: requestModel, ); _cache[cacheKey] = _SpeechToTextCacheItem(data: response); diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index 36e965137..9e5d59b05 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -97,12 +97,10 @@ class SubscriptionController extends BaseController { } else { final bool? beganWebPayment = _pangeaController.pStoreService.read( PLocalKey.beganWebPayment, - local: true, ); if (beganWebPayment ?? false) { await _pangeaController.pStoreService.delete( PLocalKey.beganWebPayment, - local: true, ); if (_pangeaController.subscriptionController.isSubscribed) { subscriptionStream.add(true); @@ -142,7 +140,6 @@ class SubscriptionController extends BaseController { await _pangeaController.pStoreService.save( PLocalKey.beganWebPayment, true, - local: true, ); setState(); launchUrlString( @@ -184,18 +181,12 @@ class SubscriptionController extends BaseController { bool get _activatedNewUserTrial => _pangeaController.userController.inTrialWindow && - (_pangeaController.pStoreService.read( - MatrixProfile.activatedFreeTrial.title, - ) ?? - false); + MatrixProfile.activatedFreeTrial; void activateNewUserTrial() { - _pangeaController.pStoreService - .save( - MatrixProfile.activatedFreeTrial.title, - true, - ) - .then((_) { + MatrixProfile.saveProfileData({ + MatrixProfileEnum.activatedFreeTrial.title: true, + }).then((_) { setNewUserTrial(); trialActivationStream.add(true); }); @@ -242,7 +233,6 @@ class SubscriptionController extends BaseController { DateTime? get _lastDismissedPaywall { final lastDismissed = _pangeaController.pStoreService.read( PLocalKey.dismissedPaywall, - local: true, ); if (lastDismissed == null) return null; return DateTime.tryParse(lastDismissed); @@ -251,7 +241,6 @@ class SubscriptionController extends BaseController { int? get _paywallBackoff { final backoff = _pangeaController.pStoreService.read( PLocalKey.paywallBackoff, - local: true, ); if (backoff == null) return null; return backoff; @@ -269,20 +258,17 @@ class SubscriptionController extends BaseController { await _pangeaController.pStoreService.save( PLocalKey.dismissedPaywall, DateTime.now().toString(), - local: true, ); if (_paywallBackoff == null) { await _pangeaController.pStoreService.save( PLocalKey.paywallBackoff, 1, - local: true, ); } else { await _pangeaController.pStoreService.save( PLocalKey.paywallBackoff, _paywallBackoff! + 1, - local: true, ); } } diff --git a/lib/pangea/controllers/text_to_speech_controller.dart b/lib/pangea/controllers/text_to_speech_controller.dart index b34092618..b00fa23a4 100644 --- a/lib/pangea/controllers/text_to_speech_controller.dart +++ b/lib/pangea/controllers/text_to_speech_controller.dart @@ -6,6 +6,7 @@ import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/network/urls.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:http/http.dart'; import '../network/requests.dart'; @@ -93,14 +94,23 @@ class TextToSpeechController { _cacheClearTimer?.cancel(); } - Future get( + Future get( TextToSpeechRequest params, ) async { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in text to speech controller", + s: StackTrace.current, + ); + return null; + } final Future response = _fetchResponse( - await _pangeaController.userController.accessToken, + accessToken, params, ); _cache[params] = _TextToSpeechCacheItem(data: response); diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 873397969..fa72e6b58 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -5,7 +5,7 @@ import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:flutter/material.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:jwt_decode/jwt_decode.dart'; import 'package:matrix/matrix.dart' as matrix; @@ -13,14 +13,44 @@ import '../constants/local.key.dart'; import '../models/user_model.dart'; import '../repo/user_repo.dart'; +/// Controller that manages saving and reading of user/profile information class UserController extends BaseController { late PangeaController _pangeaController; - final Completer _completer = Completer(); UserController(PangeaController pangeaController) : super() { _pangeaController = pangeaController; } - Future createPangeaUser({required String dob}) async { + /// Convenience function that returns the user ID currently stored in the client. + String? get userId => _pangeaController.matrixState.client.userID; + + /// Convenience function that returns the accessToken currently stored in the client. + String? get _matrixAccessToken => + _pangeaController.matrixState.client.accessToken; + + /// Returns the [PUserModel] object representing the current user. + /// + /// This method retrieves the user data from the local storage using the [PLocalKey.user] key. + /// If the data exists, it is converted to a [PUserModel] object using the [PUserModel.fromJson] method. + /// If the data is null, indicating that the user is not logged in (or that + /// profile fetching has not yet completed, or had an error), null is returned. + PUserModel? get userModel { + final data = _pangeaController.pStoreService.read(PLocalKey.user); + return data != null ? PUserModel.fromJson(data) : null; + } + + /// Creates a user pangea chat profile, saves the user's profile information + /// locally, and set the user's DOB in their matrix profile. + /// + /// The [dob] parameter is required and represents the date of birth of the user. + /// This method creates a new [PUserModel] using the [PUserRepo.repoCreatePangeaUser] method, + /// and saves the user model in local storage. + /// It also updates the user's matrix profile using the [updateMatrixProfile] method. + Future createProfile({required String dob}) async { + if (userId == null || _matrixAccessToken == null) { + ErrorHandler.logError( + e: "calling createProfile with userId == null or matrixAccessToken == null", + ); + } final PUserModel newUserModel = await PUserRepo.repoCreatePangeaUser( userID: userId!, fullName: fullname, @@ -28,139 +58,167 @@ class UserController extends BaseController { matrixAccessToken: _matrixAccessToken!, ); newUserModel.save(_pangeaController); - await updateMatrixProfile(dateOfBirth: dob); + await MatrixProfile.saveProfileData( + {MatrixProfileEnum.dateOfBirth.title: dob}, + waitForDataInSync: true, + ); } + /// A boolean flag indicating whether the profile data is currently being fetched. + bool _isFetching = false; + + /// A completer for the profile model of a user. + Completer _profileCompleter = Completer(); + + /// Fetches the user model. + /// + /// This method retrieves the user model asynchronously. If the profile completer is already completed, + /// it returns the future value of the completer. If the user model is currently being fetched, + /// it waits for the completion of the completer and returns the future value. Otherwise, it sets + /// the fetching flag, fetches the user model, completes the profile completer with the fetched user model, + /// and returns the future value of the completer. + /// + /// Returns the future value of the user model completer. Future fetchUserModel() async { - try { - if (_matrixAccessToken == null) { - throw Exception( - "calling fetchUserModel with matrixAccesstoken == null", - ); - } - - final PUserModel? newUserModel = await PUserRepo.fetchPangeaUserInfo( - userID: userId!, - matrixAccessToken: _matrixAccessToken!, - ); - newUserModel?.save(_pangeaController); - await migrateMatrixProfile(); - _completeCompleter(); - - return newUserModel; - } catch (err) { - debugPrint( - "User model not found. Probably first signup and needs Pangea account", - ); - rethrow; + if (_profileCompleter.isCompleted) return _profileCompleter.future; + if (_isFetching) { + await _profileCompleter.future; + return _profileCompleter.future; } + + _isFetching = true; + PUserModel? fetchedUserModel; + + try { + fetchedUserModel = await _fetchUserModel(); + } catch (err, s) { + ErrorHandler.logError(e: err, s: s); + return null; + } + + _isFetching = false; + _profileCompleter.complete(fetchedUserModel); + return _profileCompleter.future; } - dynamic migratedProfileInfo(MatrixProfile key) { - final dynamic localValue = _pangeaController.pStoreService.read( - key.title, - local: true, + /// Fetches the user model asynchronously. + /// + /// This method fetches the user model by calling the [fetchPangeaUserInfo] method + /// from the [PUserRepo] class. It requires the [_matrixAccessToken] and [userId] + /// to be non-null. If either of them is null, an error is logged. + /// + /// The fetched [newUserModel] is then saved locally. + /// The [migrateMatrixProfile] method is called, to migrate any information that is + /// already saved in the user's pangea profile but is not yet saved in the + /// user's matrix profile. Finally, the [newUserModel] is returned. + Future _fetchUserModel() async { + if (_matrixAccessToken == null || userId == null) { + ErrorHandler.logError( + e: "calling fetchUserModel with userId == null or matrixAccessToken == null", + ); + return null; + } + final PUserModel? newUserModel = await PUserRepo.fetchPangeaUserInfo( + userID: userId!, + matrixAccessToken: _matrixAccessToken!, ); - final dynamic matrixValue = _pangeaController.pStoreService.read( - key.title, - ); - return localValue != null && matrixValue != localValue ? localValue : null; + newUserModel?.save(_pangeaController); + await migrateMatrixProfile(); + return newUserModel; } + /// Reinitializes the user's profile + /// + /// This method sets up the necessary variables and fetches the user model. + /// It completes the [_profileCompleter] with the fetched user model. + /// This method should be called whenever the user's login status changes + Future reinitialize() async { + _profileCompleter = Completer(); + _isFetching = false; + await fetchUserModel(); + } + + /// Migrates the user's profile from Pangea to Matrix. + /// + /// This method retrieves the user's profile / local settings information from Pangea and checks for corresponding information stored in Matrix. + /// If any of the profile fields in Pangea have information, but the corresponding fields in Matrix are null, the values are updated in Matrix. + /// The profile fields that are checked for migration include date of birth, creation date, target language, source language, country, and public profile. + /// Additionally, several profile settings related to auto play, trial activation, interactive features, and instructional messages are also checked for migration. + /// + /// This method calls the [updateMatrixProfile] method to update the user's profile in Matrix with the migrated values. + /// + /// Note: This method assumes that the [userModel] and [_pangeaController] instances are properly initialized before calling this method. Future migrateMatrixProfile() async { + // This function relies on the client's account data being loaded. + // The account data is loaded during + // the first sync, so wait for that to complete. + final client = _pangeaController.matrixState.client; + if (client.prevBatch == null) { + await client.onSync.stream.first; + } + + final Map profileUpdates = {}; final Profile? pangeaProfile = userModel?.profile; - final String? pangeaDob = pangeaProfile?.dateOfBirth; - final String? matrixDob = _pangeaController.pStoreService.read( - ModelKey.userDateOfBirth, - ); - final String? dob = - pangeaDob != null && matrixDob != pangeaDob ? pangeaDob : null; + for (final field in MatrixProfile.pangeaProfileFields) { + final dynamic matrixValue = MatrixProfile.getProfileData(field); + dynamic pangeaValue; + switch (field) { + case MatrixProfileEnum.dateOfBirth: + pangeaValue = pangeaProfile?.dateOfBirth; + break; + case MatrixProfileEnum.createdAt: + pangeaValue = pangeaProfile?.createdAt; + break; + case MatrixProfileEnum.targetLanguage: + pangeaValue = pangeaProfile?.targetLanguage; + break; + case MatrixProfileEnum.sourceLanguage: + pangeaValue = pangeaProfile?.sourceLanguage; + break; + case MatrixProfileEnum.country: + pangeaValue = pangeaProfile?.country; + break; + case MatrixProfileEnum.publicProfile: + pangeaValue = pangeaProfile?.publicProfile; + break; + default: + break; + } + if (pangeaValue != null && matrixValue == null) { + profileUpdates[field.title] = pangeaValue; + } + } - final pangeaCreatedAt = pangeaProfile?.createdAt; - final matrixCreatedAt = _pangeaController.pStoreService.read( - MatrixProfile.createdAt.title, - ); - final String? createdAt = - pangeaCreatedAt != null && matrixCreatedAt != pangeaCreatedAt - ? pangeaCreatedAt - : null; + for (final value in MatrixProfileEnum.values) { + if (profileUpdates.containsKey(value.title)) continue; + final dynamic localValue = + _pangeaController.pStoreService.read(value.title); + final dynamic matrixValue = MatrixProfile.getProfileData(value); + final dynamic unmigratedValue = + localValue != null && matrixValue == null ? localValue : null; + if (unmigratedValue != null) { + profileUpdates[value.title] = unmigratedValue; + } + } - final String? pangeaTargetLanguage = pangeaProfile?.targetLanguage; - final String? matrixTargetLanguage = _pangeaController.pStoreService.read( - MatrixProfile.targetLanguage.title, - ); - final String? targetLanguage = pangeaTargetLanguage != null && - matrixTargetLanguage != pangeaTargetLanguage - ? pangeaTargetLanguage - : null; - - final String? pangeaSourceLanguage = pangeaProfile?.sourceLanguage; - final String? matrixSourceLanguage = _pangeaController.pStoreService.read( - MatrixProfile.sourceLanguage.title, - ); - final String? sourceLanguage = pangeaSourceLanguage != null && - matrixSourceLanguage != pangeaSourceLanguage - ? pangeaSourceLanguage - : null; - - final String? pangeaCountry = pangeaProfile?.country; - final String? matrixCountry = _pangeaController.pStoreService.read( - MatrixProfile.country.title, - ); - final String? country = - pangeaCountry != null && matrixCountry != pangeaCountry - ? pangeaCountry - : null; - - final bool? pangeaPublicProfile = pangeaProfile?.publicProfile; - final bool? matrixPublicProfile = _pangeaController.pStoreService.read( - MatrixProfile.publicProfile.title, - ); - final bool? publicProfile = pangeaPublicProfile != null && - matrixPublicProfile != pangeaPublicProfile - ? pangeaPublicProfile - : null; - - final bool? autoPlay = migratedProfileInfo(MatrixProfile.autoPlayMessages); - final bool? itAutoPlay = migratedProfileInfo(MatrixProfile.itAutoPlay); - final bool? trial = migratedProfileInfo(MatrixProfile.activatedFreeTrial); - final bool? interactiveTranslator = - migratedProfileInfo(MatrixProfile.interactiveTranslator); - final bool? interactiveGrammar = - migratedProfileInfo(MatrixProfile.interactiveGrammar); - final bool? immersionMode = - migratedProfileInfo(MatrixProfile.immersionMode); - final bool? definitions = migratedProfileInfo(MatrixProfile.definitions); - // final bool? translations = migratedProfileInfo(MatrixProfile.translations); - final bool? showItInstructions = - migratedProfileInfo(MatrixProfile.showedItInstructions); - final bool? showClickMessage = - migratedProfileInfo(MatrixProfile.showedClickMessage); - final bool? showBlurMeansTranslate = - migratedProfileInfo(MatrixProfile.showedBlurMeansTranslate); - - await updateMatrixProfile( - dateOfBirth: dob, - autoPlayMessages: autoPlay, - itAutoPlay: itAutoPlay, - activatedFreeTrial: trial, - interactiveTranslator: interactiveTranslator, - interactiveGrammar: interactiveGrammar, - immersionMode: immersionMode, - definitions: definitions, - // translations: translations, - showedItInstructions: showItInstructions, - showedClickMessage: showClickMessage, - showedBlurMeansTranslate: showBlurMeansTranslate, - createdAt: createdAt, - targetLanguage: targetLanguage, - sourceLanguage: sourceLanguage, - country: country, - publicProfile: publicProfile, + await MatrixProfile.saveProfileData( + profileUpdates, + waitForDataInSync: true, ); } + /// Updates the user's profile with the provided information. + /// + /// The [dateOfBirth] parameter is the new date of birth for the user. + /// The [targetLanguage] parameter is the new target language for the user. + /// The [sourceLanguage] parameter is the new source language for the user. + /// The [country] parameter is the new country for the user. + /// The [interests] parameter is a list of new interests for the user. + /// The [speaks] parameter is a list of new languages the user speaks. + /// The [publicProfile] parameter indicates whether the user's profile should be public or not. + /// + /// Throws an error if [userModel] or [accessToken] is null. Future updateUserProfile({ String? dateOfBirth, String? targetLanguage, @@ -170,7 +228,14 @@ class UserController extends BaseController { List? speaks, bool? publicProfile, }) async { - if (userModel == null) throw Exception("Local userModel not defined"); + final String? accessToken = await this.accessToken; + if (userModel == null || accessToken == null) { + ErrorHandler.logError( + e: "calling updateUserProfile with userModel == null or accessToken == null", + ); + return; + } + final profileJson = userModel!.profile!.toJson(); if (dateOfBirth != null) { @@ -194,230 +259,95 @@ class UserController extends BaseController { if (publicProfile != null) { profileJson[ModelKey.publicProfile] = publicProfile; } + final Profile updatedUserProfile = await PUserRepo.updateUserProfile( Profile.fromJson(profileJson), - await accessToken, + accessToken, ); PUserModel( - access: await accessToken, + access: accessToken, refresh: userModel!.refresh, profile: updatedUserProfile, ).save(_pangeaController); - await updateMatrixProfile( - dateOfBirth: dateOfBirth, - targetLanguage: targetLanguage, - sourceLanguage: sourceLanguage, - country: country, - publicProfile: publicProfile, - ); - } - - PUserModel? get userModel { - final data = _pangeaController.pStoreService.read( - PLocalKey.user, - local: true, - ); - return data != null ? PUserModel.fromJson(data) : null; - } - - Future updateMatrixProfile({ - String? dateOfBirth, - bool? autoPlayMessages, - bool? itAutoPlay, - bool? activatedFreeTrial, - bool? interactiveTranslator, - bool? interactiveGrammar, - bool? immersionMode, - bool? definitions, - // bool? translations, - bool? showedItInstructions, - bool? showedClickMessage, - bool? showedBlurMeansTranslate, - bool? showedTooltipInstructions, - String? createdAt, - String? targetLanguage, - String? sourceLanguage, - String? country, - bool? publicProfile, - }) async { - if (dateOfBirth != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.dateOfBirth.title, - dateOfBirth, - ); - } - if (autoPlayMessages != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.autoPlayMessages.title, - autoPlayMessages, - ); - } - if (itAutoPlay != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.itAutoPlay.title, - itAutoPlay, - ); - } - if (activatedFreeTrial != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.activatedFreeTrial.title, - activatedFreeTrial, - ); - } - if (interactiveTranslator != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.interactiveTranslator.title, - interactiveTranslator, - ); - } - if (interactiveGrammar != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.interactiveGrammar.title, - interactiveGrammar, - ); - } - if (immersionMode != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.immersionMode.title, - immersionMode, - ); - } - if (definitions != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.definitions.title, - definitions, - ); - } - // if (translations != null) { - // await _pangeaController.pStoreService.save( - // MatrixProfile.translations.title, - // translations, - // ); - // } - if (showedItInstructions != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.showedItInstructions.title, - showedItInstructions, - ); - } - if (showedClickMessage != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.showedClickMessage.title, - showedClickMessage, - ); - } - if (showedBlurMeansTranslate != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.showedBlurMeansTranslate.title, - showedBlurMeansTranslate, - ); - } - if (showedTooltipInstructions != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.showedTooltipInstructions.title, - showedTooltipInstructions, - ); - } - if (createdAt != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.createdAt.title, - createdAt, - ); - } - if (targetLanguage != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.targetLanguage.title, - targetLanguage, - ); - } - if (sourceLanguage != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.sourceLanguage.title, - sourceLanguage, - ); - } - if (country != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.country.title, - country, - ); - } - if (publicProfile != null) { - await _pangeaController.pStoreService.save( - MatrixProfile.publicProfile.title, - publicProfile, - ); - } - } - - void _completeCompleter() { - if (!_completer.isCompleted) { - _completer.complete(null); - } - } - - Future get completer async { - if (await isPUserDataAvailable) { - _completeCompleter(); - } - return _completer; + MatrixProfile.saveProfileData({ + MatrixProfileEnum.dateOfBirth.title: dateOfBirth, + MatrixProfileEnum.targetLanguage.title: targetLanguage, + MatrixProfileEnum.sourceLanguage.title: sourceLanguage, + MatrixProfileEnum.country.title: country, + MatrixProfileEnum.publicProfile.title: publicProfile, + }); } + /// Returns a boolean value indicating whether a new JWT (JSON Web Token) is needed. + /// It checks if the `userModel` has a non-null `access` token and if the token is expired using the `Jwt.isExpired()` method. + /// If the `userModel` is null or the `access` token is null, it returns true indicating that a new JWT is needed. bool get needNewJWT => userModel?.access != null ? Jwt.isExpired(userModel!.access) : true; - Future get accessToken async { - await (await completer).future; - // if userModel null or access token expired then fetchUserModel + /// Retrieves the access token for the user. + /// + /// If the locally stored user model is null or the access token has + /// expired, it fetches the user model. + /// If the user model is still null after fetching, an error is logged. + /// + /// Returns the access token as a string, or null if the user model is null. + Future get accessToken async { final PUserModel? useThisOne = needNewJWT ? await fetchUserModel() : userModel; if (useThisOne == null) { - //debugger(when: kDebugMode); - throw Exception("trying to get accessToken with userModel = null"); + ErrorHandler.logError( + e: "trying to get accessToken with userModel = null", + ); } - return useThisOne.access; + return useThisOne?.access; } - String? get userId { - return _pangeaController.matrixState.client.userID; - } - - String get fullname { - final String? userID = userId; - if (userID == null) { - throw Exception('User ID not found'); + /// Returns the full name of the user. + /// If the [userId] is null, an error will be logged and null will be returned. + /// The full name is obtained by extracting the substring before the first occurrence of ":" in the [userId] + /// and then replacing all occurrences of "@" with an empty string. + String? get fullname { + if (userId == null) { + ErrorHandler.logError( + e: "calling fullname with userId == null", + ); + return null; } - return userID.substring(0, userID.indexOf(":")).replaceAll("@", ""); + return userId!.substring(0, userId!.indexOf(":")).replaceAll("@", ""); } + /// Checks if the user data is available. + /// Returns a [Future] that completes with a [bool] value + /// indicating whether the user data is available or not. Future get isPUserDataAvailable async { try { final PUserModel? toCheck = userModel ?? (await fetchUserModel()); - return toCheck != null ? true : false; - } catch (err) { + return toCheck != null; + } catch (err, s) { + ErrorHandler.logError(e: err, s: s); return false; } } + /// Checks if user data is available and the date of birth is set. + /// Returns a [Future] that completes with a [bool] value indicating + /// whether the user data is available and the date of birth is set. Future get isUserDataAvailableAndDateOfBirthSet async { try { - final client = _pangeaController.matrixState.client; - if (client.prevBatch == null) { - await client.onSync.stream.first; - } + // the function fetchUserModel() uses a completer, so it shouldn't + // re-call the endpoint if it has already been called await fetchUserModel(); - final localAccountData = _pangeaController.pStoreService.read( - ModelKey.userDateOfBirth, - ); - return localAccountData != null; - } catch (err) { + return MatrixProfile.dateOfBirth != null; + } catch (err, s) { + ErrorHandler.logError(e: err, s: s); return false; } } + /// Returns a boolean value indicating whether the user is currently in the trial window. bool get inTrialWindow { final String? createdAt = userModel?.profile?.createdAt; if (createdAt == null) { @@ -428,6 +358,14 @@ class UserController extends BaseController { ); } + /// Checks if the user's languages are set. + /// Returns a [Future] that completes with a [bool] value + /// indicating whether the user's languages are set. + /// + /// A user's languages are considered set if the source and target languages + /// are not null, not empty, and not equal to the [LanguageKeys.unknownLanguage] constant. + /// + /// If an error occurs during the process, it logs the error and returns `false`. Future get areUserLanguagesSet async { try { final PUserModel? toCheck = userModel ?? (await fetchUserModel()); @@ -442,18 +380,29 @@ class UserController extends BaseController { tgtLang.isNotEmpty && srcLang != LanguageKeys.unknownLanguage && tgtLang != LanguageKeys.unknownLanguage; - } catch (err) { + } catch (err, s) { + ErrorHandler.logError(e: err, s: s); return false; } } - String? get _matrixAccessToken => - _pangeaController.matrixState.client.accessToken; - + /// Returns a boolean value indicating whether the user's profile is public. bool get isPublic => _pangeaController.userController.userModel?.profile?.publicProfile ?? false; + /// Retrieves the user's email address. + /// + /// This method fetches the user's email address by making a request to the + /// Matrix server. It uses the `_pangeaController` instance to access the + /// Matrix client and retrieve the account's third-party identifiers. It then + /// filters the identifiers to find the first one with the medium set to + /// `ThirdPartyIdentifierMedium.email`. Finally, it returns the email address + /// associated with the identifier, or `null` if no email address is found. + /// + /// Returns: + /// - The user's email address as a [String], or `null` if no email address + /// is found. Future get userEmail async { final List? identifiers = await _pangeaController.matrixState.client.getAccount3PIDs(); diff --git a/lib/pangea/controllers/word_net_controller.dart b/lib/pangea/controllers/word_net_controller.dart index a67941465..43d1a66b0 100644 --- a/lib/pangea/controllers/word_net_controller.dart +++ b/lib/pangea/controllers/word_net_controller.dart @@ -1,8 +1,9 @@ import 'package:collection/collection.dart'; -import 'package:http/http.dart' as http; - import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/repo/word_repo.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:http/http.dart' as http; + import '../models/word_data_model.dart'; import 'base_controller.dart'; import 'pangea_controller.dart'; @@ -31,7 +32,7 @@ class WordController extends BaseController { ), ); - Future getWordDataGlobal({ + Future getWordDataGlobal({ required String word, required String fullText, required String? userL1, @@ -53,8 +54,18 @@ class WordController extends BaseController { if (local != null) return local; + final String? accessToken = + await _pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in word controller", + s: StackTrace.current, + ); + return null; + } + final WordData remote = await WordRepo.getWordNetData( - accessToken: await _pangeaController.userController.accessToken, + accessToken: accessToken, fullText: fullText, word: word, userL1: userL1, diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart index 334c0fa78..06f34cf1f 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart @@ -88,7 +88,7 @@ class PangeaMessageEvent { return _latestEdit; } - Future getMatrixAudioFile( + Future getMatrixAudioFile( String langCode, BuildContext context, ) async { @@ -102,11 +102,15 @@ class PangeaMessageEvent { langCode: langCode, ); - final TextToSpeechResponse response = + final TextToSpeechResponse? response = await MatrixState.pangeaController.textToSpeech.get( params, ); + if (response == null) { + return null; + } + final audioBytes = base64.decode(response.audioContent); final eventIdParam = _event.eventId; final fileName = @@ -177,10 +181,13 @@ class PangeaMessageEvent { langCode: langCode, ); - final TextToSpeechResponse response = + final TextToSpeechResponse? response = await MatrixState.pangeaController.textToSpeech.get( params, ); + if (response == null) { + return null; + } final audioBytes = base64.decode(response.audioContent); @@ -323,7 +330,7 @@ class PangeaMessageEvent { debugPrint("mimeType ${matrixFile.mimeType}"); debugPrint("encoding ${mimeTypeToAudioEncoding(matrixFile.mimeType)}"); - final SpeechToTextModel response = + final SpeechToTextModel? response = await MatrixState.pangeaController.speechToText.get( SpeechToTextRequestModel( audioContent: matrixFile.bytes, @@ -339,6 +346,10 @@ class PangeaMessageEvent { ), ); + if (response == null) { + return null; + } + _representations?.add( RepresentationEvent( timeline: timeline, diff --git a/lib/pangea/models/space_model.dart b/lib/pangea/models/space_model.dart index 946da6dc7..fae097ee0 100644 --- a/lib/pangea/models/space_model.dart +++ b/lib/pangea/models/space_model.dart @@ -1,5 +1,6 @@ import 'dart:developer'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -309,4 +310,19 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.autoIGCToolDescription; } } + + MatrixProfileEnum get asMatrixProfileField { + switch (this) { + case ToolSetting.interactiveTranslator: + return MatrixProfileEnum.interactiveTranslator; + case ToolSetting.interactiveGrammar: + return MatrixProfileEnum.interactiveGrammar; + case ToolSetting.immersionMode: + return MatrixProfileEnum.immersionMode; + case ToolSetting.definitions: + return MatrixProfileEnum.definitions; + case ToolSetting.autoIGC: + return MatrixProfileEnum.autoIGC; + } + } } diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 3e3a508cd..af7de1ee5 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -1,22 +1,18 @@ -import 'dart:convert'; - import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/enum/instructions_enum.dart'; import 'package:fluffychat/pangea/models/space_model.dart'; +import 'package:fluffychat/widgets/matrix.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import 'package:matrix/matrix.dart'; import '../constants/language_constants.dart'; import 'language_model.dart'; -PUserModel pUserModelFromJson(String str) => - PUserModel.fromJson(json.decode(str)); - -String pUserModelToJson(PUserModel data) => json.encode(data.toJson()); - class PUserModel { String access; String refresh; @@ -46,12 +42,12 @@ class PUserModel { await pangeaController.pStoreService.save( PLocalKey.user, toJson(), - local: true, ); } } -enum MatrixProfile { +/// A list of all the fields in the user profile saved to matrix +enum MatrixProfileEnum { dateOfBirth, autoPlayMessages, itAutoPlay, @@ -60,7 +56,6 @@ enum MatrixProfile { interactiveGrammar, immersionMode, definitions, - // translations, showedItInstructions, showedClickMessage, showedBlurMeansTranslate, @@ -73,49 +68,182 @@ enum MatrixProfile { autoIGC, } -extension MatrixProfileExtension on MatrixProfile { +extension MatrixProfileEnumExtension on MatrixProfileEnum { String get title { switch (this) { - case MatrixProfile.dateOfBirth: + case MatrixProfileEnum.dateOfBirth: return ModelKey.userDateOfBirth; - case MatrixProfile.autoPlayMessages: - return PLocalKey.autoPlayMessages; - case MatrixProfile.itAutoPlay: - return PLocalKey.itAutoPlay; - case MatrixProfile.activatedFreeTrial: - return PLocalKey.activatedTrialKey; - case MatrixProfile.interactiveTranslator: + case MatrixProfileEnum.autoPlayMessages: + return ModelKey.autoPlayMessages; + case MatrixProfileEnum.itAutoPlay: + return ModelKey.itAutoPlay; + case MatrixProfileEnum.activatedFreeTrial: + return ModelKey.activatedTrialKey; + case MatrixProfileEnum.interactiveTranslator: return ToolSetting.interactiveTranslator.toString(); - case MatrixProfile.interactiveGrammar: + case MatrixProfileEnum.interactiveGrammar: return ToolSetting.interactiveGrammar.toString(); - case MatrixProfile.immersionMode: + case MatrixProfileEnum.immersionMode: return ToolSetting.immersionMode.toString(); - case MatrixProfile.definitions: + case MatrixProfileEnum.definitions: return ToolSetting.definitions.toString(); - // case MatrixProfile.translations: - // return ToolSetting.translations.toString(); - case MatrixProfile.autoIGC: + case MatrixProfileEnum.autoIGC: return ToolSetting.autoIGC.toString(); - case MatrixProfile.showedItInstructions: + case MatrixProfileEnum.showedItInstructions: return InstructionsEnum.itInstructions.toString(); - case MatrixProfile.showedClickMessage: + case MatrixProfileEnum.showedClickMessage: return InstructionsEnum.clickMessage.toString(); - case MatrixProfile.showedBlurMeansTranslate: + case MatrixProfileEnum.showedBlurMeansTranslate: return InstructionsEnum.blurMeansTranslate.toString(); - case MatrixProfile.showedTooltipInstructions: + case MatrixProfileEnum.showedTooltipInstructions: return InstructionsEnum.tooltipInstructions.toString(); - case MatrixProfile.createdAt: + case MatrixProfileEnum.createdAt: return ModelKey.userCreatedAt; - case MatrixProfile.targetLanguage: + case MatrixProfileEnum.targetLanguage: return ModelKey.l2LanguageKey; - case MatrixProfile.sourceLanguage: + case MatrixProfileEnum.sourceLanguage: return ModelKey.l1LanguageKey; - case MatrixProfile.country: + case MatrixProfileEnum.country: return ModelKey.userCountry; - case MatrixProfile.publicProfile: + case MatrixProfileEnum.publicProfile: return ModelKey.publicProfile; } } + + ToolSetting? get asToolSetting { + switch (this) { + case MatrixProfileEnum.interactiveTranslator: + return ToolSetting.interactiveTranslator; + case MatrixProfileEnum.interactiveGrammar: + return ToolSetting.interactiveGrammar; + case MatrixProfileEnum.immersionMode: + return ToolSetting.immersionMode; + case MatrixProfileEnum.definitions: + return ToolSetting.definitions; + case MatrixProfileEnum.autoIGC: + return ToolSetting.autoIGC; + default: + return null; + } + } +} + +/// A wrapper around the matrix account data for the user profile. +/// Enables easy access to the profile data and saving new data. +/// The matrix profile doesn't function exactly the same as a 'model', +/// since all the data here is already stored in the client as account +/// data, and duplicating that data could lead to some inconsistenies. +/// So this class is more of a helper class to make it easier to +/// access and save the data. +class MatrixProfile { + /// Returns the profile of the user. + /// + /// The profile is retrieved from the `MatrixState.pangeaController.matrixState.client.accountData` + /// using the key `ModelKey.userProfile`. It returns a `Map` object + /// representing the user's profile information. + static Map? get profile => MatrixState.pangeaController + .matrixState.client.accountData[ModelKey.userProfile]?.content; + + static dynamic getProfileData(MatrixProfileEnum key) => profile?[key.title]; + + /// Saves the profile data by updating the current user's profile with the provided updates. + /// + /// The [updates] parameter is a map containing the key-value pairs of the profile fields to be updated. + /// Only non-null values in the [updates] map will be applied to the current profile. + /// + /// If the updated profile is equal to the current profile, no changes will be made. + /// + /// If [waitForDataInSync] is true, the function will wait for the updated data in a sync update + /// If this is set to false, after this function completes there may be a gap where the + /// data has been sent but is not in the client's account data, as the sync update has not yet been received. + static Future saveProfileData( + Map updates, { + waitForDataInSync = false, + }) async { + final currentProfile = toJson(); + for (final entry in updates.entries) { + if (entry.value == null) continue; + currentProfile[entry.key] = entry.value; + } + if (mapEquals(MatrixProfile.toJson(), currentProfile)) return; + + final PangeaController pangeaController = MatrixState.pangeaController; + final Client client = pangeaController.matrixState.client; + + final List profileKeys = + MatrixProfileEnum.values.map((e) => e.title).toList(); + + Future? waitForUpdate; + if (waitForDataInSync) { + waitForUpdate = client.onSync.stream.firstWhere( + (sync) => + sync.accountData != null && + sync.accountData!.any( + (event) => event.content.keys.any((k) => profileKeys.contains(k)), + ), + ); + } + await client.setAccountData( + client.userID!, + ModelKey.userProfile, + currentProfile, + ); + if (waitForDataInSync) await waitForUpdate; + } + + /// Converts the Matrix Profile to a JSON representation. + static Map toJson() { + final Map json = {}; + for (final value in MatrixProfileEnum.values) { + json[value.title] = getProfileData(value); + } + return json; + } + + // below are some convenience methods for accessing the profile data + // getProfileData could be used directly, but these methods reduce the + // need for repeating the same code (like parsing DateTimes or + // assigning default values to null booleans) when accessing specific values. + + static DateTime? get dateOfBirth { + final dob = getProfileData(MatrixProfileEnum.dateOfBirth); + return dob != null ? DateTime.parse(dob) : null; + } + + static bool get autoPlayMessages => + getProfileData(MatrixProfileEnum.autoPlayMessages) ?? false; + static bool get itAutoPlay => + getProfileData(MatrixProfileEnum.itAutoPlay) ?? false; + static bool get activatedFreeTrial => + getProfileData(MatrixProfileEnum.activatedFreeTrial) ?? false; + static bool get interactiveTranslator => + getProfileData(MatrixProfileEnum.interactiveTranslator) ?? true; + static bool get interactiveGrammar => + getProfileData(MatrixProfileEnum.interactiveGrammar) ?? true; + static bool get immersionMode => + getProfileData(MatrixProfileEnum.immersionMode) ?? false; + static bool get definitions => + getProfileData(MatrixProfileEnum.definitions) ?? true; + static bool get autoIGC => getProfileData(MatrixProfileEnum.autoIGC) ?? false; + + /// A list of all the fields in MatrixProfileEnum that correspond to tool settings + static List get toolSettings => [ + MatrixProfileEnum.interactiveTranslator, + MatrixProfileEnum.interactiveGrammar, + MatrixProfileEnum.immersionMode, + MatrixProfileEnum.definitions, + MatrixProfileEnum.autoIGC, + ]; + + /// A list of all the fields in MatrixProfileEnum that correspond to pangea profile values + static List pangeaProfileFields = [ + MatrixProfileEnum.dateOfBirth, + MatrixProfileEnum.createdAt, + MatrixProfileEnum.targetLanguage, + MatrixProfileEnum.sourceLanguage, + MatrixProfileEnum.country, + MatrixProfileEnum.publicProfile, + ]; } class Profile { diff --git a/lib/pangea/pages/find_partner/find_partner.dart b/lib/pangea/pages/find_partner/find_partner.dart index f2bd7e8c1..44274a608 100644 --- a/lib/pangea/pages/find_partner/find_partner.dart +++ b/lib/pangea/pages/find_partner/find_partner.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; +import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/material.dart'; import '../../../widgets/matrix.dart'; @@ -91,9 +92,19 @@ class FindPartnerController extends State { if (loading || nextUrl == null) return; setState(() => loading = true); + final String? accessToken = + await pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in find partner controller", + s: StackTrace.current, + ); + return; + } + final UserProfileSearchResponse response = await PUserRepo.searchUserProfiles( - accessToken: await pangeaController.userController.accessToken, + accessToken: accessToken, targetLanguage: targetLanguageSearch.langCode, sourceLanguage: sourceLanguageSearch.langCode, country: countrySearch, diff --git a/lib/pangea/pages/p_user_age/p_user_age.dart b/lib/pangea/pages/p_user_age/p_user_age.dart index 54e98ab94..adb060e38 100644 --- a/lib/pangea/pages/p_user_age/p_user_age.dart +++ b/lib/pangea/pages/p_user_age/p_user_age.dart @@ -88,7 +88,7 @@ class PUserAgeController extends State { final String date = DateFormat('yyyy-MM-dd').format(selectedDate!); if (pangeaController.userController.userModel?.access == null) { - await pangeaController.userController.createPangeaUser(dob: date); + await pangeaController.userController.createProfile(dob: date); } else { await pangeaController.userController.updateUserProfile( dateOfBirth: date, diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 191bd76db..8198e70dc 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -1,5 +1,5 @@ -import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/models/space_model.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/user_settings/country_picker_tile.dart'; @@ -52,34 +52,30 @@ class SettingsLearningView extends StatelessWidget { ListTile( subtitle: Text(L10n.of(context)!.toggleToolSettingsDescription), ), - for (final setting in ToolSetting.values) - PSettingsSwitchListTile.adaptive( - defaultValue: controller.pangeaController.localSettings - .userLanguageToolSetting(setting), - title: setting.toolName(context), - subtitle: setting.toolDescription(context), - pStoreKey: setting.toString(), - local: false, - ), - PSettingsSwitchListTile.adaptive( - defaultValue: controller.pangeaController.pStoreService.read( - PLocalKey.itAutoPlay, - ) ?? - false, - title: L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, + for (final setting in MatrixProfile.toolSettings) + setting.asToolSetting != null + ? ProfileSettingsSwitchListTile.adaptive( + defaultValue: controller + .pangeaController.permissionsController + .userToolSetting(setting), + title: setting.asToolSetting!.toolName(context), + subtitle: + setting.asToolSetting!.toolDescription(context), + profileKey: setting.asToolSetting!.asMatrixProfileField, + ) + : const SizedBox(), + ProfileSettingsSwitchListTile.adaptive( + defaultValue: MatrixProfile.itAutoPlay, + title: + L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, subtitle: L10n.of(context)!.interactiveTranslatorAutoPlayDesc, - pStoreKey: PLocalKey.itAutoPlay, - local: false, + profileKey: MatrixProfileEnum.itAutoPlay, ), - PSettingsSwitchListTile.adaptive( - defaultValue: controller.pangeaController.pStoreService.read( - PLocalKey.autoPlayMessages, - ) ?? - false, + ProfileSettingsSwitchListTile.adaptive( + defaultValue: MatrixProfile.autoPlayMessages, title: L10n.of(context)!.autoPlayTitle, subtitle: L10n.of(context)!.autoPlayDesc, - pStoreKey: PLocalKey.autoPlayMessages, - local: false, + profileKey: MatrixProfileEnum.autoPlayMessages, ), ], ), diff --git a/lib/pangea/utils/p_store.dart b/lib/pangea/utils/p_store.dart index f92e41176..0dfe0d5cd 100644 --- a/lib/pangea/utils/p_store.dart +++ b/lib/pangea/utils/p_store.dart @@ -1,133 +1,71 @@ import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:get_storage/get_storage.dart'; -import 'package:matrix/matrix.dart'; -class PLocalStore { +/// Utility to save and read data both in the matrix profile (this is the default +/// behavior) and in the local storage (local needs to be specificied). An +/// instance of this class is created in the PangeaController. +class PStore { final GetStorage _box = GetStorage(); final PangeaController pangeaController; - PLocalStore({required this.pangeaController}); + PStore({required this.pangeaController}); - /// save data in local + /// Saves the provided [data] with the specified [key] in the local storage. + /// + /// By default, the [data] is considered as account data, but you can set + /// [isAccountData] to false if it's not account-related data. + /// + /// Example usage: + /// ```dart + /// await save('user', {'name': 'John Doe', 'age': 25}); + /// ``` Future save( String key, dynamic data, { - bool addClientIdToKey = true, - bool local = false, + bool isAccountData = true, }) async { - local - ? await saveLocal( - key, - data, - addClientIdToKey: addClientIdToKey, - ) - : await saveProfile(key, data); + await _box.write(_key(key, isAccountData: isAccountData), data); } - /// fetch data from local - dynamic read( - String key, { - bool addClientIdToKey = true, - local = false, - }) { - return local - ? readLocal( - key, - addClientIdToKey: addClientIdToKey, - ) - : readProfile(key); - } - - /// delete data from local - Future delete( - String key, { - bool addClientIdToKey = true, - local = false, - }) async { - return local - ? deleteLocal( - key, - addClientIdToKey: addClientIdToKey, - ) - : deleteProfile(key); - } - - /// save data in local - Future saveLocal( - String key, - dynamic data, { - bool addClientIdToKey = true, - }) async { - await _box.write(_key(key, addClientIdToKey: addClientIdToKey), data); - } - - Future saveProfile( - String key, - dynamic data, - ) async { - final waitForAccountSync = - pangeaController.matrixState.client.onSync.stream.firstWhere( - (sync) => - sync.accountData != null && - sync.accountData!.any( - (event) => event.content.keys.any( - (k) => k == key, - ), - ), - ); - await pangeaController.matrixState.client.setAccountData( - pangeaController.matrixState.client.userID!, - key, - {key: data}, - ); - await waitForAccountSync; - await pangeaController.matrixState.client.onSyncStatus.stream.firstWhere( - (syncStatus) => syncStatus.status == SyncStatus.finished, - ); - } - - /// fetch data from local - dynamic readLocal(String key, {bool addClientIdToKey = true}) { + /// Reads the value associated with the given [key] from the local store. + /// + /// If [isAccountData] is true, tries to find key assosiated with the logged in user. + /// Otherwise, it is read from the general store. + /// + /// Returns the value associated with the [key], or + /// null if the user ID is null or value hasn't been set. + dynamic read(String key, {bool isAccountData = true}) { return pangeaController.matrixState.client.userID != null - ? _box.read(_key(key, addClientIdToKey: addClientIdToKey)) + ? _box.read(_key(key, isAccountData: isAccountData)) : null; } - dynamic readProfile(String key) { - try { - return pangeaController.matrixState.client.accountData[key]?.content[key]; - } catch (err) { - ErrorHandler.logError(e: err); - return null; - } - } - - /// delete data from local - Future deleteLocal(String key, {bool addClientIdToKey = true}) async { + /// Deletes the value associated with the given [key] from the local store. + /// + /// If [isAccountData] is true (default), will try to use key assosiated with the logged in user's ID + /// + /// Returns a [Future] that completes when the value is successfully deleted. + /// If the user is not logged in, the value will not be deleted and the [Future] will complete with null. + Future delete(String key, {bool isAccountData = true}) async { return pangeaController.matrixState.client.userID != null - ? _box.remove(_key(key, addClientIdToKey: addClientIdToKey)) + ? _box.remove(_key(key, isAccountData: isAccountData)) : null; } - Future deleteProfile(key) async { - return pangeaController.matrixState.client.userID != null - ? pangeaController.matrixState.client.setAccountData( - pangeaController.matrixState.client.userID!, - key, - {key: null}, - ) - : null; - } - - _key(String key, {bool addClientIdToKey = true}) { - return addClientIdToKey + /// Returns the key for storing data in the pangea store. + /// + /// The [key] parameter represents the base key for the data. + /// The [isAccountData] parameter indicates whether the data is account-specific. + /// If [isAccountData] is true, the account-specific key is returned by appending the user ID to the base key. + /// If [isAccountData] is false, the base key is returned as is. + String _key(String key, {bool isAccountData = true}) { + return isAccountData ? pangeaController.matrixState.client.userID! + key : key; } - /// clear all local storage - clearStorage() { + /// Clears the storage by erasing all data in the box. + void clearStorage() { _box.erase(); } } diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart index 8d2d66b7d..ad38e688d 100644 --- a/lib/pangea/widgets/chat/message_toolbar.dart +++ b/lib/pangea/widgets/chat/message_toolbar.dart @@ -3,9 +3,9 @@ import 'dart:developer'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; -import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/enum/message_mode_enum.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; @@ -329,17 +329,12 @@ class MessageToolbarState extends State { }); WidgetsBinding.instance.addPostFrameCallback((timeStamp) { - final bool autoplay = MatrixState.pangeaController.pStoreService.read( - PLocalKey.autoPlayMessages, - ) ?? - false; - if (widget.pangeaMessageEvent.isAudioMessage) { updateMode(MessageMode.speechToText); return; } - autoplay + MatrixProfile.autoPlayMessages ? updateMode(MessageMode.textToSpeech) : updateMode(MessageMode.translation); }); diff --git a/lib/pangea/widgets/chat/message_translation_card.dart b/lib/pangea/widgets/chat/message_translation_card.dart index fd80df134..9ee15faf7 100644 --- a/lib/pangea/widgets/chat/message_translation_card.dart +++ b/lib/pangea/widgets/chat/message_translation_card.dart @@ -58,9 +58,17 @@ class MessageTranslationCardState extends State { } oldSelectedText = widget.selection.selectedText; - final String accessToken = + final String? accessToken = await MatrixState.pangeaController.userController.accessToken; + if (accessToken == null) { + ErrorHandler.logError( + e: "null accessToken in translateSelection", + s: StackTrace.current, + ); + return; + } + final resp = await FullTextTranslationRepo.translate( accessToken: accessToken, request: FullTextTranslationRequestModel( diff --git a/lib/pangea/widgets/class/join_with_link.dart b/lib/pangea/widgets/class/join_with_link.dart index 804c9b991..a20f7f1e1 100644 --- a/lib/pangea/widgets/class/join_with_link.dart +++ b/lib/pangea/widgets/class/join_with_link.dart @@ -43,8 +43,7 @@ class _JoinClassWithLinkState extends State { await _pangeaController.pStoreService.save( PLocalKey.cachedClassCodeToJoin, classCode, - addClientIdToKey: false, - local: true, + isAccountData: false, ); context.go("/home"); }); diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 2960d229c..823de6914 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -1,9 +1,9 @@ import 'dart:developer'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/bot_style.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/match_copy.dart'; @@ -154,21 +154,18 @@ class WordMatchContent extends StatelessWidget { .selected = true; controller.setState( - () => ( - controller.currentExpression = - controller - .widget - .scm - .choreographer - .igc - .igcTextData - !.matches[controller.widget.scm.matchIndex] - .match - .choices![index] - .isBestCorrection + () => (controller.currentExpression = controller + .widget + .scm + .choreographer + .igc + .igcTextData! + .matches[controller.widget.scm.matchIndex] + .match + .choices![index] + .isBestCorrection ? BotExpression.gold - : BotExpression.surprised - ), + : BotExpression.surprised), ); // if (controller.widget.scm.pangeaMatch.match.choices![index].type == // SpanChoiceType.distractor) { @@ -510,12 +507,11 @@ class DontShowSwitchListTileState extends State { activeColor: AppConfig.activeToggleColor, title: Text(L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader), value: switchValue, - onChanged: (value) => { - widget.controller.pStoreService.save( - PLocalKey.itAutoPlay.toString(), - value, - ), - setState(() => switchValue = value), + onChanged: (value) { + MatrixProfile.saveProfileData( + {MatrixProfileEnum.itAutoPlay.title: value}, + ); + setState(() => switchValue = value); }, ); } diff --git a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart index 4c3e77599..85dbb7e36 100644 --- a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart +++ b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart @@ -1,37 +1,34 @@ import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; -class PSettingsSwitchListTile extends StatefulWidget { +class ProfileSettingsSwitchListTile extends StatefulWidget { final bool defaultValue; - final String pStoreKey; + final MatrixProfileEnum profileKey; final String title; final String? subtitle; - final bool local; - const PSettingsSwitchListTile.adaptive({ + const ProfileSettingsSwitchListTile.adaptive({ super.key, this.defaultValue = false, - required this.pStoreKey, + required this.profileKey, required this.title, this.subtitle, - this.local = false, }); @override PSettingsSwitchListTileState createState() => PSettingsSwitchListTileState(); } -class PSettingsSwitchListTileState extends State { +class PSettingsSwitchListTileState + extends State { bool currentValue = true; @override void initState() { - currentValue = MatrixState.pangeaController.pStoreService.read( - widget.pStoreKey, - local: widget.local, + currentValue = MatrixProfile.getProfileData( + widget.profileKey, ) ?? widget.defaultValue; super.initState(); @@ -39,7 +36,6 @@ class PSettingsSwitchListTileState extends State { @override Widget build(BuildContext context) { - final PangeaController pangeaController = MatrixState.pangeaController; return SwitchListTile.adaptive( value: currentValue, title: Text(widget.title), @@ -47,20 +43,17 @@ class PSettingsSwitchListTileState extends State { subtitle: widget.subtitle != null ? Text(widget.subtitle!) : null, onChanged: (bool newValue) async { try { - await pangeaController.pStoreService.save( - widget.pStoreKey, - newValue, - local: widget.local, - ); - currentValue = newValue; + MatrixProfile.saveProfileData({ + widget.profileKey.title: newValue, + }); + setState(() => currentValue = newValue); } catch (err, s) { ErrorHandler.logError( e: err, - m: "Failed to updates user setting ${widget.pStoreKey}", + m: "Failed to updates user setting ${widget.profileKey.title}", s: s, ); } - setState(() {}); }, ); } diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 5c11d17ba..0f85950ff 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -342,8 +342,11 @@ class MatrixState extends State with WidgetsBindingObserver { } else { // #Pangea if (state == LoginState.loggedIn) { - await (await pangeaController.userController.completer).future; - await pangeaController.subscriptionController.reinitialize(); + final futures = [ + pangeaController.userController.reinitialize(), + pangeaController.subscriptionController.reinitialize(), + ]; + await Future.wait(futures); } String routeDestination; if (state == LoginState.loggedIn) { From 6ab62e2effa7a371b6e88acdaf86f0edd4cd5df8 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 11 Jul 2024 10:02:53 -0400 Subject: [PATCH 2/9] added functionality to look for data in the only matrix format if it's missing in the new format, make matrixProfile an instance member of userController --- .../controllers/choreographer.dart | 4 +- .../controllers/permissions_controller.dart | 15 +++-- .../controllers/subscription_controller.dart | 4 +- lib/pangea/controllers/user_controller.dart | 21 ++++--- lib/pangea/models/user_model.dart | 56 +++++++++++++------ .../settings_learning_view.dart | 6 +- lib/pangea/widgets/chat/message_toolbar.dart | 3 +- lib/pangea/widgets/igc/span_card.dart | 3 +- .../p_settings_switch_list_tile.dart | 7 ++- 9 files changed, 75 insertions(+), 44 deletions(-) diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index db317cd4e..973a89747 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -14,7 +14,6 @@ import 'package:fluffychat/pangea/models/it_step.dart'; import 'package:fluffychat/pangea/models/representation_content_model.dart'; import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/pangea/models/tokens_event_content_model.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; @@ -515,7 +514,8 @@ class Choreographer { chatController.room, ); - bool get itAutoPlayEnabled => MatrixProfile.itAutoPlay; + bool get itAutoPlayEnabled => + pangeaController.userController.matrixProfile.itAutoPlay; bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index 3932eb7d2..463a8c9a3 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -32,7 +32,8 @@ class PermissionsController extends BaseController { /// Returns false if user is null bool isUser18() => - MatrixProfile.dateOfBirth?.isAtLeastYearsOld( + _pangeaController.userController.matrixProfile.dateOfBirth + ?.isAtLeastYearsOld( AgeLimits.toAccessFeatures, ) ?? false; @@ -99,15 +100,17 @@ class PermissionsController extends BaseController { bool userToolSetting(MatrixProfileEnum setting) { switch (setting.asToolSetting) { case ToolSetting.interactiveTranslator: - return MatrixProfile.interactiveTranslator; + return _pangeaController + .userController.matrixProfile.interactiveTranslator; case ToolSetting.interactiveGrammar: - return MatrixProfile.interactiveGrammar; + return _pangeaController + .userController.matrixProfile.interactiveGrammar; case ToolSetting.immersionMode: - return MatrixProfile.immersionMode; + return _pangeaController.userController.matrixProfile.immersionMode; case ToolSetting.definitions: - return MatrixProfile.definitions; + return _pangeaController.userController.matrixProfile.definitions; case ToolSetting.autoIGC: - return MatrixProfile.autoIGC; + return _pangeaController.userController.matrixProfile.autoIGC; default: return false; } diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index 9e5d59b05..e825a7126 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -181,10 +181,10 @@ class SubscriptionController extends BaseController { bool get _activatedNewUserTrial => _pangeaController.userController.inTrialWindow && - MatrixProfile.activatedFreeTrial; + _pangeaController.userController.matrixProfile.activatedFreeTrial; void activateNewUserTrial() { - MatrixProfile.saveProfileData({ + _pangeaController.userController.matrixProfile.saveProfileData({ MatrixProfileEnum.activatedFreeTrial.title: true, }).then((_) { setNewUserTrial(); diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index fa72e6b58..541371e34 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -27,6 +27,11 @@ class UserController extends BaseController { String? get _matrixAccessToken => _pangeaController.matrixState.client.accessToken; + /// An instance of matrix profile. Used to update and access info from the user's matrix profile. + /// No information needs to be passing in the constructor as the matrix + /// profile get all of it's internal data the accountData stored in the client. + MatrixProfile matrixProfile = MatrixProfile(); + /// Returns the [PUserModel] object representing the current user. /// /// This method retrieves the user data from the local storage using the [PLocalKey.user] key. @@ -58,7 +63,7 @@ class UserController extends BaseController { matrixAccessToken: _matrixAccessToken!, ); newUserModel.save(_pangeaController); - await MatrixProfile.saveProfileData( + await matrixProfile.saveProfileData( {MatrixProfileEnum.dateOfBirth.title: dob}, waitForDataInSync: true, ); @@ -161,7 +166,7 @@ class UserController extends BaseController { final Profile? pangeaProfile = userModel?.profile; for (final field in MatrixProfile.pangeaProfileFields) { - final dynamic matrixValue = MatrixProfile.getProfileData(field); + final dynamic matrixValue = matrixProfile.getProfileData(field); dynamic pangeaValue; switch (field) { case MatrixProfileEnum.dateOfBirth: @@ -194,7 +199,7 @@ class UserController extends BaseController { if (profileUpdates.containsKey(value.title)) continue; final dynamic localValue = _pangeaController.pStoreService.read(value.title); - final dynamic matrixValue = MatrixProfile.getProfileData(value); + final dynamic matrixValue = matrixProfile.getProfileData(value); final dynamic unmigratedValue = localValue != null && matrixValue == null ? localValue : null; if (unmigratedValue != null) { @@ -202,7 +207,7 @@ class UserController extends BaseController { } } - await MatrixProfile.saveProfileData( + await matrixProfile.saveProfileData( profileUpdates, waitForDataInSync: true, ); @@ -271,7 +276,7 @@ class UserController extends BaseController { profile: updatedUserProfile, ).save(_pangeaController); - MatrixProfile.saveProfileData({ + matrixProfile.saveProfileData({ MatrixProfileEnum.dateOfBirth.title: dateOfBirth, MatrixProfileEnum.targetLanguage.title: targetLanguage, MatrixProfileEnum.sourceLanguage.title: sourceLanguage, @@ -340,7 +345,7 @@ class UserController extends BaseController { // the function fetchUserModel() uses a completer, so it shouldn't // re-call the endpoint if it has already been called await fetchUserModel(); - return MatrixProfile.dateOfBirth != null; + return matrixProfile.dateOfBirth != null; } catch (err, s) { ErrorHandler.logError(e: err, s: s); return false; @@ -387,9 +392,7 @@ class UserController extends BaseController { } /// Returns a boolean value indicating whether the user's profile is public. - bool get isPublic => - _pangeaController.userController.userModel?.profile?.publicProfile ?? - false; + bool get isPublic => userModel?.profile?.publicProfile ?? false; /// Retrieves the user's email address. /// diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index af7de1ee5..af085bdc5 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -136,15 +136,37 @@ extension MatrixProfileEnumExtension on MatrixProfileEnum { /// So this class is more of a helper class to make it easier to /// access and save the data. class MatrixProfile { + /// Convenience function get get user's account data from the client + Map get accountData => + MatrixState.pangeaController.matrixState.client.accountData; + /// Returns the profile of the user. /// - /// The profile is retrieved from the `MatrixState.pangeaController.matrixState.client.accountData` + /// The profile is retrieved from the user's account data /// using the key `ModelKey.userProfile`. It returns a `Map` object /// representing the user's profile information. - static Map? get profile => MatrixState.pangeaController - .matrixState.client.accountData[ModelKey.userProfile]?.content; + Map? get profile => + accountData[ModelKey.userProfile]?.content; - static dynamic getProfileData(MatrixProfileEnum key) => profile?[key.title]; + /// Retrieves the profile data for the given [key]. + /// + /// This method first tries to get the data from the new profile format. If the data is found, + /// it is returned. If not, it checks if the data is stored in the old format. If it is, the data + /// is saved to the new format and returned. + dynamic getProfileData(MatrixProfileEnum key) { + // try to get the data from the new profile format + if (profile?[key.title] != null) { + return profile?[key.title]; + } + + // check if the data is stored in the old format + // and if so, save it to the new format + final prevFormatData = accountData[key.title]?.content[key.title]; + if (prevFormatData != null) { + saveProfileData({key.title: prevFormatData}); + return prevFormatData; + } + } /// Saves the profile data by updating the current user's profile with the provided updates. /// @@ -156,7 +178,7 @@ class MatrixProfile { /// If [waitForDataInSync] is true, the function will wait for the updated data in a sync update /// If this is set to false, after this function completes there may be a gap where the /// data has been sent but is not in the client's account data, as the sync update has not yet been received. - static Future saveProfileData( + Future saveProfileData( Map updates, { waitForDataInSync = false, }) async { @@ -165,7 +187,7 @@ class MatrixProfile { if (entry.value == null) continue; currentProfile[entry.key] = entry.value; } - if (mapEquals(MatrixProfile.toJson(), currentProfile)) return; + if (mapEquals(toJson(), currentProfile)) return; final PangeaController pangeaController = MatrixState.pangeaController; final Client client = pangeaController.matrixState.client; @@ -192,7 +214,7 @@ class MatrixProfile { } /// Converts the Matrix Profile to a JSON representation. - static Map toJson() { + Map toJson() { final Map json = {}; for (final value in MatrixProfileEnum.values) { json[value.title] = getProfileData(value); @@ -205,26 +227,24 @@ class MatrixProfile { // need for repeating the same code (like parsing DateTimes or // assigning default values to null booleans) when accessing specific values. - static DateTime? get dateOfBirth { + DateTime? get dateOfBirth { final dob = getProfileData(MatrixProfileEnum.dateOfBirth); return dob != null ? DateTime.parse(dob) : null; } - static bool get autoPlayMessages => + bool get autoPlayMessages => getProfileData(MatrixProfileEnum.autoPlayMessages) ?? false; - static bool get itAutoPlay => - getProfileData(MatrixProfileEnum.itAutoPlay) ?? false; - static bool get activatedFreeTrial => + bool get itAutoPlay => getProfileData(MatrixProfileEnum.itAutoPlay) ?? false; + bool get activatedFreeTrial => getProfileData(MatrixProfileEnum.activatedFreeTrial) ?? false; - static bool get interactiveTranslator => + bool get interactiveTranslator => getProfileData(MatrixProfileEnum.interactiveTranslator) ?? true; - static bool get interactiveGrammar => + bool get interactiveGrammar => getProfileData(MatrixProfileEnum.interactiveGrammar) ?? true; - static bool get immersionMode => + bool get immersionMode => getProfileData(MatrixProfileEnum.immersionMode) ?? false; - static bool get definitions => - getProfileData(MatrixProfileEnum.definitions) ?? true; - static bool get autoIGC => getProfileData(MatrixProfileEnum.autoIGC) ?? false; + bool get definitions => getProfileData(MatrixProfileEnum.definitions) ?? true; + bool get autoIGC => getProfileData(MatrixProfileEnum.autoIGC) ?? false; /// A list of all the fields in MatrixProfileEnum that correspond to tool settings static List get toolSettings => [ diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 8198e70dc..06136cd7e 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -65,14 +65,16 @@ class SettingsLearningView extends StatelessWidget { ) : const SizedBox(), ProfileSettingsSwitchListTile.adaptive( - defaultValue: MatrixProfile.itAutoPlay, + defaultValue: controller + .pangeaController.userController.matrixProfile.itAutoPlay, title: L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, subtitle: L10n.of(context)!.interactiveTranslatorAutoPlayDesc, profileKey: MatrixProfileEnum.itAutoPlay, ), ProfileSettingsSwitchListTile.adaptive( - defaultValue: MatrixProfile.autoPlayMessages, + defaultValue: controller.pangeaController.userController + .matrixProfile.autoPlayMessages, title: L10n.of(context)!.autoPlayTitle, subtitle: L10n.of(context)!.autoPlayDesc, profileKey: MatrixProfileEnum.autoPlayMessages, diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart index ad38e688d..b547efa7a 100644 --- a/lib/pangea/widgets/chat/message_toolbar.dart +++ b/lib/pangea/widgets/chat/message_toolbar.dart @@ -5,7 +5,6 @@ import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat/chat.dart'; import 'package:fluffychat/pangea/enum/message_mode_enum.dart'; import 'package:fluffychat/pangea/matrix_event_wrappers/pangea_message_event.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/any_state_holder.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/overlay.dart'; @@ -334,7 +333,7 @@ class MessageToolbarState extends State { return; } - MatrixProfile.autoPlayMessages + MatrixState.pangeaController.userController.matrixProfile.autoPlayMessages ? updateMode(MessageMode.textToSpeech) : updateMode(MessageMode.translation); }); diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index 823de6914..c758ea213 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -508,7 +508,8 @@ class DontShowSwitchListTileState extends State { title: Text(L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader), value: switchValue, onChanged: (value) { - MatrixProfile.saveProfileData( + MatrixState.pangeaController.userController.matrixProfile + .saveProfileData( {MatrixProfileEnum.itAutoPlay.title: value}, ); setState(() => switchValue = value); diff --git a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart index 85dbb7e36..3f04c61fd 100644 --- a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart +++ b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart @@ -1,6 +1,7 @@ import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; +import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; class ProfileSettingsSwitchListTile extends StatefulWidget { @@ -27,7 +28,8 @@ class PSettingsSwitchListTileState @override void initState() { - currentValue = MatrixProfile.getProfileData( + currentValue = MatrixState.pangeaController.userController.matrixProfile + .getProfileData( widget.profileKey, ) ?? widget.defaultValue; @@ -43,7 +45,8 @@ class PSettingsSwitchListTileState subtitle: widget.subtitle != null ? Text(widget.subtitle!) : null, onChanged: (bool newValue) async { try { - MatrixProfile.saveProfileData({ + MatrixState.pangeaController.userController.matrixProfile + .saveProfileData({ widget.profileKey.title: newValue, }); setState(() => currentValue = newValue); From 6c2d90f8f8bf4885007620aef81e432e2c7b398a Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 11 Jul 2024 11:42:00 -0400 Subject: [PATCH 3/9] prevent recursion when migrating from old matrix account data format --- lib/pangea/models/user_model.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index af085bdc5..d87e125fa 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -217,7 +217,7 @@ class MatrixProfile { Map toJson() { final Map json = {}; for (final value in MatrixProfileEnum.values) { - json[value.title] = getProfileData(value); + json[value.title] = profile?[value.title]; } return json; } From 91e2aa2dfd5f662dc98a85cc5561020bc2b78986 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 11 Jul 2024 12:39:03 -0400 Subject: [PATCH 4/9] remove updatePermissions function that is not called --- lib/pangea/models/space_model.dart | 40 ------------------------------ 1 file changed, 40 deletions(-) diff --git a/lib/pangea/models/space_model.dart b/lib/pangea/models/space_model.dart index fae097ee0..81306372c 100644 --- a/lib/pangea/models/space_model.dart +++ b/lib/pangea/models/space_model.dart @@ -110,46 +110,6 @@ class PangeaRoomRules { this.autoIGC = ClassDefaultValues.languageToolPermissions, }); - updatePermission(String key, bool value) { - switch (key) { - case 'isPublic': - isPublic = value; - break; - case 'isOpenEnrollment': - isOpenEnrollment = value; - break; - case 'oneToOneChatClass': - oneToOneChatClass = value; - break; - case 'isCreateRooms': - isCreateRooms = value; - break; - case 'isShareVideo': - isShareVideo = value; - break; - case 'isSharePhoto': - isSharePhoto = value; - break; - case 'isShareFiles': - isShareFiles = value; - break; - case 'isShareLocation': - isShareLocation = value; - break; - case 'isCreateStories': - isCreateStories = value; - break; - case 'isVoiceNotes': - isVoiceNotes = value; - break; - case 'isInviteOnlyStudents': - isInviteOnlyStudents = value; - break; - default: - throw Exception('Invalid key for setting permissions - $key'); - } - } - setLanguageToolSetting(ToolSetting setting, int value) { switch (setting) { case ToolSetting.interactiveTranslator: From 303d2b1e17ac9db88c513950da2262bb5ffdf74e Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 11 Jul 2024 13:11:20 -0400 Subject: [PATCH 5/9] switched accessToken back to be non-nullable --- .../controllers/choreographer.dart | 3 +- .../widgets/it_feedback_card.dart | 10 +---- .../contextual_definition_controller.dart | 7 --- .../controllers/it_feedback_controller.dart | 9 +--- .../language_detection_controller.dart | 10 +---- .../controllers/message_data_controller.dart | 18 +------- .../speech_to_text_controller.dart | 9 +--- .../text_to_speech_controller.dart | 10 +---- lib/pangea/controllers/user_controller.dart | 21 ++++----- .../controllers/word_net_controller.dart | 11 +---- .../pages/find_partner/find_partner.dart | 44 ++++++++++++------- lib/pangea/repo/span_data_repo.dart | 2 +- lib/pangea/repo/topic_data_repo.dart | 3 +- .../widgets/chat/message_audio_card.dart | 1 - .../chat/message_translation_card.dart | 10 +---- 15 files changed, 47 insertions(+), 121 deletions(-) diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 973a89747..9ccb197ee 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -406,8 +406,7 @@ class Choreographer { PangeaTextController get textController => _textController; - Future get accessToken => - pangeaController.userController.accessToken; + Future get accessToken => pangeaController.userController.accessToken; clear() { choreoMode = ChoreoMode.igc; diff --git a/lib/pangea/choreographer/widgets/it_feedback_card.dart b/lib/pangea/choreographer/widgets/it_feedback_card.dart index 840843ed5..4285f4dca 100644 --- a/lib/pangea/choreographer/widgets/it_feedback_card.dart +++ b/lib/pangea/choreographer/widgets/it_feedback_card.dart @@ -73,15 +73,7 @@ class ITFeedbackCardController extends State { isTranslating = true; }); - final String? accessToken = await controller.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - m: "Cannot translate feedback because accessToken is null", - ); - error = "Cannot translate feedback because accessToken is null"; - return; - } - + final String accessToken = await controller.userController.accessToken; FullTextTranslationRepo.translate( accessToken: accessToken, request: FullTextTranslationRequestModel( diff --git a/lib/pangea/controllers/contextual_definition_controller.dart b/lib/pangea/controllers/contextual_definition_controller.dart index ecc08a234..68e075d97 100644 --- a/lib/pangea/controllers/contextual_definition_controller.dart +++ b/lib/pangea/controllers/contextual_definition_controller.dart @@ -50,13 +50,6 @@ class ContextualDefinitionController { ) async { try { final accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in contextual definition controller", - s: StackTrace.current, - ); - return null; - } final ContextualDefinitionResponseModel res = await _ContextualDefinitionRepo.define( accessToken, diff --git a/lib/pangea/controllers/it_feedback_controller.dart b/lib/pangea/controllers/it_feedback_controller.dart index c2cd96cad..74aee21de 100644 --- a/lib/pangea/controllers/it_feedback_controller.dart +++ b/lib/pangea/controllers/it_feedback_controller.dart @@ -51,15 +51,8 @@ class ITFeedbackController { ITFeedbackRequestModel request, ) async { try { - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in it feedback controller", - s: StackTrace.current, - ); - return null; - } final ITFeedbackResponseModel res = await _ITFeedbackRepo.get( accessToken, request, diff --git a/lib/pangea/controllers/language_detection_controller.dart b/lib/pangea/controllers/language_detection_controller.dart index 5ba0f8879..ecbdea47d 100644 --- a/lib/pangea/controllers/language_detection_controller.dart +++ b/lib/pangea/controllers/language_detection_controller.dart @@ -6,7 +6,6 @@ import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/language_detection_model.dart'; import 'package:fluffychat/pangea/network/urls.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:http/http.dart' as http; import '../network/requests.dart'; @@ -145,15 +144,8 @@ class LanguageDetectionController { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in language detection controller", - s: StackTrace.current, - ); - return null; - } final Future response = _fetchResponse( accessToken, params, diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index 7ad3a748f..aa0c77b9d 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -43,15 +43,6 @@ class MessageDataController extends BaseController { TokensRequestModel req, ) async { final accessToken = await _pangeaController.userController.accessToken; - - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in _getTokens", - s: StackTrace.current, - ); - return null; - } - final TokensResponseModel igcTextData = await TokensRepo.tokenize(accessToken, req); @@ -201,15 +192,8 @@ class MessageDataController extends BaseController { ); try { - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in _getPangeaRepresentation", - s: StackTrace.current, - ); - return null; - } final FullTextTranslationResponseModel res = await FullTextTranslationRepo.translate( diff --git a/lib/pangea/controllers/speech_to_text_controller.dart b/lib/pangea/controllers/speech_to_text_controller.dart index 3daeada07..1b151aca0 100644 --- a/lib/pangea/controllers/speech_to_text_controller.dart +++ b/lib/pangea/controllers/speech_to_text_controller.dart @@ -52,15 +52,8 @@ class SpeechToTextController { if (_cache.containsKey(cacheKey)) { return _cache[cacheKey]!.data; } else { - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: 'null accessToken in speech to text controller', - s: StackTrace.current, - ); - return null; - } final Future response = _fetchResponse( accessToken: accessToken, diff --git a/lib/pangea/controllers/text_to_speech_controller.dart b/lib/pangea/controllers/text_to_speech_controller.dart index b00fa23a4..25b888e05 100644 --- a/lib/pangea/controllers/text_to_speech_controller.dart +++ b/lib/pangea/controllers/text_to_speech_controller.dart @@ -6,7 +6,6 @@ import 'package:fluffychat/pangea/config/environment.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/network/urls.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:http/http.dart'; import '../network/requests.dart'; @@ -100,15 +99,8 @@ class TextToSpeechController { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in text to speech controller", - s: StackTrace.current, - ); - return null; - } final Future response = _fetchResponse( accessToken, params, diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 541371e34..a4fd08c4d 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -222,8 +222,6 @@ class UserController extends BaseController { /// The [interests] parameter is a list of new interests for the user. /// The [speaks] parameter is a list of new languages the user speaks. /// The [publicProfile] parameter indicates whether the user's profile should be public or not. - /// - /// Throws an error if [userModel] or [accessToken] is null. Future updateUserProfile({ String? dateOfBirth, String? targetLanguage, @@ -233,10 +231,9 @@ class UserController extends BaseController { List? speaks, bool? publicProfile, }) async { - final String? accessToken = await this.accessToken; - if (userModel == null || accessToken == null) { + if (userModel == null) { ErrorHandler.logError( - e: "calling updateUserProfile with userModel == null or accessToken == null", + e: "calling updateUserProfile with userModel == null", ); return; } @@ -267,11 +264,11 @@ class UserController extends BaseController { final Profile updatedUserProfile = await PUserRepo.updateUserProfile( Profile.fromJson(profileJson), - accessToken, + await accessToken, ); PUserModel( - access: accessToken, + access: await accessToken, refresh: userModel!.refresh, profile: updatedUserProfile, ).save(_pangeaController); @@ -295,19 +292,17 @@ class UserController extends BaseController { /// /// If the locally stored user model is null or the access token has /// expired, it fetches the user model. - /// If the user model is still null after fetching, an error is logged. + /// If the user model is still null after fetching, an error thrown. /// /// Returns the access token as a string, or null if the user model is null. - Future get accessToken async { + Future get accessToken async { final PUserModel? useThisOne = needNewJWT ? await fetchUserModel() : userModel; if (useThisOne == null) { - ErrorHandler.logError( - e: "trying to get accessToken with userModel = null", - ); + throw ("Trying to get accessToken with null userModel"); } - return useThisOne?.access; + return useThisOne.access; } /// Returns the full name of the user. diff --git a/lib/pangea/controllers/word_net_controller.dart b/lib/pangea/controllers/word_net_controller.dart index 43d1a66b0..18c3290a9 100644 --- a/lib/pangea/controllers/word_net_controller.dart +++ b/lib/pangea/controllers/word_net_controller.dart @@ -1,7 +1,6 @@ import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/repo/word_repo.dart'; -import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:http/http.dart' as http; import '../models/word_data_model.dart'; @@ -54,16 +53,8 @@ class WordController extends BaseController { if (local != null) return local; - final String? accessToken = + final String accessToken = await _pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in word controller", - s: StackTrace.current, - ); - return null; - } - final WordData remote = await WordRepo.getWordNetData( accessToken: accessToken, fullText: fullText, diff --git a/lib/pangea/pages/find_partner/find_partner.dart b/lib/pangea/pages/find_partner/find_partner.dart index 44274a608..46eb365ae 100644 --- a/lib/pangea/pages/find_partner/find_partner.dart +++ b/lib/pangea/pages/find_partner/find_partner.dart @@ -5,6 +5,7 @@ import 'package:fluffychat/pangea/models/language_model.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../../../widgets/matrix.dart'; import '../../controllers/pangea_controller.dart'; @@ -39,6 +40,7 @@ class FindPartnerController extends State { final List _userProfilesCache = []; final scrollController = ScrollController(); + String? error; @override void initState() { @@ -67,6 +69,17 @@ class FindPartnerController extends State { @override Widget build(BuildContext context) { + if (error != null && error!.isNotEmpty) { + return Center( + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text(L10n.of(context)!.oopsSomethingWentWrong), + Text(L10n.of(context)!.errorPleaseRefresh), + ], + ), + ); + } return FindPartnerView(this); } @@ -92,26 +105,25 @@ class FindPartnerController extends State { if (loading || nextUrl == null) return; setState(() => loading = true); - final String? accessToken = - await pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in find partner controller", - s: StackTrace.current, + UserProfileSearchResponse response; + try { + final String accessToken = + await pangeaController.userController.accessToken; + response = await PUserRepo.searchUserProfiles( + accessToken: accessToken, + targetLanguage: targetLanguageSearch.langCode, + sourceLanguage: sourceLanguageSearch.langCode, + country: countrySearch, + limit: 15, + pageNumber: nextPage.toString(), ); + } catch (err, s) { + error = err.toString(); + setState(() => loading = false); + ErrorHandler.logError(e: err, s: s); return; } - final UserProfileSearchResponse response = - await PUserRepo.searchUserProfiles( - accessToken: accessToken, - targetLanguage: targetLanguageSearch.langCode, - sourceLanguage: sourceLanguageSearch.langCode, - country: countrySearch, - limit: 15, - pageNumber: nextPage.toString(), - ); - nextUrl = response.next; nextPage++; diff --git a/lib/pangea/repo/span_data_repo.dart b/lib/pangea/repo/span_data_repo.dart index 3c2eb2ab3..cc5c0640a 100644 --- a/lib/pangea/repo/span_data_repo.dart +++ b/lib/pangea/repo/span_data_repo.dart @@ -13,7 +13,7 @@ import '../network/urls.dart'; class SpanDataRepo { static Future getSpanDetails( - String? accessToken, { + String accessToken, { required SpanDetailsRepoReqAndRes request, }) async { final Requests req = Requests( diff --git a/lib/pangea/repo/topic_data_repo.dart b/lib/pangea/repo/topic_data_repo.dart index 9a5def03f..7a4ce049f 100644 --- a/lib/pangea/repo/topic_data_repo.dart +++ b/lib/pangea/repo/topic_data_repo.dart @@ -1,7 +1,6 @@ import 'dart:convert'; import 'package:flutter/services.dart'; - import 'package:http/http.dart'; import '../config/environment.dart'; @@ -12,7 +11,7 @@ import '../network/urls.dart'; /// accepts ChatTopic and calls an API for a list of Lemma class TopicDataRepo { static Future generate( - String? accessToken, { + String accessToken, { required TopicDataRequest request, }) async { final Requests req = Requests( diff --git a/lib/pangea/widgets/chat/message_audio_card.dart b/lib/pangea/widgets/chat/message_audio_card.dart index 5c1f8e67b..cfae4282a 100644 --- a/lib/pangea/widgets/chat/message_audio_card.dart +++ b/lib/pangea/widgets/chat/message_audio_card.dart @@ -46,7 +46,6 @@ class MessageAudioCardState extends State { await widget.messageEvent.getMatrixAudioFile(langCode, context); if (mounted) setState(() => _isLoading = false); } catch (e, _) { - debugPrint(StackTrace.current.toString()); if (!mounted) return; setState(() => _isLoading = false); ScaffoldMessenger.of(context).showSnackBar( diff --git a/lib/pangea/widgets/chat/message_translation_card.dart b/lib/pangea/widgets/chat/message_translation_card.dart index 9ee15faf7..fd80df134 100644 --- a/lib/pangea/widgets/chat/message_translation_card.dart +++ b/lib/pangea/widgets/chat/message_translation_card.dart @@ -58,17 +58,9 @@ class MessageTranslationCardState extends State { } oldSelectedText = widget.selection.selectedText; - final String? accessToken = + final String accessToken = await MatrixState.pangeaController.userController.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - e: "null accessToken in translateSelection", - s: StackTrace.current, - ); - return; - } - final resp = await FullTextTranslationRepo.translate( accessToken: accessToken, request: FullTextTranslationRequestModel( From ff468cb4bddb8b0a02549a1da9c63e81bc880bc8 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Thu, 11 Jul 2024 13:17:30 -0400 Subject: [PATCH 6/9] remove isFetching flag from user controller and replaced that functionality by making the completer nullable --- lib/pangea/controllers/user_controller.dart | 31 +++++++++------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index a4fd08c4d..1fd13acfc 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -69,11 +69,8 @@ class UserController extends BaseController { ); } - /// A boolean flag indicating whether the profile data is currently being fetched. - bool _isFetching = false; - /// A completer for the profile model of a user. - Completer _profileCompleter = Completer(); + Completer? _profileCompleter; /// Fetches the user model. /// @@ -85,25 +82,27 @@ class UserController extends BaseController { /// /// Returns the future value of the user model completer. Future fetchUserModel() async { - if (_profileCompleter.isCompleted) return _profileCompleter.future; - if (_isFetching) { - await _profileCompleter.future; - return _profileCompleter.future; + if (_profileCompleter?.isCompleted ?? false) { + return _profileCompleter!.future; } - _isFetching = true; + if (_profileCompleter != null) { + await _profileCompleter!.future; + return _profileCompleter!.future; + } + + _profileCompleter = Completer(); PUserModel? fetchedUserModel; try { fetchedUserModel = await _fetchUserModel(); } catch (err, s) { ErrorHandler.logError(e: err, s: s); - return null; + } finally { + _profileCompleter!.complete(fetchedUserModel); } - _isFetching = false; - _profileCompleter.complete(fetchedUserModel); - return _profileCompleter.future; + return _profileCompleter!.future; } /// Fetches the user model asynchronously. @@ -133,13 +132,9 @@ class UserController extends BaseController { } /// Reinitializes the user's profile - /// - /// This method sets up the necessary variables and fetches the user model. - /// It completes the [_profileCompleter] with the fetched user model. /// This method should be called whenever the user's login status changes Future reinitialize() async { - _profileCompleter = Completer(); - _isFetching = false; + _profileCompleter = null; await fetchUserModel(); } From ca9dcba4e747f952e778a417321597f477f64e50 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 12 Jul 2024 13:52:46 -0400 Subject: [PATCH 7/9] removed any functionality attached to pangea profile, only use it to migrate. Made matrix profile a class with instance members. --- .../controllers/choreographer.dart | 5 +- lib/pangea/constants/local.key.dart | 2 +- lib/pangea/constants/model_keys.dart | 3 + .../controllers/language_controller.dart | 17 +- .../controllers/my_analytics_controller.dart | 36 +- .../controllers/permissions_controller.dart | 32 +- .../controllers/subscription_controller.dart | 35 +- lib/pangea/controllers/user_controller.dart | 341 ++---- lib/pangea/models/space_model.dart | 16 - lib/pangea/models/user_model.dart | 1037 +++++------------ .../models/user_profile_search_model.dart | 6 +- .../pages/find_partner/find_partner.dart | 7 +- .../pages/find_partner/find_partner_view.dart | 5 +- lib/pangea/pages/p_user_age/p_user_age.dart | 29 +- .../settings_learning/settings_learning.dart | 62 +- .../settings_learning_view.dart | 153 ++- lib/pangea/repo/user_repo.dart | 54 +- lib/pangea/utils/country_display.dart | 515 ++++++++ lib/pangea/widgets/chat/message_toolbar.dart | 3 +- lib/pangea/widgets/igc/span_card.dart | 14 +- .../user_settings/country_picker_tile.dart | 8 +- .../user_settings/p_language_dialog.dart | 15 +- .../p_settings_switch_list_tile.dart | 21 +- 23 files changed, 1171 insertions(+), 1245 deletions(-) create mode 100644 lib/pangea/utils/country_display.dart diff --git a/lib/pangea/choreographer/controllers/choreographer.dart b/lib/pangea/choreographer/controllers/choreographer.dart index 9ccb197ee..e5108ae4d 100644 --- a/lib/pangea/choreographer/controllers/choreographer.dart +++ b/lib/pangea/choreographer/controllers/choreographer.dart @@ -513,8 +513,9 @@ class Choreographer { chatController.room, ); - bool get itAutoPlayEnabled => - pangeaController.userController.matrixProfile.itAutoPlay; + bool get itAutoPlayEnabled { + return pangeaController.userController.profile.userSettings.itAutoPlay; + } bool get definitionsEnabled => pangeaController.permissionsController.isToolEnabled( diff --git a/lib/pangea/constants/local.key.dart b/lib/pangea/constants/local.key.dart index b8c1a4f5d..08446ace4 100644 --- a/lib/pangea/constants/local.key.dart +++ b/lib/pangea/constants/local.key.dart @@ -1,5 +1,5 @@ class PLocalKey { - static const String user = 'user'; + static const String access = "access"; static const String cachedClassCodeToJoin = "cachedclasscodetojoin"; static const String beganWebPayment = "beganWebPayment"; static const String dismissedPaywall = 'dismissedPaywall'; diff --git a/lib/pangea/constants/model_keys.dart b/lib/pangea/constants/model_keys.dart index 08164d9f6..7c60b98d7 100644 --- a/lib/pangea/constants/model_keys.dart +++ b/lib/pangea/constants/model_keys.dart @@ -16,6 +16,9 @@ class ModelKey { static const String l1LanguageKey = 'source_language'; static const String publicProfile = 'public'; static const String userId = 'user_id'; + static const String toolSettings = 'tool_settings'; + static const String userSettings = 'user_settings'; + static const String instructionsSettings = 'instructions_settings'; // matrix profile keys // making this a random string so that it's harder to guess diff --git a/lib/pangea/controllers/language_controller.dart b/lib/pangea/controllers/language_controller.dart index b1bc02380..ccd33761f 100644 --- a/lib/pangea/controllers/language_controller.dart +++ b/lib/pangea/controllers/language_controller.dart @@ -1,12 +1,8 @@ -import 'dart:developer'; - import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/controllers/language_list_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/language_model.dart'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:sentry_flutter/sentry_flutter.dart'; import '../widgets/user_settings/p_language_dialog.dart'; @@ -18,15 +14,6 @@ class LanguageController { } //show diloag when user does not have languages selected showDialogOnEmptyLanguage(BuildContext dialogContext, Function callback) { - if (_pangeaController.userController.userModel?.profile == null) { - debugger(when: kDebugMode); - Sentry.addBreadcrumb( - Breadcrumb( - message: 'calling showDialogOnEmptyLanguagae with empty user', - ), - ); - return; - } if (!languagesSet) { pLanguageDialog(dialogContext, callback); } @@ -42,13 +29,13 @@ class LanguageController { String? get _userL1Code { final source = - _pangeaController.userController.userModel?.profile?.sourceLanguage; + _pangeaController.userController.profile.userSettings.sourceLanguage; return source == null || source.isEmpty ? null : source; } String? get _userL2Code { final target = - _pangeaController.userController.userModel?.profile?.targetLanguage; + _pangeaController.userController.profile.userSettings.targetLanguage; return target == null || target.isEmpty ? null : target; } diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index 058bad359..8fa8989b1 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -204,24 +204,24 @@ class MyAnalyticsController { Completer? _updateCompleter; Future updateAnalytics() async { - if (!(_updateCompleter?.isCompleted ?? true)) { - await _updateCompleter!.future; - return; - } - _updateCompleter = Completer(); - try { - await _updateAnalytics(); - clearMessagesSinceUpdate(); - } catch (err, s) { - ErrorHandler.logError( - e: err, - m: "Failed to update analytics", - s: s, - ); - } finally { - _updateCompleter?.complete(); - _updateCompleter = null; - } + // if (!(_updateCompleter?.isCompleted ?? true)) { + // await _updateCompleter!.future; + // return; + // } + // _updateCompleter = Completer(); + // try { + // await _updateAnalytics(); + // clearMessagesSinceUpdate(); + // } catch (err, s) { + // ErrorHandler.logError( + // e: err, + // m: "Failed to update analytics", + // s: s, + // ); + // } finally { + // _updateCompleter?.complete(); + // _updateCompleter = null; + // } } String? get userL2 => _pangeaController.languageController.activeL2Code(); diff --git a/lib/pangea/controllers/permissions_controller.dart b/lib/pangea/controllers/permissions_controller.dart index 463a8c9a3..ed84e13c3 100644 --- a/lib/pangea/controllers/permissions_controller.dart +++ b/lib/pangea/controllers/permissions_controller.dart @@ -4,7 +4,6 @@ import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension/pangea_room_extension.dart'; import 'package:fluffychat/pangea/models/space_model.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/p_extension.dart'; import 'package:matrix/matrix.dart'; @@ -31,12 +30,11 @@ class PermissionsController extends BaseController { } /// Returns false if user is null - bool isUser18() => - _pangeaController.userController.matrixProfile.dateOfBirth - ?.isAtLeastYearsOld( - AgeLimits.toAccessFeatures, - ) ?? - false; + bool isUser18() { + final DateTime? dob = + _pangeaController.userController.profile.userSettings.dateOfBirth; + return dob?.isAtLeastYearsOld(AgeLimits.toAccessFeatures) ?? false; + } /// A user can private chat if /// 1) they are 18 and outside a class context or @@ -97,20 +95,22 @@ class PermissionsController extends BaseController { return classPermission == 0; } - bool userToolSetting(MatrixProfileEnum setting) { - switch (setting.asToolSetting) { + bool userToolSetting(ToolSetting setting) { + switch (setting) { case ToolSetting.interactiveTranslator: return _pangeaController - .userController.matrixProfile.interactiveTranslator; + .userController.profile.toolSettings.interactiveTranslator; case ToolSetting.interactiveGrammar: return _pangeaController - .userController.matrixProfile.interactiveGrammar; + .userController.profile.toolSettings.interactiveGrammar; case ToolSetting.immersionMode: - return _pangeaController.userController.matrixProfile.immersionMode; + return _pangeaController + .userController.profile.toolSettings.immersionMode; case ToolSetting.definitions: - return _pangeaController.userController.matrixProfile.definitions; + return _pangeaController + .userController.profile.toolSettings.definitions; case ToolSetting.autoIGC: - return _pangeaController.userController.matrixProfile.autoIGC; + return _pangeaController.userController.profile.toolSettings.autoIGC; default: return false; } @@ -118,13 +118,13 @@ class PermissionsController extends BaseController { bool isToolEnabled(ToolSetting setting, Room? room) { if (room?.isSpaceAdmin ?? false) { - return userToolSetting(setting.asMatrixProfileField); + return userToolSetting(setting); } final int? classPermission = room != null ? classLanguageToolPermission(room, setting) : 1; if (classPermission == 0) return false; if (classPermission == 2) return true; - return userToolSetting(setting.asMatrixProfileField); + return userToolSetting(setting); } bool isWritingAssistanceEnabled(Room? room) { diff --git a/lib/pangea/controllers/subscription_controller.dart b/lib/pangea/controllers/subscription_controller.dart index e825a7126..d5a04a82d 100644 --- a/lib/pangea/controllers/subscription_controller.dart +++ b/lib/pangea/controllers/subscription_controller.dart @@ -8,7 +8,6 @@ import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/models/base_subscription_info.dart'; import 'package:fluffychat/pangea/models/mobile_subscriptions.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/models/web_subscriptions.dart'; import 'package:fluffychat/pangea/network/requests.dart'; import 'package:fluffychat/pangea/network/urls.dart'; @@ -179,31 +178,35 @@ class SubscriptionController extends BaseController { } } - bool get _activatedNewUserTrial => - _pangeaController.userController.inTrialWindow && - _pangeaController.userController.matrixProfile.activatedFreeTrial; + bool get _activatedNewUserTrial { + final bool activated = _pangeaController + .userController.profile.userSettings.activatedFreeTrial; + return _pangeaController.userController.inTrialWindow && activated; + } void activateNewUserTrial() { - _pangeaController.userController.matrixProfile.saveProfileData({ - MatrixProfileEnum.activatedFreeTrial.title: true, - }).then((_) { - setNewUserTrial(); - trialActivationStream.add(true); - }); + _pangeaController.userController.updateProfile( + (profile) { + profile.userSettings.activatedFreeTrial = true; + return profile; + }, + ); + setNewUserTrial(); + trialActivationStream.add(true); } void setNewUserTrial() { - if (_pangeaController.userController.userModel?.profile == null) { + final DateTime? createdAt = + _pangeaController.userController.profile.userSettings.createdAt; + if (createdAt == null) { ErrorHandler.logError( - m: "Null user profile in subscription settings", + m: "Null user profile createAt in subscription settings", s: StackTrace.current, ); return; } - final String profileCreatedAt = - _pangeaController.userController.userModel!.profile!.createdAt; - final DateTime creationTimestamp = DateTime.parse(profileCreatedAt); - final DateTime expirationDate = creationTimestamp.add( + + final DateTime expirationDate = createdAt.add( const Duration(days: 7), ); subscription?.setTrial(expirationDate); diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index 1fd13acfc..a8c6ced14 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/language_constants.dart'; -import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; @@ -27,61 +26,62 @@ class UserController extends BaseController { String? get _matrixAccessToken => _pangeaController.matrixState.client.accessToken; - /// An instance of matrix profile. Used to update and access info from the user's matrix profile. - /// No information needs to be passing in the constructor as the matrix - /// profile get all of it's internal data the accountData stored in the client. - MatrixProfile matrixProfile = MatrixProfile(); + Profile? _cachedProfile; - /// Returns the [PUserModel] object representing the current user. - /// - /// This method retrieves the user data from the local storage using the [PLocalKey.user] key. - /// If the data exists, it is converted to a [PUserModel] object using the [PUserModel.fromJson] method. - /// If the data is null, indicating that the user is not logged in (or that - /// profile fetching has not yet completed, or had an error), null is returned. - PUserModel? get userModel { - final data = _pangeaController.pStoreService.read(PLocalKey.user); - return data != null ? PUserModel.fromJson(data) : null; + /// Listen for updates to account data in syncs and update the cached profile + void addProfileListener() { + _pangeaController.matrixState.client.onSync.stream + .where((sync) => sync.accountData != null) + .listen((sync) { + final Profile? fromAccountData = Profile.fromAccountData(); + if (fromAccountData != null) { + _cachedProfile = fromAccountData; + } + }); } - /// Creates a user pangea chat profile, saves the user's profile information - /// locally, and set the user's DOB in their matrix profile. - /// - /// The [dob] parameter is required and represents the date of birth of the user. - /// This method creates a new [PUserModel] using the [PUserRepo.repoCreatePangeaUser] method, - /// and saves the user model in local storage. - /// It also updates the user's matrix profile using the [updateMatrixProfile] method. - Future createProfile({required String dob}) async { - if (userId == null || _matrixAccessToken == null) { - ErrorHandler.logError( - e: "calling createProfile with userId == null or matrixAccessToken == null", - ); + /// The user's profile. Will be empty if the client's accountData hasn't + /// been loaded yet (if the first sync hasn't gone through yet) + /// or if the user hasn't yer set their date of birth. + Profile get profile { + /// if the profile is cached, return it + if (_cachedProfile != null) return _cachedProfile!; + + /// if account data is empty, return an empty profile + if (_pangeaController.matrixState.client.accountData.isEmpty) { + return Profile.emptyProfile; } - final PUserModel newUserModel = await PUserRepo.repoCreatePangeaUser( - userID: userId!, - fullName: fullname, - dob: dob, - matrixAccessToken: _matrixAccessToken!, - ); - newUserModel.save(_pangeaController); - await matrixProfile.saveProfileData( - {MatrixProfileEnum.dateOfBirth.title: dob}, - waitForDataInSync: true, + + /// try to get the account data in the up-to-date format + final Profile? fromAccountData = Profile.fromAccountData(); + if (fromAccountData != null) { + _cachedProfile = fromAccountData; + return fromAccountData; + } + + _cachedProfile = Profile.migrateFromAccountData(); + _cachedProfile?.saveProfileData(); + return _cachedProfile ?? Profile.emptyProfile; + } + + void updateProfile(Profile Function(Profile) update) { + final Profile updatedProfile = update(profile); + updatedProfile.saveProfileData(); + } + + Future createProfile({required DateTime dob}) async { + final userSettings = UserSettings( + dateOfBirth: dob, + createdAt: DateTime.now(), ); + final newProfile = Profile(userSettings: userSettings); + await newProfile.saveProfileData(waitForDataInSync: true); } /// A completer for the profile model of a user. - Completer? _profileCompleter; + Completer? _profileCompleter; - /// Fetches the user model. - /// - /// This method retrieves the user model asynchronously. If the profile completer is already completed, - /// it returns the future value of the completer. If the user model is currently being fetched, - /// it waits for the completion of the completer and returns the future value. Otherwise, it sets - /// the fetching flag, fetches the user model, completes the profile completer with the fetched user model, - /// and returns the future value of the completer. - /// - /// Returns the future value of the user model completer. - Future fetchUserModel() async { + Future initialize() async { if (_profileCompleter?.isCompleted ?? false) { return _profileCompleter!.future; } @@ -91,213 +91,79 @@ class UserController extends BaseController { return _profileCompleter!.future; } - _profileCompleter = Completer(); - PUserModel? fetchedUserModel; + _profileCompleter = Completer(); try { - fetchedUserModel = await _fetchUserModel(); + await _initialize(); + addProfileListener(); } catch (err, s) { ErrorHandler.logError(e: err, s: s); } finally { - _profileCompleter!.complete(fetchedUserModel); + _profileCompleter!.complete(); } return _profileCompleter!.future; } - /// Fetches the user model asynchronously. - /// - /// This method fetches the user model by calling the [fetchPangeaUserInfo] method - /// from the [PUserRepo] class. It requires the [_matrixAccessToken] and [userId] - /// to be non-null. If either of them is null, an error is logged. - /// - /// The fetched [newUserModel] is then saved locally. - /// The [migrateMatrixProfile] method is called, to migrate any information that is - /// already saved in the user's pangea profile but is not yet saved in the - /// user's matrix profile. Finally, the [newUserModel] is returned. - Future _fetchUserModel() async { - if (_matrixAccessToken == null || userId == null) { - ErrorHandler.logError( - e: "calling fetchUserModel with userId == null or matrixAccessToken == null", - ); - return null; + Future _initialize() async { + await waitForAccountData(); + if (profile.userSettings.dateOfBirth != null) { + return; } - final PUserModel? newUserModel = await PUserRepo.fetchPangeaUserInfo( + final PangeaProfileResponse? resp = await PUserRepo.fetchPangeaUserInfo( userID: userId!, matrixAccessToken: _matrixAccessToken!, ); - newUserModel?.save(_pangeaController); - await migrateMatrixProfile(); - return newUserModel; + if (resp?.profile == null) { + return; + } + final userSetting = UserSettings.fromJson(resp!.profile.toJson()); + final newProfile = Profile(userSettings: userSetting); + await newProfile.saveProfileData(waitForDataInSync: true); } /// Reinitializes the user's profile /// This method should be called whenever the user's login status changes Future reinitialize() async { _profileCompleter = null; - await fetchUserModel(); + _cachedProfile = null; + await initialize(); } - /// Migrates the user's profile from Pangea to Matrix. - /// - /// This method retrieves the user's profile / local settings information from Pangea and checks for corresponding information stored in Matrix. - /// If any of the profile fields in Pangea have information, but the corresponding fields in Matrix are null, the values are updated in Matrix. - /// The profile fields that are checked for migration include date of birth, creation date, target language, source language, country, and public profile. - /// Additionally, several profile settings related to auto play, trial activation, interactive features, and instructional messages are also checked for migration. - /// - /// This method calls the [updateMatrixProfile] method to update the user's profile in Matrix with the migrated values. - /// - /// Note: This method assumes that the [userModel] and [_pangeaController] instances are properly initialized before calling this method. - Future migrateMatrixProfile() async { - // This function relies on the client's account data being loaded. - // The account data is loaded during - // the first sync, so wait for that to complete. + /// Account data comes through in the first sync, so wait for that + Future waitForAccountData() async { final client = _pangeaController.matrixState.client; if (client.prevBatch == null) { await client.onSync.stream.first; } - - final Map profileUpdates = {}; - final Profile? pangeaProfile = userModel?.profile; - - for (final field in MatrixProfile.pangeaProfileFields) { - final dynamic matrixValue = matrixProfile.getProfileData(field); - dynamic pangeaValue; - switch (field) { - case MatrixProfileEnum.dateOfBirth: - pangeaValue = pangeaProfile?.dateOfBirth; - break; - case MatrixProfileEnum.createdAt: - pangeaValue = pangeaProfile?.createdAt; - break; - case MatrixProfileEnum.targetLanguage: - pangeaValue = pangeaProfile?.targetLanguage; - break; - case MatrixProfileEnum.sourceLanguage: - pangeaValue = pangeaProfile?.sourceLanguage; - break; - case MatrixProfileEnum.country: - pangeaValue = pangeaProfile?.country; - break; - case MatrixProfileEnum.publicProfile: - pangeaValue = pangeaProfile?.publicProfile; - break; - default: - break; - } - if (pangeaValue != null && matrixValue == null) { - profileUpdates[field.title] = pangeaValue; - } - } - - for (final value in MatrixProfileEnum.values) { - if (profileUpdates.containsKey(value.title)) continue; - final dynamic localValue = - _pangeaController.pStoreService.read(value.title); - final dynamic matrixValue = matrixProfile.getProfileData(value); - final dynamic unmigratedValue = - localValue != null && matrixValue == null ? localValue : null; - if (unmigratedValue != null) { - profileUpdates[value.title] = unmigratedValue; - } - } - - await matrixProfile.saveProfileData( - profileUpdates, - waitForDataInSync: true, - ); - } - - /// Updates the user's profile with the provided information. - /// - /// The [dateOfBirth] parameter is the new date of birth for the user. - /// The [targetLanguage] parameter is the new target language for the user. - /// The [sourceLanguage] parameter is the new source language for the user. - /// The [country] parameter is the new country for the user. - /// The [interests] parameter is a list of new interests for the user. - /// The [speaks] parameter is a list of new languages the user speaks. - /// The [publicProfile] parameter indicates whether the user's profile should be public or not. - Future updateUserProfile({ - String? dateOfBirth, - String? targetLanguage, - String? sourceLanguage, - String? country, - List? interests, - List? speaks, - bool? publicProfile, - }) async { - if (userModel == null) { - ErrorHandler.logError( - e: "calling updateUserProfile with userModel == null", - ); - return; - } - - final profileJson = userModel!.profile!.toJson(); - - if (dateOfBirth != null) { - profileJson[ModelKey.userDateOfBirth] = dateOfBirth; - } - if (targetLanguage != null) { - profileJson[ModelKey.userTargetLanguage] = targetLanguage; - } - if (sourceLanguage != null) { - profileJson[ModelKey.userSourceLanguage] = sourceLanguage; - } - if (interests != null) { - profileJson[ModelKey.userInterests] = interests.toString(); - } - if (speaks != null) { - profileJson[ModelKey.userSpeaks] = speaks.toString(); - } - if (country != null) { - profileJson[ModelKey.userCountry] = country; - } - if (publicProfile != null) { - profileJson[ModelKey.publicProfile] = publicProfile; - } - - final Profile updatedUserProfile = await PUserRepo.updateUserProfile( - Profile.fromJson(profileJson), - await accessToken, - ); - - PUserModel( - access: await accessToken, - refresh: userModel!.refresh, - profile: updatedUserProfile, - ).save(_pangeaController); - - matrixProfile.saveProfileData({ - MatrixProfileEnum.dateOfBirth.title: dateOfBirth, - MatrixProfileEnum.targetLanguage.title: targetLanguage, - MatrixProfileEnum.sourceLanguage.title: sourceLanguage, - MatrixProfileEnum.country.title: country, - MatrixProfileEnum.publicProfile.title: publicProfile, - }); } /// Returns a boolean value indicating whether a new JWT (JSON Web Token) is needed. - /// It checks if the `userModel` has a non-null `access` token and if the token is expired using the `Jwt.isExpired()` method. - /// If the `userModel` is null or the `access` token is null, it returns true indicating that a new JWT is needed. - bool get needNewJWT => - userModel?.access != null ? Jwt.isExpired(userModel!.access) : true; + bool needNewJWT(String token) => Jwt.isExpired(token); - /// Retrieves the access token for the user. - /// - /// If the locally stored user model is null or the access token has - /// expired, it fetches the user model. - /// If the user model is still null after fetching, an error thrown. - /// - /// Returns the access token as a string, or null if the user model is null. + /// Retrieves the access token for the user. Looks for it locally, + /// and if it's not found or expired, fetches it from the server. Future get accessToken async { - final PUserModel? useThisOne = - needNewJWT ? await fetchUserModel() : userModel; + final localAccessToken = + _pangeaController.pStoreService.read(PLocalKey.access); - if (useThisOne == null) { - throw ("Trying to get accessToken with null userModel"); + if (localAccessToken == null || needNewJWT(localAccessToken)) { + final PangeaProfileResponse? userModel = + await PUserRepo.fetchPangeaUserInfo( + userID: userId!, + matrixAccessToken: _matrixAccessToken!, + ); + if (userModel?.access == null) { + throw ("Trying to get accessToken with null userModel"); + } + _pangeaController.pStoreService.save( + PLocalKey.access, + userModel!.access, + ); + return userModel.access; } - return useThisOne.access; + + return localAccessToken; } /// Returns the full name of the user. @@ -314,19 +180,6 @@ class UserController extends BaseController { return userId!.substring(0, userId!.indexOf(":")).replaceAll("@", ""); } - /// Checks if the user data is available. - /// Returns a [Future] that completes with a [bool] value - /// indicating whether the user data is available or not. - Future get isPUserDataAvailable async { - try { - final PUserModel? toCheck = userModel ?? (await fetchUserModel()); - return toCheck != null; - } catch (err, s) { - ErrorHandler.logError(e: err, s: s); - return false; - } - } - /// Checks if user data is available and the date of birth is set. /// Returns a [Future] that completes with a [bool] value indicating /// whether the user data is available and the date of birth is set. @@ -334,8 +187,8 @@ class UserController extends BaseController { try { // the function fetchUserModel() uses a completer, so it shouldn't // re-call the endpoint if it has already been called - await fetchUserModel(); - return matrixProfile.dateOfBirth != null; + await initialize(); + return profile.userSettings.dateOfBirth != null; } catch (err, s) { ErrorHandler.logError(e: err, s: s); return false; @@ -344,11 +197,11 @@ class UserController extends BaseController { /// Returns a boolean value indicating whether the user is currently in the trial window. bool get inTrialWindow { - final String? createdAt = userModel?.profile?.createdAt; + final DateTime? createdAt = profile.userSettings.createdAt; if (createdAt == null) { return false; } - return DateTime.parse(createdAt).isAfter( + return createdAt.isAfter( DateTime.now().subtract(const Duration(days: 7)), ); } @@ -363,12 +216,8 @@ class UserController extends BaseController { /// If an error occurs during the process, it logs the error and returns `false`. Future get areUserLanguagesSet async { try { - final PUserModel? toCheck = userModel ?? (await fetchUserModel()); - if (toCheck?.profile == null) { - return false; - } - final String? srcLang = toCheck!.profile!.sourceLanguage; - final String? tgtLang = toCheck.profile!.targetLanguage; + final String? srcLang = profile.userSettings.sourceLanguage; + final String? tgtLang = profile.userSettings.targetLanguage; return srcLang != null && tgtLang != null && srcLang.isNotEmpty && @@ -382,7 +231,9 @@ class UserController extends BaseController { } /// Returns a boolean value indicating whether the user's profile is public. - bool get isPublic => userModel?.profile?.publicProfile ?? false; + bool get isPublic { + return profile.userSettings.publicProfile; + } /// Retrieves the user's email address. /// diff --git a/lib/pangea/models/space_model.dart b/lib/pangea/models/space_model.dart index 81306372c..232899bb8 100644 --- a/lib/pangea/models/space_model.dart +++ b/lib/pangea/models/space_model.dart @@ -1,6 +1,5 @@ import 'dart:developer'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -270,19 +269,4 @@ extension SettingCopy on ToolSetting { return L10n.of(context)!.autoIGCToolDescription; } } - - MatrixProfileEnum get asMatrixProfileField { - switch (this) { - case ToolSetting.interactiveTranslator: - return MatrixProfileEnum.interactiveTranslator; - case ToolSetting.interactiveGrammar: - return MatrixProfileEnum.interactiveGrammar; - case ToolSetting.immersionMode: - return MatrixProfileEnum.immersionMode; - case ToolSetting.definitions: - return MatrixProfileEnum.definitions; - case ToolSetting.autoIGC: - return MatrixProfileEnum.autoIGC; - } - } } diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index d87e125fa..51aa746d9 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -1,199 +1,320 @@ -import 'package:country_picker/country_picker.dart'; -import 'package:fluffychat/pangea/constants/local.key.dart'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/enum/instructions_enum.dart'; import 'package:fluffychat/pangea/models/space_model.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import '../constants/language_constants.dart'; import 'language_model.dart'; -class PUserModel { - String access; - String refresh; - Profile? profile; +class UserSettings { + DateTime? dateOfBirth; + DateTime? createdAt; + bool autoPlayMessages; + bool itAutoPlay; + bool activatedFreeTrial; + bool publicProfile; + String? targetLanguage; + String? sourceLanguage; + String? country; - PUserModel({required this.access, required this.refresh, this.profile}); + UserSettings({ + this.dateOfBirth, + this.createdAt, + this.autoPlayMessages = false, + this.itAutoPlay = false, + this.activatedFreeTrial = false, + this.publicProfile = false, + this.targetLanguage, + this.sourceLanguage, + this.country, + }); - factory PUserModel.fromJson(Map json) => PUserModel( - access: json[ModelKey.userAccess], - refresh: json[ModelKey.userRefresh], - profile: json[ModelKey.userProfile] != null - ? Profile.fromJson(json[ModelKey.userProfile]) + factory UserSettings.fromJson(Map json) => UserSettings( + dateOfBirth: DateTime.parse(json[ModelKey.userDateOfBirth]), + createdAt: json[ModelKey.userCreatedAt] != null + ? DateTime.parse(json[ModelKey.userCreatedAt]) : null, + autoPlayMessages: json[ModelKey.autoPlayMessages] ?? false, + itAutoPlay: json[ModelKey.itAutoPlay] ?? false, + activatedFreeTrial: json[ModelKey.activatedTrialKey] ?? false, + publicProfile: json[ModelKey.publicProfile] ?? false, + targetLanguage: json[ModelKey.l2LanguageKey], + sourceLanguage: json[ModelKey.l1LanguageKey], + country: json[ModelKey.userCountry], ); Map toJson() { final Map data = {}; - data[ModelKey.userAccess] = access; - data[ModelKey.userRefresh] = refresh; - if (profile != null) { - data[ModelKey.userProfile] = profile!.toJson(); - } + data[ModelKey.userDateOfBirth] = dateOfBirth?.toIso8601String(); + data[ModelKey.userCreatedAt] = createdAt?.toIso8601String(); + data[ModelKey.autoPlayMessages] = autoPlayMessages; + data[ModelKey.itAutoPlay] = itAutoPlay; + data[ModelKey.activatedTrialKey] = activatedFreeTrial; + data[ModelKey.publicProfile] = publicProfile; + data[ModelKey.l2LanguageKey] = targetLanguage; + data[ModelKey.l1LanguageKey] = sourceLanguage; + data[ModelKey.userCountry] = country; return data; } - Future save(PangeaController pangeaController) async { - await pangeaController.pStoreService.save( - PLocalKey.user, - toJson(), + static UserSettings? migrateFromAccountData() { + final accountData = + MatrixState.pangeaController.matrixState.client.accountData; + + if (!accountData.containsKey(ModelKey.userDateOfBirth)) return null; + final dobContent = accountData[ModelKey.userDateOfBirth]! + .content[ModelKey.userDateOfBirth]; + + String? dobString; + if (dobContent != null) { + dobString = dobContent as String; + } + + DateTime dob; + try { + dob = DateTime.parse(dobString!); + } catch (_) { + return null; + } + + final createdAtContent = + accountData[ModelKey.userCreatedAt]?.content[ModelKey.userCreatedAt]; + DateTime? createdAt; + if (createdAtContent != null) { + try { + createdAt = DateTime.parse(createdAtContent as String); + } catch (_) { + createdAt = null; + } + } + + return UserSettings( + dateOfBirth: dob, + createdAt: createdAt, + autoPlayMessages: (accountData[ModelKey.autoPlayMessages] + ?.content[ModelKey.autoPlayMessages] as bool?) ?? + false, + itAutoPlay: (accountData[ModelKey.itAutoPlay] + ?.content[ModelKey.itAutoPlay] as bool?) ?? + false, + activatedFreeTrial: (accountData[ModelKey.activatedTrialKey] + ?.content[ModelKey.activatedTrialKey] as bool?) ?? + false, + publicProfile: (accountData[ModelKey.publicProfile] + ?.content[ModelKey.publicProfile] as bool?) ?? + false, + targetLanguage: accountData[ModelKey.l2LanguageKey] + ?.content[ModelKey.l2LanguageKey] as String?, + sourceLanguage: accountData[ModelKey.l1LanguageKey] + ?.content[ModelKey.l1LanguageKey] as String?, + country: accountData[ModelKey.userCountry]?.content[ModelKey.userCountry] + as String?, ); } } -/// A list of all the fields in the user profile saved to matrix -enum MatrixProfileEnum { - dateOfBirth, - autoPlayMessages, - itAutoPlay, - activatedFreeTrial, - interactiveTranslator, - interactiveGrammar, - immersionMode, - definitions, - showedItInstructions, - showedClickMessage, - showedBlurMeansTranslate, - showedTooltipInstructions, - createdAt, - targetLanguage, - sourceLanguage, - country, - publicProfile, - autoIGC, -} +class UserToolSettings { + bool interactiveTranslator; + bool interactiveGrammar; + bool immersionMode; + bool definitions; + bool autoIGC; -extension MatrixProfileEnumExtension on MatrixProfileEnum { - String get title { - switch (this) { - case MatrixProfileEnum.dateOfBirth: - return ModelKey.userDateOfBirth; - case MatrixProfileEnum.autoPlayMessages: - return ModelKey.autoPlayMessages; - case MatrixProfileEnum.itAutoPlay: - return ModelKey.itAutoPlay; - case MatrixProfileEnum.activatedFreeTrial: - return ModelKey.activatedTrialKey; - case MatrixProfileEnum.interactiveTranslator: - return ToolSetting.interactiveTranslator.toString(); - case MatrixProfileEnum.interactiveGrammar: - return ToolSetting.interactiveGrammar.toString(); - case MatrixProfileEnum.immersionMode: - return ToolSetting.immersionMode.toString(); - case MatrixProfileEnum.definitions: - return ToolSetting.definitions.toString(); - case MatrixProfileEnum.autoIGC: - return ToolSetting.autoIGC.toString(); - case MatrixProfileEnum.showedItInstructions: - return InstructionsEnum.itInstructions.toString(); - case MatrixProfileEnum.showedClickMessage: - return InstructionsEnum.clickMessage.toString(); - case MatrixProfileEnum.showedBlurMeansTranslate: - return InstructionsEnum.blurMeansTranslate.toString(); - case MatrixProfileEnum.showedTooltipInstructions: - return InstructionsEnum.tooltipInstructions.toString(); - case MatrixProfileEnum.createdAt: - return ModelKey.userCreatedAt; - case MatrixProfileEnum.targetLanguage: - return ModelKey.l2LanguageKey; - case MatrixProfileEnum.sourceLanguage: - return ModelKey.l1LanguageKey; - case MatrixProfileEnum.country: - return ModelKey.userCountry; - case MatrixProfileEnum.publicProfile: - return ModelKey.publicProfile; - } + UserToolSettings({ + this.interactiveTranslator = true, + this.interactiveGrammar = true, + this.immersionMode = false, + this.definitions = true, + this.autoIGC = false, + }); + + factory UserToolSettings.fromJson(Map json) => + UserToolSettings( + interactiveTranslator: + json[ToolSetting.interactiveTranslator.toString()] ?? true, + interactiveGrammar: + json[ToolSetting.interactiveGrammar.toString()] ?? true, + immersionMode: json[ToolSetting.immersionMode.toString()] ?? false, + definitions: json[ToolSetting.definitions.toString()] ?? true, + autoIGC: json[ToolSetting.autoIGC.toString()] ?? false, + ); + + Map toJson() { + final Map data = {}; + data[ToolSetting.interactiveTranslator.toString()] = interactiveTranslator; + data[ToolSetting.interactiveGrammar.toString()] = interactiveGrammar; + data[ToolSetting.immersionMode.toString()] = immersionMode; + data[ToolSetting.definitions.toString()] = definitions; + data[ToolSetting.autoIGC.toString()] = autoIGC; + return data; } - ToolSetting? get asToolSetting { - switch (this) { - case MatrixProfileEnum.interactiveTranslator: - return ToolSetting.interactiveTranslator; - case MatrixProfileEnum.interactiveGrammar: - return ToolSetting.interactiveGrammar; - case MatrixProfileEnum.immersionMode: - return ToolSetting.immersionMode; - case MatrixProfileEnum.definitions: - return ToolSetting.definitions; - case MatrixProfileEnum.autoIGC: - return ToolSetting.autoIGC; - default: - return null; - } + factory UserToolSettings.migrateFromAccountData() { + final accountData = + MatrixState.pangeaController.matrixState.client.accountData; + return UserToolSettings( + interactiveTranslator: + (accountData[ToolSetting.interactiveTranslator.toString()] + ?.content[ToolSetting.interactiveTranslator.toString()] + as bool?) ?? + true, + interactiveGrammar: + (accountData[ToolSetting.interactiveGrammar.toString()] + ?.content[ToolSetting.interactiveGrammar.toString()] + as bool?) ?? + true, + immersionMode: (accountData[ToolSetting.immersionMode.toString()] + ?.content[ToolSetting.immersionMode.toString()] as bool?) ?? + false, + definitions: (accountData[ToolSetting.definitions.toString()] + ?.content[ToolSetting.definitions.toString()] as bool?) ?? + true, + autoIGC: (accountData[ToolSetting.autoIGC.toString()] + ?.content[ToolSetting.autoIGC.toString()] as bool?) ?? + false, + ); + } +} + +class UserInstructions { + bool showedItInstructions; + bool showedClickMessage; + bool showedBlurMeansTranslate; + bool showedTooltipInstructions; + + UserInstructions({ + this.showedItInstructions = false, + this.showedClickMessage = false, + this.showedBlurMeansTranslate = false, + this.showedTooltipInstructions = false, + }); + + factory UserInstructions.fromJson(Map json) => + UserInstructions( + showedItInstructions: + json[InstructionsEnum.itInstructions.toString()] ?? false, + showedClickMessage: + json[InstructionsEnum.clickMessage.toString()] ?? false, + showedBlurMeansTranslate: + json[InstructionsEnum.blurMeansTranslate.toString()] ?? false, + showedTooltipInstructions: + json[InstructionsEnum.tooltipInstructions.toString()] ?? false, + ); + + Map toJson() { + final Map data = {}; + data[InstructionsEnum.itInstructions.toString()] = showedItInstructions; + data[InstructionsEnum.clickMessage.toString()] = showedClickMessage; + data[InstructionsEnum.blurMeansTranslate.toString()] = + showedBlurMeansTranslate; + data[InstructionsEnum.tooltipInstructions.toString()] = + showedTooltipInstructions; + return data; + } + + factory UserInstructions.migrateFromAccountData() { + final accountData = + MatrixState.pangeaController.matrixState.client.accountData; + return UserInstructions( + showedItInstructions: + (accountData[InstructionsEnum.itInstructions.toString()] + ?.content[InstructionsEnum.itInstructions.toString()] + as bool?) ?? + false, + showedClickMessage: (accountData[InstructionsEnum.clickMessage.toString()] + ?.content[InstructionsEnum.clickMessage.toString()] as bool?) ?? + false, + showedBlurMeansTranslate: + (accountData[InstructionsEnum.blurMeansTranslate.toString()] + ?.content[InstructionsEnum.blurMeansTranslate.toString()] + as bool?) ?? + false, + showedTooltipInstructions: + (accountData[InstructionsEnum.tooltipInstructions.toString()] + ?.content[InstructionsEnum.tooltipInstructions.toString()] + as bool?) ?? + false, + ); } } /// A wrapper around the matrix account data for the user profile. /// Enables easy access to the profile data and saving new data. -/// The matrix profile doesn't function exactly the same as a 'model', -/// since all the data here is already stored in the client as account -/// data, and duplicating that data could lead to some inconsistenies. -/// So this class is more of a helper class to make it easier to -/// access and save the data. -class MatrixProfile { - /// Convenience function get get user's account data from the client - Map get accountData => - MatrixState.pangeaController.matrixState.client.accountData; +class Profile { + late UserSettings userSettings; + late UserToolSettings toolSettings; + late UserInstructions instructionSettings; - /// Returns the profile of the user. - /// - /// The profile is retrieved from the user's account data - /// using the key `ModelKey.userProfile`. It returns a `Map` object - /// representing the user's profile information. - Map? get profile => - accountData[ModelKey.userProfile]?.content; - - /// Retrieves the profile data for the given [key]. - /// - /// This method first tries to get the data from the new profile format. If the data is found, - /// it is returned. If not, it checks if the data is stored in the old format. If it is, the data - /// is saved to the new format and returned. - dynamic getProfileData(MatrixProfileEnum key) { - // try to get the data from the new profile format - if (profile?[key.title] != null) { - return profile?[key.title]; - } - - // check if the data is stored in the old format - // and if so, save it to the new format - final prevFormatData = accountData[key.title]?.content[key.title]; - if (prevFormatData != null) { - saveProfileData({key.title: prevFormatData}); - return prevFormatData; - } + Profile({ + required this.userSettings, + UserToolSettings? toolSettings, + UserInstructions? instructionSettings, + }) { + this.toolSettings = toolSettings ?? UserToolSettings(); + this.instructionSettings = instructionSettings ?? UserInstructions(); } - /// Saves the profile data by updating the current user's profile with the provided updates. - /// - /// The [updates] parameter is a map containing the key-value pairs of the profile fields to be updated. - /// Only non-null values in the [updates] map will be applied to the current profile. - /// - /// If the updated profile is equal to the current profile, no changes will be made. - /// - /// If [waitForDataInSync] is true, the function will wait for the updated data in a sync update - /// If this is set to false, after this function completes there may be a gap where the - /// data has been sent but is not in the client's account data, as the sync update has not yet been received. - Future saveProfileData( - Map updates, { + static Profile? fromAccountData() { + final profileData = MatrixState.pangeaController.matrixState.client + .accountData[ModelKey.userProfile]?.content; + if (profileData == null) return null; + + final userSettingsContent = profileData[ModelKey.userSettings]; + if (userSettingsContent == null) return null; + + final toolSettingsContent = profileData[ModelKey.toolSettings]; + final instructionSettingsContent = + profileData[ModelKey.instructionsSettings]; + + return Profile( + userSettings: + UserSettings.fromJson(userSettingsContent as Map), + toolSettings: toolSettingsContent != null + ? UserToolSettings.fromJson( + toolSettingsContent as Map, + ) + : UserToolSettings(), + instructionSettings: instructionSettingsContent != null + ? UserInstructions.fromJson( + instructionSettingsContent as Map, + ) + : UserInstructions(), + ); + } + + Map toJson() { + final Map json = { + ModelKey.userSettings: userSettings.toJson(), + ModelKey.toolSettings: toolSettings.toJson(), + ModelKey.instructionsSettings: instructionSettings.toJson(), + }; + return json; + } + + static Profile? migrateFromAccountData() { + final userSettings = UserSettings.migrateFromAccountData(); + if (userSettings == null) return null; + + final toolSettings = UserToolSettings.migrateFromAccountData(); + final instructionSettings = UserInstructions.migrateFromAccountData(); + return Profile( + userSettings: userSettings, + toolSettings: toolSettings, + instructionSettings: instructionSettings, + ); + } + + Future saveProfileData({ waitForDataInSync = false, }) async { - final currentProfile = toJson(); - for (final entry in updates.entries) { - if (entry.value == null) continue; - currentProfile[entry.key] = entry.value; - } - if (mapEquals(toJson(), currentProfile)) return; - final PangeaController pangeaController = MatrixState.pangeaController; final Client client = pangeaController.matrixState.client; - - final List profileKeys = - MatrixProfileEnum.values.map((e) => e.title).toList(); + final List profileKeys = [ + ModelKey.userSettings, + ModelKey.toolSettings, + ModelKey.instructionsSettings, + ]; Future? waitForUpdate; if (waitForDataInSync) { @@ -208,68 +329,26 @@ class MatrixProfile { await client.setAccountData( client.userID!, ModelKey.userProfile, - currentProfile, + toJson(), ); - if (waitForDataInSync) await waitForUpdate; - } - /// Converts the Matrix Profile to a JSON representation. - Map toJson() { - final Map json = {}; - for (final value in MatrixProfileEnum.values) { - json[value.title] = profile?[value.title]; + if (waitForDataInSync) { + await waitForUpdate; } - return json; } - // below are some convenience methods for accessing the profile data - // getProfileData could be used directly, but these methods reduce the - // need for repeating the same code (like parsing DateTimes or - // assigning default values to null booleans) when accessing specific values. - - DateTime? get dateOfBirth { - final dob = getProfileData(MatrixProfileEnum.dateOfBirth); - return dob != null ? DateTime.parse(dob) : null; + static Profile get emptyProfile { + return Profile( + userSettings: UserSettings(), + toolSettings: UserToolSettings(), + instructionSettings: UserInstructions(), + ); } - - bool get autoPlayMessages => - getProfileData(MatrixProfileEnum.autoPlayMessages) ?? false; - bool get itAutoPlay => getProfileData(MatrixProfileEnum.itAutoPlay) ?? false; - bool get activatedFreeTrial => - getProfileData(MatrixProfileEnum.activatedFreeTrial) ?? false; - bool get interactiveTranslator => - getProfileData(MatrixProfileEnum.interactiveTranslator) ?? true; - bool get interactiveGrammar => - getProfileData(MatrixProfileEnum.interactiveGrammar) ?? true; - bool get immersionMode => - getProfileData(MatrixProfileEnum.immersionMode) ?? false; - bool get definitions => getProfileData(MatrixProfileEnum.definitions) ?? true; - bool get autoIGC => getProfileData(MatrixProfileEnum.autoIGC) ?? false; - - /// A list of all the fields in MatrixProfileEnum that correspond to tool settings - static List get toolSettings => [ - MatrixProfileEnum.interactiveTranslator, - MatrixProfileEnum.interactiveGrammar, - MatrixProfileEnum.immersionMode, - MatrixProfileEnum.definitions, - MatrixProfileEnum.autoIGC, - ]; - - /// A list of all the fields in MatrixProfileEnum that correspond to pangea profile values - static List pangeaProfileFields = [ - MatrixProfileEnum.dateOfBirth, - MatrixProfileEnum.createdAt, - MatrixProfileEnum.targetLanguage, - MatrixProfileEnum.sourceLanguage, - MatrixProfileEnum.country, - MatrixProfileEnum.publicProfile, - ]; } -class Profile { - // i'm considering removing this field because it's duplicating info in the - // matrix database - // String? fullName; +/// Model of data from pangea chat server. Not used anymore, in favor of matrix account data. +/// This class if used to read in data from the server to be migrated to matrix account data. +class PangeaProfile { final String createdAt; final String pangeaUserId; String? dateOfBirth; @@ -279,8 +358,7 @@ class Profile { String? country; bool publicProfile; - Profile({ - // this.fullName, + PangeaProfile({ required this.createdAt, required this.pangeaUserId, this.dateOfBirth, @@ -290,16 +368,15 @@ class Profile { this.publicProfile = false, }); - factory Profile.fromJson(Map json) { + factory PangeaProfile.fromJson(Map json) { final l2 = LanguageModel.codeFromNameOrCode( - json[ModelKey.l2LanguageKey] ?? LanguageKeys.unknownLanguage, + json[ModelKey.l2LanguageKey], ); final l1 = LanguageModel.codeFromNameOrCode( - json[ModelKey.l1LanguageKey] ?? LanguageKeys.unknownLanguage, + json[ModelKey.l1LanguageKey], ); - return Profile( - // fullName: json[ModelKey.userFullName], + return PangeaProfile( createdAt: json[ModelKey.userCreatedAt], pangeaUserId: json[ModelKey.userPangeaUserId], dateOfBirth: json[ModelKey.userDateOfBirth], @@ -312,7 +389,6 @@ class Profile { Map toJson() { final Map data = {}; - // data[ModelKey.userFullName] = fullName; data[ModelKey.userCreatedAt] = createdAt; data[ModelKey.userPangeaUserId] = pangeaUserId; data[ModelKey.userDateOfBirth] = dateOfBirth; @@ -322,514 +398,21 @@ class Profile { data[ModelKey.userCountry] = country; return data; } +} - /// used in find a partner page for display partner's country - String get flagEmoji { - final String? countryName = this.country?.split(' (')[0]; - final Country? country = CountryService().findByName(countryName); - return country?.flagEmoji ?? ""; - } +class PangeaProfileResponse { + final PangeaProfile profile; + final String access; - String? countryDisplayName(BuildContext context) { - final String? countryName = this.country?.split(' (')[0]; - final Country? country = CountryService().findByName(countryName); - if (country?.countryCode == null) return null; - switch (country!.countryCode) { - case 'WW': - return L10n.of(context)!.wwCountryDisplayName; - case 'AF': - return L10n.of(context)!.afCountryDisplayName; - case 'AX': - return L10n.of(context)!.axCountryDisplayName; - case 'AL': - return L10n.of(context)!.alCountryDisplayName; - case 'DZ': - return L10n.of(context)!.dzCountryDisplayName; - case 'AS': - return L10n.of(context)!.asCountryDisplayName; - case 'AD': - return L10n.of(context)!.adCountryDisplayName; - case 'AO': - return L10n.of(context)!.aoCountryDisplayName; - case 'AI': - return L10n.of(context)!.aiCountryDisplayName; - case 'AG': - return L10n.of(context)!.agCountryDisplayName; - case 'AR': - return L10n.of(context)!.arCountryDisplayName; - case 'AM': - return L10n.of(context)!.amCountryDisplayName; - case 'AW': - return L10n.of(context)!.awCountryDisplayName; - case 'AC': - return L10n.of(context)!.acCountryDisplayName; - case 'AU': - return L10n.of(context)!.auCountryDisplayName; - case 'AT': - return L10n.of(context)!.atCountryDisplayName; - case 'AZ': - return L10n.of(context)!.azCountryDisplayName; - case 'BS': - return L10n.of(context)!.bsCountryDisplayName; - case 'BH': - return L10n.of(context)!.bhCountryDisplayName; - case 'BD': - return L10n.of(context)!.bdCountryDisplayName; - case 'BB': - return L10n.of(context)!.bbCountryDisplayName; - case 'BY': - return L10n.of(context)!.byCountryDisplayName; - case 'BE': - return L10n.of(context)!.beCountryDisplayName; - case 'BZ': - return L10n.of(context)!.bzCountryDisplayName; - case 'BJ': - return L10n.of(context)!.bjCountryDisplayName; - case 'BM': - return L10n.of(context)!.bmCountryDisplayName; - case 'BT': - return L10n.of(context)!.btCountryDisplayName; - case 'BO': - return L10n.of(context)!.boCountryDisplayName; - case 'BA': - return L10n.of(context)!.baCountryDisplayName; - case 'BW': - return L10n.of(context)!.bwCountryDisplayName; - case 'BR': - return L10n.of(context)!.brCountryDisplayName; - case 'IO': - return L10n.of(context)!.ioCountryDisplayName; - case 'VG': - return L10n.of(context)!.vgCountryDisplayName; - case 'BN': - return L10n.of(context)!.bnCountryDisplayName; - case 'BG': - return L10n.of(context)!.bgCountryDisplayName; - case 'BF': - return L10n.of(context)!.bfCountryDisplayName; - case 'BI': - return L10n.of(context)!.biCountryDisplayName; - case 'KH': - return L10n.of(context)!.khCountryDisplayName; - case 'CM': - return L10n.of(context)!.cmCountryDisplayName; - case 'CA': - return L10n.of(context)!.caCountryDisplayName; - case 'CV': - return L10n.of(context)!.cvCountryDisplayName; - case 'BQ': - return L10n.of(context)!.bqCountryDisplayName; - case 'KY': - return L10n.of(context)!.kyCountryDisplayName; - case 'CF': - return L10n.of(context)!.cfCountryDisplayName; - case 'TD': - return L10n.of(context)!.tdCountryDisplayName; - case 'CL': - return L10n.of(context)!.clCountryDisplayName; - case 'CN': - return L10n.of(context)!.cnCountryDisplayName; - case 'CX': - return L10n.of(context)!.cxCountryDisplayName; - case 'CC': - return L10n.of(context)!.ccCountryDisplayName; - case 'CO': - return L10n.of(context)!.coCountryDisplayName; - case 'KM': - return L10n.of(context)!.kmCountryDisplayName; - case 'CD': - return L10n.of(context)!.cdCountryDisplayName; - case 'CG': - return L10n.of(context)!.cgCountryDisplayName; - case 'CK': - return L10n.of(context)!.ckCountryDisplayName; - case 'CR': - return L10n.of(context)!.crCountryDisplayName; - case 'CI': - return L10n.of(context)!.ciCountryDisplayName; - case 'HR': - return L10n.of(context)!.hrCountryDisplayName; - case 'CU': - return L10n.of(context)!.cuCountryDisplayName; - case 'CW': - return L10n.of(context)!.cwCountryDisplayName; - case 'CY': - return L10n.of(context)!.cyCountryDisplayName; - case 'CZ': - return L10n.of(context)!.czCountryDisplayName; - case 'DK': - return L10n.of(context)!.dkCountryDisplayName; - case 'DJ': - return L10n.of(context)!.djCountryDisplayName; - case 'DM': - return L10n.of(context)!.dmCountryDisplayName; - case 'DO': - return L10n.of(context)!.doCountryDisplayName; - case 'TL': - return L10n.of(context)!.tlCountryDisplayName; - case 'EC': - return L10n.of(context)!.ecCountryDisplayName; - case 'EG': - return L10n.of(context)!.egCountryDisplayName; - case 'SV': - return L10n.of(context)!.svCountryDisplayName; - case 'GQ': - return L10n.of(context)!.gqCountryDisplayName; - case 'ER': - return L10n.of(context)!.erCountryDisplayName; - case 'EE': - return L10n.of(context)!.eeCountryDisplayName; - case 'SZ': - return L10n.of(context)!.szCountryDisplayName; - case 'ET': - return L10n.of(context)!.etCountryDisplayName; - case 'FK': - return L10n.of(context)!.fkCountryDisplayName; - case 'FO': - return L10n.of(context)!.foCountryDisplayName; - case 'FJ': - return L10n.of(context)!.fjCountryDisplayName; - case 'FI': - return L10n.of(context)!.fiCountryDisplayName; - case 'FR': - return L10n.of(context)!.frCountryDisplayName; - case 'GF': - return L10n.of(context)!.gfCountryDisplayName; - case 'PF': - return L10n.of(context)!.pfCountryDisplayName; - case 'GA': - return L10n.of(context)!.gaCountryDisplayName; - case 'GM': - return L10n.of(context)!.gmCountryDisplayName; - case 'GE': - return L10n.of(context)!.geCountryDisplayName; - case 'DE': - return L10n.of(context)!.deCountryDisplayName; - case 'GH': - return L10n.of(context)!.ghCountryDisplayName; - case 'GI': - return L10n.of(context)!.giCountryDisplayName; - case 'GR': - return L10n.of(context)!.grCountryDisplayName; - case 'GL': - return L10n.of(context)!.glCountryDisplayName; - case 'GD': - return L10n.of(context)!.gdCountryDisplayName; - case 'GP': - return L10n.of(context)!.gpCountryDisplayName; - case 'GU': - return L10n.of(context)!.guCountryDisplayName; - case 'GT': - return L10n.of(context)!.gtCountryDisplayName; - case 'GG': - return L10n.of(context)!.ggCountryDisplayName; - case 'GN': - return L10n.of(context)!.gnCountryDisplayName; - case 'GW': - return L10n.of(context)!.gwCountryDisplayName; - case 'GY': - return L10n.of(context)!.gyCountryDisplayName; - case 'HT': - return L10n.of(context)!.htCountryDisplayName; - case 'HM': - return L10n.of(context)!.hmCountryDisplayName; - case 'HN': - return L10n.of(context)!.hnCountryDisplayName; - case 'HK': - return L10n.of(context)!.hkCountryDisplayName; - case 'HU': - return L10n.of(context)!.huCountryDisplayName; - case 'IS': - return L10n.of(context)!.isCountryDisplayName; - case 'IN': - return L10n.of(context)!.inCountryDisplayName; - case 'ID': - return L10n.of(context)!.idCountryDisplayName; - case 'IR': - return L10n.of(context)!.irCountryDisplayName; - case 'IQ': - return L10n.of(context)!.iqCountryDisplayName; - case 'IE': - return L10n.of(context)!.ieCountryDisplayName; - case 'IM': - return L10n.of(context)!.imCountryDisplayName; - case 'IL': - return L10n.of(context)!.ilCountryDisplayName; - case 'IT': - return L10n.of(context)!.itCountryDisplayName; - case 'JM': - return L10n.of(context)!.jmCountryDisplayName; - case 'JP': - return L10n.of(context)!.jpCountryDisplayName; - case 'JE': - return L10n.of(context)!.jeCountryDisplayName; - case 'JO': - return L10n.of(context)!.joCountryDisplayName; - case 'KZ': - return L10n.of(context)!.kzCountryDisplayName; - case 'KE': - return L10n.of(context)!.keCountryDisplayName; - case 'KI': - return L10n.of(context)!.kiCountryDisplayName; - case 'XK': - return L10n.of(context)!.xkCountryDisplayName; - case 'KW': - return L10n.of(context)!.kwCountryDisplayName; - case 'KG': - return L10n.of(context)!.kgCountryDisplayName; - case 'LA': - return L10n.of(context)!.laCountryDisplayName; - case 'LV': - return L10n.of(context)!.lvCountryDisplayName; - case 'LB': - return L10n.of(context)!.lbCountryDisplayName; - case 'LS': - return L10n.of(context)!.lsCountryDisplayName; - case 'LR': - return L10n.of(context)!.lrCountryDisplayName; - case 'LY': - return L10n.of(context)!.lyCountryDisplayName; - case 'LI': - return L10n.of(context)!.liCountryDisplayName; - case 'LT': - return L10n.of(context)!.ltCountryDisplayName; - case 'LU': - return L10n.of(context)!.luCountryDisplayName; - case 'MO': - return L10n.of(context)!.moCountryDisplayName; - case 'MK': - return L10n.of(context)!.mkCountryDisplayName; - case 'MG': - return L10n.of(context)!.mgCountryDisplayName; - case 'MW': - return L10n.of(context)!.mwCountryDisplayName; - case 'MY': - return L10n.of(context)!.myCountryDisplayName; - case 'MV': - return L10n.of(context)!.mvCountryDisplayName; - case 'ML': - return L10n.of(context)!.mlCountryDisplayName; - case 'MT': - return L10n.of(context)!.mtCountryDisplayName; - case 'MH': - return L10n.of(context)!.mhCountryDisplayName; - case 'MQ': - return L10n.of(context)!.mqCountryDisplayName; - case 'MR': - return L10n.of(context)!.mrCountryDisplayName; - case 'MU': - return L10n.of(context)!.muCountryDisplayName; - case 'YT': - return L10n.of(context)!.ytCountryDisplayName; - case 'MX': - return L10n.of(context)!.mxCountryDisplayName; - case 'FM': - return L10n.of(context)!.fmCountryDisplayName; - case 'MD': - return L10n.of(context)!.mdCountryDisplayName; - case 'MC': - return L10n.of(context)!.mcCountryDisplayName; - case 'MN': - return L10n.of(context)!.mnCountryDisplayName; - case 'ME': - return L10n.of(context)!.meCountryDisplayName; - case 'MS': - return L10n.of(context)!.msCountryDisplayName; - case 'MA': - return L10n.of(context)!.maCountryDisplayName; - case 'MZ': - return L10n.of(context)!.mzCountryDisplayName; - case 'MM': - return L10n.of(context)!.mmCountryDisplayName; - case 'NA': - return L10n.of(context)!.naCountryDisplayName; - case 'NR': - return L10n.of(context)!.nrCountryDisplayName; - case 'NP': - return L10n.of(context)!.npCountryDisplayName; - case 'NL': - return L10n.of(context)!.nlCountryDisplayName; - case 'NC': - return L10n.of(context)!.ncCountryDisplayName; - case 'NZ': - return L10n.of(context)!.nzCountryDisplayName; - case 'NI': - return L10n.of(context)!.niCountryDisplayName; - case 'NE': - return L10n.of(context)!.neCountryDisplayName; - case 'NG': - return L10n.of(context)!.ngCountryDisplayName; - case 'NU': - return L10n.of(context)!.nuCountryDisplayName; - case 'NF': - return L10n.of(context)!.nfCountryDisplayName; - case 'KP': - return L10n.of(context)!.kpCountryDisplayName; - case 'MP': - return L10n.of(context)!.mpCountryDisplayName; - case 'NO': - return L10n.of(context)!.noCountryDisplayName; - case 'OM': - return L10n.of(context)!.omCountryDisplayName; - case 'PK': - return L10n.of(context)!.pkCountryDisplayName; - case 'PW': - return L10n.of(context)!.pwCountryDisplayName; - case 'PS': - return L10n.of(context)!.psCountryDisplayName; - case 'PA': - return L10n.of(context)!.paCountryDisplayName; - case 'PG': - return L10n.of(context)!.pgCountryDisplayName; - case 'PY': - return L10n.of(context)!.pyCountryDisplayName; - case 'PE': - return L10n.of(context)!.peCountryDisplayName; - case 'PH': - return L10n.of(context)!.phCountryDisplayName; - case 'PL': - return L10n.of(context)!.plCountryDisplayName; - case 'PT': - return L10n.of(context)!.ptCountryDisplayName; - case 'PR': - return L10n.of(context)!.prCountryDisplayName; - case 'QA': - return L10n.of(context)!.qaCountryDisplayName; - case 'RE': - return L10n.of(context)!.reCountryDisplayName; - case 'RO': - return L10n.of(context)!.roCountryDisplayName; - case 'RU': - return L10n.of(context)!.ruCountryDisplayName; - case 'RW': - return L10n.of(context)!.rwCountryDisplayName; - case 'BL': - return L10n.of(context)!.blCountryDisplayName; - case 'SH': - return L10n.of(context)!.shCountryDisplayName; - case 'KN': - return L10n.of(context)!.knCountryDisplayName; - case 'LC': - return L10n.of(context)!.lcCountryDisplayName; - case 'MF': - return L10n.of(context)!.mfCountryDisplayName; - case 'PM': - return L10n.of(context)!.pmCountryDisplayName; - case 'VC': - return L10n.of(context)!.vcCountryDisplayName; - case 'WS': - return L10n.of(context)!.wsCountryDisplayName; - case 'SM': - return L10n.of(context)!.smCountryDisplayName; - case 'ST': - return L10n.of(context)!.stCountryDisplayName; - case 'SA': - return L10n.of(context)!.saCountryDisplayName; - case 'SN': - return L10n.of(context)!.snCountryDisplayName; - case 'RS': - return L10n.of(context)!.rsCountryDisplayName; - case 'SC': - return L10n.of(context)!.scCountryDisplayName; - case 'SL': - return L10n.of(context)!.slCountryDisplayName; - case 'SG': - return L10n.of(context)!.sgCountryDisplayName; - case 'SX': - return L10n.of(context)!.sxCountryDisplayName; - case 'SK': - return L10n.of(context)!.skCountryDisplayName; - case 'SI': - return L10n.of(context)!.siCountryDisplayName; - case 'SB': - return L10n.of(context)!.sbCountryDisplayName; - case 'SO': - return L10n.of(context)!.soCountryDisplayName; - case 'ZA': - return L10n.of(context)!.zaCountryDisplayName; - case 'GS': - return L10n.of(context)!.gsCountryDisplayName; - case 'KR': - return L10n.of(context)!.krCountryDisplayName; - case 'SS': - return L10n.of(context)!.ssCountryDisplayName; - case 'ES': - return L10n.of(context)!.esCountryDisplayName; - case 'LK': - return L10n.of(context)!.lkCountryDisplayName; - case 'SD': - return L10n.of(context)!.sdCountryDisplayName; - case 'SR': - return L10n.of(context)!.srCountryDisplayName; - case 'SJ': - return L10n.of(context)!.sjCountryDisplayName; - case 'SE': - return L10n.of(context)!.seCountryDisplayName; - case 'CH': - return L10n.of(context)!.chCountryDisplayName; - case 'SY': - return L10n.of(context)!.syCountryDisplayName; - case 'TW': - return L10n.of(context)!.twCountryDisplayName; - case 'TJ': - return L10n.of(context)!.tjCountryDisplayName; - case 'TZ': - return L10n.of(context)!.tzCountryDisplayName; - case 'TH': - return L10n.of(context)!.thCountryDisplayName; - case 'TG': - return L10n.of(context)!.tgCountryDisplayName; - case 'TK': - return L10n.of(context)!.tkCountryDisplayName; - case 'TO': - return L10n.of(context)!.toCountryDisplayName; - case 'TT': - return L10n.of(context)!.ttCountryDisplayName; - case 'TN': - return L10n.of(context)!.tnCountryDisplayName; - case 'TR': - return L10n.of(context)!.trCountryDisplayName; - case 'TM': - return L10n.of(context)!.tmCountryDisplayName; - case 'TC': - return L10n.of(context)!.tcCountryDisplayName; - case 'TV': - return L10n.of(context)!.tvCountryDisplayName; - case 'VI': - return L10n.of(context)!.viCountryDisplayName; - case 'UG': - return L10n.of(context)!.ugCountryDisplayName; - case 'UA': - return L10n.of(context)!.uaCountryDisplayName; - case 'AE': - return L10n.of(context)!.aeCountryDisplayName; - case 'GB': - return L10n.of(context)!.gbCountryDisplayName; - case 'US': - return L10n.of(context)!.usCountryDisplayName; - case 'UY': - return L10n.of(context)!.uyCountryDisplayName; - case 'UZ': - return L10n.of(context)!.uzCountryDisplayName; - case 'VU': - return L10n.of(context)!.vuCountryDisplayName; - case 'VA': - return L10n.of(context)!.vaCountryDisplayName; - case 'VE': - return L10n.of(context)!.veCountryDisplayName; - case 'VN': - return L10n.of(context)!.vnCountryDisplayName; - case 'WF': - return L10n.of(context)!.wfCountryDisplayName; - case 'EH': - return L10n.of(context)!.ehCountryDisplayName; - case 'YE': - return L10n.of(context)!.yeCountryDisplayName; - case 'ZM': - return L10n.of(context)!.zmCountryDisplayName; - case 'ZW': - return L10n.of(context)!.zwCountryDisplayName; - } - return null; + PangeaProfileResponse({ + required this.profile, + required this.access, + }); + + factory PangeaProfileResponse.fromJson(Map json) { + return PangeaProfileResponse( + profile: PangeaProfile.fromJson(json), + access: json[ModelKey.userAccess], + ); } } diff --git a/lib/pangea/models/user_profile_search_model.dart b/lib/pangea/models/user_profile_search_model.dart index de8822b04..212e8e392 100644 --- a/lib/pangea/models/user_profile_search_model.dart +++ b/lib/pangea/models/user_profile_search_model.dart @@ -4,7 +4,7 @@ class UserProfileSearchResponse { int count; String? next; String? previous; - List results; + List results; UserProfileSearchResponse({ required this.count, @@ -19,9 +19,9 @@ class UserProfileSearchResponse { next: json["next"], previous: json["previous"], results: json["results"] - .map((p) => Profile.fromJson(p)) + .map((p) => PangeaProfile.fromJson(p)) .toList() - .cast(), + .cast(), ); } } diff --git a/lib/pangea/pages/find_partner/find_partner.dart b/lib/pangea/pages/find_partner/find_partner.dart index 46eb365ae..a953c7f19 100644 --- a/lib/pangea/pages/find_partner/find_partner.dart +++ b/lib/pangea/pages/find_partner/find_partner.dart @@ -37,7 +37,7 @@ class FindPartnerController extends State { Timer? coolDown; - final List _userProfilesCache = []; + final List _userProfilesCache = []; final scrollController = ScrollController(); String? error; @@ -83,7 +83,7 @@ class FindPartnerController extends State { return FindPartnerView(this); } - List get userProfiles => _userProfilesCache.where((p) { + List get userProfiles => _userProfilesCache.where((p) { return (p.targetLanguage != null && targetLanguageSearch.langCode == p.targetLanguage) && (p.sourceLanguage != null && @@ -127,8 +127,7 @@ class FindPartnerController extends State { nextUrl = response.next; nextPage++; - final String? currentUserId = - pangeaController.userController.userModel?.profile?.pangeaUserId; + final String? currentUserId = pangeaController.matrixState.client.userID; _userProfilesCache.addAll( response.results.where( (p) => diff --git a/lib/pangea/pages/find_partner/find_partner_view.dart b/lib/pangea/pages/find_partner/find_partner_view.dart index db6afa2d1..032ed7daf 100644 --- a/lib/pangea/pages/find_partner/find_partner_view.dart +++ b/lib/pangea/pages/find_partner/find_partner_view.dart @@ -2,6 +2,7 @@ import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pangea/models/user_model.dart'; +import 'package:fluffychat/pangea/utils/country_display.dart'; import 'package:fluffychat/pangea/widgets/common/list_placeholder.dart'; import 'package:fluffychat/pangea/widgets/common/pangea_logo_svg.dart'; import 'package:fluffychat/pangea/widgets/user_settings/p_language_dropdown.dart'; @@ -244,7 +245,7 @@ class LanguageSelectionRow extends StatelessWidget { } class UserProfileEntry extends StatelessWidget { - final Profile pangeaProfile; + final PangeaProfile pangeaProfile; final FindPartnerController controller; const UserProfileEntry({ @@ -287,7 +288,7 @@ class UserProfileEntry extends StatelessWidget { const SizedBox(width: 20), RichText( text: TextSpan( - text: pangeaProfile.flagEmoji, + text: CountryDisplayUtil.flagEmoji(pangeaProfile.country), style: const TextStyle(fontSize: 15), ), ), diff --git a/lib/pangea/pages/p_user_age/p_user_age.dart b/lib/pangea/pages/p_user_age/p_user_age.dart index adb060e38..5fe489485 100644 --- a/lib/pangea/pages/p_user_age/p_user_age.dart +++ b/lib/pangea/pages/p_user_age/p_user_age.dart @@ -10,7 +10,6 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:intl/intl.dart'; import '../../utils/bot_name.dart'; import '../../utils/error_handler.dart'; @@ -73,26 +72,24 @@ class PUserAgeController extends State { } //Note: used linear progress bar (also used in fluffychat signup button) for consistency - createUserInPangea() async { + Future createUserInPangea() async { try { - setState(() { - error = dobValidator(); - }); - + setState(() => error = dobValidator()); if (error?.isNotEmpty == true) return; + setState(() => loading = true); - setState(() { - loading = true; - }); + final DateTime? dob = + pangeaController.userController.profile.userSettings.dateOfBirth; - final String date = DateFormat('yyyy-MM-dd').format(selectedDate!); - - if (pangeaController.userController.userModel?.access == null) { - await pangeaController.userController.createProfile(dob: date); - } else { - await pangeaController.userController.updateUserProfile( - dateOfBirth: date, + if (dob == null) { + await pangeaController.userController.createProfile( + dob: selectedDate!, ); + } else { + pangeaController.userController.updateProfile((profile) { + profile.userSettings.dateOfBirth = selectedDate!; + return profile; + }); } FluffyChatApp.router.go('/rooms'); } catch (err, s) { diff --git a/lib/pangea/pages/settings_learning/settings_learning.dart b/lib/pangea/pages/settings_learning/settings_learning.dart index 4c4fe4d50..03e5f635a 100644 --- a/lib/pangea/pages/settings_learning/settings_learning.dart +++ b/lib/pangea/pages/settings_learning/settings_learning.dart @@ -2,6 +2,8 @@ import 'dart:async'; import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/models/space_model.dart'; +import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning_view.dart'; import 'package:fluffychat/pangea/widgets/user_settings/p_language_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; @@ -18,31 +20,55 @@ class SettingsLearningController extends State { late StreamSubscription _userSubscription; PangeaController pangeaController = MatrixState.pangeaController; - setPublicProfile(bool b) async { - await pangeaController.userController.updateUserProfile(publicProfile: b); - setState(() {}); + Future changeLanguage() async { + await pLanguageDialog(context, () {}); } - @override - void initState() { - super.initState(); - - _userSubscription = - pangeaController.userController.stateStream.listen((event) { - setState(() {}); + Future setPublicProfile(bool isPublic) async { + pangeaController.userController.updateProfile((profile) { + profile.userSettings.publicProfile = isPublic; + return profile; }); } - Future changeLanguage() async { - await pLanguageDialog(context, () {}); - setState(() {}); + Future changeCountry(Country country) async { + pangeaController.userController.updateProfile((profile) { + profile.userSettings.country = country.displayNameNoCountryCode; + return profile; + }); } - Future changeCountry(Country country) async { - await pangeaController.userController.updateUserProfile( - country: country.displayNameNoCountryCode, - ); - setState(() {}); + void updateToolSetting(ToolSetting toolSetting, bool value) { + pangeaController.userController.updateProfile((Profile profile) { + switch (toolSetting) { + case ToolSetting.interactiveTranslator: + return profile..toolSettings.interactiveTranslator = value; + case ToolSetting.interactiveGrammar: + return profile..toolSettings.interactiveGrammar = value; + case ToolSetting.immersionMode: + return profile..toolSettings.immersionMode = value; + case ToolSetting.definitions: + return profile..toolSettings.definitions = value; + case ToolSetting.autoIGC: + return profile..toolSettings.autoIGC = value; + } + }); + } + + bool getToolSetting(ToolSetting toolSetting) { + final toolSettings = pangeaController.userController.profile.toolSettings; + switch (toolSetting) { + case ToolSetting.interactiveTranslator: + return toolSettings.interactiveTranslator; + case ToolSetting.interactiveGrammar: + return toolSettings.interactiveGrammar; + case ToolSetting.immersionMode: + return toolSettings.immersionMode; + case ToolSetting.definitions: + return toolSettings.definitions; + case ToolSetting.autoIGC: + return toolSettings.autoIGC; + } } @override diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart index 06136cd7e..5422ebbe5 100644 --- a/lib/pangea/pages/settings_learning/settings_learning_view.dart +++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart @@ -1,5 +1,4 @@ import 'package:fluffychat/pangea/models/space_model.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/widgets/user_settings/country_picker_tile.dart'; @@ -18,71 +17,97 @@ class SettingsLearningView extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - centerTitle: true, - title: Text( - L10n.of(context)!.learningSettings, - ), + // rebuild this page each time a sync comes through with new account data + // this prevents having to call setState each time an individual setting is changed + return StreamBuilder( + stream: + controller.pangeaController.matrixState.client.onSync.stream.where( + (update) => update.accountData != null, ), - body: ListTileTheme( - iconColor: Theme.of(context).textTheme.bodyLarge!.color, - child: MaxWidthBody( - withScrolling: true, - child: Column( - children: [ - LanguageTile(controller), - CountryPickerTile(controller), - const SizedBox(height: 8), - const Divider(height: 1), - const SizedBox(height: 8), - if (controller.pangeaController.permissionsController.isUser18()) - SwitchListTile.adaptive( - activeColor: AppConfig.activeToggleColor, - title: Text(L10n.of(context)!.publicProfileTitle), - subtitle: Text(L10n.of(context)!.publicProfileDesc), - value: controller.pangeaController.userController.isPublic, - onChanged: (bool isPublicProfile) => showFutureLoadingDialog( - context: context, - future: () => controller.setPublicProfile(isPublicProfile), - onError: (err) => - ErrorHandler.logError(e: err, s: StackTrace.current), - ), - ), - ListTile( - subtitle: Text(L10n.of(context)!.toggleToolSettingsDescription), - ), - for (final setting in MatrixProfile.toolSettings) - setting.asToolSetting != null - ? ProfileSettingsSwitchListTile.adaptive( - defaultValue: controller - .pangeaController.permissionsController - .userToolSetting(setting), - title: setting.asToolSetting!.toolName(context), - subtitle: - setting.asToolSetting!.toolDescription(context), - profileKey: setting.asToolSetting!.asMatrixProfileField, - ) - : const SizedBox(), - ProfileSettingsSwitchListTile.adaptive( - defaultValue: controller - .pangeaController.userController.matrixProfile.itAutoPlay, - title: - L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader, - subtitle: L10n.of(context)!.interactiveTranslatorAutoPlayDesc, - profileKey: MatrixProfileEnum.itAutoPlay, - ), - ProfileSettingsSwitchListTile.adaptive( - defaultValue: controller.pangeaController.userController - .matrixProfile.autoPlayMessages, - title: L10n.of(context)!.autoPlayTitle, - subtitle: L10n.of(context)!.autoPlayDesc, - profileKey: MatrixProfileEnum.autoPlayMessages, - ), - ], + builder: (context, snapshot) { + return Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text( + L10n.of(context)!.learningSettings, + ), ), - ), - ), + body: ListTileTheme( + iconColor: Theme.of(context).textTheme.bodyLarge!.color, + child: MaxWidthBody( + withScrolling: true, + child: Column( + children: [ + LanguageTile(controller), + CountryPickerTile(controller), + const SizedBox(height: 8), + const Divider(height: 1), + const SizedBox(height: 8), + if (controller.pangeaController.permissionsController + .isUser18()) + SwitchListTile.adaptive( + activeColor: AppConfig.activeToggleColor, + title: Text(L10n.of(context)!.publicProfileTitle), + subtitle: Text(L10n.of(context)!.publicProfileDesc), + value: + controller.pangeaController.userController.isPublic, + onChanged: (bool isPublicProfile) => + showFutureLoadingDialog( + context: context, + future: () => + controller.setPublicProfile(isPublicProfile), + onError: (err) => ErrorHandler.logError( + e: err, + s: StackTrace.current, + ), + ), + ), + ListTile( + subtitle: + Text(L10n.of(context)!.toggleToolSettingsDescription), + ), + for (final toolSetting in ToolSetting.values) + ProfileSettingsSwitchListTile.adaptive( + defaultValue: controller.getToolSetting(toolSetting), + title: toolSetting.toolName(context), + subtitle: toolSetting.toolDescription(context), + onChange: (bool value) => controller.updateToolSetting( + toolSetting, + value, + ), + ), + ProfileSettingsSwitchListTile.adaptive( + defaultValue: controller.pangeaController.userController + .profile.userSettings.itAutoPlay, + title: L10n.of(context)! + .interactiveTranslatorAutoPlaySliderHeader, + subtitle: + L10n.of(context)!.interactiveTranslatorAutoPlayDesc, + onChange: (bool value) => controller + .pangeaController.userController + .updateProfile((profile) { + profile.userSettings.itAutoPlay = value; + return profile; + }), + ), + ProfileSettingsSwitchListTile.adaptive( + defaultValue: controller.pangeaController.userController + .profile.userSettings.autoPlayMessages, + title: L10n.of(context)!.autoPlayTitle, + subtitle: L10n.of(context)!.autoPlayDesc, + onChange: (bool value) => controller + .pangeaController.userController + .updateProfile((profile) { + profile.userSettings.autoPlayMessages = value; + return profile; + }), + ), + ], + ), + ), + ), + ); + }, ); } } diff --git a/lib/pangea/repo/user_repo.dart b/lib/pangea/repo/user_repo.dart index 8f3b5a67f..47caaab0b 100644 --- a/lib/pangea/repo/user_repo.dart +++ b/lib/pangea/repo/user_repo.dart @@ -4,37 +4,13 @@ import 'dart:developer'; import 'package:fluffychat/pangea/constants/model_keys.dart'; import 'package:http/http.dart'; -import '../../widgets/matrix.dart'; import '../models/user_model.dart'; import '../models/user_profile_search_model.dart'; import '../network/requests.dart'; import '../network/urls.dart'; class PUserRepo { - static Future repoCreatePangeaUser({ - required String userID, - required String dob, - required fullName, - required String matrixAccessToken, - }) async { - final Requests req = Requests( - baseUrl: PApiUrls.baseAPI, - matrixAccessToken: matrixAccessToken, - ); - - final Map body = { - ModelKey.userFullName: fullName, - ModelKey.userPangeaUserId: userID, - ModelKey.userDateOfBirth: dob, - }; - final Response res = await req.post( - url: PApiUrls.createUser, - body: body, - ); - return PUserModel.fromJson(jsonDecode(res.body)); - } - - static Future fetchPangeaUserInfo({ + static Future fetchPangeaUserInfo({ required String userID, required String matrixAccessToken, }) async { @@ -49,7 +25,7 @@ class PUserRepo { objectId: userID, ); - return PUserModel.fromJson(jsonDecode(res.body)); + return PangeaProfileResponse.fromJson(jsonDecode(res.body)); } catch (err) { //status code should be 400 - PTODO - check ffor this. log("Most likely a first signup and needs to make an account"); @@ -57,32 +33,6 @@ class PUserRepo { } } - //notes for jordan - only replace non-null fields, return whole profile - //Jordan - should return pangeaUserId as well - static Future updateUserProfile( - Profile userProfile, - String accessToken, - ) async { - final Requests req = Requests( - baseUrl: PApiUrls.baseAPI, - accessToken: accessToken, - ); - final Response res = await req.put( - url: PApiUrls.updateUserProfile, - body: userProfile.toJson(), - ); - - //temp fix - final content = jsonDecode(res.body); - //PTODO - try taking this out and see where bug occurs - if (content[ModelKey.userPangeaUserId] == null) { - content[ModelKey.userPangeaUserId] = - MatrixState.pangeaController.matrixState.client.userID; - } - - return Profile.fromJson(content); - } - static Future searchUserProfiles({ // List? interests, String? targetLanguage, diff --git a/lib/pangea/utils/country_display.dart b/lib/pangea/utils/country_display.dart new file mode 100644 index 000000000..caba48442 --- /dev/null +++ b/lib/pangea/utils/country_display.dart @@ -0,0 +1,515 @@ +import 'package:country_picker/country_picker.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +class CountryDisplayUtil { + /// used in find a partner page for display partner's country + static String flagEmoji(String? countryName) { + countryName = countryName?.split(' (')[0]; + final Country? country = CountryService().findByName(countryName); + return country?.flagEmoji ?? ""; + } + + static String? countryDisplayName(String? countryName, BuildContext context) { + countryName = countryName?.split(' (')[0]; + final Country? country = CountryService().findByName(countryName); + if (country?.countryCode == null) return null; + switch (country!.countryCode) { + case 'WW': + return L10n.of(context)!.wwCountryDisplayName; + case 'AF': + return L10n.of(context)!.afCountryDisplayName; + case 'AX': + return L10n.of(context)!.axCountryDisplayName; + case 'AL': + return L10n.of(context)!.alCountryDisplayName; + case 'DZ': + return L10n.of(context)!.dzCountryDisplayName; + case 'AS': + return L10n.of(context)!.asCountryDisplayName; + case 'AD': + return L10n.of(context)!.adCountryDisplayName; + case 'AO': + return L10n.of(context)!.aoCountryDisplayName; + case 'AI': + return L10n.of(context)!.aiCountryDisplayName; + case 'AG': + return L10n.of(context)!.agCountryDisplayName; + case 'AR': + return L10n.of(context)!.arCountryDisplayName; + case 'AM': + return L10n.of(context)!.amCountryDisplayName; + case 'AW': + return L10n.of(context)!.awCountryDisplayName; + case 'AC': + return L10n.of(context)!.acCountryDisplayName; + case 'AU': + return L10n.of(context)!.auCountryDisplayName; + case 'AT': + return L10n.of(context)!.atCountryDisplayName; + case 'AZ': + return L10n.of(context)!.azCountryDisplayName; + case 'BS': + return L10n.of(context)!.bsCountryDisplayName; + case 'BH': + return L10n.of(context)!.bhCountryDisplayName; + case 'BD': + return L10n.of(context)!.bdCountryDisplayName; + case 'BB': + return L10n.of(context)!.bbCountryDisplayName; + case 'BY': + return L10n.of(context)!.byCountryDisplayName; + case 'BE': + return L10n.of(context)!.beCountryDisplayName; + case 'BZ': + return L10n.of(context)!.bzCountryDisplayName; + case 'BJ': + return L10n.of(context)!.bjCountryDisplayName; + case 'BM': + return L10n.of(context)!.bmCountryDisplayName; + case 'BT': + return L10n.of(context)!.btCountryDisplayName; + case 'BO': + return L10n.of(context)!.boCountryDisplayName; + case 'BA': + return L10n.of(context)!.baCountryDisplayName; + case 'BW': + return L10n.of(context)!.bwCountryDisplayName; + case 'BR': + return L10n.of(context)!.brCountryDisplayName; + case 'IO': + return L10n.of(context)!.ioCountryDisplayName; + case 'VG': + return L10n.of(context)!.vgCountryDisplayName; + case 'BN': + return L10n.of(context)!.bnCountryDisplayName; + case 'BG': + return L10n.of(context)!.bgCountryDisplayName; + case 'BF': + return L10n.of(context)!.bfCountryDisplayName; + case 'BI': + return L10n.of(context)!.biCountryDisplayName; + case 'KH': + return L10n.of(context)!.khCountryDisplayName; + case 'CM': + return L10n.of(context)!.cmCountryDisplayName; + case 'CA': + return L10n.of(context)!.caCountryDisplayName; + case 'CV': + return L10n.of(context)!.cvCountryDisplayName; + case 'BQ': + return L10n.of(context)!.bqCountryDisplayName; + case 'KY': + return L10n.of(context)!.kyCountryDisplayName; + case 'CF': + return L10n.of(context)!.cfCountryDisplayName; + case 'TD': + return L10n.of(context)!.tdCountryDisplayName; + case 'CL': + return L10n.of(context)!.clCountryDisplayName; + case 'CN': + return L10n.of(context)!.cnCountryDisplayName; + case 'CX': + return L10n.of(context)!.cxCountryDisplayName; + case 'CC': + return L10n.of(context)!.ccCountryDisplayName; + case 'CO': + return L10n.of(context)!.coCountryDisplayName; + case 'KM': + return L10n.of(context)!.kmCountryDisplayName; + case 'CD': + return L10n.of(context)!.cdCountryDisplayName; + case 'CG': + return L10n.of(context)!.cgCountryDisplayName; + case 'CK': + return L10n.of(context)!.ckCountryDisplayName; + case 'CR': + return L10n.of(context)!.crCountryDisplayName; + case 'CI': + return L10n.of(context)!.ciCountryDisplayName; + case 'HR': + return L10n.of(context)!.hrCountryDisplayName; + case 'CU': + return L10n.of(context)!.cuCountryDisplayName; + case 'CW': + return L10n.of(context)!.cwCountryDisplayName; + case 'CY': + return L10n.of(context)!.cyCountryDisplayName; + case 'CZ': + return L10n.of(context)!.czCountryDisplayName; + case 'DK': + return L10n.of(context)!.dkCountryDisplayName; + case 'DJ': + return L10n.of(context)!.djCountryDisplayName; + case 'DM': + return L10n.of(context)!.dmCountryDisplayName; + case 'DO': + return L10n.of(context)!.doCountryDisplayName; + case 'TL': + return L10n.of(context)!.tlCountryDisplayName; + case 'EC': + return L10n.of(context)!.ecCountryDisplayName; + case 'EG': + return L10n.of(context)!.egCountryDisplayName; + case 'SV': + return L10n.of(context)!.svCountryDisplayName; + case 'GQ': + return L10n.of(context)!.gqCountryDisplayName; + case 'ER': + return L10n.of(context)!.erCountryDisplayName; + case 'EE': + return L10n.of(context)!.eeCountryDisplayName; + case 'SZ': + return L10n.of(context)!.szCountryDisplayName; + case 'ET': + return L10n.of(context)!.etCountryDisplayName; + case 'FK': + return L10n.of(context)!.fkCountryDisplayName; + case 'FO': + return L10n.of(context)!.foCountryDisplayName; + case 'FJ': + return L10n.of(context)!.fjCountryDisplayName; + case 'FI': + return L10n.of(context)!.fiCountryDisplayName; + case 'FR': + return L10n.of(context)!.frCountryDisplayName; + case 'GF': + return L10n.of(context)!.gfCountryDisplayName; + case 'PF': + return L10n.of(context)!.pfCountryDisplayName; + case 'GA': + return L10n.of(context)!.gaCountryDisplayName; + case 'GM': + return L10n.of(context)!.gmCountryDisplayName; + case 'GE': + return L10n.of(context)!.geCountryDisplayName; + case 'DE': + return L10n.of(context)!.deCountryDisplayName; + case 'GH': + return L10n.of(context)!.ghCountryDisplayName; + case 'GI': + return L10n.of(context)!.giCountryDisplayName; + case 'GR': + return L10n.of(context)!.grCountryDisplayName; + case 'GL': + return L10n.of(context)!.glCountryDisplayName; + case 'GD': + return L10n.of(context)!.gdCountryDisplayName; + case 'GP': + return L10n.of(context)!.gpCountryDisplayName; + case 'GU': + return L10n.of(context)!.guCountryDisplayName; + case 'GT': + return L10n.of(context)!.gtCountryDisplayName; + case 'GG': + return L10n.of(context)!.ggCountryDisplayName; + case 'GN': + return L10n.of(context)!.gnCountryDisplayName; + case 'GW': + return L10n.of(context)!.gwCountryDisplayName; + case 'GY': + return L10n.of(context)!.gyCountryDisplayName; + case 'HT': + return L10n.of(context)!.htCountryDisplayName; + case 'HM': + return L10n.of(context)!.hmCountryDisplayName; + case 'HN': + return L10n.of(context)!.hnCountryDisplayName; + case 'HK': + return L10n.of(context)!.hkCountryDisplayName; + case 'HU': + return L10n.of(context)!.huCountryDisplayName; + case 'IS': + return L10n.of(context)!.isCountryDisplayName; + case 'IN': + return L10n.of(context)!.inCountryDisplayName; + case 'ID': + return L10n.of(context)!.idCountryDisplayName; + case 'IR': + return L10n.of(context)!.irCountryDisplayName; + case 'IQ': + return L10n.of(context)!.iqCountryDisplayName; + case 'IE': + return L10n.of(context)!.ieCountryDisplayName; + case 'IM': + return L10n.of(context)!.imCountryDisplayName; + case 'IL': + return L10n.of(context)!.ilCountryDisplayName; + case 'IT': + return L10n.of(context)!.itCountryDisplayName; + case 'JM': + return L10n.of(context)!.jmCountryDisplayName; + case 'JP': + return L10n.of(context)!.jpCountryDisplayName; + case 'JE': + return L10n.of(context)!.jeCountryDisplayName; + case 'JO': + return L10n.of(context)!.joCountryDisplayName; + case 'KZ': + return L10n.of(context)!.kzCountryDisplayName; + case 'KE': + return L10n.of(context)!.keCountryDisplayName; + case 'KI': + return L10n.of(context)!.kiCountryDisplayName; + case 'XK': + return L10n.of(context)!.xkCountryDisplayName; + case 'KW': + return L10n.of(context)!.kwCountryDisplayName; + case 'KG': + return L10n.of(context)!.kgCountryDisplayName; + case 'LA': + return L10n.of(context)!.laCountryDisplayName; + case 'LV': + return L10n.of(context)!.lvCountryDisplayName; + case 'LB': + return L10n.of(context)!.lbCountryDisplayName; + case 'LS': + return L10n.of(context)!.lsCountryDisplayName; + case 'LR': + return L10n.of(context)!.lrCountryDisplayName; + case 'LY': + return L10n.of(context)!.lyCountryDisplayName; + case 'LI': + return L10n.of(context)!.liCountryDisplayName; + case 'LT': + return L10n.of(context)!.ltCountryDisplayName; + case 'LU': + return L10n.of(context)!.luCountryDisplayName; + case 'MO': + return L10n.of(context)!.moCountryDisplayName; + case 'MK': + return L10n.of(context)!.mkCountryDisplayName; + case 'MG': + return L10n.of(context)!.mgCountryDisplayName; + case 'MW': + return L10n.of(context)!.mwCountryDisplayName; + case 'MY': + return L10n.of(context)!.myCountryDisplayName; + case 'MV': + return L10n.of(context)!.mvCountryDisplayName; + case 'ML': + return L10n.of(context)!.mlCountryDisplayName; + case 'MT': + return L10n.of(context)!.mtCountryDisplayName; + case 'MH': + return L10n.of(context)!.mhCountryDisplayName; + case 'MQ': + return L10n.of(context)!.mqCountryDisplayName; + case 'MR': + return L10n.of(context)!.mrCountryDisplayName; + case 'MU': + return L10n.of(context)!.muCountryDisplayName; + case 'YT': + return L10n.of(context)!.ytCountryDisplayName; + case 'MX': + return L10n.of(context)!.mxCountryDisplayName; + case 'FM': + return L10n.of(context)!.fmCountryDisplayName; + case 'MD': + return L10n.of(context)!.mdCountryDisplayName; + case 'MC': + return L10n.of(context)!.mcCountryDisplayName; + case 'MN': + return L10n.of(context)!.mnCountryDisplayName; + case 'ME': + return L10n.of(context)!.meCountryDisplayName; + case 'MS': + return L10n.of(context)!.msCountryDisplayName; + case 'MA': + return L10n.of(context)!.maCountryDisplayName; + case 'MZ': + return L10n.of(context)!.mzCountryDisplayName; + case 'MM': + return L10n.of(context)!.mmCountryDisplayName; + case 'NA': + return L10n.of(context)!.naCountryDisplayName; + case 'NR': + return L10n.of(context)!.nrCountryDisplayName; + case 'NP': + return L10n.of(context)!.npCountryDisplayName; + case 'NL': + return L10n.of(context)!.nlCountryDisplayName; + case 'NC': + return L10n.of(context)!.ncCountryDisplayName; + case 'NZ': + return L10n.of(context)!.nzCountryDisplayName; + case 'NI': + return L10n.of(context)!.niCountryDisplayName; + case 'NE': + return L10n.of(context)!.neCountryDisplayName; + case 'NG': + return L10n.of(context)!.ngCountryDisplayName; + case 'NU': + return L10n.of(context)!.nuCountryDisplayName; + case 'NF': + return L10n.of(context)!.nfCountryDisplayName; + case 'KP': + return L10n.of(context)!.kpCountryDisplayName; + case 'MP': + return L10n.of(context)!.mpCountryDisplayName; + case 'NO': + return L10n.of(context)!.noCountryDisplayName; + case 'OM': + return L10n.of(context)!.omCountryDisplayName; + case 'PK': + return L10n.of(context)!.pkCountryDisplayName; + case 'PW': + return L10n.of(context)!.pwCountryDisplayName; + case 'PS': + return L10n.of(context)!.psCountryDisplayName; + case 'PA': + return L10n.of(context)!.paCountryDisplayName; + case 'PG': + return L10n.of(context)!.pgCountryDisplayName; + case 'PY': + return L10n.of(context)!.pyCountryDisplayName; + case 'PE': + return L10n.of(context)!.peCountryDisplayName; + case 'PH': + return L10n.of(context)!.phCountryDisplayName; + case 'PL': + return L10n.of(context)!.plCountryDisplayName; + case 'PT': + return L10n.of(context)!.ptCountryDisplayName; + case 'PR': + return L10n.of(context)!.prCountryDisplayName; + case 'QA': + return L10n.of(context)!.qaCountryDisplayName; + case 'RE': + return L10n.of(context)!.reCountryDisplayName; + case 'RO': + return L10n.of(context)!.roCountryDisplayName; + case 'RU': + return L10n.of(context)!.ruCountryDisplayName; + case 'RW': + return L10n.of(context)!.rwCountryDisplayName; + case 'BL': + return L10n.of(context)!.blCountryDisplayName; + case 'SH': + return L10n.of(context)!.shCountryDisplayName; + case 'KN': + return L10n.of(context)!.knCountryDisplayName; + case 'LC': + return L10n.of(context)!.lcCountryDisplayName; + case 'MF': + return L10n.of(context)!.mfCountryDisplayName; + case 'PM': + return L10n.of(context)!.pmCountryDisplayName; + case 'VC': + return L10n.of(context)!.vcCountryDisplayName; + case 'WS': + return L10n.of(context)!.wsCountryDisplayName; + case 'SM': + return L10n.of(context)!.smCountryDisplayName; + case 'ST': + return L10n.of(context)!.stCountryDisplayName; + case 'SA': + return L10n.of(context)!.saCountryDisplayName; + case 'SN': + return L10n.of(context)!.snCountryDisplayName; + case 'RS': + return L10n.of(context)!.rsCountryDisplayName; + case 'SC': + return L10n.of(context)!.scCountryDisplayName; + case 'SL': + return L10n.of(context)!.slCountryDisplayName; + case 'SG': + return L10n.of(context)!.sgCountryDisplayName; + case 'SX': + return L10n.of(context)!.sxCountryDisplayName; + case 'SK': + return L10n.of(context)!.skCountryDisplayName; + case 'SI': + return L10n.of(context)!.siCountryDisplayName; + case 'SB': + return L10n.of(context)!.sbCountryDisplayName; + case 'SO': + return L10n.of(context)!.soCountryDisplayName; + case 'ZA': + return L10n.of(context)!.zaCountryDisplayName; + case 'GS': + return L10n.of(context)!.gsCountryDisplayName; + case 'KR': + return L10n.of(context)!.krCountryDisplayName; + case 'SS': + return L10n.of(context)!.ssCountryDisplayName; + case 'ES': + return L10n.of(context)!.esCountryDisplayName; + case 'LK': + return L10n.of(context)!.lkCountryDisplayName; + case 'SD': + return L10n.of(context)!.sdCountryDisplayName; + case 'SR': + return L10n.of(context)!.srCountryDisplayName; + case 'SJ': + return L10n.of(context)!.sjCountryDisplayName; + case 'SE': + return L10n.of(context)!.seCountryDisplayName; + case 'CH': + return L10n.of(context)!.chCountryDisplayName; + case 'SY': + return L10n.of(context)!.syCountryDisplayName; + case 'TW': + return L10n.of(context)!.twCountryDisplayName; + case 'TJ': + return L10n.of(context)!.tjCountryDisplayName; + case 'TZ': + return L10n.of(context)!.tzCountryDisplayName; + case 'TH': + return L10n.of(context)!.thCountryDisplayName; + case 'TG': + return L10n.of(context)!.tgCountryDisplayName; + case 'TK': + return L10n.of(context)!.tkCountryDisplayName; + case 'TO': + return L10n.of(context)!.toCountryDisplayName; + case 'TT': + return L10n.of(context)!.ttCountryDisplayName; + case 'TN': + return L10n.of(context)!.tnCountryDisplayName; + case 'TR': + return L10n.of(context)!.trCountryDisplayName; + case 'TM': + return L10n.of(context)!.tmCountryDisplayName; + case 'TC': + return L10n.of(context)!.tcCountryDisplayName; + case 'TV': + return L10n.of(context)!.tvCountryDisplayName; + case 'VI': + return L10n.of(context)!.viCountryDisplayName; + case 'UG': + return L10n.of(context)!.ugCountryDisplayName; + case 'UA': + return L10n.of(context)!.uaCountryDisplayName; + case 'AE': + return L10n.of(context)!.aeCountryDisplayName; + case 'GB': + return L10n.of(context)!.gbCountryDisplayName; + case 'US': + return L10n.of(context)!.usCountryDisplayName; + case 'UY': + return L10n.of(context)!.uyCountryDisplayName; + case 'UZ': + return L10n.of(context)!.uzCountryDisplayName; + case 'VU': + return L10n.of(context)!.vuCountryDisplayName; + case 'VA': + return L10n.of(context)!.vaCountryDisplayName; + case 'VE': + return L10n.of(context)!.veCountryDisplayName; + case 'VN': + return L10n.of(context)!.vnCountryDisplayName; + case 'WF': + return L10n.of(context)!.wfCountryDisplayName; + case 'EH': + return L10n.of(context)!.ehCountryDisplayName; + case 'YE': + return L10n.of(context)!.yeCountryDisplayName; + case 'ZM': + return L10n.of(context)!.zmCountryDisplayName; + case 'ZW': + return L10n.of(context)!.zwCountryDisplayName; + } + return null; + } +} diff --git a/lib/pangea/widgets/chat/message_toolbar.dart b/lib/pangea/widgets/chat/message_toolbar.dart index b547efa7a..07b0ad0d5 100644 --- a/lib/pangea/widgets/chat/message_toolbar.dart +++ b/lib/pangea/widgets/chat/message_toolbar.dart @@ -333,7 +333,8 @@ class MessageToolbarState extends State { return; } - MatrixState.pangeaController.userController.matrixProfile.autoPlayMessages + MatrixState.pangeaController.userController.profile.userSettings + .autoPlayMessages ? updateMode(MessageMode.textToSpeech) : updateMode(MessageMode.translation); }); diff --git a/lib/pangea/widgets/igc/span_card.dart b/lib/pangea/widgets/igc/span_card.dart index c758ea213..26046f8d0 100644 --- a/lib/pangea/widgets/igc/span_card.dart +++ b/lib/pangea/widgets/igc/span_card.dart @@ -3,7 +3,6 @@ import 'dart:developer'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pangea/enum/span_data_type.dart'; import 'package:fluffychat/pangea/models/span_data.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/bot_style.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:fluffychat/pangea/utils/match_copy.dart'; @@ -341,6 +340,12 @@ class WordMatchContent extends StatelessWidget { if (controller.widget.scm.pangeaMatch!.isITStart) DontShowSwitchListTile( controller: pangeaController, + onSwitch: (bool value) { + pangeaController.userController.updateProfile((profile) { + profile.userSettings.itAutoPlay = value; + return profile; + }); + }, ), ], ); @@ -483,10 +488,12 @@ class StartITButton extends StatelessWidget { class DontShowSwitchListTile extends StatefulWidget { final PangeaController controller; + final Function(bool) onSwitch; const DontShowSwitchListTile({ super.key, required this.controller, + required this.onSwitch, }); @override @@ -508,10 +515,7 @@ class DontShowSwitchListTileState extends State { title: Text(L10n.of(context)!.interactiveTranslatorAutoPlaySliderHeader), value: switchValue, onChanged: (value) { - MatrixState.pangeaController.userController.matrixProfile - .saveProfileData( - {MatrixProfileEnum.itAutoPlay.title: value}, - ); + widget.onSwitch(value); setState(() => switchValue = value); }, ); diff --git a/lib/pangea/widgets/user_settings/country_picker_tile.dart b/lib/pangea/widgets/user_settings/country_picker_tile.dart index 63677cc68..df292a837 100644 --- a/lib/pangea/widgets/user_settings/country_picker_tile.dart +++ b/lib/pangea/widgets/user_settings/country_picker_tile.dart @@ -3,6 +3,7 @@ import 'dart:developer'; import 'package:country_picker/country_picker.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; import 'package:fluffychat/pangea/pages/settings_learning/settings_learning.dart'; +import 'package:fluffychat/pangea/utils/country_display.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -19,10 +20,13 @@ class CountryPickerTile extends StatelessWidget { @override Widget build(BuildContext context) { - final Profile? profile = pangeaController.userController.userModel?.profile; + final Profile profile = pangeaController.userController.profile; return ListTile( title: Text( - "${L10n.of(context)!.countryInformation}: ${profile?.countryDisplayName(context) ?? ''} ${profile?.flagEmoji}", + "${L10n.of(context)!.countryInformation}: ${CountryDisplayUtil.countryDisplayName( + profile.userSettings.country, + context, + ) ?? ''} ${CountryDisplayUtil.flagEmoji(profile.userSettings.country)}", ), trailing: const Icon(Icons.edit_outlined), onTap: () => showCountryPicker( diff --git a/lib/pangea/widgets/user_settings/p_language_dialog.dart b/lib/pangea/widgets/user_settings/p_language_dialog.dart index 8b7ae33b5..8635170a0 100644 --- a/lib/pangea/widgets/user_settings/p_language_dialog.dart +++ b/lib/pangea/widgets/user_settings/p_language_dialog.dart @@ -88,13 +88,14 @@ pLanguageDialog(BuildContext parentContext, Function callback) async { context: context, future: () async { try { - await pangeaController.userController - .updateUserProfile( - sourceLanguage: - selectedSourceLanguage.langCode, - targetLanguage: - selectedTargetLanguage.langCode, - ); + pangeaController.userController + .updateProfile((profile) { + profile.userSettings.sourceLanguage = + selectedSourceLanguage.langCode; + profile.userSettings.targetLanguage = + selectedTargetLanguage.langCode; + return profile; + }); Navigator.pop(context); } catch (err, s) { debugger(when: kDebugMode); diff --git a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart index 3f04c61fd..2649b28e2 100644 --- a/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart +++ b/lib/pangea/widgets/user_settings/p_settings_switch_list_tile.dart @@ -1,20 +1,18 @@ import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/pangea/models/user_model.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; -import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; class ProfileSettingsSwitchListTile extends StatefulWidget { final bool defaultValue; - final MatrixProfileEnum profileKey; final String title; final String? subtitle; + final Function(bool) onChange; const ProfileSettingsSwitchListTile.adaptive({ super.key, - this.defaultValue = false, - required this.profileKey, + required this.defaultValue, required this.title, + required this.onChange, this.subtitle, }); @@ -28,11 +26,7 @@ class PSettingsSwitchListTileState @override void initState() { - currentValue = MatrixState.pangeaController.userController.matrixProfile - .getProfileData( - widget.profileKey, - ) ?? - widget.defaultValue; + currentValue = widget.defaultValue; super.initState(); } @@ -45,15 +39,12 @@ class PSettingsSwitchListTileState subtitle: widget.subtitle != null ? Text(widget.subtitle!) : null, onChanged: (bool newValue) async { try { - MatrixState.pangeaController.userController.matrixProfile - .saveProfileData({ - widget.profileKey.title: newValue, - }); + widget.onChange(newValue); setState(() => currentValue = newValue); } catch (err, s) { ErrorHandler.logError( e: err, - m: "Failed to updates user setting ${widget.profileKey.title}", + m: "Failed to updates user setting", s: s, ); } From 3759731d4813a0e9d07f5ed8e1068e99d784fdea Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 12 Jul 2024 14:06:21 -0400 Subject: [PATCH 8/9] code cleanup --- .../controllers/alternative_translator.dart | 14 ++------ .../widgets/it_feedback_card.dart | 4 +-- .../contextual_definition_controller.dart | 3 +- .../controllers/it_feedback_controller.dart | 4 +-- .../language_detection_controller.dart | 8 ++--- .../controllers/message_data_controller.dart | 6 ++-- .../controllers/my_analytics_controller.dart | 36 +++++++++---------- .../speech_to_text_controller.dart | 7 ++-- .../text_to_speech_controller.dart | 6 ++-- .../controllers/word_net_controller.dart | 6 ++-- .../pangea_message_event.dart | 19 +++------- lib/pangea/repo/span_data_repo.dart | 4 +-- lib/pangea/repo/topic_data_repo.dart | 2 +- .../widgets/chat/message_audio_card.dart | 1 + 14 files changed, 42 insertions(+), 78 deletions(-) diff --git a/lib/pangea/choreographer/controllers/alternative_translator.dart b/lib/pangea/choreographer/controllers/alternative_translator.dart index ccba733e2..5771d7f90 100644 --- a/lib/pangea/choreographer/controllers/alternative_translator.dart +++ b/lib/pangea/choreographer/controllers/alternative_translator.dart @@ -89,19 +89,9 @@ class AlternativeTranslator { final String? goldRouteTranslation = choreographer.itController.goldRouteTracker.fullTranslation; - final accessToken = await choreographer.accessToken; - if (accessToken == null) { - ErrorHandler.logError( - m: "accessToken null in setTranslationFeedback", - s: StackTrace.current, - ); - translationFeedbackKey = FeedbackKey.loadingPleaseWait; - return; - } - final FullTextTranslationResponseModel results = await FullTextTranslationRepo.translate( - accessToken: accessToken, + accessToken: await choreographer.accessToken, request: FullTextTranslationRequestModel( text: choreographer.itController.sourceText!, tgtLang: choreographer.l2LangCode!, @@ -127,7 +117,7 @@ class AlternativeTranslator { } similarityResponse = await SimilarityRepo.get( - accessToken: accessToken, + accessToken: await choreographer.accessToken, request: SimilarityRequestModel( benchmark: results.bestTranslation, toCompare: [userTranslation!], diff --git a/lib/pangea/choreographer/widgets/it_feedback_card.dart b/lib/pangea/choreographer/widgets/it_feedback_card.dart index 4285f4dca..9cada0548 100644 --- a/lib/pangea/choreographer/widgets/it_feedback_card.dart +++ b/lib/pangea/choreographer/widgets/it_feedback_card.dart @@ -72,10 +72,8 @@ class ITFeedbackCardController extends State { setState(() { isTranslating = true; }); - - final String accessToken = await controller.userController.accessToken; FullTextTranslationRepo.translate( - accessToken: accessToken, + accessToken: await controller.userController.accessToken, request: FullTextTranslationRequestModel( text: res!.text, tgtLang: controller.languageController.userL1?.langCode ?? diff --git a/lib/pangea/controllers/contextual_definition_controller.dart b/lib/pangea/controllers/contextual_definition_controller.dart index 68e075d97..d423c9b38 100644 --- a/lib/pangea/controllers/contextual_definition_controller.dart +++ b/lib/pangea/controllers/contextual_definition_controller.dart @@ -49,10 +49,9 @@ class ContextualDefinitionController { ContextualDefinitionRequestModel request, ) async { try { - final accessToken = await _pangeaController.userController.accessToken; final ContextualDefinitionResponseModel res = await _ContextualDefinitionRepo.define( - accessToken, + await _pangeaController.userController.accessToken, request, ); return res; diff --git a/lib/pangea/controllers/it_feedback_controller.dart b/lib/pangea/controllers/it_feedback_controller.dart index 74aee21de..ffef9123f 100644 --- a/lib/pangea/controllers/it_feedback_controller.dart +++ b/lib/pangea/controllers/it_feedback_controller.dart @@ -51,10 +51,8 @@ class ITFeedbackController { ITFeedbackRequestModel request, ) async { try { - final String accessToken = - await _pangeaController.userController.accessToken; final ITFeedbackResponseModel res = await _ITFeedbackRepo.get( - accessToken, + await _pangeaController.userController.accessToken, request, ); return res; diff --git a/lib/pangea/controllers/language_detection_controller.dart b/lib/pangea/controllers/language_detection_controller.dart index ecbdea47d..a3e07b0a3 100644 --- a/lib/pangea/controllers/language_detection_controller.dart +++ b/lib/pangea/controllers/language_detection_controller.dart @@ -125,7 +125,7 @@ class LanguageDetectionController { _cacheClearTimer?.cancel(); } - Future detectLanguage( + Future detectLanguage( String fullText, String? userL2, String? userL1, @@ -138,16 +138,14 @@ class LanguageDetectionController { return get(params); } - Future get( + Future get( LanguageDetectionRequest params, ) async { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { - final String accessToken = - await _pangeaController.userController.accessToken; final Future response = _fetchResponse( - accessToken, + await _pangeaController.userController.accessToken, params, ); _cache[params] = _LanguageDetectionCacheItem(data: response); diff --git a/lib/pangea/controllers/message_data_controller.dart b/lib/pangea/controllers/message_data_controller.dart index aa0c77b9d..7b3a3e6d2 100644 --- a/lib/pangea/controllers/message_data_controller.dart +++ b/lib/pangea/controllers/message_data_controller.dart @@ -43,6 +43,7 @@ class MessageDataController extends BaseController { TokensRequestModel req, ) async { final accessToken = await _pangeaController.userController.accessToken; + final TokensResponseModel igcTextData = await TokensRepo.tokenize(accessToken, req); @@ -192,12 +193,9 @@ class MessageDataController extends BaseController { ); try { - final String accessToken = - await _pangeaController.userController.accessToken; - final FullTextTranslationResponseModel res = await FullTextTranslationRepo.translate( - accessToken: accessToken, + accessToken: await _pangeaController.userController.accessToken, request: req, ); diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart index 8fa8989b1..058bad359 100644 --- a/lib/pangea/controllers/my_analytics_controller.dart +++ b/lib/pangea/controllers/my_analytics_controller.dart @@ -204,24 +204,24 @@ class MyAnalyticsController { Completer? _updateCompleter; Future updateAnalytics() async { - // if (!(_updateCompleter?.isCompleted ?? true)) { - // await _updateCompleter!.future; - // return; - // } - // _updateCompleter = Completer(); - // try { - // await _updateAnalytics(); - // clearMessagesSinceUpdate(); - // } catch (err, s) { - // ErrorHandler.logError( - // e: err, - // m: "Failed to update analytics", - // s: s, - // ); - // } finally { - // _updateCompleter?.complete(); - // _updateCompleter = null; - // } + if (!(_updateCompleter?.isCompleted ?? true)) { + await _updateCompleter!.future; + return; + } + _updateCompleter = Completer(); + try { + await _updateAnalytics(); + clearMessagesSinceUpdate(); + } catch (err, s) { + ErrorHandler.logError( + e: err, + m: "Failed to update analytics", + s: s, + ); + } finally { + _updateCompleter?.complete(); + _updateCompleter = null; + } } String? get userL2 => _pangeaController.languageController.activeL2Code(); diff --git a/lib/pangea/controllers/speech_to_text_controller.dart b/lib/pangea/controllers/speech_to_text_controller.dart index 1b151aca0..67462bcef 100644 --- a/lib/pangea/controllers/speech_to_text_controller.dart +++ b/lib/pangea/controllers/speech_to_text_controller.dart @@ -44,7 +44,7 @@ class SpeechToTextController { _cacheClearTimer?.cancel(); } - Future get( + Future get( SpeechToTextRequestModel requestModel, ) async { final int cacheKey = requestModel.hashCode; @@ -52,11 +52,8 @@ class SpeechToTextController { if (_cache.containsKey(cacheKey)) { return _cache[cacheKey]!.data; } else { - final String accessToken = - await _pangeaController.userController.accessToken; - final Future response = _fetchResponse( - accessToken: accessToken, + accessToken: await _pangeaController.userController.accessToken, requestModel: requestModel, ); _cache[cacheKey] = _SpeechToTextCacheItem(data: response); diff --git a/lib/pangea/controllers/text_to_speech_controller.dart b/lib/pangea/controllers/text_to_speech_controller.dart index 25b888e05..b34092618 100644 --- a/lib/pangea/controllers/text_to_speech_controller.dart +++ b/lib/pangea/controllers/text_to_speech_controller.dart @@ -93,16 +93,14 @@ class TextToSpeechController { _cacheClearTimer?.cancel(); } - Future get( + Future get( TextToSpeechRequest params, ) async { if (_cache.containsKey(params)) { return _cache[params]!.data; } else { - final String accessToken = - await _pangeaController.userController.accessToken; final Future response = _fetchResponse( - accessToken, + await _pangeaController.userController.accessToken, params, ); _cache[params] = _TextToSpeechCacheItem(data: response); diff --git a/lib/pangea/controllers/word_net_controller.dart b/lib/pangea/controllers/word_net_controller.dart index 18c3290a9..b7a8d287e 100644 --- a/lib/pangea/controllers/word_net_controller.dart +++ b/lib/pangea/controllers/word_net_controller.dart @@ -31,7 +31,7 @@ class WordController extends BaseController { ), ); - Future getWordDataGlobal({ + Future getWordDataGlobal({ required String word, required String fullText, required String? userL1, @@ -53,10 +53,8 @@ class WordController extends BaseController { if (local != null) return local; - final String accessToken = - await _pangeaController.userController.accessToken; final WordData remote = await WordRepo.getWordNetData( - accessToken: accessToken, + accessToken: await _pangeaController.userController.accessToken, fullText: fullText, word: word, userL1: userL1, diff --git a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart index 06f34cf1f..334c0fa78 100644 --- a/lib/pangea/matrix_event_wrappers/pangea_message_event.dart +++ b/lib/pangea/matrix_event_wrappers/pangea_message_event.dart @@ -88,7 +88,7 @@ class PangeaMessageEvent { return _latestEdit; } - Future getMatrixAudioFile( + Future getMatrixAudioFile( String langCode, BuildContext context, ) async { @@ -102,15 +102,11 @@ class PangeaMessageEvent { langCode: langCode, ); - final TextToSpeechResponse? response = + final TextToSpeechResponse response = await MatrixState.pangeaController.textToSpeech.get( params, ); - if (response == null) { - return null; - } - final audioBytes = base64.decode(response.audioContent); final eventIdParam = _event.eventId; final fileName = @@ -181,13 +177,10 @@ class PangeaMessageEvent { langCode: langCode, ); - final TextToSpeechResponse? response = + final TextToSpeechResponse response = await MatrixState.pangeaController.textToSpeech.get( params, ); - if (response == null) { - return null; - } final audioBytes = base64.decode(response.audioContent); @@ -330,7 +323,7 @@ class PangeaMessageEvent { debugPrint("mimeType ${matrixFile.mimeType}"); debugPrint("encoding ${mimeTypeToAudioEncoding(matrixFile.mimeType)}"); - final SpeechToTextModel? response = + final SpeechToTextModel response = await MatrixState.pangeaController.speechToText.get( SpeechToTextRequestModel( audioContent: matrixFile.bytes, @@ -346,10 +339,6 @@ class PangeaMessageEvent { ), ); - if (response == null) { - return null; - } - _representations?.add( RepresentationEvent( timeline: timeline, diff --git a/lib/pangea/repo/span_data_repo.dart b/lib/pangea/repo/span_data_repo.dart index cc5c0640a..7073581a1 100644 --- a/lib/pangea/repo/span_data_repo.dart +++ b/lib/pangea/repo/span_data_repo.dart @@ -13,7 +13,7 @@ import '../network/urls.dart'; class SpanDataRepo { static Future getSpanDetails( - String accessToken, { + String? accessToken, { required SpanDetailsRepoReqAndRes request, }) async { final Requests req = Requests( @@ -150,4 +150,4 @@ SpanDetailsRepoReqAndRes get mockReponseWithChoices { // res.span.choices![1].selected = true; // res.span.message = "Conjugation error"; // return res; -// } +// } \ No newline at end of file diff --git a/lib/pangea/repo/topic_data_repo.dart b/lib/pangea/repo/topic_data_repo.dart index 7a4ce049f..06abf6929 100644 --- a/lib/pangea/repo/topic_data_repo.dart +++ b/lib/pangea/repo/topic_data_repo.dart @@ -11,7 +11,7 @@ import '../network/urls.dart'; /// accepts ChatTopic and calls an API for a list of Lemma class TopicDataRepo { static Future generate( - String accessToken, { + String? accessToken, { required TopicDataRequest request, }) async { final Requests req = Requests( diff --git a/lib/pangea/widgets/chat/message_audio_card.dart b/lib/pangea/widgets/chat/message_audio_card.dart index cfae4282a..5c1f8e67b 100644 --- a/lib/pangea/widgets/chat/message_audio_card.dart +++ b/lib/pangea/widgets/chat/message_audio_card.dart @@ -46,6 +46,7 @@ class MessageAudioCardState extends State { await widget.messageEvent.getMatrixAudioFile(langCode, context); if (mounted) setState(() => _isLoading = false); } catch (e, _) { + debugPrint(StackTrace.current.toString()); if (!mounted) return; setState(() => _isLoading = false); ScaffoldMessenger.of(context).showSnackBar( From 8acc793f0c6d9913f5512cdec38f1672aab53f19 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Fri, 12 Jul 2024 14:26:44 -0400 Subject: [PATCH 9/9] added documentation to user controller and user model --- lib/pangea/controllers/user_controller.dart | 27 ++++++++++++------- .../client_extension/client_extension.dart | 2 ++ .../general_info_extension.dart | 7 +++++ lib/pangea/models/user_model.dart | 9 +++++++ 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/lib/pangea/controllers/user_controller.dart b/lib/pangea/controllers/user_controller.dart index a8c6ced14..2ef0227e5 100644 --- a/lib/pangea/controllers/user_controller.dart +++ b/lib/pangea/controllers/user_controller.dart @@ -4,6 +4,7 @@ import 'package:collection/collection.dart'; import 'package:fluffychat/pangea/constants/language_constants.dart'; import 'package:fluffychat/pangea/controllers/base_controller.dart'; import 'package:fluffychat/pangea/controllers/pangea_controller.dart'; +import 'package:fluffychat/pangea/extensions/client_extension/client_extension.dart'; import 'package:fluffychat/pangea/utils/error_handler.dart'; import 'package:jwt_decode/jwt_decode.dart'; import 'package:matrix/matrix.dart' as matrix; @@ -26,11 +27,16 @@ class UserController extends BaseController { String? get _matrixAccessToken => _pangeaController.matrixState.client.accessToken; + /// Cached version of the user profile, so it doesn't have + /// to be read in from client's account data each time it is accessed. Profile? _cachedProfile; + /// Listens for account updates and updates the cached profile + StreamSubscription? _profileListener; + /// Listen for updates to account data in syncs and update the cached profile void addProfileListener() { - _pangeaController.matrixState.client.onSync.stream + _profileListener ??= _pangeaController.matrixState.client.onSync.stream .where((sync) => sync.accountData != null) .listen((sync) { final Profile? fromAccountData = Profile.fromAccountData(); @@ -64,11 +70,13 @@ class UserController extends BaseController { return _cachedProfile ?? Profile.emptyProfile; } + /// Updates the user's profile with the given [update] function and saves it. void updateProfile(Profile Function(Profile) update) { final Profile updatedProfile = update(profile); updatedProfile.saveProfileData(); } + /// Creates a new profile for the user with the given date of birth. Future createProfile({required DateTime dob}) async { final userSettings = UserSettings( dateOfBirth: dob, @@ -81,6 +89,9 @@ class UserController extends BaseController { /// A completer for the profile model of a user. Completer? _profileCompleter; + /// Initializes the user's profile. Runs a function to wait for account data to load, + /// read account data into profile, and migrate any missing info from the pangea profile. + /// Finally, it adds a listen to update the profile data when new account data comes in. Future initialize() async { if (_profileCompleter?.isCompleted ?? false) { return _profileCompleter!.future; @@ -105,11 +116,14 @@ class UserController extends BaseController { return _profileCompleter!.future; } + /// Initializes the user's profile by waiting for account data to load, reading in account + /// data to profile, and migrating from the pangea profile if the account data is not present. Future _initialize() async { - await waitForAccountData(); + await _pangeaController.matrixState.client.waitForAccountData(); if (profile.userSettings.dateOfBirth != null) { return; } + final PangeaProfileResponse? resp = await PUserRepo.fetchPangeaUserInfo( userID: userId!, matrixAccessToken: _matrixAccessToken!, @@ -117,6 +131,7 @@ class UserController extends BaseController { if (resp?.profile == null) { return; } + final userSetting = UserSettings.fromJson(resp!.profile.toJson()); final newProfile = Profile(userSettings: userSetting); await newProfile.saveProfileData(waitForDataInSync: true); @@ -130,14 +145,6 @@ class UserController extends BaseController { await initialize(); } - /// Account data comes through in the first sync, so wait for that - Future waitForAccountData() async { - final client = _pangeaController.matrixState.client; - if (client.prevBatch == null) { - await client.onSync.stream.first; - } - } - /// Returns a boolean value indicating whether a new JWT (JSON Web Token) is needed. bool needNewJWT(String token) => Jwt.isExpired(token); diff --git a/lib/pangea/extensions/client_extension/client_extension.dart b/lib/pangea/extensions/client_extension/client_extension.dart index addcfd0ed..bef384f6a 100644 --- a/lib/pangea/extensions/client_extension/client_extension.dart +++ b/lib/pangea/extensions/client_extension/client_extension.dart @@ -80,4 +80,6 @@ extension PangeaClient on Client { String? powerLevelName(int powerLevel, L10n l10n) => _powerLevelName(powerLevel, l10n); + + Future waitForAccountData() async => await _waitForAccountData(); } diff --git a/lib/pangea/extensions/client_extension/general_info_extension.dart b/lib/pangea/extensions/client_extension/general_info_extension.dart index aada940d7..ca5df40cc 100644 --- a/lib/pangea/extensions/client_extension/general_info_extension.dart +++ b/lib/pangea/extensions/client_extension/general_info_extension.dart @@ -78,4 +78,11 @@ extension GeneralInfoClientExtension on Client { 50: l10n.moderator, 100: l10n.admin, }[powerLevel]; + + /// Account data comes through in the first sync, so wait for that + Future _waitForAccountData() async { + if (prevBatch == null) { + await onSync.stream.first; + } + } } diff --git a/lib/pangea/models/user_model.dart b/lib/pangea/models/user_model.dart index 51aa746d9..972d7bbba 100644 --- a/lib/pangea/models/user_model.dart +++ b/lib/pangea/models/user_model.dart @@ -7,6 +7,7 @@ import 'package:matrix/matrix.dart'; import 'language_model.dart'; +/// The user's settings learning settings. class UserSettings { DateTime? dateOfBirth; DateTime? createdAt; @@ -114,6 +115,7 @@ class UserSettings { } } +/// The user's language tool settings. class UserToolSettings { bool interactiveTranslator; bool interactiveGrammar; @@ -177,6 +179,7 @@ class UserToolSettings { } } +/// The user's settings for whether or not to show instuction messages. class UserInstructions { bool showedItInstructions; bool showedClickMessage; @@ -255,6 +258,7 @@ class Profile { this.instructionSettings = instructionSettings ?? UserInstructions(); } + /// Load an instance of profile from the client's account data. static Profile? fromAccountData() { final profileData = MatrixState.pangeaController.matrixState.client .accountData[ModelKey.userProfile]?.content; @@ -292,6 +296,8 @@ class Profile { return json; } + /// Migrate data from the old matrix account data + /// format to the new matrix account data format. static Profile? migrateFromAccountData() { final userSettings = UserSettings.migrateFromAccountData(); if (userSettings == null) return null; @@ -305,6 +311,9 @@ class Profile { ); } + /// Saves the current configuration of the profile to the client's account data. + /// If [waitForDataInSync] is true, the function will wait for the updated account + /// data to come through in a sync, indicating that it has been set on the matrix server. Future saveProfileData({ waitForDataInSync = false, }) async {