* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
183 lines
6.4 KiB
Dart
183 lines
6.4 KiB
Dart
import 'dart:async';
|
|
import 'dart:convert';
|
|
import 'dart:developer';
|
|
import 'dart:io';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
|
|
import 'package:async/async.dart';
|
|
import 'package:get_storage/get_storage.dart';
|
|
import 'package:http/http.dart';
|
|
|
|
import 'package:fluffychat/pangea/analytics_practice/grammar_error_practice_generator.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/morph_category_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/vocab_audio_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/vocab_meaning_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/common/config/environment.dart';
|
|
import 'package:fluffychat/pangea/common/network/requests.dart';
|
|
import 'package:fluffychat/pangea/common/network/urls.dart';
|
|
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/emoji_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/lemma_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/lemma_meaning_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/message_activity_request.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/morph_activity_generator.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/word_focus_listening_generator.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
/// Represents an item in the completion cache.
|
|
class _RequestCacheItem {
|
|
final PracticeActivityModel practiceActivity;
|
|
final DateTime timestamp;
|
|
|
|
_RequestCacheItem({required this.practiceActivity, required this.timestamp});
|
|
|
|
bool get isExpired =>
|
|
DateTime.now().difference(timestamp) > PracticeRepo._cacheDuration;
|
|
|
|
factory _RequestCacheItem.fromJson(Map<String, dynamic> json) {
|
|
return _RequestCacheItem(
|
|
practiceActivity: PracticeActivityModel.fromJson(
|
|
json['practiceActivity'],
|
|
),
|
|
timestamp: DateTime.parse(json['timestamp']),
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() => {
|
|
'practiceActivity': practiceActivity.toJson(),
|
|
'timestamp': timestamp.toIso8601String(),
|
|
};
|
|
}
|
|
|
|
/// Controller for handling activity completions.
|
|
class PracticeRepo {
|
|
static final GetStorage _storage = GetStorage('practice_activity_cache');
|
|
static const Duration _cacheDuration = Duration(minutes: 1);
|
|
|
|
/// [event] is optional and used for saving the activity event to Matrix
|
|
static Future<Result<PracticeActivityModel>> getPracticeActivity(
|
|
MessageActivityRequest req, {
|
|
required Map<String, dynamic> messageInfo,
|
|
}) async {
|
|
final cached = _getCached(req);
|
|
if (cached != null) return Result.value(cached);
|
|
|
|
try {
|
|
final MessageActivityResponse res = await _routePracticeActivity(
|
|
accessToken: MatrixState.pangeaController.userController.accessToken,
|
|
req: req,
|
|
messageInfo: messageInfo,
|
|
);
|
|
|
|
await _setCached(req, res);
|
|
return Result.value(res.activity);
|
|
} on HttpException catch (e, s) {
|
|
return Result.error(e, s);
|
|
} catch (e, s) {
|
|
ErrorHandler.logError(
|
|
e: e,
|
|
s: s,
|
|
data: {
|
|
'message': 'Error fetching practice activity',
|
|
'request': req.toJson(),
|
|
},
|
|
);
|
|
return Result.error(e, s);
|
|
}
|
|
}
|
|
|
|
static Future<MessageActivityResponse> _fetch({
|
|
required String accessToken,
|
|
required MessageActivityRequest requestModel,
|
|
}) async {
|
|
final Requests request = Requests(
|
|
choreoApiKey: Environment.choreoApiKey,
|
|
accessToken: accessToken,
|
|
);
|
|
final Response res = await request.post(
|
|
url: PApiUrls.messageActivityGeneration,
|
|
body: requestModel.toJson(),
|
|
);
|
|
|
|
if (res.statusCode != 200) {
|
|
throw Exception('Failed to fetch activity');
|
|
}
|
|
|
|
final Map<String, dynamic> json = jsonDecode(utf8.decode(res.bodyBytes));
|
|
return MessageActivityResponse.fromJson(json);
|
|
}
|
|
|
|
static Future<MessageActivityResponse> _routePracticeActivity({
|
|
required String accessToken,
|
|
required MessageActivityRequest req,
|
|
required Map<String, dynamic> messageInfo,
|
|
}) async {
|
|
// some activities we'll get from the server and others we'll generate locally
|
|
switch (req.target.activityType) {
|
|
case ActivityTypeEnum.emoji:
|
|
return EmojiActivityGenerator.get(req, messageInfo: messageInfo);
|
|
case ActivityTypeEnum.lemmaId:
|
|
return LemmaActivityGenerator.get(req);
|
|
case ActivityTypeEnum.lemmaMeaning:
|
|
return VocabMeaningActivityGenerator.get(req);
|
|
case ActivityTypeEnum.lemmaAudio:
|
|
return VocabAudioActivityGenerator.get(req);
|
|
case ActivityTypeEnum.grammarCategory:
|
|
return MorphCategoryActivityGenerator.get(req);
|
|
case ActivityTypeEnum.grammarError:
|
|
assert(
|
|
req.grammarErrorInfo != null,
|
|
'Grammar error info must be provided for grammar error activities',
|
|
);
|
|
return GrammarErrorPracticeGenerator.get(req);
|
|
case ActivityTypeEnum.morphId:
|
|
return MorphActivityGenerator.get(req);
|
|
case ActivityTypeEnum.wordMeaning:
|
|
debugger(when: kDebugMode);
|
|
return LemmaMeaningActivityGenerator.get(req, messageInfo: messageInfo);
|
|
case ActivityTypeEnum.messageMeaning:
|
|
case ActivityTypeEnum.wordFocusListening:
|
|
return WordFocusListeningGenerator.get(req);
|
|
case ActivityTypeEnum.hiddenWordListening:
|
|
return _fetch(accessToken: accessToken, requestModel: req);
|
|
}
|
|
}
|
|
|
|
static PracticeActivityModel? _getCached(MessageActivityRequest req) {
|
|
final keys = List.from(_storage.getKeys());
|
|
for (final k in keys) {
|
|
try {
|
|
final item = _RequestCacheItem.fromJson(_storage.read(k));
|
|
if (item.isExpired) {
|
|
_storage.remove(k);
|
|
}
|
|
} catch (e) {
|
|
_storage.remove(k);
|
|
}
|
|
}
|
|
|
|
try {
|
|
final entry = _RequestCacheItem.fromJson(
|
|
_storage.read(req.hashCode.toString()),
|
|
);
|
|
return entry.practiceActivity;
|
|
} catch (e) {
|
|
_storage.remove(req.hashCode.toString());
|
|
}
|
|
return null;
|
|
}
|
|
|
|
static Future<void> _setCached(
|
|
MessageActivityRequest req,
|
|
MessageActivityResponse res,
|
|
) => _storage.write(
|
|
req.hashCode.toString(),
|
|
_RequestCacheItem(
|
|
practiceActivity: res.activity,
|
|
timestamp: DateTime.now(),
|
|
).toJson(),
|
|
);
|
|
}
|