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

Merge pull request #127 from pangeachat/audio-chat-subtitle

Browse source 
don't show audio message sent in chat subtitle after text-to-speech m…
This commit is contained in:
wcjord 2024-03-25 10:15:39 -04:00 • committed by GitHub
commit fe0ef2379f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ios/Runner.xcodeproj/project.pbxproj
View file

@ -484,6 +484,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -627,6 +628,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
@ -664,6 +666,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",

35
lib/pangea/utils/get_chat_list_item_subtitle.dart
View file

@ -18,10 +18,32 @@ class GetChatListItemSubtitle {
) async {
if (event == null) return L10n.of(context)!.emptyChat;
try {
String? eventContextId = event.eventId;
if (!event.eventId.isValidMatrixId || event.eventId.sigil != '\$') {
eventContextId = null;
}
final Timeline timeline =
await event.room.getTimeline(eventContextId: eventContextId);
if (event.content.tryGet(ModelKey.transcription) != null) {
int index = timeline.events.indexWhere(
(e) => e.eventId == event!.eventId,
);
while (index < timeline.events.length &&
timeline.events[index].content.tryGet(ModelKey.transcription) !=
null) {
index++;
}
if (timeline.events.length > index + 1) {
event = timeline.events[index];
}
}
if (event.type != EventTypes.Message ||
!pangeaController.permissionsController
.isToolEnabled(ToolSetting.immersionMode, event.room) ||
event.content.tryGet(ModelKey.transcription) != null) {
.isToolEnabled(ToolSetting.immersionMode, event.room)) {
return event.calcLocalizedBody(
MatrixLocals(L10n.of(context)!),
hideReply: true,
@ -33,13 +55,6 @@ class GetChatListItemSubtitle {
);
}
String? eventContextId = event.eventId;
if (!event.eventId.isValidMatrixId || event.eventId.sigil != '\$') {
eventContextId = null;
}
final Timeline timeline =
await event.room.getTimeline(eventContextId: eventContextId);
final PangeaMessageEvent pangeaMessageEvent = PangeaMessageEvent(
event: event,
timeline: timeline,
@ -78,7 +93,7 @@ class GetChatListItemSubtitle {
} catch (e, s) {
// debugger(when: kDebugMode);
ErrorHandler.logError(e: e, s: s);
return event.body;
return event?.body ?? L10n.of(context)!.emptyChat;
}
}
}