improve handling of events which failed to send

commet/lib/client/matrix/matrix_room.dart

@@ -643,4 +643,16 @@ class MatrixRoom extends Room {
       _onUpdate.add(null);
     }
   }
+
+  @override
+  Future<void> cancelSend(TimelineEvent event) async {
+    final mxEvent = event as MatrixTimelineEvent;
+    await mxEvent.event.cancelSend();
+  }
+
+  @override
+  Future<void> retrySend(TimelineEvent event) async {
+    final mxEvent = event as MatrixTimelineEvent;
+    await mxEvent.event.sendAgain();
+  }
 }

commet/lib/client/matrix/matrix_timeline.dart

@@ -82,8 +82,8 @@ class MatrixTimeline extends Timeline {
   }
 
   void onEventRemoved(index) {
-    events.removeAt(index);
     onRemove.add(index);
+    events.removeAt(index);
   }
 
   @override

commet/lib/client/room.dart

@@ -75,6 +75,10 @@ abstract class Room {
     List<ProcessedAttachment> processedAttachments,
   });
 
+  Future<void> cancelSend(TimelineEvent event);
+
+  Future<void> retrySend(TimelineEvent event);
+
   /// Add an emoticon reaction to a message
   Future<TimelineEvent?> addReaction(
       TimelineEvent reactingTo, Emoticon reaction);

commet/lib/client/timeline.dart

