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

Merge branch 'main' into usability-5-14

Browse source
This commit is contained in:
ggurdin 2024-05-16 10:09:47 -04:00
commit e03beac866
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/pages/chat/events/message.dart
View file

@ -167,9 +167,10 @@ class Message extends StatelessWidget {
// #Pangea
ToolbarDisplayController? toolbarController;
if (event.type == EventTypes.Message &&
event.messageType == MessageTypes.Text ||
event.messageType == MessageTypes.Notice ||
event.messageType == MessageTypes.Audio) {
!event.redacted &&
(event.messageType == MessageTypes.Text ||
event.messageType == MessageTypes.Notice ||
event.messageType == MessageTypes.Audio)) {
toolbarController = controller.getToolbarDisplayController(
event.eventId,
nextEvent: nextEvent,

2
lib/pangea/pages/settings_learning/settings_learning_view.dart
View file

@ -65,7 +65,7 @@ class SettingsLearningView extends StatelessWidget {
defaultValue: controller.pangeaController.pStoreService.read(
PLocalKey.autoPlayMessages,
) ??
true,
false,
title: L10n.of(context)!.autoPlayTitle,
subtitle: L10n.of(context)!.autoPlayDesc,
pStoreKey: PLocalKey.autoPlayMessages,