* 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>
246 lines
8.3 KiB
Dart
246 lines
8.3 KiB
Dart
import 'dart:math';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/choreo_record_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dart';
|
|
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
import 'package:fluffychat/pangea/speech_to_text/speech_to_text_response_model.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
/// this class is contained within a [RepresentationEvent]
|
|
/// this event is the child of a [EventTypes.Message]
|
|
/// the event has two potential children events -
|
|
/// [PangeaTokensEvent] and [PangeaIGCEvent]
|
|
/// these events contain [PangeaMessageTokens] and [ChoreoRecordModel], respectively.
|
|
class PangeaRepresentation {
|
|
/// system-detected language, possibly condensed from a list,
|
|
/// but only with high certainty
|
|
/// cannot be "unk"
|
|
String langCode;
|
|
|
|
/// final sent text
|
|
/// if this was a process, a [PangeaIGCEvent] will contain changes
|
|
String text;
|
|
|
|
bool originalSent;
|
|
bool originalWritten;
|
|
|
|
// a representation can be create via speech to text on the original message
|
|
SpeechToTextResponseModel? speechToText;
|
|
|
|
// how do we know which representation was sent by author?
|
|
// RepresentationEvent.text == PangeaMessageEvent.event.body
|
|
// use: to know whether directUse
|
|
|
|
// how do we know which representation was original L1 message that was translated (if it exists)?
|
|
// (of l2 rep) RepresentationEvent.igc.steps.first.text = RepresentationEvent.text (of L1 rep)
|
|
// use: for base text for future translations
|
|
|
|
// os = true and ow = false
|
|
// rep that went through IGC/IT
|
|
|
|
// os = false and ow = false
|
|
// rep added by other user
|
|
|
|
// os = true and ow = true
|
|
// potentially L1 language use, maybe with limited IGC, and ignored out of target cries
|
|
// potentially perfect L2 use
|
|
|
|
// os = false and ow = true
|
|
// L1 message that then went through significant IGC and/or IT
|
|
// L2 message with errors that went through IGC
|
|
|
|
PangeaRepresentation({
|
|
required this.langCode,
|
|
required this.text,
|
|
required this.originalSent,
|
|
required this.originalWritten,
|
|
this.speechToText,
|
|
});
|
|
|
|
factory PangeaRepresentation.fromJson(Map<String, dynamic> json) {
|
|
return PangeaRepresentation(
|
|
langCode: json[_langCodeKey],
|
|
text: json[_textKey],
|
|
originalSent: json[_originalSentKey] ?? false,
|
|
originalWritten: json[_originalWrittenKey] ?? false,
|
|
speechToText: json[_speechToTextKey] == null
|
|
? null
|
|
: SpeechToTextResponseModel.fromJson(json[_speechToTextKey]),
|
|
);
|
|
}
|
|
|
|
static const _textKey = "txt";
|
|
static const _langCodeKey = "lang";
|
|
static const _originalSentKey = "snt";
|
|
static const _originalWrittenKey = "wrttn";
|
|
static const _speechToTextKey = "stt";
|
|
|
|
Map<String, dynamic> toJson() {
|
|
final data = <String, dynamic>{};
|
|
data[_textKey] = text;
|
|
data[_langCodeKey] = langCode;
|
|
if (originalSent) data[_originalSentKey] = originalSent;
|
|
if (originalWritten) data[_originalWrittenKey] = originalWritten;
|
|
if (speechToText != null) {
|
|
data[_speechToTextKey] = speechToText!.toJson();
|
|
}
|
|
return data;
|
|
}
|
|
|
|
bool get langCodeMatchesL2 =>
|
|
langCode.split("-").first ==
|
|
MatrixState.pangeaController.userController.userL2?.langCodeShort;
|
|
|
|
/// Get construct uses for the message that weren't captured during language assistance.
|
|
/// Takes a list of tokens and a choreo record, which is searched
|
|
/// through for each token for its construct use type.
|
|
/// Also takes either an event (typically when the Representation itself is
|
|
/// available) or construct use metadata (when the event is not available,
|
|
/// i.e. immediately after message send) to create the construct use.
|
|
List<OneConstructUse> vocabAndMorphUses({
|
|
required List<PangeaToken> tokens,
|
|
Event? event,
|
|
ConstructUseMetaData? metadata,
|
|
ChoreoRecordModel? choreo,
|
|
}) {
|
|
final List<OneConstructUse> uses = [];
|
|
|
|
// missing vital info so return
|
|
if (event?.roomId == null && metadata?.roomId == null) {
|
|
// debugger(when: kDebugMode);
|
|
return uses;
|
|
}
|
|
|
|
metadata ??= ConstructUseMetaData(
|
|
roomId: event!.roomId!,
|
|
eventId: event.eventId,
|
|
timeStamp: event.originServerTs,
|
|
);
|
|
|
|
// for each token, record whether selected in ga, ta, or wa
|
|
List<PangeaToken> tokensToSave = tokens
|
|
.where((token) => token.lemma.saveVocab)
|
|
.toList();
|
|
if (choreo != null && choreo.pastedStrings.isNotEmpty) {
|
|
tokensToSave = tokensToSave
|
|
.where(
|
|
(token) => !choreo.pastedStrings.any(
|
|
(pasted) => pasted.toLowerCase().contains(
|
|
token.text.content.toLowerCase(),
|
|
),
|
|
),
|
|
)
|
|
.toList();
|
|
}
|
|
|
|
if (choreo == null || choreo.choreoSteps.isEmpty) {
|
|
for (final token in tokensToSave) {
|
|
uses.addAll(
|
|
token.allUses(
|
|
ConstructUseTypeEnum.wa,
|
|
metadata,
|
|
ConstructUseTypeEnum.wa.pointValue,
|
|
),
|
|
);
|
|
}
|
|
|
|
return uses;
|
|
}
|
|
|
|
for (final token in tokensToSave) {
|
|
ChoreoRecordStepModel? tokenStep;
|
|
for (final step in choreo.choreoSteps) {
|
|
final igcMatch = step.acceptedOrIgnoredMatch;
|
|
final itStep = step.itStep;
|
|
if (itStep == null && igcMatch == null) {
|
|
continue;
|
|
}
|
|
|
|
final choices = step.choices;
|
|
if (choices == null || choices.isEmpty) {
|
|
continue;
|
|
}
|
|
|
|
final stepContainsToken = choices.any(
|
|
(choice) => choice.contains(token.text.content),
|
|
);
|
|
|
|
// if the step contains the token, and the token hasn't been assigned a step
|
|
// (or the assigned step is an IGC step, but an IT step contains the token)
|
|
// then assign the token to the step
|
|
if (stepContainsToken &&
|
|
(tokenStep == null ||
|
|
(tokenStep.itStep == null && step.itStep != null))) {
|
|
tokenStep = step;
|
|
}
|
|
}
|
|
|
|
if (tokenStep == null ||
|
|
tokenStep.acceptedOrIgnoredMatch?.status ==
|
|
PangeaMatchStatusEnum.automatic) {
|
|
// if the token wasn't found in any IT or IGC step, so it was wa
|
|
uses.addAll(
|
|
token.allUses(
|
|
ConstructUseTypeEnum.wa,
|
|
metadata,
|
|
ConstructUseTypeEnum.wa.pointValue,
|
|
),
|
|
);
|
|
continue;
|
|
}
|
|
|
|
if (tokenStep.acceptedOrIgnoredMatch != null &&
|
|
tokenStep.acceptedOrIgnoredMatch?.status !=
|
|
PangeaMatchStatusEnum.accepted) {
|
|
uses.addAll(token.allUses(ConstructUseTypeEnum.ga, metadata, 0));
|
|
continue;
|
|
}
|
|
|
|
if (tokenStep.itStep != null) {
|
|
final selectedChoices = tokenStep.itStep!.continuances
|
|
.where((choice) => choice.wasClicked)
|
|
.length;
|
|
if (selectedChoices == 0) {
|
|
ErrorHandler.logError(
|
|
e: "No selected choices for IT step",
|
|
data: {"token": token.text.content, "step": tokenStep.toJson()},
|
|
);
|
|
continue;
|
|
}
|
|
|
|
final corITPoints = ConstructUseTypeEnum.corIt.pointValue;
|
|
final incITPoints = ConstructUseTypeEnum.incIt.pointValue;
|
|
final xp = max(0, corITPoints + (incITPoints * (selectedChoices - 1)));
|
|
|
|
uses.addAll(token.allUses(ConstructUseTypeEnum.ta, metadata, xp));
|
|
} else if (tokenStep.acceptedOrIgnoredMatch!.match.choices != null) {
|
|
final selectedChoices = tokenStep.acceptedOrIgnoredMatch!.match.choices!
|
|
.where((choice) => choice.selected)
|
|
.length;
|
|
if (selectedChoices == 0) {
|
|
ErrorHandler.logError(
|
|
e: "No selected choices for IGC step",
|
|
data: {"token": token.text.content, "step": tokenStep.toJson()},
|
|
);
|
|
continue;
|
|
}
|
|
|
|
final corIGCPoints = ConstructUseTypeEnum.corIGC.pointValue;
|
|
final incIGCPoints = ConstructUseTypeEnum.incIGC.pointValue;
|
|
final xp = max(
|
|
0,
|
|
corIGCPoints + (incIGCPoints * (selectedChoices - 1)),
|
|
);
|
|
|
|
uses.addAll(token.allUses(ConstructUseTypeEnum.ga, metadata, xp));
|
|
}
|
|
}
|
|
|
|
return uses;
|
|
}
|
|
}
|