feat: pinned messaged and display redacted last events (#18)

Feichtmeier · web-flow · commit 1a6164db2cf0 · 2025-03-12T18:51:36.000Z
diff --git a/lib/chat/chat_room/common/view/chat_room_master_tile_subtitle.dart b/lib/chat/chat_room/common/view/chat_room_master_tile_subtitle.dart
@@ -26,7 +26,9 @@ class ChatRoomMasterTileSubTitle extends StatelessWidget with WatchItMixin {
 
     if (typingUsers.isEmpty) {
       return _LastEvent(
-        key: ValueKey('${lastEvent?.eventId}lastevent'),
+        key: ValueKey(
+          '${lastEvent?.eventId}_${lastEvent?.type}_${lastEvent?.redacted}',
+        ),
         lastEvent: room.lastEvent,
         fallbackText: room.membership == Membership.invite ? room.name : null,
       );
@@ -58,25 +60,31 @@ class _LastEvent extends StatefulWidget with WatchItStatefulWidgetMixin {
 }
 
 class _LastEventState extends State<_LastEvent> {
-  late final Future<String> _future;
+  late Future<String> _future;
 
   static final Map<String, String> _cache = {};
 
   @override
   void initState() {
     super.initState();
     _future = widget.lastEvent != null &&
+            !widget.lastEvent!.redacted &&
             _cache.containsKey(widget.lastEvent!.eventId)
         ? Future.value(_cache[widget.lastEvent!.eventId]!)
-        : widget.lastEvent
-                ?.calcLocalizedBody(const MatrixDefaultLocalizations()) ??
+        : widget.lastEvent?.calcLocalizedBody(
+              const MatrixDefaultLocalizations(),
+              hideReply: true,
+              hideEdit: false,
+              plaintextBody: true,
+            ) ??
             Future.value(widget.lastEvent?.body ?? '');
   }
 
   @override
   Widget build(BuildContext context) {
     if (widget.lastEvent != null &&
-        _cache.containsKey(widget.lastEvent!.eventId)) {
+        _cache.containsKey(widget.lastEvent!.eventId) &&
+        widget.lastEvent!.redacted == false) {
       return Text(
         _cache[widget.lastEvent!.eventId]!,
         maxLines: 1,
diff --git a/lib/chat/chat_room/common/view/chat_room_page.dart b/lib/chat/chat_room/common/view/chat_room_page.dart
@@ -18,9 +18,10 @@ import 'chat_room_timeline_list.dart';
 final GlobalKey<ScaffoldState> chatRoomScaffoldKey = GlobalKey();
 
 class ChatRoomPage extends StatefulWidget with WatchItStatefulWidgetMixin {
-  final Room room;
   const ChatRoomPage({required this.room, super.key});
 
+  final Room room;
+
   @override
   State<ChatRoomPage> createState() => _ChatRoomPageState();
 }
@@ -108,7 +109,7 @@ class _ChatRoomPageState extends State<ChatRoomPage> {
         ),
         if (updating)
           Positioned(
-            top: 3 * kBigPadding,
+            top: 4 * kBigPadding,
             child: RepaintBoundary(
               child: CircleAvatar(
                 backgroundColor: colorScheme.surface,
diff --git a/lib/chat/chat_room/common/view/chat_room_pinned_events_dialog.dart b/lib/chat/chat_room/common/view/chat_room_pinned_events_dialog.dart
@@ -0,0 +1,78 @@
+import 'package:flutter/material.dart';
+import 'package:matrix/matrix.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../../common/chat_model.dart';
+import '../../../events/view/chat_event_tile.dart';
+
+class ChatRoomPinnedEventsDialog extends StatelessWidget with WatchItMixin {
+  const ChatRoomPinnedEventsDialog({
+    super.key,
+    required this.timeline,
+  });
+
+  final Timeline timeline;
+
+  @override
+  Widget build(BuildContext context) {
+    final pinnedEvents = watchStream(
+          (ChatModel m) => m
+              .getJoinedRoomUpdate(timeline.room.id)
+              .map((_) => timeline.room.pinnedEventIds),
+          initialValue: timeline.room.pinnedEventIds,
+        ).data ??
+        [];
+    return AlertDialog(
+      content: SizedBox(
+        height: 400,
+        width: 400,
+        child: ListView.builder(
+          itemCount: pinnedEvents.length,
+          itemBuilder: (context, index) => ChatRoomPinnedEventTile(
+            eventId: pinnedEvents.elementAt(index),
+            timeline: timeline,
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class ChatRoomPinnedEventTile extends StatefulWidget {
+  const ChatRoomPinnedEventTile({
+    super.key,
+    required this.timeline,
+    required this.eventId,
+  });
+
+  final Timeline timeline;
+  final String eventId;
+
+  @override
+  State<ChatRoomPinnedEventTile> createState() =>
+      _ChatRoomPinnedEventTileState();
+}
+
+class _ChatRoomPinnedEventTileState extends State<ChatRoomPinnedEventTile> {
+  late Future<Event?> _future;
+
+  @override
+  void initState() {
+    super.initState();
+    _future = widget.timeline.room.getEventById(widget.eventId);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return FutureBuilder(
+      future: _future,
+      builder: (c, s) => s.hasData
+          ? ChatEventTile(
+              event: s.data!,
+              timeline: widget.timeline,
+              onReplyOriginClick: (p0) async {},
+            )
+          : const Text(''),
+    );
+  }
+}
diff --git a/lib/chat/chat_room/common/view/chat_room_timeline_list.dart b/lib/chat/chat_room/common/view/chat_room_timeline_list.dart
@@ -1,3 +1,4 @@
+import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:matrix/matrix.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
@@ -9,11 +10,13 @@ import '../../../../common/view/build_context_x.dart';
 import '../../../../common/view/theme.dart';
 import '../../../../common/view/ui_constants.dart';
 import '../../../../l10n/l10n.dart';
+import '../../../common/chat_model.dart';
 import '../../../common/event_x.dart';
 import '../../../events/view/chat_event_tile.dart';
 import '../../../settings/settings_model.dart';
 import '../../titlebar/chat_room_title_bar.dart';
 import '../timeline_model.dart';
+import 'chat_room_pinned_events_dialog.dart';
 import 'chat_seen_by_indicator.dart';
 
 class ChatRoomTimelineList extends StatefulWidget
@@ -35,6 +38,7 @@ class _ChatRoomTimelineListState extends State<ChatRoomTimelineList> {
   final AutoScrollController _controller = AutoScrollController();
   bool _showScrollButton = false;
   int retryCount = 15;
+  String? scrolledToId;
 
   @override
   void initState() {
@@ -57,6 +61,13 @@ class _ChatRoomTimelineListState extends State<ChatRoomTimelineList> {
         watchPropertyValue((SettingsModel m) => m.showChatAvatarChanges);
     final showDisplayNameChanges =
         watchPropertyValue((SettingsModel m) => m.showChatDisplaynameChanges);
+    final pinnedEvents = watchStream(
+          (ChatModel m) => m
+              .getJoinedRoomUpdate(widget.timeline.room.id)
+              .map((_) => widget.timeline.room.pinnedEventIds),
+          initialValue: widget.timeline.room.pinnedEventIds,
+        ).data ??
+        [];
 
     return Stack(
       children: [
@@ -132,6 +143,26 @@ class _ChatRoomTimelineListState extends State<ChatRoomTimelineList> {
             },
           ),
         ),
+        if (pinnedEvents.isNotEmpty)
+          Positioned(
+            right: kBigPadding,
+            top: kBigPadding,
+            child: AnimatedContainer(
+              duration: const Duration(milliseconds: 200),
+              child: FloatingActionButton.small(
+                backgroundColor: getMonochromeBg(theme: theme, darkFactor: 5),
+                onPressed: () => showDialog(
+                  context: context,
+                  builder: (context) =>
+                      ChatRoomPinnedEventsDialog(timeline: widget.timeline),
+                ),
+                child: Icon(
+                  YaruIcons.pin,
+                  color: theme.colorScheme.onSurface,
+                ),
+              ),
+            ),
+          ),
         if (_showScrollButton)
           Positioned(
             right: kBigPadding,
diff --git a/lib/chat/common/chat_model.dart b/lib/chat/common/chat_model.dart
@@ -137,6 +137,21 @@ class ChatModel extends SafeChangeNotifier {
     notifyListeners();
   }
 
+  final Map<String, String> _roomIdsToEventContextIds = {};
+  String? getEventContextId(String? roomId) =>
+      roomId == null ? null : _roomIdsToEventContextIds[roomId];
+  void setContextEventId({
+    required String roomId,
+    required String contextEventId,
+  }) {
+    _roomIdsToEventContextIds.update(
+      roomId,
+      (value) => contextEventId,
+      ifAbsent: () => contextEventId,
+    );
+    notifyListeners();
+  }
+
   bool _processingJoinOrLeave = false;
   bool get processingJoinOrLeave => _processingJoinOrLeave;
   void _setProcessingJoinOrLeave(bool value) {
diff --git a/lib/chat/common/event_x.dart b/lib/chat/common/event_x.dart
@@ -25,6 +25,9 @@ extension EventX on Event {
     required bool showAvatarChanges,
     required bool showDisplayNameChanges,
   }) {
+    if (type == EventTypes.RoomPinnedEvents) {
+      return true;
+    }
     if (type == EventTypes.RoomMember &&
         roomMemberChangeType == RoomMemberChangeType.avatar &&
         !showAvatarChanges) {
diff --git a/lib/chat/events/view/chat_event_status_icon.dart b/lib/chat/events/view/chat_event_status_icon.dart
@@ -83,6 +83,11 @@ class ChatEventStatusIcon extends StatelessWidget {
                 YaruIcons.pen,
                 size: iconSize,
               ),
+            if (event.room.pinnedEventIds.contains(event.eventId))
+              const Icon(
+                YaruIcons.pin,
+                size: iconSize,
+              ),
             if (!userEvent && event.isImage)
               ConstrainedBox(
                 constraints: const BoxConstraints(maxWidth: 100),
diff --git a/lib/chat/events/view/chat_message_menu.dart b/lib/chat/events/view/chat_message_menu.dart
@@ -30,7 +30,10 @@ class _ChatMessageMenuState extends State<ChatMessageMenu> {
   @override
   Widget build(BuildContext context) {
     final style = context.textTheme.bodyMedium;
+    final pinned =
+        widget.event.room.pinnedEventIds.contains(widget.event.eventId);
     return GestureDetector(
+      key: ValueKey('${widget.event.eventId}_$pinned'),
       onSecondaryTap: () => _controller.open(),
       behavior: HitTestBehavior.opaque,
       child: MenuAnchor(
@@ -89,6 +92,26 @@ class _ChatMessageMenuState extends State<ChatMessageMenu> {
               ),
             ),
           ),
+          if (widget.event.room.canSendEvent(EventTypes.RoomPinnedEvents))
+            MenuItemButton(
+              trailingIcon: const Icon(YaruIcons.pin),
+              child: Text(
+                pinned ? context.l10n.unpin : context.l10n.pinMessage,
+                style: style,
+              ),
+              onPressed: () {
+                if (pinned) {
+                  final newPinned =
+                      List<String>.from(widget.event.room.pinnedEventIds);
+                  newPinned.remove(widget.event.eventId);
+                  widget.event.room.setPinnedEvents(newPinned);
+                } else {
+                  widget.event.room.setPinnedEvents(
+                    [...widget.event.room.pinnedEventIds, widget.event.eventId],
+                  );
+                }
+              },
+            ),
           ChatMessageReactionPicker(event: widget.event),
         ],
         child: widget.child,
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,25 +2,13 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:system_theme/system_theme.dart';
-import 'package:window_manager/window_manager.dart';
 import 'package:yaru/yaru.dart';
 
 import 'app/view/app.dart';
-import 'common/view/ui_constants.dart';
 import 'register.dart';
 
 void main() async {
-  if (isMobile) {
-    WidgetsFlutterBinding.ensureInitialized();
-  } else {
-    await YaruWindowTitleBar.ensureInitialized();
-    if (Platform.isMacOS) {
-      windowManager.waitUntilReadyToShow(windowOptions, () async {
-        await windowManager.show();
-        await windowManager.focus();
-      });
-    }
-  }
+  await YaruWindowTitleBar.ensureInitialized();
 
   if (!Platform.isLinux) {
     await SystemTheme.accentColor.load();
diff --git a/pubspec.lock b/pubspec.lock
