Merge branch 'room-fix-requestusermethod' into 'master'

[Room] Fix request User method

See merge request famedly/famedlysdk!81

lib/src/Room.dart

@@ -282,12 +282,12 @@ class Room {
 
     // Try to manipulate the file size and create a thumbnail
     try {
-      Image image = copyResize(decodeImage(file.readAsBytesSync()), width: 1200);
+      Image image =
+          copyResize(decodeImage(file.readAsBytesSync()), width: 1200);
       Image thumbnail = copyResize(image, width: 800);
 
       file = File(path)..writeAsBytesSync(encodePng(image));
-      File thumbnailFile = File(path)
+      File thumbnailFile = File(path)..writeAsBytesSync(encodePng(thumbnail));
-        ..writeAsBytesSync(encodePng(thumbnail));
       final dynamic uploadThumbnailResp =
           await client.connection.upload(thumbnailFile);
       if (uploadThumbnailResp is ErrorResponse) throw (uploadThumbnailResp);
@@ -652,9 +652,10 @@ class Room {
         type: HTTPType.GET,
         action: "/client/r0/rooms/$id/state/m.room.member/$mxID");
     if (resp is ErrorResponse) return null;
-    // Somehow we miss the mxid in the response and only get the content of the event.
+    return User(mxID,
-    resp["matrix_id"] = mxID;
+        displayName: resp["displayname"],
-    return RoomState.fromJson(resp, this).asUser;
+        avatarUrl: resp["avatar_url"],
+        room: this);
   }
 
   /// Searches for the event in the store. If it isn't found, try to request it

pubspec.lock

@@ -28,14 +28,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   build:
     dependency: transitive
     description:
@@ -276,7 +276,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.1.7"
   mime:
     dependency: transitive
     description:
@@ -311,14 +311,14 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.6.2"
+    version: "1.6.4"
   pedantic:
     dependency: "direct dev"
     description:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0+1"
   petitparser:
     dependency: transitive
     description:
@@ -353,7 +353,7 @@ packages:
       name: quiver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.5"
   shelf:
     dependency: transitive
     description:
@@ -393,7 +393,7 @@ packages:
       name: sqflite
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.5"
+    version: "1.1.6+4"
   stack_trace:
     dependency: transitive
     description:
@@ -421,7 +421,7 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   synchronized:
     dependency: transitive
     description:

pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
 
   # Database
-  sqflite: ^1.1.0
+  sqflite: ^1.1.6+4
   path: ^1.6.2
 
   # Connection

test/FakeMatrixApi.dart

@@ -66,18 +66,9 @@ class FakeMatrixApi extends MockClient {
     "GET": {
       "/client/r0/rooms/!localpart:server.abc/state/m.room.member/@getme:example.com":
           (var req) => {
-                "content": {
+                "avatar_url": "mxc://test",
-                  "membership": "join",
                 "displayname": "You got me",
               },
-                "type": "m.room.member",
-                "event_id": "143273582443PhrSn:example.org",
-                "room_id": "!localpart:server.abc",
-                "sender": "@getme:example.com",
-                "state_key": "@getme:example.com",
-                "origin_server_ts": 1432735824653,
-                "unsigned": {"age": 1234}
-              },
       "/client/r0/rooms/!localpart:server.abc/event/1234": (var req) => {
             "content": {
               "body": "This is an example text message",