From c5898f62b9aad90cbc7bd57b4d22241dee5fc898 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Thu, 26 Jan 2023 09:05:05 +0100
Subject: [PATCH] fix: Fake User object

---
 lib/src/event.dart | 22 +++++++++++-----------
 lib/src/user.dart  | 24 +++++++++++++-----------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/lib/src/event.dart b/lib/src/event.dart
index a3835755..e039aeb9 100644
--- a/lib/src/event.dart
+++ b/lib/src/event.dart
@@ -243,17 +243,17 @@ class Event extends MatrixEvent {
   }
 
   User get asUser => User.fromState(
-      // state key should always be set for member events
-      stateKey: stateKey!,
-      prevContent: prevContent,
-      content: content,
-      typeKey: type,
-      eventId: eventId,
-      roomId: roomId,
-      senderId: senderId,
-      originServerTs: originServerTs,
-      unsigned: unsigned,
-      room: room);
+        // state key should always be set for member events
+        stateKey: stateKey!,
+        prevContent: prevContent,
+        content: content,
+        typeKey: type,
+        eventId: eventId,
+        senderId: senderId,
+        originServerTs: originServerTs,
+        unsigned: unsigned,
+        room: room,
+      );
 
   String get messageType => type == EventTypes.Sticker
       ? MessageTypes.Sticker
diff --git a/lib/src/user.dart b/lib/src/user.dart
index f7321baa..473f47f8 100644
--- a/lib/src/user.dart
+++ b/lib/src/user.dart
@@ -20,33 +20,35 @@ import 'package:matrix/matrix.dart';
 
 /// Represents a Matrix User which may be a participant in a Matrix Room.
 class User extends Event {
-  factory User(String id,
-      {String? membership,
-      String? displayName,
-      String? avatarUrl,
-      required Room room}) {
+  factory User(
+    String id, {
+    String? membership,
+    String? displayName,
+    String? avatarUrl,
+    required Room room,
+  }) {
     return User.fromState(
       stateKey: id,
+      senderId: id,
+      eventId: 'fake_event',
       content: {
         if (membership != null) 'membership': membership,
         if (displayName != null) 'displayname': displayName,
         if (avatarUrl != null) 'avatar_url': avatarUrl,
       },
       typeKey: EventTypes.RoomMember,
-      roomId: room.id,
       room: room,
       originServerTs: DateTime.now(),
     );
   }
 
   User.fromState({
-    dynamic prevContent,
+    Map<String, dynamic>? prevContent,
     required String stateKey,
-    dynamic content,
+    Map<String, dynamic> content = const {},
     required String typeKey,
-    String eventId = 'fakevent',
-    String? roomId,
-    String senderId = 'fakesender',
+    required String eventId,
+    required String senderId,
     required DateTime originServerTs,
     dynamic unsigned,
     required Room room,