TW-898: fix error when unpin message in current selected pin

linagora · Dec 20, 2023 · 28d28a1 · 28d28a1
1 parent d4c2ffa
commit 28d28a1
Show file tree

Hide file tree

Showing 15 changed files with 218 additions and 83 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -2970,7 +2970,7 @@
   "description": "Description",
   "groupName": "Group name",
   "descriptionHelper": "You can provide an optional description for your group.",
-  "groupNameCannotBeEmpty": "Group name cannot be empty"
+  "groupNameCannotBeEmpty": "Group name cannot be empty",
   "sharedMediaAndFiles": "Shared media and files",
   "unpinAllMessages": "Unpin all messages",
   "pinnedMessagesTooltip": "Pinned messages",

diff --git a/lib/config/go_routes/go_router.dart b/lib/config/go_routes/go_router.dart
@@ -438,6 +438,25 @@ abstract class AppRoutes {
                   ),
                   redirect: loggedOutRedirect,
                 ),
+                GoRoute(
+                  path: 'pinnedmessages',
+                  pageBuilder: (context, state) {
+                    if (state.extra is PinnedEventsArgument) {
+                      final arg = state.extra as PinnedEventsArgument;
+                      return MaterialPage(
+                        fullscreenDialog: true,
+                        child: PinnedMessages(
+                          pinnedEvents: arg.pinnedEvents,
+                          timeline: arg.timeline,
+                        ),
+                      );
+                    }
+
+                    return const CupertinoPage(
+                      child: PinnedMessages(pinnedEvents: []),
+                    );
+                  },
+                ),
               ],
             ),
           ],

diff --git a/lib/di/global/get_it_initializer.dart b/lib/di/global/get_it_initializer.dart
@@ -57,6 +57,7 @@ import 'package:fluffychat/domain/usecase/room/chat_room_search_interactor.dart'
 import 'package:fluffychat/domain/usecase/room/create_new_group_chat_interactor.dart';
 import 'package:fluffychat/domain/usecase/room/timeline_search_event_interactor.dart';
 import 'package:fluffychat/domain/usecase/room/update_group_chat_interactor.dart';
+import 'package:fluffychat/domain/usecase/room/update_pinned_messages_interactor.dart';
 import 'package:fluffychat/domain/usecase/room/upload_content_interactor.dart';
 import 'package:fluffychat/domain/usecase/room/upload_content_for_web_interactor.dart';
 import 'package:fluffychat/domain/usecase/search/pre_search_recent_contacts_interactor.dart';
@@ -264,5 +265,8 @@ class GetItInitializer {
     getIt.registerSingleton<UpdateGroupChatInteractor>(
       UpdateGroupChatInteractor(),
     );
+    getIt.registerLazySingleton<UpdatePinnedMessagesInteractor>(
+      () => UpdatePinnedMessagesInteractor(),
+    );
   }
 }
