DEVELOPMENT.md

@@ -1,5 +1,3 @@
-# Development Documentation
-
 ## Build instructions
 
 CBuild instructions can be found in [README.md](./README.md#build-it-yourself).
@@ -11,54 +9,3 @@ You can run the following command to update the Gomuks submodule:
 ```sh
 git submodule update --remote
 ```
-
-## Code Style
-
-### Controllers and Helpers ([Riverpod](https://pub.dev/packages/riverpod))
-
-Controllers live in `lib/controllers/` and provide a source that exposes data and logic via Riverpod providers, allowing other parts of the code to watch state changes with ref.watch (`ref.watch(MyController.provider)`), access the current value with ref.read (`ref.read(MyController.provider)`), and run helper methods on those classes using the notifier:
-
-```dart
-ref.watch(MyController.provider.notifier).helperMethod()
-```
-
-We use an object oriented style for controllers, where `provider` is a static member on the controller class. E.g.
-
-```dart
-class MyController extends AsyncNotifier<DataThisControllerExposes> {
-  final SomeInputType input;
-  MyController(this.input);
-
-  @override
-  Future<DataThisControllerExposes> build() async {
-    return input.foo;
-  }
-
-  static final provider =
-	AsyncNotifierProvider.family<MyController, DataThisControllerExposes, SomeInputType>(
-	  AuthorController.new,
-	);
-}
-```
-
-Providers which are not controllers, e.g. they expose no data, only methods, should instead live in `lib/helpers/`. For an example, see `lib/helpers/launch_helper.dart`. Other, non-provider helpers, like extensions or helper methods can also go in `lib/helpers/`.
-
-### Don't use StatefulWidgets ([Flutter Hooks](https://pub.dev/packages/flutter_hooks))
-
-This project uses Flutter Hooks to help with boilerplate that StatefulWidgets create. Instead of using a StatefulWidget, we just use hooks like `useState` or `useEffect` in the build method of a `HookWidget`, which is a drop in replacement for `StatelessWidget`. If you need both a `WidgetRef` to watch providers, and access to hooks, use `HookConsumerWidget`.
-
-### Models ([Freezed](https://pub.dev/packages/freezed))
-
-We use Freezed for our models to avoid boilerplate and enforce an immutable style of state and data modeling throughout the code. See their documentation for more info, or see our existing models in `lib/models/`.
-
-### Immutable Data Collections ([Fast Immutable Collections](https://pub.dev/packages/fast_immutable_collections))
-
-When possible, use immutable collections instead of the mutable equivalent. For example, use `IMap` over `Map`, `IList` over `List`, `ISet` over `Set`. This matches the immutable style of Riverpod and Freezed.
-
-### Don't create globals
-
-When possible, we prefer not to create global variables or methods. You can usually replace a global variable with a Riverpod controller, and a global method with an extension method.
-
-## Code of Conduct
-
-All contributions must follow the [Federated Nexus Code of Conduct](https://federated.nexus/code/).

lib/controllers/reactions_controller.dart

@@ -1,56 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/models/configs/reactions_config.dart";
-import "package:nexus/models/content/reaction.dart";
-import "package:nexus/models/requests/get_related_events_request.dart";
-
-class ReactionsController extends AsyncNotifier<IMap<String, IList<String>>> {
-  final ReactionsConfig config;
-  ReactionsController(this.config);
-
-  @override
-  Future<IMap<String, IList<String>>> build() async {
-    final eventInfo = ref.watch(
-      RoomsController.provider.select((value) {
-        final event = value[config.roomId]?.events[config.eventRowId];
-        return event == null ? null : (event.eventId, event.reactions);
-      }),
-    );
-
-    final reactionEvents = eventInfo?.$2.isNotEmpty == true
-        ? await ref
-              .watch(ClientController.provider.notifier)
-              .getRelatedEvents(
-                GetRelatedEventsRequest(
-                  roomId: config.roomId,
-                  eventId: eventInfo!.$1,
-                  relationType: "m.annotation",
-                ),
-              )
-        : null;
-
-    return reactionEvents
-            ?.where((event) => event.redactedBy == null)
-            .fold<IMap<String, IList<String>>>(IMap(), (acc, event) {
-              if (event.content case ReactionContent(:final key?)) {
-                return acc.update(
-                  key,
-                  (list) => list.add(event.sender),
-                  ifAbsent: () => IList([event.sender]),
-                );
-              }
-
-              return acc;
-            }) ??
-        const IMap.empty();
-  }
-
-  static final provider =
-      AsyncNotifierProvider.family<
-        ReactionsController,
-        IMap<String, IList<String>>,
-        ReactionsConfig
-      >(ReactionsController.new);
-}

lib/controllers/room_chat_controller.dart

@@ -37,14 +37,13 @@ class RoomChatController extends AsyncNotifier<IList<Event>> {
       await ref.read(RoomsController.provider.notifier).addState(roomId, state);
     }
 
-    // While there are under 20 events, try to load more
-    // until there's no more or the conditions are met.
-    if (room.hasMore && room.timeline.length < 20) {
+    // While there are under 30 messages, try up to load more messages until there's no more or we have 20 messages.
+    if (room.hasMore && room.timeline.length < 30) {
       loadOlder();
     }
 
     return room.timeline
-        .toEntryIList(compare: (a, b) => (b?.key ?? 0).compareTo(a?.key ?? 0))
+        .toEntryIList(compare: (a, b) => (a?.key ?? 0).compareTo(b?.key ?? 0))
         .map((entry) {
           if (entry.value == null) return null;
 

lib/helpers/extensions/string_to_color.dart

@@ -1,6 +0,0 @@
-import "package:color_hash/color_hash.dart";
-import "package:flutter/material.dart";
-
-extension ToColor on String {
-  Color get colorHash => ColorHash(this, lightness: .7, saturation: .7).color;
-}

lib/main.dart

@@ -67,8 +67,8 @@ void main() async {
     await windowManager.setMinimumSize(Size.square(500));
   }
 
-  FlutterError.onError = (FlutterErrorDetails details) =>
-      showError(details.exception.toString(), details.stack);
+  // FlutterError.onError = (FlutterErrorDetails details) =>
+  // showError(details.exception.toString(), details.stack);
 
   runApp(
     ProviderScope(

lib/models/configs/reactions_config.dart

@@ -1,14 +0,0 @@
-import "package:freezed_annotation/freezed_annotation.dart";
-part "reactions_config.freezed.dart";
-part "reactions_config.g.dart";
-
-@freezed
-abstract class ReactionsConfig with _$ReactionsConfig {
-  const factory ReactionsConfig({
-    required String roomId,
-    required int eventRowId,
-  }) = _ReactionsConfig;
-
-  factory ReactionsConfig.fromJson(Map<String, Object?> json) =>
-      _$ReactionsConfigFromJson(json);
-}

lib/pages/verify_page.dart

@@ -21,7 +21,7 @@ class VerifyPage extends HookConsumerWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             Text(
-              "Enter your recovery key or passphrase below to unlock encrypted events.\nYour passphrase is usually not the same as your password.",
+              "Enter your recovery key or passphrase below to unlock encrypted messages.\nYour passphrase is usually not the same as your password.",
             ),
             SizedBox(height: 12),
             FormTextInput(

lib/widgets/event_wrapper.dart

@@ -0,0 +1,45 @@
+import "package:flutter/material.dart";
+import "package:nexus/models/event.dart";
+import "package:nexus/widgets/reaction_row.dart";
+
+class EventWrapper extends StatelessWidget {
+  final Event event;
+  final Widget child;
+  final bool isFlashing;
+  const EventWrapper(
+    this.event,
+    this.child, {
+    this.isFlashing = false,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+
+    return ClipRRect(
+      borderRadius: BorderRadius.all(Radius.circular(12)),
+      child: AnimatedContainer(
+        padding: isFlashing ? EdgeInsets.all(8) : EdgeInsets.all(0),
+        color: isFlashing
+            ? Theme.of(context).colorScheme.onSurface.withAlpha(50)
+            : Colors.transparent,
+        duration: Duration(milliseconds: 250),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            child,
+            if (event.sendError != null && event.sendError != "not sent")
+              Text(
+                event.sendError!,
+                style: theme.textTheme.labelSmall?.copyWith(
+                  color: theme.colorScheme.error,
+                ),
+              ),
+            ReactionRow(event),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/widgets/flash_wrapper.dart

@@ -1,20 +0,0 @@
-import "package:flutter/material.dart";
-
-class FlashWrapper extends StatelessWidget {
-  final Widget child;
-  final bool isFlashing;
-  const FlashWrapper(this.child, {this.isFlashing = false, super.key});
-
-  @override
-  Widget build(BuildContext context) => ClipRRect(
-    borderRadius: BorderRadius.all(Radius.circular(12)),
-    child: AnimatedContainer(
-      padding: isFlashing ? EdgeInsets.all(8) : EdgeInsets.all(0),
-      color: isFlashing
-          ? Theme.of(context).colorScheme.onSurface.withAlpha(50)
-          : Colors.transparent,
-      duration: Duration(milliseconds: 250),
-      child: child,
-    ),
-  );
-}

lib/widgets/lazy_loading/message_displayname.dart

@@ -1,10 +1,10 @@
+import "package:color_hash/color_hash.dart";
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/controllers/author_controller.dart";
 import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
-import "package:nexus/helpers/extensions/string_to_color.dart";
 import "package:nexus/models/event.dart";
 
 class MessageDisplayname extends ConsumerWidget {
@@ -35,7 +35,11 @@ class MessageDisplayname extends ConsumerWidget {
             style:
                 style ??
                 TextStyle(
-                  color: event.sender.colorHash,
+                  color: ColorHash(
+                    event.sender,
+                    lightness: .7,
+                    saturation: .7,
+                  ).color,
                   fontWeight: FontWeight.bold,
                 ),
             maxLines: 1,

lib/widgets/link_preview.dart

@@ -7,9 +7,9 @@ import "package:nexus/helpers/extensions/better_when.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/launch_helper.dart";
 
-class UrlPreview extends ConsumerWidget {
+class LinkPreview extends ConsumerWidget {
   final String link;
-  const UrlPreview(this.link, {super.key});
+  const LinkPreview(this.link, {super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) => ConstrainedBox(

lib/widgets/member_list.dart

@@ -1,10 +1,10 @@
+import "package:color_hash/color_hash.dart";
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/members_by_status_controller.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
-import "package:nexus/helpers/extensions/string_to_color.dart";
 import "package:nexus/models/configs/members_by_status_config.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/membership_status.dart";
@@ -94,7 +94,11 @@ class MemberList extends HookConsumerWidget {
                                 displayName ?? member.stateKey!.localpart,
                                 overflow: TextOverflow.ellipsis,
                                 style: TextStyle(
-                                  color: member.stateKey!.colorHash,
+                                  color: ColorHash(
+                                    member.stateKey!,
+                                    lightness: .7,
+                                    saturation: .8,
+                                  ).color,
                                   fontWeight: FontWeight.bold,
                                 ),
                               ),

lib/widgets/players/audio.dart

@@ -61,42 +61,39 @@ class AudioPlayer extends HookConsumerWidget {
       return "$minutes:$seconds";
     }
 
-    return SizedBox(
-      height: 60,
-      child: Card(
-        color: Theme.of(context).colorScheme.surfaceContainer,
-        child: Padding(
-          padding: EdgeInsetsGeometry.only(left: 8, right: 16),
-          child: Row(
-            children: [
-              IconButton(
-                onPressed: player.playOrPause,
-                icon: Icon(
-                  playing.value ? Icons.pause_circle : Icons.play_circle,
-                ),
+    return Card(
+      color: Theme.of(context).colorScheme.surfaceContainer,
+      child: Padding(
+        padding: EdgeInsetsGeometry.only(left: 8, right: 16),
+        child: Row(
+          children: [
+            IconButton(
+              onPressed: player.playOrPause,
+              icon: Icon(
+                playing.value ? Icons.pause_circle : Icons.play_circle,
               ),
-              SizedBox(width: 8),
-              Text(
-                format(position.value),
-                style: Theme.of(context).textTheme.bodySmall,
+            ),
+            SizedBox(width: 8),
+            Text(
+              format(position.value),
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+            Expanded(
+              child: Slider(
+                min: 0,
+                max: duration.value.inMilliseconds <= 0
+                    ? 1
+                    : duration.value.inMilliseconds.toDouble(),
+                value: position.value.inMilliseconds.toDouble(),
+                onChanged: (value) =>
+                    player.seek(Duration(milliseconds: value.toInt())),
               ),
-              Expanded(
-                child: Slider(
-                  min: 0,
-                  max: duration.value.inMilliseconds <= 0
-                      ? 1
-                      : duration.value.inMilliseconds.toDouble(),
-                  value: position.value.inMilliseconds.toDouble(),
-                  onChanged: (value) =>
-                      player.seek(Duration(milliseconds: value.toInt())),
-                ),
-              ),
-              Text(
-                format(duration.value),
-                style: Theme.of(context).textTheme.bodySmall,
-              ),
-            ],
-          ),
+            ),
+            Text(
+              format(duration.value),
+              style: Theme.of(context).textTheme.bodySmall,
+            ),
+          ],
         ),
       ),
     );

lib/widgets/reaction_row.dart

@@ -4,15 +4,11 @@ import "package:flutter_hooks/flutter_hooks.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:nexus/controllers/client_state_controller.dart";
 import "package:nexus/controllers/cross_cache_controller.dart";
-import "package:nexus/controllers/reactions_controller.dart";
 import "package:nexus/controllers/room_chat_controller.dart";
 import "package:nexus/helpers/extensions/get_headers.dart";
 import "package:nexus/helpers/extensions/mxc_to_https.dart";
-import "package:nexus/models/configs/reactions_config.dart";
-import "package:nexus/models/event.dart";
-import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/main.dart";
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:nexus/models/event.dart";
 
 class ReactionRow extends ConsumerWidget {
   final Event event;
@@ -22,99 +18,100 @@ class ReactionRow extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final clientState = ref.watch(ClientStateController.provider);
 
-    return switch (ref.watch(
-      ReactionsController.provider(
-        ReactionsConfig(roomId: event.roomId, eventRowId: event.rowId),
-      ),
-    )) {
-      AsyncData(value: final IMap<String, IList<String>>? reactors) ||
-      AsyncLoading(value: final reactors) => Wrap(
-        spacing: 4,
-        runSpacing: 4,
-        children: event.reactions
-            .where((_, value) => value != 0)
-            .mapTo(
-              (reaction, count) => HookBuilder(
-                builder: (context) {
-                  final enabled = useState(true);
+    return SizedBox.shrink();
 
-                  final selected =
-                      reactors?[reaction]?.contains(clientState!.userId) ??
-                      false;
-                  return Tooltip(
-                    message: reactors?[reaction]?.join(", ") ?? "",
-                    child: ChoiceChip(
-                      showCheckmark: false,
-                      selected: selected,
-                      label: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        spacing: 8,
-                        children: [
-                          Flexible(
-                            child: reaction.startsWith("mxc://")
-                                ? Image(
-                                    height: 20,
-                                    image: CachedNetworkImage(
-                                      headers: ref.headers,
-                                      Uri.parse(reaction)
-                                          .mxcToHttps(
-                                            clientState!.homeserverUrl!,
-                                          )
-                                          .toString(),
-                                      ref.watch(CrossCacheController.provider),
-                                    ),
-                                  )
-                                : Text(
-                                    reaction,
-                                    overflow: TextOverflow.ellipsis,
-                                  ),
-                          ),
-                          Text(
-                            count.toString(),
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ],
-                      ),
-                      onSelected: enabled.value
-                          ? (value) async {
-                              enabled.value = false;
-                              try {
-                                final controller = ref.watch(
-                                  RoomChatController.provider(
-                                    event.roomId,
-                                  ).notifier,
-                                );
+    // TODO: IMPL
+    // return Wrap(
+    //   spacing: 4,
+    //   runSpacing: 4,
+    //   children: clientState?.homeserverUrl == null
+    //       ? []
+    //       : event.reactions
+    //             .mapTo(
+    //               (reaction, reactors) => HookBuilder(
+    //                 builder: (context) {
+    //                   final enabled = useState(true);
+    //                   final selected = reactors.contains(clientState!.userId);
+    //                   return Tooltip(
+    //                     message: reactors.join(", "),
+    //                     child: ChoiceChip(
+    //                       showCheckmark: false,
+    //                       selected: selected,
+    //                       label: Row(
+    //                         mainAxisSize: MainAxisSize.min,
+    //                         spacing: 8,
+    //                         children: [
+    //                           Flexible(
+    //                             child: reaction.startsWith("mxc://")
+    //                                 ? Image(
+    //                                     height: 20,
+    //                                     image: CachedNetworkImage(
+    //                                       headers: ref.headers,
+    //                                       Uri.parse(reaction)
+    //                                           .mxcToHttps(
+    //                                             clientState.homeserverUrl!,
+    //                                           )
+    //                                           .toString(),
+    //                                       ref.watch(
+    //                                         CrossCacheController.provider,
+    //                                       ),
+    //                                     ),
+    //                                   )
+    //                                 : Text(
+    //                                     reaction,
+    //                                     overflow: TextOverflow.ellipsis,
+    //                                   ),
+    //                           ),
+    //                           Text(
+    //                             reactors.length.toString(),
+    //                             overflow: TextOverflow.ellipsis,
+    //                           ),
+    //                         ],
+    //                       ),
+    //                       onSelected: enabled.value
+    //                           ? (value) async {
+    //                               enabled.value = false;
+    //                               try {
+    //                                 final roomId = ref.watch(
+    //                                   SelectedRoomController.provider.select(
+    //                                     (value) => value?.metadata?.id,
+    //                                   ),
+    //                                 );
+    //                                 if (roomId == null ||
+    //                                     clientState.userId == null) {
+    //                                   return;
+    //                                 }
 
-                                if (selected) {
-                                  await controller
-                                      .removeReaction(
-                                        reaction,
-                                        event,
-                                        clientState!.userId!,
-                                      )
-                                      .onError(showError);
-                                } else {
-                                  await controller
-                                      .sendReaction(reaction, event)
-                                      .onError(showError);
-                                }
-                              } finally {
-                                enabled.value = true;
-                              }
-                            }
-                          : null,
-                    ),
-                  );
-                },
-              ),
-            )
-            .toList(),
-      ),
+    //                                 final controller = ref.watch(
+    //                                   RoomChatController.provider(
+    //                                     roomId,
+    //                                   ).notifier,
+    //                                 );
 
-      AsyncError(:final error, :final stackTrace) => ErrorDialog(
-        error,
-        stackTrace,
-      ),
-    };
+    //                                 if (selected) {
+    //                                   await controller
+    //                                       .removeReaction(
+    //                                         reaction,
+    //                                         event,
+    //                                         clientState.userId!,
+    //                                       )
+    //                                       .onError(showError);
+    //                                 } else {
+    //                                   await controller
+    //                                       .sendReaction(reaction, event)
+    //                                       .onError(showError);
+    //                                 }
+    //                               } finally {
+    //                                 enabled.value = true;
+    //                               }
+    //                             }
+    //                           : null,
+    //                     ),
+    //                   );
+    //                 },
+    //               ),
+    //             )
+    //             .toList(),
+    // );
   }
 }

lib/widgets/renderers/event.dart

@@ -24,13 +24,11 @@ import "package:nexus/widgets/expandable_image.dart";
 import "package:nexus/widgets/html/html.dart";
 import "package:nexus/widgets/lazy_loading/message_avatar.dart";
 import "package:nexus/widgets/lazy_loading/message_displayname.dart";
-import "package:nexus/widgets/url_preview.dart";
+import "package:nexus/widgets/link_preview.dart";
 import "package:nexus/widgets/loading.dart";
 import "package:nexus/widgets/players/video.dart";
 import "package:nexus/widgets/players/audio.dart";
-import "package:nexus/widgets/reaction_row.dart";
 import "package:nexus/widgets/renderers/membership.dart";
-import "package:nexus/widgets/renderers/generic_event.dart";
 import "package:nexus/widgets/file_card.dart";
 import "package:timeago/timeago.dart";
 import "package:flutter_linkify/flutter_linkify.dart";
@@ -216,7 +214,7 @@ class EventRenderer extends ConsumerWidget {
                                             textStyle: textStyle,
                                             formattedBody!.replaceAllMapped(
                                               RegExp(
-                                                r"(<a\b[^>]*>.*?<\/a>)|(\bhttps?:\/\/[^\s<]+)",
+                                                r"(<a\b[^>]*>.*?<\/a>)|(\\bhttps?:\/\/[^\s<]+)",
                                                 caseSensitive: false,
                                                 dotAll: true,
                                               ),
@@ -357,21 +355,16 @@ class EventRenderer extends ConsumerWidget {
                                             style: errorStyle,
                                           ),
                                         },
-
                                       if (event.lastEditRowId != 0)
                                         Text(
                                           "(edited)",
                                           style: theme.textTheme.labelSmall,
                                         ),
-
                                       if (linkify(body).firstWhereOrNull(
                                             (element) => element is UrlElement,
                                           )
                                           case final UrlElement link?)
-                                        UrlPreview(link.url),
-
-                                      SizedBox(height: 4),
-                                      ReactionRow(event),
+                                        LinkPreview(link.url),
                                     ],
                                   ],
                                 ),
@@ -403,49 +396,35 @@ class EventRenderer extends ConsumerWidget {
                           content.status
                   ? null
                   : MembershipRenderer(event),
-            AvatarContent() => GenericEventRenderer(Icons.numbers, [
-              Padding(
-                padding: EdgeInsets.symmetric(horizontal: 4),
-                child: Icon(Icons.numbers),
-              ),
-              Flexible(child: MessageDisplayname(event)),
-              Expanded(child: Text("changed the room avatar")),
-            ]),
+            AvatarContent() => Row(
+              spacing: 4,
+              children: [
+                Padding(
+                  padding: EdgeInsets.symmetric(horizontal: 4),
+                  child: Icon(Icons.numbers),
+                ),
+                Flexible(child: MessageDisplayname(event)),
+                Expanded(child: Text("changed the room avatar")),
+              ],
+            ),
             _ => null,
           };
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        if (child != null) ...[
-          if (textOnly)
-            child
-          else
-            GestureDetector(
-              onSecondaryTapUp: contextMenuCallback,
-              onLongPressStart: contextMenuCallback,
-              child: Padding(
-                padding: isGrouped ? EdgeInsets.zero : EdgeInsets.only(top: 8),
-                child: child,
-              ),
-            ),
-
-          if (event.content is! MessageContent)
-            Padding(
-              padding: EdgeInsetsGeometry.only(left: 12),
-              child: ReactionRow(event),
-            ),
-
-          if (event.sendError != null && event.sendError != "not sent")
-            Text(
-              event.sendError!,
-              style: theme.textTheme.labelSmall?.copyWith(
-                color: theme.colorScheme.error,
-              ),
-            ),
-        ] else if (textOnly)
-          Text("Unknown event type", style: errorStyle),
-      ],
-    );
+    return child == null
+        ? textOnly
+              ? Text("Unknown event type", style: errorStyle)
+              : SizedBox.shrink()
+        : (textOnly
+              ? child
+              : GestureDetector(
+                  onSecondaryTapUp: contextMenuCallback,
+                  onLongPressStart: contextMenuCallback,
+                  child: Padding(
+                    padding: isGrouped
+                        ? EdgeInsets.zero
+                        : EdgeInsets.only(top: 8),
+                    child: child,
+                  ),
+                ));
   }
 }

lib/widgets/renderers/generic_event.dart

@@ -1,22 +0,0 @@
-import "package:flutter/material.dart";
-
-class GenericEventRenderer extends StatelessWidget {
-  final IconData icon;
-  final List<Widget> children;
-  const GenericEventRenderer(this.icon, this.children, {super.key});
-
-  @override
-  Widget build(BuildContext context) => Padding(
-    padding: EdgeInsets.only(bottom: 8),
-    child: Row(
-      spacing: 8,
-      children: [
-        Padding(
-          padding: EdgeInsets.symmetric(horizontal: 4),
-          child: Icon(Icons.people),
-        ),
-        Expanded(child: Wrap(spacing: 4, children: children)),
-      ],
-    ),
-  );
-}

lib/widgets/renderers/membership.dart

@@ -1,12 +1,11 @@
+import "package:color_hash/color_hash.dart";
 import "package:flutter/material.dart";
 import "package:nexus/helpers/extensions/get_localpart.dart";
 import "package:nexus/helpers/extensions/show_user_popover.dart";
-import "package:nexus/helpers/extensions/string_to_color.dart";
 import "package:nexus/models/content/membership.dart";
 import "package:nexus/models/event.dart";
 import "package:nexus/models/membership_status.dart";
 import "package:nexus/widgets/lazy_loading/message_displayname.dart";
-import "package:nexus/widgets/renderers/generic_event.dart";
 
 class MembershipRenderer extends StatelessWidget {
   final Event event;
@@ -20,37 +19,55 @@ class MembershipRenderer extends StatelessWidget {
     );
 
     return switch (event.content) {
-      MembershipContent content => GenericEventRenderer(Icons.people, [
-        InkWell(
-          onTapUp: (details) => context.showUserPopover(
-            content,
-            event.stateKey!,
-            globalPosition: details.globalPosition,
+      MembershipContent content => Row(
+        spacing: 8,
+        children: [
+          Padding(
+            padding: EdgeInsets.symmetric(horizontal: 4),
+            child: Icon(Icons.people),
           ),
-          child: Text(
-            overflow: TextOverflow.ellipsis,
-            content.displayName ?? event.stateKey!.localpart,
-            maxLines: 1,
-            style: TextStyle(
-              color: event.sender.colorHash,
-              fontWeight: FontWeight.bold,
+          Expanded(
+            child: Wrap(
+              spacing: 4,
+              children: [
+                InkWell(
+                  onTapUp: (details) => context.showUserPopover(
+                    content,
+                    event.stateKey!,
+                    globalPosition: details.globalPosition,
+                  ),
+                  child: Text(
+                    overflow: TextOverflow.ellipsis,
+                    content.displayName ?? event.stateKey!.localpart,
+                    maxLines: 1,
+                    style: TextStyle(
+                      color: ColorHash(
+                        event.sender,
+                        lightness: .7,
+                        saturation: .7,
+                      ).color,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
+                ),
+                Text(
+                  overflow: TextOverflow.ellipsis,
+                  maxLines: 1,
+                  "${switch (content.status) {
+                    MembershipStatus.invite => "was invited to",
+                    MembershipStatus.join => "joined",
+                    MembershipStatus.leave => event.sender == event.stateKey ? "left" : (event.unsigned["prev_content"]?["membership"] == "ban" ? "was unbanned from" : "was kicked from"),
+                    MembershipStatus.ban => "was banned from",
+                    MembershipStatus.knock => "asked to join",
+                  }} the room${event.sender == event.stateKey ? "" : " by "}",
+                ),
+                if (event.sender != event.stateKey) MessageDisplayname(event),
+                if (content.reason != null) Text("for \"${content.reason}\""),
+              ],
             ),
           ),
-        ),
-        Text(
-          overflow: TextOverflow.ellipsis,
-          maxLines: 1,
-          "${switch (content.status) {
-            MembershipStatus.invite => "was invited to",
-            MembershipStatus.join => "joined",
-            MembershipStatus.leave => event.sender == event.stateKey ? "left" : (event.unsigned["prev_content"]?["membership"] == "ban" ? "was unbanned from" : "was kicked from"),
-            MembershipStatus.ban => "was banned from",
-            MembershipStatus.knock => "asked to join",
-          }} the room${event.sender == event.stateKey ? "" : " by "}",
-        ),
-        if (event.sender != event.stateKey) MessageDisplayname(event),
-        if (content.reason != null) Text("for \"${content.reason}\""),
-      ]),
+        ],
+      ),
       _ => SizedBox.shrink(),
     };
   }

lib/widgets/room_chat.dart

@@ -21,7 +21,7 @@ import "package:nexus/widgets/emoji_picker_button.dart";
 import "package:nexus/widgets/renderers/event.dart";
 import "package:nexus/widgets/member_list.dart";
 import "package:nexus/widgets/room_appbar.dart";
-import "package:nexus/widgets/flash_wrapper.dart";
+import "package:nexus/widgets/event_wrapper.dart";
 import "package:nexus/widgets/error_dialog.dart";
 import "package:nexus/widgets/form_text_input.dart";
 import "package:nexus/main.dart";
@@ -319,8 +319,6 @@ class RoomChat extends HookConsumerWidget {
       ].toIList();
     }
 
-    final controllerData = ref.watch(controllerProvider);
-
     return Scaffold(
       appBar: RoomAppbar(
         roomId: roomId,
@@ -339,7 +337,7 @@ class RoomChat extends HookConsumerWidget {
                 Positioned.fill(
                   child: Padding(
                     padding: EdgeInsets.symmetric(horizontal: 12),
-                    child: switch (controllerData) {
+                    child: switch (ref.watch(controllerProvider)) {
                       AsyncData(:final value) ||
                       AsyncLoading(:final value?) => CustomScrollView(
                         reverse: true,
@@ -348,14 +346,14 @@ class RoomChat extends HookConsumerWidget {
                           SliverPadding(
                             padding: EdgeInsetsGeometry.only(bottom: 64),
                           ),
-
                           SuperSliverList.builder(
                             listController: listController.value,
                             itemCount: value.length,
                             itemBuilder: (_, index) {
                               final event = value[index];
                               final previousEvent = value.getOrNull(index + 1);
-                              return FlashWrapper(
+                              return EventWrapper(
+                                event,
                                 EventRenderer(
                                   event,
                                   onTapReply: () async {
@@ -394,20 +392,6 @@ class RoomChat extends HookConsumerWidget {
                               );
                             },
                           ),
-
-                          SliverToBoxAdapter(
-                            child: Padding(
-                              padding: EdgeInsets.only(bottom: 36),
-                              child: Center(
-                                child: controllerData is AsyncLoading
-                                    ? Loading()
-                                    : ElevatedButton(
-                                        onPressed: notifier.loadOlder,
-                                        child: Text("Load More"),
-                                      ),
-                              ),
-                            ),
-                          ),
                         ],
                       ),
                       AsyncLoading() => Loading(),