|
|
|
|
@ -18,8 +18,6 @@ import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dar
|
|
|
|
|
import 'package:fluffychat/pangea/events/event_wrappers/pangea_representation_event.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/events/models/tokens_event_content_model.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/lemmas/lemma_info_response.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
|
|
|
|
|
import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
|
|
|
|
|
@ -135,7 +133,11 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
|
|
|
|
|
|
|
|
|
|
RepresentationEvent? repEvent =
|
|
|
|
|
pangeaMessageEvent?.messageDisplayRepresentation;
|
|
|
|
|
repEvent ??= await _fetchNewRepEvent();
|
|
|
|
|
|
|
|
|
|
if (repEvent == null ||
|
|
|
|
|
(repEvent.event == null && repEvent.tokens == null)) {
|
|
|
|
|
repEvent = await _fetchNewRepEvent();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (repEvent?.event != null) {
|
|
|
|
|
await repEvent!.sendTokensEvent(
|
|
|
|
|
@ -145,24 +147,6 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
|
|
|
|
|
MatrixState.pangeaController.languageController.userL2!.langCode,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
// If repEvent is originalSent but it's missing tokens, then fetch tokens.
|
|
|
|
|
// An edge case, but has happened with some bot message.
|
|
|
|
|
else if (repEvent != null &&
|
|
|
|
|
repEvent.tokens == null &&
|
|
|
|
|
repEvent.content.originalSent) {
|
|
|
|
|
final tokens = await repEvent.tokensGlobal(
|
|
|
|
|
pangeaMessageEvent!.senderId,
|
|
|
|
|
pangeaMessageEvent!.event.originServerTs,
|
|
|
|
|
);
|
|
|
|
|
await pangeaMessageEvent!.room.pangeaSendTextEvent(
|
|
|
|
|
pangeaMessageEvent!.messageDisplayText,
|
|
|
|
|
editEventId: pangeaMessageEvent!.eventId,
|
|
|
|
|
originalSent: pangeaMessageEvent!.originalSent?.content,
|
|
|
|
|
originalWritten: pangeaMessageEvent!.originalWritten?.content,
|
|
|
|
|
tokensSent: PangeaMessageTokens(tokens: tokens),
|
|
|
|
|
choreo: pangeaMessageEvent!.originalSent?.choreo,
|
|
|
|
|
);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Get all the lemma infos
|
|
|
|
|
final messageVocabConstructIds = pangeaMessageEvent!
|
|
|
|
|
|