diff --git a/lib/domain/app_state/room/update_pinned_events_state.dart b/lib/domain/app_state/room/update_pinned_events_state.dart
@@ -0,0 +1,43 @@
+import 'package:fluffychat/app_state/failure.dart';
+import 'package:fluffychat/app_state/success.dart';
+
+class UpdatePinnedEventsInitial extends Success {
+  @override
+  List<Object?> get props => [];
+}
+
+class UpdatePinnedEventsSuccess extends Success {
+  final String eventId;
+
+  const UpdatePinnedEventsSuccess(this.eventId);
+
+  @override
+  List<Object?> get props => [eventId];
+}
+
+class UpdatePinnedEventsFailure extends Failure {
+  final Exception exception;
+
+  const UpdatePinnedEventsFailure(this.exception);
+
+  @override
+  List<Object?> get props => [exception];
+}
+
+class PinEventsFailure extends Failure {
+  final Object error;
+
+  const PinEventsFailure(this.error);
+
+  @override
+  List<Object?> get props => [error];
+}
+
+class UnpinEventsFailure extends Failure {
+  final Object error;
+
+  const UnpinEventsFailure(this.error);
+
+  @override
+  List<Object?> get props => [error];
+}
diff --git a/lib/domain/enums/pinned_messages_action_enum.dart b/lib/domain/enums/pinned_messages_action_enum.dart
@@ -0,0 +1,4 @@
+enum PinnedMessagesActionEnum {
+  pin,
+  unpin,
+}
diff --git a/lib/domain/usecase/room/update_pinned_messages_interactor.dart b/lib/domain/usecase/room/update_pinned_messages_interactor.dart
@@ -0,0 +1,39 @@
+import 'package:dartz/dartz.dart';
+import 'package:fluffychat/app_state/failure.dart';
+import 'package:fluffychat/app_state/success.dart';
+import 'package:fluffychat/domain/app_state/room/update_pinned_events_state.dart';
+import 'package:fluffychat/domain/enums/pinned_messages_action_enum.dart';
+import 'package:matrix/matrix.dart';
+
+class UpdatePinnedMessagesInteractor {
+  Stream<Either<Failure, Success>> execute({
+    required Room room,
+    required List<String> eventIds,
+    PinnedMessagesActionEnum action = PinnedMessagesActionEnum.unpin,
+  }) async* {
+    try {
+      yield Right(UpdatePinnedEventsInitial());
+      final currentPinnedEvents = room.pinnedEventIds.toSet();
+      if (action == PinnedMessagesActionEnum.pin) {
+        currentPinnedEvents.addAll(eventIds);
+      } else {
+        currentPinnedEvents.removeAll(eventIds);
+      }
+      final result = await room.setPinnedEvents(currentPinnedEvents.toList());
+      yield Right(UpdatePinnedEventsSuccess(result));
+    } on MatrixException catch (exception) {
+      Logs().e(
+        'UpdatePinnedMessagesInteractor::execute(): ErrorCode ${exception.errcode}: ${exception.errorMessage}',
+      );
+      yield Left(
+        UpdatePinnedEventsFailure(exception),
+      );
+    } catch (e) {
+      if (action == PinnedMessagesActionEnum.pin) {
+        yield Left(PinEventsFailure(e));
+      } else {
+        yield Left(UnpinEventsFailure(e));
+      }
+    }
+  }
+}
diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -786,8 +786,8 @@ class ChatController extends State<Chat>
     inputFocus.requestFocus();
   }
 
-  Future<void> scrollToEventIdAndHighlight(String eventId) {
-    return scrollToEventId(eventId, highlight: true);
+  Future<void> scrollToEventIdAndHighlight(String eventId) async {
+    return await scrollToEventId(eventId, highlight: true);
   }
 
   Future<void>? loadTimelineFuture;
@@ -868,6 +868,11 @@ class ChatController extends State<Chat>
     }
   }
 
+  int getDisplayEventIndex(int eventIndex) {
+    const addedHeadItemsInChat = 1;
+    return eventIndex + addedHeadItemsInChat;
+  }
+
   Future<void> scrollToEventId(String eventId, {bool highlight = false}) async {
     final eventIndex = timeline!.events.indexWhere((e) => e.eventId == eventId);
     if (eventIndex == -1) {
@@ -884,7 +889,7 @@ class ChatController extends State<Chat>
       setState(() {});
       return;
     }
-    await scrollToIndex(eventIndex, highlight: highlight);
+    await scrollToIndex(getDisplayEventIndex(eventIndex), highlight: highlight);
     _updateScrollController();
   }
 
@@ -895,7 +900,7 @@ class ChatController extends State<Chat>
     );
     if (highlight) {
       await scrollController.highlight(
-        index + 1,
+        index,
       );
     }
     setState(() {});

