fix PMP rendering, add grouping

lib/models/event.dart

@@ -8,11 +8,6 @@ part "event.g.dart";
 
 @freezed
 abstract class Event with _$Event {
-  static Profile? pmpFromJson(Map<String, dynamic>? json) {
-    final pmp = json?["content"]?["com.beeper.per_message_profile"];
-    return pmp == null ? null : Profile.fromJsonWithCatch(pmp);
-  }
-
   static String typeJsonFromJson(Map<dynamic, dynamic> json, _) =>
       json["decrypted_type"] ?? json["type"];
 
@@ -43,7 +38,7 @@ abstract class Event with _$Event {
     @Default(IMap.empty()) IMap<String, int> reactions,
     @JsonKey(name: "last_edit_rowid") @Default(0) int lastEditRowId,
     @UnreadTypeConverter() UnreadType? unreadType,
-    @JsonKey(fromJson: Event.pmpFromJson) Profile? pmp,
+    Profile? pmp,
     required Content content,
     required Content? previousContent,
   }) = _Event;
@@ -53,6 +48,11 @@ abstract class Event with _$Event {
         replyTo: getContentFromJson(
           json,
         )["m.relates_to"]?["m.in_reply_to"]?["event_id"],
+        pmp: json["content"]?["com.beeper.per_message_profile"] == null
+            ? null
+            : Profile.fromJsonWithCatch(
+                json["content"]?["com.beeper.per_message_profile"],
+              ),
         content: Content.fromEventJson(
           getContentFromJson(json),
           json["decrypted_type"] ?? json["type"],

lib/widgets/renderers/event.dart

@@ -441,7 +441,9 @@ class EventRenderer extends ConsumerWidget {
             onSecondaryTapUp: contextMenuCallback,
             onLongPressStart: contextMenuCallback,
             child: Padding(
-              padding: EdgeInsets.symmetric(vertical: 8),
+              padding: isGrouped
+                  ? EdgeInsets.zero
+                  : EdgeInsets.symmetric(vertical: 8),
               child: child,
             ),
           );

lib/widgets/room_chat.dart

@@ -333,12 +333,15 @@ class RoomChat extends HookConsumerWidget {
                           SuperSliverList.builder(
                             listController: listController.value,
                             itemCount: value.length,
-                            itemBuilder: (_, index) => EventWrapper(
+                            itemBuilder: (_, index) {
-                              value[index],
+                              final event = value[index];
+                              final previousEvent = value.getOrNull(index - 1);
+                              return EventWrapper(
+                                event,
                                 EventRenderer(
-                                value[index],
+                                  event,
                                   onTapReply: () async {
-                                  final replyId = value[index].replyTo;
+                                    final replyId = event.replyTo;
                                     listController.value.animateToItem(
                                       index: value.indexWhere(
                                         (element) => element.eventId == replyId,
@@ -360,12 +363,14 @@ class RoomChat extends HookConsumerWidget {
                                     );
                                   },
                                   getEventOptions: getEventOptions,
-                                // TODO: Reimplement grouping
+                                  isGrouped:
-                                isGrouped: false,
+                                      "${event.sender}${event.pmp?.id}" ==
+                                      "${previousEvent?.sender}${previousEvent?.pmp?.id}",
                                 ),
                                 isFlashing:
-                                  flashingEvent.value == value[index].eventId,
+                                    flashingEvent.value == event.eventId,
-                            ),
+                              );
+                            },
                           ),
                         ],
                       ),