OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Wrong parameters use

This commit is contained in:
Christian Pauly 2021-02-09 10:26:58 +01:00
parent 9617e76763
commit 0b7a0dffb9
5 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,3 +1,7 @@
## 0.1.8
- fix: Wrong parameters use
## 0.1.7
- change: Less noisy one-line logs

27
lib/src/matrix_api.dart
View File

@ -2038,7 +2038,8 @@ class MatrixApi {
String sessionId, String version, RoomKeysSingleKey session) async {
final ret = await request(
RequestType.PUT,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
query: {'version': version},
data: session.toJson(),
);
return RoomKeysUpdateResponse.fromJson(ret);
@ -2050,7 +2051,8 @@ class MatrixApi {
String roomId, String sessionId, String version) async {
final ret = await request(
RequestType.GET,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
query: {'version': version},
);
return RoomKeysSingleKey.fromJson(ret);
}
@ -2061,7 +2063,8 @@ class MatrixApi {
String roomId, String sessionId, String version) async {
final ret = await request(
RequestType.DELETE,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}/${Uri.encodeComponent(sessionId)}',
query: {'version': version},
);
return RoomKeysUpdateResponse.fromJson(ret);
}
@ -2072,7 +2075,8 @@ class MatrixApi {
String roomId, String version, RoomKeysRoom keys) async {
final ret = await request(
RequestType.PUT,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
query: {'version': version},
data: keys.toJson(),
);
return RoomKeysUpdateResponse.fromJson(ret);
@ -2083,7 +2087,8 @@ class MatrixApi {
Future<RoomKeysRoom> getRoomKeysRoom(String roomId, String version) async {
final ret = await request(
RequestType.GET,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
query: {'version': version},
);
return RoomKeysRoom.fromJson(ret);
}
@ -2094,7 +2099,8 @@ class MatrixApi {
String roomId, String version) async {
final ret = await request(
RequestType.DELETE,
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys/${Uri.encodeComponent(roomId)}',
query: {'version': version},
);
return RoomKeysUpdateResponse.fromJson(ret);
}
@ -2105,7 +2111,8 @@ class MatrixApi {
String version, RoomKeys keys) async {
final ret = await request(
RequestType.PUT,
'/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys',
query: {'version': version},
data: keys.toJson(),
);
return RoomKeysUpdateResponse.fromJson(ret);
@ -2116,7 +2123,8 @@ class MatrixApi {
Future<RoomKeys> getRoomKeys(String version) async {
final ret = await request(
RequestType.GET,
'/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys',
query: {'version': version},
);
return RoomKeys.fromJson(ret);
}
@ -2126,7 +2134,8 @@ class MatrixApi {
Future<RoomKeysUpdateResponse> deleteRoomKeys(String version) async {
final ret = await request(
RequestType.DELETE,
'/client/unstable/room_keys/keys?version=${Uri.encodeComponent(version)}',
'/client/unstable/room_keys/keys',
query: {'version': version},
);
return RoomKeysUpdateResponse.fromJson(ret);
}

6
lib/src/model/filter.dart
View File

@ -214,13 +214,13 @@ class StateFilter extends EventFilter {
data['not_types'] = notTypes;
}
if (lazyLoadMembers != null) {
data['lazy_load_members'] = notTypes;
data['lazy_load_members'] = lazyLoadMembers;
}
if (includeRedundantMembers != null) {
data['include_redundant_members'] = notTypes;
data['include_redundant_members'] = includeRedundantMembers;
}
if (containsUrl != null) {
data['contains_url'] = notTypes;
data['contains_url'] = containsUrl;
}
return data;
}

2
pubspec.yaml
View File

@ -1,6 +1,6 @@
name: matrix_api_lite
description: Dead simple data model for the matrix.org client-server API.
version: 0.1.7
version: 0.1.8
homepage: https://famedly.com
environment:

16
test/matrix_api_test.dart
View File

@ -134,12 +134,14 @@ void main() {
final wellKnownInformations =
await matrixApi.requestWellKnownInformations();
expect(wellKnownInformations.mHomeserver.baseUrl,
'https://matrix.example.com');
'https://fakeserver.notexisting');
expect(wellKnownInformations.toJson(), {
'm.homeserver': {'base_url': 'https://matrix.example.com'},
'm.identity_server': {'base_url': 'https://identity.example.com'},
'm.homeserver': {'base_url': 'https://fakeserver.notexisting'},
'm.identity_server': {
'base_url': 'https://identity.fakeserver.notexisting'
},
'org.example.custom.property': {
'app_url': 'https://custom.app.example.org'
'app_url': 'https://custom.app.fakeserver.notexisting'
}
});
});
@ -414,9 +416,9 @@ void main() {
'not_rooms': ['!1234'],
'not_senders': ['@bob:example.com'],
'not_types': ['type2'],
'lazy_load_members': ['type2'],
'include_redundant_members': ['type2'],
'contains_url': ['type2']
'lazy_load_members': true,
'include_redundant_members': false,
'contains_url': true,
},
'account_data': {
'limit': 10,