* 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>
244 lines
7 KiB
Dart
244 lines
7 KiB
Dart
import 'package:get_storage/get_storage.dart';
|
|
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_selection.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_target.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class _PracticeSelectionCacheEntry {
|
|
final PracticeSelection selection;
|
|
final DateTime timestamp;
|
|
|
|
_PracticeSelectionCacheEntry({
|
|
required this.selection,
|
|
required this.timestamp,
|
|
});
|
|
|
|
bool get isExpired => DateTime.now().difference(timestamp).inDays > 1;
|
|
|
|
Map<String, dynamic> toJson() => {
|
|
'selection': selection.toJson(),
|
|
'timestamp': timestamp.toIso8601String(),
|
|
};
|
|
|
|
factory _PracticeSelectionCacheEntry.fromJson(Map<String, dynamic> json) {
|
|
return _PracticeSelectionCacheEntry(
|
|
selection: PracticeSelection.fromJson(json['selection']),
|
|
timestamp: DateTime.parse(json['timestamp']),
|
|
);
|
|
}
|
|
}
|
|
|
|
class PracticeSelectionRepo {
|
|
static final GetStorage _storage = GetStorage('practice_selection_cache');
|
|
|
|
static Future<PracticeSelection?> get(
|
|
String eventId,
|
|
String messageLanguage,
|
|
List<PangeaToken> tokens,
|
|
) async {
|
|
final userL2 = MatrixState.pangeaController.userController.userL2;
|
|
if (userL2?.langCodeShort != messageLanguage.split("-").first) {
|
|
return null;
|
|
}
|
|
|
|
final cached = _getCached(eventId);
|
|
if (cached != null) return cached;
|
|
|
|
final newEntry = await _fetch(tokens: tokens, langCode: messageLanguage);
|
|
|
|
_setCached(eventId, newEntry);
|
|
return newEntry;
|
|
}
|
|
|
|
static Future<PracticeSelection> _fetch({
|
|
required List<PangeaToken> tokens,
|
|
required String langCode,
|
|
}) async {
|
|
if (langCode.split("-")[0] !=
|
|
MatrixState.pangeaController.userController.userL2?.langCodeShort) {
|
|
return PracticeSelection({});
|
|
}
|
|
|
|
final eligibleTokens = tokens.where((t) => t.lemma.saveVocab).toList();
|
|
if (eligibleTokens.isEmpty) {
|
|
return PracticeSelection({});
|
|
}
|
|
final queue = await _fillActivityQueue(eligibleTokens);
|
|
final selection = PracticeSelection(queue);
|
|
return selection;
|
|
}
|
|
|
|
static PracticeSelection? _getCached(String eventId) {
|
|
try {
|
|
final keys = List.from(_storage.getKeys());
|
|
for (final String key in keys) {
|
|
final cacheEntry = _PracticeSelectionCacheEntry.fromJson(
|
|
_storage.read(key),
|
|
);
|
|
if (cacheEntry.isExpired) {
|
|
_storage.remove(key);
|
|
}
|
|
}
|
|
} catch (e) {
|
|
_storage.erase();
|
|
return null;
|
|
}
|
|
|
|
final entry = _storage.read(eventId);
|
|
if (entry == null) return null;
|
|
|
|
try {
|
|
return _PracticeSelectionCacheEntry.fromJson(
|
|
_storage.read(eventId),
|
|
).selection;
|
|
} catch (e) {
|
|
_storage.remove(eventId);
|
|
return null;
|
|
}
|
|
}
|
|
|
|
static void _setCached(String eventId, PracticeSelection entry) {
|
|
final cachedEntry = _PracticeSelectionCacheEntry(
|
|
selection: entry,
|
|
timestamp: DateTime.now(),
|
|
);
|
|
_storage.write(eventId, cachedEntry.toJson());
|
|
}
|
|
|
|
static Future<Map<ActivityTypeEnum, List<PracticeTarget>>> _fillActivityQueue(
|
|
List<PangeaToken> tokens,
|
|
) async {
|
|
final queue = <ActivityTypeEnum, List<PracticeTarget>>{};
|
|
for (final type in ActivityTypeEnum.practiceTypes) {
|
|
queue[type] = await _buildActivity(type, tokens);
|
|
}
|
|
return queue;
|
|
}
|
|
|
|
static int _sortTokens(
|
|
PangeaToken a,
|
|
PangeaToken b,
|
|
int aScore,
|
|
int bScore,
|
|
) => bScore.compareTo(aScore);
|
|
|
|
static int _sortMorphTargets(
|
|
PracticeTarget a,
|
|
PracticeTarget b,
|
|
int aScore,
|
|
int bScore,
|
|
) => bScore.compareTo(aScore);
|
|
|
|
static List<PracticeTarget> _tokenToMorphTargets(PangeaToken t) {
|
|
return t.morphsBasicallyEligibleForPracticeByPriority
|
|
.map(
|
|
(m) => PracticeTarget(
|
|
tokens: [t],
|
|
activityType: ActivityTypeEnum.morphId,
|
|
morphFeature: MorphFeaturesEnumExtension.fromString(m.category),
|
|
),
|
|
)
|
|
.toList();
|
|
}
|
|
|
|
static Future<List<PracticeTarget>> _buildActivity(
|
|
ActivityTypeEnum activityType,
|
|
List<PangeaToken> tokens,
|
|
) async {
|
|
if (activityType == ActivityTypeEnum.morphId) {
|
|
return _buildMorphActivity(tokens);
|
|
}
|
|
|
|
List<PangeaToken> practiceTokens = List<PangeaToken>.from(tokens);
|
|
final seenTexts = <String>{};
|
|
final seenLemmas = <String>{};
|
|
practiceTokens.retainWhere(
|
|
(token) =>
|
|
token.eligibleForPractice(activityType) &&
|
|
seenTexts.add(token.text.content.toLowerCase()) &&
|
|
seenLemmas.add(token.lemma.text.toLowerCase()),
|
|
);
|
|
|
|
if (practiceTokens.length < activityType.minTokensForMatchActivity) {
|
|
return [];
|
|
}
|
|
|
|
final scores = await _fetchPriorityScores(practiceTokens, activityType);
|
|
|
|
practiceTokens.sort((a, b) => _sortTokens(a, b, scores[a]!, scores[b]!));
|
|
practiceTokens = practiceTokens.take(8).toList();
|
|
practiceTokens.shuffle();
|
|
|
|
return [
|
|
PracticeTarget(
|
|
activityType: activityType,
|
|
tokens: practiceTokens.take(PracticeSelection.maxQueueLength).toList(),
|
|
),
|
|
];
|
|
}
|
|
|
|
static Future<List<PracticeTarget>> _buildMorphActivity(
|
|
List<PangeaToken> tokens,
|
|
) async {
|
|
final List<PangeaToken> practiceTokens = List<PangeaToken>.from(tokens);
|
|
final candidates = practiceTokens.expand(_tokenToMorphTargets).toList();
|
|
final scores = await _fetchPriorityScores(
|
|
practiceTokens,
|
|
ActivityTypeEnum.morphId,
|
|
);
|
|
candidates.sort(
|
|
(a, b) => _sortMorphTargets(
|
|
a,
|
|
b,
|
|
scores[a.tokens.first]!,
|
|
scores[b.tokens.first]!,
|
|
),
|
|
);
|
|
|
|
final seenTexts = <String>{};
|
|
final seenLemmas = <String>{};
|
|
candidates.retainWhere(
|
|
(target) =>
|
|
seenTexts.add(target.tokens.first.text.content.toLowerCase()) &&
|
|
seenLemmas.add(target.tokens.first.lemma.text.toLowerCase()),
|
|
);
|
|
return candidates.take(PracticeSelection.maxQueueLength).toList();
|
|
}
|
|
|
|
static Future<Map<PangeaToken, int>> _fetchPriorityScores(
|
|
List<PangeaToken> tokens,
|
|
ActivityTypeEnum activityType,
|
|
) async {
|
|
final scores = <PangeaToken, int>{};
|
|
for (final token in tokens) {
|
|
scores[token] = 0;
|
|
}
|
|
|
|
final ids = tokens.map((t) => t.vocabConstructID).toList();
|
|
final idMap = {for (final token in tokens) token: token.vocabConstructID};
|
|
|
|
final constructs = await MatrixState
|
|
.pangeaController
|
|
.matrixState
|
|
.analyticsDataService
|
|
.getConstructUses(ids);
|
|
|
|
for (final token in tokens) {
|
|
final construct = constructs[idMap[token]];
|
|
final lastUsed = construct?.lastUseByTypes(
|
|
activityType.associatedUseTypes,
|
|
);
|
|
|
|
final daysSinceLastUsed = lastUsed == null
|
|
? 20
|
|
: DateTime.now().difference(lastUsed).inDays;
|
|
|
|
scores[token] =
|
|
daysSinceLastUsed * (token.vocabConstructID.isContentWord ? 10 : 9);
|
|
}
|
|
return scores;
|
|
}
|
|
}
|