@@ -62,9 +62,10 @@ enum EventRelationshipType { reply }
 abstract class Timeline {
   late List<TimelineEvent> events = List.empty(growable: true);
   final Map<String, TimelineEvent> _eventsDict = {};
-  late StreamController<int> onEventAdded = StreamController.broadcast();
-  late StreamController<int> onChange = StreamController.broadcast();
-  late StreamController<int> onRemove = StreamController.broadcast();
+  late StreamController<int> onEventAdded =
+      StreamController.broadcast(sync: true);
+  late StreamController<int> onChange = StreamController.broadcast(sync: true);
+  late StreamController<int> onRemove = StreamController.broadcast(sync: true);
   late Client client;
   late Room room;
 

commet/lib/ui/molecules/room_timeline_widget/room_timeline_widget_view.dart

@@ -186,7 +186,10 @@ class RoomTimelineWidgetViewState extends State<RoomTimelineWidgetView> {
       historyItemsCount = timeline.events.length - recentItemsCount;
     }
     var removed = eventKeys.removeAt(index);
+
     assert(timeline.events[index].eventId == removed.$2);
+
+    setState(() {});
   }
 
   void onAfterFirstFrame(_) {

commet/lib/ui/molecules/timeline_events/timeline_event_menu.dart

@@ -54,6 +54,16 @@ class TimelineEventMenu {
           "If a message was sent with an effect, this prompts to replay the effect",
       name: "promptReplayMessageEffect");
 
+  String get promptCancelEventSend => Intl.message("Cancel",
+      desc:
+          "When a message failed to send, this prompts to cancel sending the event",
+      name: "promptCancelEventSend");
+
+  String get promptRetryEventSend => Intl.message("Retry",
+      desc:
+          "When a message failed to send, this prompts to retry sending the event",
+      name: "promptRetryEventSend");
+
   TimelineEventMenu({
     required this.timeline,
     required this.event,
@@ -62,46 +72,81 @@ class TimelineEventMenu {
     this.onActionFinished,
     this.isThreadTimeline = false,
   }) {
-    bool canEditEvent = event is TimelineEventMessage &&
-        timeline.room.permissions.canUserEditMessages &&
-        event.senderId == timeline.room.client.self!.identifier &&
-        setEditingEvent != null;
-
-    bool canDeleteEvent = timeline.canDeleteEvent(event);
+    bool canEditEvent = false;
+    bool canSaveAttachment = false;
+    bool canAddReaction = false;
+    bool canReplyInThread = false;
+    bool canCopy = false;
+    bool canEditPinState = false;
+    bool canPin = false;
+    bool canUnpin = false;
+    bool hasEffect = false;
+    bool canReply = false;
+    bool canDeleteEvent = false;
 
-    bool canReply = event is TimelineEventMessage ||
-        event is TimelineEventSticker ||
-        event is TimelineEventEmote;
+    bool canRetrySend = event.status == TimelineEventStatus.error;
+    bool canCancelSend = event.status == TimelineEventStatus.error;
 
-    bool canSaveAttachment = false;
-    if (event is TimelineEventMessage) {
-      canSaveAttachment =
-          (event as TimelineEventMessage).attachments?.isNotEmpty == true;
-    }
+    var effects = timeline.room.client.getComponent<MessageEffectComponent>();
     var emoticons = timeline.room.getComponent<RoomEmoticonComponent>();
-    bool canAddReaction =
-        (event is TimelineEventMessage || event is TimelineEventSticker) &&
-            emoticons != null;
+    var pins = timeline.room.getComponent<PinnedMessagesComponent>();
 
-    bool canReplyInThread = !isThreadTimeline && event is TimelineEventMessage;
+    if (event.status == TimelineEventStatus.synced) {
+      canEditEvent = event is TimelineEventMessage &&
+          timeline.room.permissions.canUserEditMessages &&
+          event.senderId == timeline.room.client.self!.identifier &&
+          setEditingEvent != null;
 
-    bool canCopy = event is TimelineEventMessage;
+      canDeleteEvent = timeline.canDeleteEvent(event) &&
+          event.status == TimelineEventStatus.synced;
 
-    var pins = timeline.room.getComponent<PinnedMessagesComponent>();
+      canReply = event is TimelineEventMessage ||
+          event is TimelineEventSticker ||
+          event is TimelineEventEmote;
 
-    bool canEditPinState = pins?.canPinMessages == true &&
-        (event is TimelineEventMessage ||
-            event is TimelineEventSticker ||
-            event is TimelineEventEmote);
-    bool isPinned = pins?.isMessagePinned(event.eventId) == true;
-    bool canPin = canEditPinState && !isPinned;
-    bool canUnpin = canEditPinState && isPinned;
+      if (event is TimelineEventMessage) {
+        canSaveAttachment =
+            (event as TimelineEventMessage).attachments?.isNotEmpty == true;
+      }
 
-    var effects = timeline.room.client.getComponent<MessageEffectComponent>();
+      canAddReaction =
+          (event is TimelineEventMessage || event is TimelineEventSticker) &&
+              emoticons != null;
+
+      canReplyInThread = !isThreadTimeline && event is TimelineEventMessage;
 
-    bool hasEffect = effects?.hasEffect(event) == true;
+      canCopy = event is TimelineEventMessage;
+
+      canEditPinState = pins?.canPinMessages == true &&
+          (event is TimelineEventMessage ||
+              event is TimelineEventSticker ||
+              event is TimelineEventEmote);
+
+      bool isPinned = pins?.isMessagePinned(event.eventId) == true;
+
+      canPin = canEditPinState && !isPinned;
+      canUnpin = canEditPinState && isPinned;
+
+      hasEffect = effects?.hasEffect(event) == true;
+    }
 
     primaryActions = [
+      if (canRetrySend)
+        TimelineEventMenuEntry(
+            name: promptRetryEventSend,
+            icon: Icons.refresh,
+            action: (BuildContext context) {
+              timeline.room.retrySend(event);
+              onActionFinished?.call();
+            }),
+      if (canCancelSend)
+        TimelineEventMenuEntry(
+            name: promptCancelEventSend,
+            icon: Icons.cancel,
+            action: (BuildContext context) {
+              timeline.room.cancelSend(event);
+              onActionFinished?.call();
+            }),
       if (hasEffect)
         TimelineEventMenuEntry(
             name: promptReplayMessageEffect,
@@ -143,7 +188,7 @@ class TimelineEventMenu {
           name: CommonStrings.promptAddReaction,
           icon: Icons.add_reaction,
           secondaryMenuBuilder: (context, dismissSecondaryMenu) {
-            return EmojiPicker(emoticons.availableEmoji,
+            return EmojiPicker(emoticons!.availableEmoji,
                 preferredTooltipDirection: AxisDirection.left,
                 onEmoticonPressed: (emote) async {
               timeline.room.addReaction(event, emote);

commet/lib/ui/molecules/timeline_events/timeline_view_entry.dart

@@ -18,8 +18,6 @@ import 'package:commet/ui/molecules/timeline_events/timeline_event_menu.dart';
 import 'package:commet/ui/molecules/timeline_events/timeline_event_menu_dialog.dart';
 import 'package:flutter/material.dart';
 
-import 'package:tiamat/tiamat.dart' as tiamat;
-
 class TimelineViewEntry extends StatefulWidget {
   const TimelineViewEntry(
       {required this.timeline,
@@ -118,6 +116,8 @@ class TimelineViewEntryState extends State<TimelineViewEntry>
       return TimelineEventWidgetDisplayType.message;
     } else if (event is TimelineEventGeneric) {
       return TimelineEventWidgetDisplayType.generic;
+    } else if (event.status == TimelineEventStatus.error) {
+      return TimelineEventWidgetDisplayType.generic;
     } else {
       return TimelineEventWidgetDisplayType.hidden;
     }
@@ -187,18 +187,27 @@ class TimelineViewEntryState extends State<TimelineViewEntry>
       return Container();
     }
 
-    if (status == TimelineEventStatus.sending) {
+    if (status == TimelineEventStatus.sending ||
+        status == TimelineEventStatus.error) {
       result = Opacity(
         opacity: 0.5,
         child: result,
       );
     }
 
     if (status == TimelineEventStatus.error) {
-      result = Column(
+      result = Row(
+        mainAxisSize: MainAxisSize.min,
         children: [
-          result,
-          const tiamat.Text.error("Failed to send"),
+          Padding(
+            padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),
+            child: Icon(
+              Icons.error,
+              size: 14,
+              color: Theme.of(context).colorScheme.error,
+            ),
+          ),
+          Expanded(child: result),
         ],
       );
     }