ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix audio errors

Browse source
This commit is contained in:
Kelrap 2024-08-13 10:39:30 -04:00 • committed by ggurdin
parent 34d02bb95c
commit 54d63b1a4f
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
2 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
lib/pangea/choreographer/controllers/choreographer.dart
View file

@ -19,6 +19,7 @@ import 'package:fluffychat/pangea/utils/any_state_holder.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:fluffychat/pangea/utils/overlay.dart';
import 'package:fluffychat/pangea/widgets/igc/paywall_card.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:matrix/matrix.dart';
@ -71,38 +72,47 @@ class Choreographer {
List<PreviousMessage> prevMessages() {
const int howFarBack = 5;
final List<Event> events = chatController.timeline?.events
final List<Event> eventList = chatController.timeline?.events
.where(
(e) =>
e.messageType == MessageTypes.Text ||
e.messageType == MessageTypes.Audio,
e.isVisibleInGui &&
(e.messageType == MessageTypes.Text ||
e.messageType == MessageTypes.Audio) &&
e.status.isSent &&
e.type.equals('m.room.message'),
)
.toList() ??
[];
// Sort from most recent to least
events.sort(
(a, b) => b.originServerTs.compareTo(a.originServerTs),
);
final List<PreviousMessage> messages = [];
for (final Event event in events) {
final Map<String, Object?>? content =
(event.messageType == MessageTypes.Text)
? event.content
: (event as PangeaMessageEvent)
.getSpeechToTextLocalOnly(l1LangCode, l2LangCode)
?.toJson();
if (content != null) {
messages.add(
PreviousMessage(
content: event.content,
sender: event.senderId,
timestamp: event.originServerTs,
),
);
if (messages.length >= howFarBack) {
return messages;
try {
for (final Event event in eventList) {
final String? content = (event.messageType == MessageTypes.Text)
? event.content.toString()
: PangeaMessageEvent(
event: event,
// eventList will be empty if the timeline is null
timeline: chatController.timeline!,
ownMessage: event.senderId ==
pangeaController.matrixState.client.userID,
)
.getSpeechToTextLocalOnly(l1LangCode, l2LangCode)
?.transcript
.text;
if (content != null) {
messages.add(
PreviousMessage(
content: content,
sender: event.senderId,
timestamp: event.originServerTs,
),
);
if (messages.length >= howFarBack) {
return messages;
}
}
}
} catch (err, stack) {
ErrorHandler.logError(e: err, s: stack);
}
return messages;
}

6
lib/pangea/repo/igc_repo.dart
View file

@ -98,7 +98,7 @@ class IgcRepo {
/// Previous text/audio message sent in chat
/// Contain message content, sender, and timestamp
class PreviousMessage {
Map<String, Object?> content;
String content;
String sender;
DateTime timestamp;
@ -110,7 +110,7 @@ class PreviousMessage {
factory PreviousMessage.fromJson(Map<String, dynamic> json) =>
PreviousMessage(
content: jsonDecode(json[ModelKey.prevContent]) ?? <String, Object?>{},
content: json[ModelKey.prevContent] ?? "",
sender: json[ModelKey.prevSender] ?? "",
timestamp: json[ModelKey.prevTimestamp] == null
? DateTime.now()
@ -118,7 +118,7 @@ class PreviousMessage {
);
Map<String, dynamic> toJson() => {
ModelKey.prevContent: jsonEncode(content),
ModelKey.prevContent: content,
ModelKey.prevSender: sender,
ModelKey.prevTimestamp: timestamp.toIso8601String(),
};