diff --git a/lib/pages/chat/chat_pinned_events/pinned_events_controller.dart b/lib/pages/chat/chat_pinned_events/pinned_events_controller.dart
@@ -18,8 +18,7 @@ class PinnedEventsController {
   final AutoScrollController pinnedMessageScrollController =
       AutoScrollController();
 
-  final ValueNotifier<Event?> isCurrentPinnedEventNotifier =
-      ValueNotifier(null);
+  final ValueNotifier<Event?> currentPinnedEventNotifier = ValueNotifier(null);
 
   final ValueNotifier<Either<Failure, Success>> getPinnedMessageNotifier =
       ValueNotifier<Either<Failure, Success>>(
@@ -29,7 +28,7 @@ class PinnedEventsController {
   StreamSubscription? _pinnedEventsSubscription;
 
   bool isCurrentPinnedEvent(Event event) {
-    return isCurrentPinnedEventNotifier.value?.eventId == event.eventId;
+    return currentPinnedEventNotifier.value?.eventId == event.eventId;
   }
 
   void getPinnedMessageAction({
@@ -71,7 +70,7 @@ class PinnedEventsController {
       "PinnedEventsController()::jumpToPinnedMessage(): eventID: ${event?.eventId}",
     );
     if (event != null) {
-      isCurrentPinnedEventNotifier.value = event;
+      currentPinnedEventNotifier.value = event;
       pinnedMessageScrollController.scrollToIndex(nextIndex);
       if (scrollToEventId != null) {
         scrollToEventId.call(event.eventId);
@@ -80,9 +79,13 @@ class PinnedEventsController {
   }
 
   int currentIndexOfPinnedMessage(List<Event?> pinnedEvents) {
-    return pinnedEvents.indexWhere(
-      (event) => event?.eventId == isCurrentPinnedEventNotifier.value?.eventId,
+    final index = pinnedEvents.indexWhere(
+      (event) => event?.eventId == currentPinnedEventNotifier.value?.eventId,
     );
+    if (index < 0) {
+      currentPinnedEventNotifier.value = pinnedEvents.first;
+    }
+    return index;
   }
 
   int _nextIndexOfPinnedMessage(List<Event?> pinnedEvents) {
@@ -93,7 +96,7 @@ class PinnedEventsController {
   }
 
   void initialPinnedMessage(List<Event?> pinnedEvents) {
-    isCurrentPinnedEventNotifier.value = pinnedEvents.last;
+    currentPinnedEventNotifier.value = pinnedEvents.last;
     pinnedMessageScrollController.scrollToIndex(
       pinnedEvents.length - 1,
     );
@@ -121,13 +124,16 @@ class PinnedEventsController {
     final currentEvent = pinnedEvents.firstWhere(
       (event) => event?.eventId == eventId,
     );
-    final index = pinnedEvents.indexOf(currentEvent);
-    isCurrentPinnedEventNotifier.value = currentEvent;
+    int index = pinnedEvents.indexOf(currentEvent);
+    if (index == -1) {
+      index = 0;
+    }
+    currentPinnedEventNotifier.value = currentEvent;
     pinnedMessageScrollController.scrollToIndex(index);
   }
 
   void dispose() {
-    isCurrentPinnedEventNotifier.dispose();
+    currentPinnedEventNotifier.dispose();
     getPinnedMessageNotifier.dispose();
     pinnedMessageScrollController.dispose();
     _pinnedEventsSubscription?.cancel();

diff --git a/lib/pages/chat/chat_pinned_events/pinned_events_view.dart b/lib/pages/chat/chat_pinned_events/pinned_events_view.dart
@@ -56,7 +56,7 @@ class PinnedEventsView extends StatelessWidget {
                         children: [
                           ValueListenableBuilder(
                             valueListenable: controller.pinnedEventsController
-                                .isCurrentPinnedEventNotifier,
+                                .currentPinnedEventNotifier,
                             builder: (context, currentEvent, child) {
                               if (currentEvent == null) return child!;
                               return Expanded(
@@ -115,14 +115,15 @@ class PinnedEventsView extends StatelessWidget {
                                         ),
                                       ),
                                     ),
-                                    _PinnedEventsContentWidget(
-                                      countPinnedEvents: controller
-                                          .pinnedEventsController
-                                          .currentIndexOfPinnedMessage(
-                                        data.pinnedEvents.reversed.toList(),
+                                    if (data.pinnedEvents.isNotEmpty)
+                                      _PinnedEventsContentWidget(
+                                        countPinnedEvents: controller
+                                            .pinnedEventsController
+                                            .currentIndexOfPinnedMessage(
+                                          data.pinnedEvents.reversed.toList(),
+                                        ),
+                                        currentEvent: currentEvent,
                                       ),
-                                      currentEvent: currentEvent,
-                                    ),
                                     TwakeIconButton(
                                       tooltip: L10n.of(context)!
                                           .pinnedMessagesTooltip,

diff --git a/lib/pages/chat/chat_pinned_events/pinned_messages.dart b/lib/pages/chat/chat_pinned_events/pinned_messages.dart
@@ -1,7 +1,11 @@
+import 'package:fluffychat/di/global/get_it_initializer.dart';
+import 'package:fluffychat/domain/app_state/room/update_pinned_events_state.dart';
+import 'package:fluffychat/domain/usecase/room/update_pinned_messages_interactor.dart';
 import 'package:fluffychat/pages/chat/chat_pinned_events/pinned_messages_screen.dart';
 import 'package:fluffychat/presentation/model/chat/pop_up_menu_item_model.dart';
 import 'package:fluffychat/resource/image_paths.dart';
 import 'package:fluffychat/utils/extension/build_context_extension.dart';
+import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/twake_snackbar.dart';
 import 'package:fluffychat/widgets/mixins/popup_context_menu_action_mixin.dart';
@@ -29,23 +33,19 @@ class PinnedMessagesController extends State<PinnedMessages>
 
   final ScrollController scrollController = ScrollController();
 
+  final updatePinnedMessagesInteractor =
+      getIt.get<UpdatePinnedMessagesInteractor>();
+
+  Room? get room => widget.pinnedEvents.first?.room;
+
   List<ContextMenuItemModel> get pinnedMessagesActionsList => [
         ContextMenuItemModel(
           text: L10n.of(context)!.unpin,
           imagePath: ImagePaths.icUnpin,
           color: Theme.of(context).colorScheme.onSurface,
           onTap: ({extra}) async {
             if (extra is Event) {
-              final result = await extra.unpin();
-              if (result) {
-                eventsNotifier.value.remove(extra);
-                eventsNotifier.value = List.from(eventsNotifier.value);
-                if (eventsNotifier.value.isEmpty) {
-                  Navigator.of(context).pop(eventsNotifier.value);
-                }
-              } else {
-                TwakeSnackBar.show(context, L10n.of(context)!.failedToUnpin);
-              }
+              unpin(extra.eventId);
             }
           },
         ),
@@ -71,9 +71,41 @@ class PinnedMessagesController extends State<PinnedMessages>
         ),
       ];
 
+  void unpin(String eventId) {
+    updatePinnedMessagesInteractor
+        .execute(room: room!, eventIds: [eventId]).listen((event) {
+      event.fold((failure) {
+        if (failure is UnpinEventsFailure) {
+          TwakeSnackBar.show(context, L10n.of(context)!.failedToUnpin);
+        } else if (failure is UpdatePinnedEventsFailure) {
+          TwakeSnackBar.show(
+            context,
+            failure.exception.toLocalizedString(context),
+          );
+        }
+      }, (success) {
+        if (success is UpdatePinnedEventsSuccess) {
+          eventsNotifier.value
+              .removeWhere((element) => element?.eventId == eventId);
+          eventsNotifier.value = List.from(eventsNotifier.value);
+          if (eventsNotifier.value.isEmpty) {
+            Navigator.of(context).pop(eventsNotifier.value);
+          }
+        }
+      });
+    });
+  }
+
   void unpinAll() {
-    widget.pinnedEvents.first?.room.setPinnedEvents([]);
-    Navigator.of(context).pop();
+    updatePinnedMessagesInteractor
+        .execute(room: room!, eventIds: []).listen((event) {
+      if (event is UpdatePinnedEventsSuccess) {
+        eventsNotifier.value = [];
+        Navigator.of(context).pop();
+      } else if (event is UnpinEventsFailure) {
+        TwakeSnackBar.show(context, L10n.of(context)!.failedToUnpin);
+      }
+    });
   }
 
   void handleContextMenuActionInMore(

diff --git a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
@@ -11,7 +11,7 @@ import 'package:fluffychat/utils/date_time_extension.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/utils/responsive/responsive_utils.dart';
-import 'package:fluffychat/widgets/context_menu/context_menu_area.dart';
+import 'package:fluffychat/widgets/context_menu/twake_context_menu_area.dart';
 import 'package:fluffychat/widgets/twake_components/twake_icon_button.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
@@ -73,7 +73,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
       children: [
         if (event.isOwnMessage)
           _menuActionsRowBuilder(context, event.isOwnMessage),
-        ContextMenuArea(
+        TwakeContextMenuArea(
           width: MessageStyle.contextMenuWidth,
           builder: menuChildren != null
               ? (context) => menuChildren!.call(context)

diff --git a/lib/pages/chat/events/message/message_style.dart b/lib/pages/chat/events/message/message_style.dart
@@ -144,5 +144,5 @@ class MessageStyle {
 
   static const double paddingAllPushpin = 0;
 
-  static const double contextMenuWidth = 250;
+  static const double contextMenuWidth = 200;
 }