inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Room] Fix the requestHistory query.

Browse source
This commit is contained in:
Christian Pauly 2019-06-28 11:42:57 +02:00
parent 3f72cf2c05
commit c56c2f0a95
3 changed files with 65 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/Room.dart
View file

@ -106,7 +106,7 @@ class Room {
this.avatar, this.avatar,
this.notificationCount, this.notificationCount,
this.highlightCount, this.highlightCount,
this.prev_batch, this.prev_batch = "",
this.draft, this.draft,
this.unread, this.unread,
this.fullyRead, this.fullyRead,
@ -295,8 +295,8 @@ class Room {
Future<void> requestHistory({int historyCount = 100}) async { Future<void> requestHistory({int historyCount = 100}) async {
final dynamic resp = await client.connection.jsonRequest( final dynamic resp = await client.connection.jsonRequest(
type: "GET", type: "GET",
action: "/client/r0/rooms/$id/messages", action:
data: {"from": prev_batch, "dir": "b", "limit": historyCount}); "/client/r0/rooms/$id/messages?from=${prev_batch}&dir=b&limit=$historyCount");
if (resp is ErrorResponse) return; if (resp is ErrorResponse) return;

118
test/FakeMatrixApi.dart
View file

@ -31,8 +31,11 @@ class FakeMatrixApi extends MockClient {
FakeMatrixApi() FakeMatrixApi()
: super((request) async { : super((request) async {
// Collect data from Request // Collect data from Request
final String action = request.url.path.split("/_matrix")[1]; String action =
request.url.path.split("/_matrix")[1] + "?" + request.url.query;
if (action.endsWith("?")) action = action.replaceAll("?", "");
final String method = request.method; final String method = request.method;
print("Got action: $action");
final dynamic data = final dynamic data =
method == "GET" ? request.url.queryParameters : request.body; method == "GET" ? request.url.queryParameters : request.body;
var res = {}; var res = {};
@ -76,64 +79,65 @@ class FakeMatrixApi extends MockClient {
"origin_server_ts": 1432735824653, "origin_server_ts": 1432735824653,
"unsigned": {"age": 1234} "unsigned": {"age": 1234}
}, },
"/client/r0/rooms/!1234:example.com/messages": (var req) => { "/client/r0/rooms/!1234:example.com/messages?from=1234&dir=b&limit=100":
"start": "t47429-4392820_219380_26003_2265", (var req) => {
"end": "t47409-4357353_219380_26003_2265", "start": "t47429-4392820_219380_26003_2265",
"chunk": [ "end": "t47409-4357353_219380_26003_2265",
{ "chunk": [
"content": { {
"body": "This is an example text message", "content": {
"msgtype": "m.text", "body": "This is an example text message",
"format": "org.matrix.custom.html", "msgtype": "m.text",
"formatted_body": "<b>This is an example text message</b>" "format": "org.matrix.custom.html",
}, "formatted_body": "<b>This is an example text message</b>"
"type": "m.room.message",
"event_id": "3143273582443PhrSn:example.org",
"room_id": "!1234:example.com",
"sender": "@example:example.org",
"origin_server_ts": 1432735824653,
"unsigned": {"age": 1234}
},
{
"content": {"name": "The room name"},
"type": "m.room.name",
"event_id": "2143273582443PhrSn:example.org",
"room_id": "!1234:example.com",
"sender": "@example:example.org",
"origin_server_ts": 1432735824653,
"unsigned": {"age": 1234},
"state_key": ""
},
{
"content": {
"body": "Gangnam Style",
"url": "mxc://example.org/a526eYUSFFxlgbQYZmo442",
"info": {
"thumbnail_url":
"mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe",
"thumbnail_info": {
"mimetype": "image/jpeg",
"size": 46144,
"w": 300,
"h": 300
}, },
"w": 480, "type": "m.room.message",
"h": 320, "event_id": "3143273582443PhrSn:example.org",
"duration": 2140786, "room_id": "!1234:example.com",
"size": 1563685, "sender": "@example:example.org",
"mimetype": "video/mp4" "origin_server_ts": 1432735824653,
"unsigned": {"age": 1234}
}, },
"msgtype": "m.video" {
}, "content": {"name": "The room name"},
"type": "m.room.message", "type": "m.room.name",
"event_id": "1143273582443PhrSn:example.org", "event_id": "2143273582443PhrSn:example.org",
"room_id": "!1234:example.com", "room_id": "!1234:example.com",
"sender": "@example:example.org", "sender": "@example:example.org",
"origin_server_ts": 1432735824653, "origin_server_ts": 1432735824653,
"unsigned": {"age": 1234} "unsigned": {"age": 1234},
} "state_key": ""
] },
}, {
"content": {
"body": "Gangnam Style",
"url": "mxc://example.org/a526eYUSFFxlgbQYZmo442",
"info": {
"thumbnail_url":
"mxc://example.org/FHyPlCeYUSFFxlgbQYZmoEoe",
"thumbnail_info": {
"mimetype": "image/jpeg",
"size": 46144,
"w": 300,
"h": 300
},
"w": 480,
"h": 320,
"duration": 2140786,
"size": 1563685,
"mimetype": "video/mp4"
},
"msgtype": "m.video"
},
"type": "m.room.message",
"event_id": "1143273582443PhrSn:example.org",
"room_id": "!1234:example.com",
"sender": "@example:example.org",
"origin_server_ts": 1432735824653,
"unsigned": {"age": 1234}
}
]
},
"/client/versions": (var req) => { "/client/versions": (var req) => {
"versions": ["r0.0.1", "r0.1.0", "r0.2.0", "r0.3.0", "r0.4.0"], "versions": ["r0.0.1", "r0.1.0", "r0.2.0", "r0.3.0", "r0.4.0"],
"unstable_features": {"m.lazy_load_members": true}, "unstable_features": {"m.lazy_load_members": true},

2
test/Timeline_test.dart
View file

@ -41,7 +41,7 @@ void main() {
client.connection.httpClient = FakeMatrixApi(); client.connection.httpClient = FakeMatrixApi();
client.homeserver = "https://fakeServer.notExisting"; client.homeserver = "https://fakeServer.notExisting";
Room room = Room(id: roomID, client: client); Room room = Room(id: roomID, client: client, prev_batch: "1234");
Timeline timeline = Timeline( Timeline timeline = Timeline(
room: room, room: room,
events: [], events: [],