* 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>
326 lines
9.4 KiB
Dart
326 lines
9.4 KiB
Dart
import 'dart:async';
|
|
import 'dart:convert';
|
|
import 'dart:developer';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:collection/collection.dart';
|
|
import 'package:flutter_tts/flutter_tts.dart' as flutter_tts;
|
|
import 'package:just_audio/just_audio.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
|
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/pages/chat/chat.dart';
|
|
import 'package:fluffychat/pages/chat/events/audio_player.dart';
|
|
import 'package:fluffychat/pangea/bot/utils/bot_style.dart';
|
|
import 'package:fluffychat/pangea/common/utils/overlay.dart';
|
|
import 'package:fluffychat/pangea/common/widgets/card_header.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart';
|
|
import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
|
|
import 'package:fluffychat/pangea/languages/language_constants.dart';
|
|
import 'package:fluffychat/pangea/text_to_speech/text_to_speech_repo.dart';
|
|
import 'package:fluffychat/pangea/text_to_speech/text_to_speech_request_model.dart';
|
|
import 'package:fluffychat/pangea/text_to_speech/text_to_speech_response_model.dart';
|
|
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
import 'package:fluffychat/pangea/common/utils/error_handler.dart'
|
|
as error_handler;
|
|
|
|
class TtsController {
|
|
static List<String> _availableLangCodes = [];
|
|
|
|
static final _tts = flutter_tts.FlutterTts();
|
|
static final StreamController<bool> loadingChoreoStream =
|
|
StreamController<bool>.broadcast();
|
|
|
|
static AudioPlayer? audioPlayer;
|
|
|
|
static Future<void> _onError(dynamic message) async {
|
|
if (message != 'canceled' && message != 'interrupted') {
|
|
error_handler.ErrorHandler.logError(
|
|
e: 'TTS error',
|
|
data: {'message': message},
|
|
);
|
|
}
|
|
}
|
|
|
|
static Future<void> setAvailableLanguages() async {
|
|
try {
|
|
await _tts.awaitSpeakCompletion(true);
|
|
await _setAvailableBaseLanguages();
|
|
} catch (e, s) {
|
|
debugger(when: kDebugMode);
|
|
error_handler.ErrorHandler.logError(e: e, s: s, data: {});
|
|
}
|
|
}
|
|
|
|
static Future<void> _setAvailableBaseLanguages() async {
|
|
final voices = (await _tts.getVoices) as List?;
|
|
_availableLangCodes = (voices ?? [])
|
|
.map((v) {
|
|
// on iOS / web, the codes are in 'locale', but on Android, they are in 'name'
|
|
final nameCode = v['name'];
|
|
final localeCode = v['locale'];
|
|
return localeCode.contains("-") ? localeCode : nameCode;
|
|
})
|
|
.toSet()
|
|
.cast<String>()
|
|
.toList();
|
|
}
|
|
|
|
static Future<void> _setSpeakingLanguage(String langCode) async {
|
|
String? selectedLangCode;
|
|
final langCodeShort = langCode.split("-").first;
|
|
if (_availableLangCodes.contains(langCode)) {
|
|
selectedLangCode = langCode;
|
|
} else {
|
|
selectedLangCode = _availableLangCodes.firstWhereOrNull(
|
|
(code) => code.startsWith(langCodeShort),
|
|
);
|
|
}
|
|
|
|
if (selectedLangCode != null) {
|
|
await (_tts.setLanguage(selectedLangCode));
|
|
} else {
|
|
final jsonData = {
|
|
'langCode': langCode,
|
|
'availableLangCodes': _availableLangCodes,
|
|
};
|
|
debugPrint("TTS: Language not supported: $jsonData");
|
|
Sentry.addBreadcrumb(Breadcrumb.fromJson(jsonData));
|
|
}
|
|
}
|
|
|
|
static Future<void> stop() async {
|
|
try {
|
|
// return type is dynamic but apparent its supposed to be 1
|
|
// https://pub.dev/packages/flutter_tts
|
|
final result = await (_tts.stop());
|
|
audioPlayer?.stop();
|
|
|
|
if (result != 1) {
|
|
error_handler.ErrorHandler.logError(
|
|
m: 'Unexpected result from tts.stop',
|
|
data: {'result': result},
|
|
);
|
|
}
|
|
} catch (e, s) {
|
|
debugger(when: kDebugMode);
|
|
error_handler.ErrorHandler.logError(e: e, s: s, data: {});
|
|
}
|
|
}
|
|
|
|
static VoidCallback? _onStop;
|
|
|
|
static Future<void> tryToSpeak(
|
|
String text, {
|
|
required String langCode,
|
|
// Target ID for where to show warning popup
|
|
String? targetID,
|
|
BuildContext? context,
|
|
ChatController? chatController,
|
|
VoidCallback? onStart,
|
|
VoidCallback? onStop,
|
|
}) async {
|
|
final prevOnStop = _onStop;
|
|
_onStop = onStop;
|
|
|
|
if (_availableLangCodes.isEmpty) {
|
|
await setAvailableLanguages();
|
|
}
|
|
|
|
_tts.setErrorHandler((message) {
|
|
_onError(message);
|
|
prevOnStop?.call();
|
|
});
|
|
|
|
onStart?.call();
|
|
|
|
await _tryToSpeak(
|
|
text,
|
|
langCode: langCode,
|
|
targetID: targetID,
|
|
context: context,
|
|
chatController: chatController,
|
|
onStart: onStart,
|
|
onStop: onStop,
|
|
);
|
|
}
|
|
|
|
/// A safer version of speak, that handles the case of
|
|
/// the language not being supported by the TTS engine
|
|
static Future<void> _tryToSpeak(
|
|
String text, {
|
|
required String langCode,
|
|
// Target ID for where to show warning popup
|
|
String? targetID,
|
|
BuildContext? context,
|
|
ChatController? chatController,
|
|
VoidCallback? onStart,
|
|
VoidCallback? onStop,
|
|
}) async {
|
|
chatController?.stopMediaStream.add(null);
|
|
MatrixState.pangeaController.matrixState.audioPlayer?.stop();
|
|
|
|
await _setSpeakingLanguage(langCode);
|
|
|
|
final enableTTS = MatrixState
|
|
.pangeaController
|
|
.userController
|
|
.profile
|
|
.toolSettings
|
|
.enableTTS;
|
|
|
|
if (enableTTS) {
|
|
final token = PangeaTokenText(
|
|
offset: 0,
|
|
content: text,
|
|
length: text.length,
|
|
);
|
|
|
|
onStart?.call();
|
|
await (_isLangFullySupported(langCode)
|
|
? _speak(text, langCode, [token])
|
|
: _speakFromChoreo(text, langCode, [token]));
|
|
} else if (targetID != null && context != null) {
|
|
await _showTTSDisabledPopup(context, targetID);
|
|
}
|
|
|
|
onStop?.call();
|
|
}
|
|
|
|
static Future<void> _speak(
|
|
String text,
|
|
String langCode,
|
|
List<PangeaTokenText> tokens,
|
|
) async {
|
|
try {
|
|
await stop();
|
|
text = text.toLowerCase();
|
|
|
|
Logs().i('Speaking: $text, langCode: $langCode');
|
|
final result = await Future(
|
|
() => (_tts.speak(text)),
|
|
// .timeout(
|
|
// const Duration(seconds: 5),
|
|
// // onTimeout: () {
|
|
// // ErrorHandler.logError(
|
|
// // e: "Timeout on tts.speak",
|
|
// // data: {"text": text},
|
|
// // );
|
|
// // },
|
|
// ),
|
|
);
|
|
Logs().i('Finished speaking: $text, result: $result');
|
|
|
|
// return type is dynamic but apparent its supposed to be 1
|
|
// https://pub.dev/packages/flutter_tts
|
|
// if (result != 1 && !kIsWeb) {
|
|
// ErrorHandler.logError(
|
|
// m: 'Unexpected result from tts.speak',
|
|
// data: {
|
|
// 'result': result,
|
|
// 'text': text,
|
|
// },
|
|
// level: SentryLevel.warning,
|
|
// );
|
|
// }
|
|
} catch (e, s) {
|
|
debugger(when: kDebugMode);
|
|
error_handler.ErrorHandler.logError(e: e, s: s, data: {'text': text});
|
|
await _speakFromChoreo(text, langCode, tokens);
|
|
} finally {
|
|
stop();
|
|
}
|
|
}
|
|
|
|
static Future<void> _speakFromChoreo(
|
|
String text,
|
|
String langCode,
|
|
List<PangeaTokenText> tokens,
|
|
) async {
|
|
TextToSpeechResponseModel? ttsRes;
|
|
|
|
loadingChoreoStream.add(true);
|
|
final result = await TextToSpeechRepo.get(
|
|
MatrixState.pangeaController.userController.accessToken,
|
|
TextToSpeechRequestModel(
|
|
text: text,
|
|
langCode: langCode,
|
|
tokens: tokens,
|
|
userL1:
|
|
MatrixState.pangeaController.userController.userL1Code ??
|
|
LanguageKeys.unknownLanguage,
|
|
userL2:
|
|
MatrixState.pangeaController.userController.userL2Code ??
|
|
LanguageKeys.unknownLanguage,
|
|
),
|
|
);
|
|
loadingChoreoStream.add(false);
|
|
if (result.isError) return;
|
|
ttsRes = result.result!;
|
|
|
|
try {
|
|
Logs().i('Speaking from choreo: $text, langCode: $langCode');
|
|
final audioContent = base64Decode(ttsRes.audioContent);
|
|
audioPlayer?.dispose();
|
|
audioPlayer = AudioPlayer();
|
|
await audioPlayer!.setAudioSource(
|
|
BytesAudioSource(audioContent, ttsRes.mimeType),
|
|
);
|
|
await audioPlayer!.play();
|
|
} catch (e, s) {
|
|
error_handler.ErrorHandler.logError(
|
|
e: 'Error playing audio',
|
|
s: s,
|
|
data: {'error': e.toString(), 'text': text},
|
|
);
|
|
} finally {
|
|
audioPlayer?.dispose();
|
|
audioPlayer = null;
|
|
}
|
|
}
|
|
|
|
static bool _isLangFullySupported(String langCode) {
|
|
if (_availableLangCodes.contains(langCode)) {
|
|
return true;
|
|
}
|
|
|
|
final langCodeShort = langCode.split("-").first;
|
|
if (langCodeShort.isEmpty) {
|
|
return false;
|
|
}
|
|
|
|
return _availableLangCodes.any((lang) => lang.startsWith(langCodeShort));
|
|
}
|
|
|
|
static Future<void> _showTTSDisabledPopup(
|
|
BuildContext context,
|
|
String targetID,
|
|
) async => OverlayUtil.showPositionedCard(
|
|
context: context,
|
|
backDropToDismiss: false,
|
|
cardToShow: Column(
|
|
spacing: 12.0,
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
children: [
|
|
CardHeader(InstructionsEnum.ttsDisabled.title(L10n.of(context))),
|
|
Padding(
|
|
padding: const EdgeInsets.all(6.0),
|
|
child: Text(
|
|
InstructionsEnum.ttsDisabled.body(L10n.of(context)),
|
|
style: BotStyle.text(context),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
maxHeight: 300,
|
|
maxWidth: 300,
|
|
transformTargetId: targetID,
|
|
closePrevOverlay: false,
|
|
overlayKey: InstructionsEnum.ttsDisabled.toString(),
|
|
);
|
|
}
|