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

Merge branch 'krille/fix-request-user' into 'main' 

fix: Requested users are not stored

See merge request famedly/company/frontend/famedlysdk!930
This commit is contained in:
Krille Fear 2022-01-04 06:28:00 +00:00
parent e9e9dcb4aa 62a04b52d4
commit 6d8fabd1e0
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/src/room.dart
View File

@ -18,9 +18,11 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:typed_data';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:html_unescape/html_unescape.dart'; import 'package:html_unescape/html_unescape.dart';
import 'package:matrix/src/utils/crypto/crypto.dart';
import 'package:matrix/src/utils/space_child.dart'; import 'package:matrix/src/utils/space_child.dart';
import '../matrix.dart'; import '../matrix.dart';
@ -1241,20 +1243,20 @@ class Room {
bool ignoreErrors = false, bool ignoreErrors = false,
bool requestProfile = true, bool requestProfile = true,
}) async { }) async {
// Checks if the user is really missing
final stateUser = getState(EventTypes.RoomMember, mxID); final stateUser = getState(EventTypes.RoomMember, mxID);
if (stateUser != null) { if (stateUser != null) {
return stateUser.asUser; return stateUser.asUser;
} }
{ // it may be in the database
// it may be in the database final dbuser = await client.database?.getUser(mxID, this);
final user = await client.database?.getUser(mxID, this); if (dbuser != null) {
if (user != null) { setState(dbuser);
setState(user); onUpdate.add(id);
onUpdate.add(id); return dbuser;
return user;
}
} }
if (!_requestingMatrixIds.add(mxID)) return null; if (!_requestingMatrixIds.add(mxID)) return null;
Map<String, dynamic>? resp; Map<String, dynamic>? resp;
try { try {
@ -1304,9 +1306,22 @@ class Room {
'content': resp, 'content': resp,
'state_key': mxID, 'state_key': mxID,
}; };
final fakeEventId = String.fromCharCodes(
await sha256(
Uint8List.fromList(
(id + mxID + client.generateUniqueTransactionId()).codeUnits),
),
);
await client.database?.storeEventUpdate( await client.database?.storeEventUpdate(
EventUpdate( EventUpdate(
content: content, content: MatrixEvent(
type: EventTypes.RoomMember,
content: resp!,
stateKey: mxID,
originServerTs: DateTime.now(),
senderId: mxID,
eventId: fakeEventId,
).toJson(),
roomID: id, roomID: id,
type: EventUpdateType.state, type: EventUpdateType.state,
), ),