lib/controllers/client_controller.dart

@@ -170,24 +170,8 @@ class ClientController extends AsyncNotifier<int> {
   Future<Event> sendMessage(SendMessageRequest request) async =>
       Event.fromJson(await _sendCommand("send_message", request.toJson()));
 
-  Future<Event> sendEvent(SendEventRequest request) async {
+  Future<Event> sendEvent(SendEventRequest request) async =>
-    final json = request.toJson();
+      Event.fromJson(await _sendCommand("send_event", request.toJson()));
-    final content = request.content.toJson();
-
-    return Event.fromJson(
-      await _sendCommand("send_event", {
-        ...json,
-        "content": {
-          ...content,
-          "m.relates_to": {
-            ...((content["m.relates_to"] as Map<String, dynamic>?) ?? {}),
-            "event_id": request.relatesTo,
-            "rel_type": request.relationType,
-          },
-        },
-      }),
-    );
-  }
 
   Future<String?> setState(SetStateRequest request) async =>
       await _sendCommand("set_state", request.toJson());

lib/controllers/room_chat_controller.dart

@@ -205,11 +205,15 @@ class RoomChatController extends AsyncNotifier<IList<Event>?> {
       .new(
         roomId: roomId,
         type: EventType.reaction.type,
-        content: ReactionContent(key: reaction),
+        content: {
+          "m.relates_to": {
+            "event_id": event.eventId,
+            "rel_type": "m.annotation",
+            "key": reaction,
+          },
+        },
         synchronous: true,
         disableEncryption: true,
-        relatesTo: event.eventId,
-        relationType: "m.annotation",
       ),
     );
   }

lib/models/content/reaction.dart

@@ -3,7 +3,7 @@ import "package:nexus/models/content/content.dart";
 part "reaction.freezed.dart";
 part "reaction.g.dart";
 
-@Freezed(toJson: false)
+@freezed
 abstract class ReactionContent extends Content with _$ReactionContent {
   ReactionContent._();
   static String? keyJsonFromJson(Map<dynamic, dynamic> json, String key) =>
@@ -13,11 +13,6 @@ abstract class ReactionContent extends Content with _$ReactionContent {
     @JsonKey(readValue: ReactionContent.keyJsonFromJson) String? key,
   }) = _ReactionContent;
 
-  @override
-  Map<String, dynamic> toJson() => {
-    "m.relates_to": {"key": key},
-  };
-
   factory ReactionContent.fromJson(Map<String, Object?> json) =>
       _$ReactionContentFromJson(json);
 }

lib/models/requests/send_event_request.dart

@@ -1,5 +1,4 @@
 import "package:freezed_annotation/freezed_annotation.dart";
-import "package:nexus/models/content/content.dart";
 part "send_event_request.freezed.dart";
 part "send_event_request.g.dart";
 
@@ -8,9 +7,7 @@ abstract class SendEventRequest with _$SendEventRequest {
   const factory SendEventRequest({
     required String roomId,
     required String type,
-    required Content content,
+    required Map<String, dynamic> content,
-    String? relatesTo,
-    String? relationType,
     @Default(false) bool synchronous,
     @Default(false) bool disableEncryption,
   }) = _SendEventRequest;

lib/widgets/member_list.dart

@@ -143,8 +143,8 @@ class MemberList extends HookConsumerWidget {
                                   if (member.content
                                       case MembershipContent content) {
                                     showModalBottomSheet(
-                                      constraints: .loose(
+                                      constraints: BoxConstraints.loose(
-                                        .new(
+                                        Size(
                                           500,
                                           (context.size?.height ?? 1000) - 80,
                                         ),