Merge branch 'master' into soru/modularize-e2ee

This commit is contained in:
Sorunome 2020-06-05 13:05:47 +02:00
commit c47bdee9f5
No known key found for this signature in database
GPG key ID: B19471D07FC9BE9C
2 changed files with 3 additions and 3 deletions

View file

@ -1295,7 +1295,7 @@ class MatrixApi {
String statusMsg,
}) async {
await request(
RequestType.POST,
RequestType.PUT,
'/client/r0/presence/${Uri.encodeComponent(userId)}/status',
data: {
'presence': presenceType.toString().split('.').last,

View file

@ -1510,8 +1510,6 @@ class FakeMatrixApi extends MockClient {
}
}
},
'/client/r0/presence/${Uri.encodeComponent('@alice:example.com')}/status':
(var req) => {},
'/client/r0/account/deactivate': (var req) =>
{'id_server_unbind_result': 'success'},
'/client/r0/user_directory/search': (var req) => {
@ -1743,6 +1741,8 @@ class FakeMatrixApi extends MockClient {
'/client/r0/rooms/!localpart%3Aserver.abc/invite': (var reqI) => {},
},
'PUT': {
'/client/r0/presence/${Uri.encodeComponent('@alice:example.com')}/status':
(var req) => {},
'/client/r0/pushrules/global/content/nocake/enabled': (var req) => {},
'/client/r0/pushrules/global/content/nocake/actions': (var req) => {},
'/client/r0/rooms/%21localpart%3Aserver.abc/state/m.room.history_visibility':