* 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>
243 lines
7 KiB
Dart
243 lines
7 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/pangea/analytics_misc/client_analytics_extension.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/analytics_practice_session_model.dart';
|
|
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
|
|
/// Internal result class that holds all computed data from building an example message.
|
|
class _ExampleMessageResult {
|
|
final List<InlineSpan> displaySpans;
|
|
final List<PangeaToken> includedTokens;
|
|
final String text;
|
|
final int adjustedTargetIndex;
|
|
final String? eventId;
|
|
final String? roomId;
|
|
|
|
_ExampleMessageResult({
|
|
required this.displaySpans,
|
|
required this.includedTokens,
|
|
required this.text,
|
|
required this.adjustedTargetIndex,
|
|
this.eventId,
|
|
this.roomId,
|
|
});
|
|
|
|
List<InlineSpan> toSpans() => displaySpans;
|
|
AudioExampleMessage toAudioExampleMessage() => AudioExampleMessage(
|
|
tokens: includedTokens,
|
|
eventId: eventId,
|
|
roomId: roomId,
|
|
exampleMessage: ExampleMessageInfo(exampleMessage: displaySpans),
|
|
);
|
|
}
|
|
|
|
class ExampleMessageUtil {
|
|
static Future<List<InlineSpan>?> getExampleMessage(
|
|
ConstructUses construct,
|
|
Client client, {
|
|
String? form,
|
|
bool noBold = false,
|
|
}) async {
|
|
final result = await _getExampleMessageResult(
|
|
construct,
|
|
client,
|
|
form: form,
|
|
noBold: noBold,
|
|
);
|
|
return result?.toSpans();
|
|
}
|
|
|
|
static Future<AudioExampleMessage?> getAudioExampleMessage(
|
|
ConstructUses construct,
|
|
Client client, {
|
|
String? form,
|
|
bool noBold = false,
|
|
}) async {
|
|
final result = await _getExampleMessageResult(
|
|
construct,
|
|
client,
|
|
form: form,
|
|
noBold: noBold,
|
|
);
|
|
return result?.toAudioExampleMessage();
|
|
}
|
|
|
|
static Future<List<List<InlineSpan>>> getExampleMessages(
|
|
ConstructUses construct,
|
|
Client client,
|
|
int maxMessages, {
|
|
bool noBold = false,
|
|
}) async {
|
|
final List<List<InlineSpan>> allSpans = [];
|
|
for (final use in construct.cappedUses) {
|
|
if (allSpans.length >= maxMessages) break;
|
|
final event = await client.getEventByConstructUse(use);
|
|
if (event == null) continue;
|
|
|
|
final result = _buildExampleMessage(use.form, event, noBold: noBold);
|
|
if (result != null) {
|
|
allSpans.add(result.toSpans());
|
|
}
|
|
}
|
|
return allSpans;
|
|
}
|
|
|
|
static Future<_ExampleMessageResult?> _getExampleMessageResult(
|
|
ConstructUses construct,
|
|
Client client, {
|
|
String? form,
|
|
bool noBold = false,
|
|
}) async {
|
|
for (final use in construct.cappedUses) {
|
|
if (form != null && use.form != form) continue;
|
|
|
|
final event = await client.getEventByConstructUse(use);
|
|
if (event == null) continue;
|
|
|
|
final result = _buildExampleMessage(use.form, event, noBold: noBold);
|
|
if (result != null) return result;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
static _ExampleMessageResult? _buildExampleMessage(
|
|
String? form,
|
|
PangeaMessageEvent messageEvent, {
|
|
bool noBold = false,
|
|
}) {
|
|
String? text;
|
|
List<PangeaToken>? tokens;
|
|
int targetTokenIndex = -1;
|
|
|
|
if (messageEvent.isAudioMessage) {
|
|
final stt = messageEvent.getSpeechToTextLocal();
|
|
if (stt == null) return null;
|
|
|
|
tokens = stt.transcript.sttTokens.map((t) => t.token).toList();
|
|
targetTokenIndex = tokens.indexWhere((t) => t.text.content == form);
|
|
text = stt.transcript.text;
|
|
} else {
|
|
tokens = messageEvent.messageDisplayRepresentation?.tokens;
|
|
if (tokens == null || tokens.isEmpty) return null;
|
|
|
|
targetTokenIndex = tokens.indexWhere((t) => t.text.content == form);
|
|
text = messageEvent.messageDisplayText;
|
|
}
|
|
|
|
if (targetTokenIndex == -1) {
|
|
return null;
|
|
}
|
|
|
|
final targetToken = tokens[targetTokenIndex];
|
|
|
|
const maxContextChars = 100;
|
|
|
|
final targetStart = targetToken.text.offset;
|
|
final targetEnd = targetStart + targetToken.text.content.characters.length;
|
|
|
|
final totalChars = text.characters.length;
|
|
|
|
final beforeAvailable = targetStart;
|
|
final afterAvailable = totalChars - targetEnd;
|
|
|
|
// ---------- Dynamic budget split ----------
|
|
int beforeBudget = maxContextChars ~/ 2;
|
|
int afterBudget = maxContextChars - beforeBudget;
|
|
|
|
if (beforeAvailable < beforeBudget) {
|
|
afterBudget += beforeBudget - beforeAvailable;
|
|
beforeBudget = beforeAvailable;
|
|
} else if (afterAvailable < afterBudget) {
|
|
beforeBudget += afterBudget - afterAvailable;
|
|
afterBudget = afterAvailable;
|
|
}
|
|
|
|
// ---------- BEFORE ----------
|
|
int beforeStartOffset = 0;
|
|
bool trimmedBefore = false;
|
|
int firstIncludedTokenIndex = 0;
|
|
|
|
if (beforeAvailable > beforeBudget) {
|
|
final desiredStart = targetStart - beforeBudget;
|
|
|
|
for (int i = 0; i < targetTokenIndex; i++) {
|
|
final token = tokens[i];
|
|
final tokenEnd =
|
|
token.text.offset + token.text.content.characters.length;
|
|
|
|
if (tokenEnd > desiredStart) {
|
|
beforeStartOffset = token.text.offset;
|
|
firstIncludedTokenIndex = i;
|
|
trimmedBefore = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
final before = text.characters
|
|
.skip(beforeStartOffset)
|
|
.take(targetStart - beforeStartOffset)
|
|
.toString();
|
|
|
|
// ---------- AFTER ----------
|
|
int afterEndOffset = totalChars;
|
|
bool trimmedAfter = false;
|
|
int lastIncludedTokenIndex = tokens.length - 1;
|
|
|
|
if (afterAvailable > afterBudget) {
|
|
final desiredEnd = targetEnd + afterBudget;
|
|
|
|
for (int i = targetTokenIndex + 1; i < tokens.length; i++) {
|
|
final token = tokens[i];
|
|
if (token.text.offset >= desiredEnd) {
|
|
afterEndOffset = token.text.offset;
|
|
lastIncludedTokenIndex = i - 1;
|
|
trimmedAfter = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
final after = text.characters
|
|
.skip(targetEnd)
|
|
.take(afterEndOffset - targetEnd)
|
|
.toString()
|
|
.trimRight();
|
|
|
|
final displaySpans = [
|
|
if (trimmedBefore) const TextSpan(text: '… '),
|
|
TextSpan(text: before),
|
|
TextSpan(
|
|
text: targetToken.text.content,
|
|
style: noBold ? null : const TextStyle(fontWeight: FontWeight.bold),
|
|
),
|
|
TextSpan(text: after),
|
|
if (trimmedAfter) const TextSpan(text: '…'),
|
|
];
|
|
|
|
// Extract only the tokens that are included in the displayed text
|
|
final includedTokens = tokens.sublist(
|
|
firstIncludedTokenIndex,
|
|
lastIncludedTokenIndex + 1,
|
|
);
|
|
|
|
// Adjust target token index relative to the included tokens
|
|
final adjustedTargetIndex = targetTokenIndex - firstIncludedTokenIndex;
|
|
|
|
return _ExampleMessageResult(
|
|
displaySpans: displaySpans,
|
|
includedTokens: includedTokens,
|
|
text: text.characters
|
|
.skip(beforeStartOffset)
|
|
.take(afterEndOffset - beforeStartOffset)
|
|
.toString(),
|
|
adjustedTargetIndex: adjustedTargetIndex,
|
|
eventId: messageEvent.eventId,
|
|
roomId: messageEvent.room.id,
|
|
);
|
|
}
|
|
}
|