fix: Store sending files in database and fix retrying to send them
This commit is contained in:
commit
6f977b7c9d
|
|
@ -327,13 +327,20 @@ class Event extends MatrixEvent {
|
|||
/// Try to send this event again. Only works with events of status -1.
|
||||
Future<String?> sendAgain({String? txid}) async {
|
||||
if (!status.isError) return null;
|
||||
// If this is a failed file sending event, try to fetch the file from the
|
||||
// database first.
|
||||
final url = getAttachmentUrl();
|
||||
if (url?.scheme == 'local') {
|
||||
final file = await downloadAndDecryptAttachment();
|
||||
return await room.sendFileEvent(file, extraContent: content);
|
||||
}
|
||||
|
||||
// we do not remove the event here. It will automatically be updated
|
||||
// in the `sendEvent` method to transition -1 -> 0 -> 1 -> 2
|
||||
final newEventId = await room.sendEvent(
|
||||
return await room.sendEvent(
|
||||
content,
|
||||
txid: txid ?? unsigned?['transaction_id'] ?? eventId,
|
||||
);
|
||||
return newEventId;
|
||||
}
|
||||
|
||||
/// Whether the client is allowed to redact this event.
|
||||
|
|
|
|||
|
|
@ -695,7 +695,7 @@ class Room {
|
|||
/// Set [shrinkImageMaxDimension] to for example `1600` if you want to shrink
|
||||
/// your image before sending. This is ignored if the File is not a
|
||||
/// [MatrixImageFile].
|
||||
Future<Uri> sendFileEvent(
|
||||
Future<String?> sendFileEvent(
|
||||
MatrixFile file, {
|
||||
String? txid,
|
||||
Event? inReplyTo,
|
||||
|
|
@ -755,6 +755,7 @@ class Room {
|
|||
name: file.name,
|
||||
maxDimension: shrinkImageMaxDimension,
|
||||
customImageResizer: client.customImageResizer,
|
||||
compute: client.runInBackground,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -859,14 +860,14 @@ class Room {
|
|||
},
|
||||
if (extraContent != null) ...extraContent,
|
||||
};
|
||||
await sendEvent(
|
||||
final eventId = await sendEvent(
|
||||
content,
|
||||
txid: txid,
|
||||
inReplyTo: inReplyTo,
|
||||
editEventId: editEventId,
|
||||
);
|
||||
sendingFilePlaceholders.remove(txid);
|
||||
return uploadResp;
|
||||
return eventId;
|
||||
}
|
||||
|
||||
Future<String?> _sendContent(
|
||||
|
|
@ -1275,8 +1276,7 @@ class Room {
|
|||
void Function()? onUpdate,
|
||||
}) async {
|
||||
await postLoad();
|
||||
var events;
|
||||
events = await client.database?.getEventList(
|
||||
final events = await client.database?.getEventList(
|
||||
this,
|
||||
limit: defaultHistoryCount,
|
||||
) ??
|
||||
|
|
@ -1288,13 +1288,20 @@ class Room {
|
|||
for (var i = 0; i < events.length; i++) {
|
||||
if (events[i].type == EventTypes.Encrypted &&
|
||||
events[i].content['can_request_session'] == true) {
|
||||
events[i] = await client.encryption
|
||||
?.decryptRoomEvent(id, events[i], store: true);
|
||||
events[i] = await client.encryption!
|
||||
.decryptRoomEvent(id, events[i], store: true);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Fetch all users from database we have got here.
|
||||
for (final event in events) {
|
||||
if (getState(EventTypes.RoomMember, event.senderId) != null) continue;
|
||||
final dbUser = await client.database?.getUser(event.senderId, this);
|
||||
if (dbUser != null) setState(dbUser);
|
||||
}
|
||||
|
||||
final timeline = Timeline(
|
||||
room: this,
|
||||
events: events,
|
||||
|
|
@ -1303,9 +1310,6 @@ class Room {
|
|||
onInsert: onInsert,
|
||||
onUpdate: onUpdate,
|
||||
);
|
||||
if (client.database == null) {
|
||||
await requestHistory(historyCount: 10);
|
||||
}
|
||||
return timeline;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,6 +85,16 @@ class Timeline {
|
|||
limit: Room.defaultHistoryCount,
|
||||
);
|
||||
if (eventsFromStore != null && eventsFromStore.isNotEmpty) {
|
||||
// Fetch all users from database we have got here.
|
||||
for (final event in events) {
|
||||
if (room.getState(EventTypes.RoomMember, event.senderId) != null) {
|
||||
continue;
|
||||
}
|
||||
final dbUser =
|
||||
await room.client.database?.getUser(event.senderId, room);
|
||||
if (dbUser != null) room.setState(dbUser);
|
||||
}
|
||||
|
||||
events.addAll(eventsFromStore);
|
||||
final startIndex = events.length - eventsFromStore.length;
|
||||
final endIndex = events.length;
|
||||
|
|
|
|||
|
|
@ -745,7 +745,7 @@ void main() {
|
|||
test('sendFileEvent', () async {
|
||||
final testFile = MatrixFile(bytes: Uint8List(0), name: 'file.jpeg');
|
||||
final dynamic resp = await room.sendFileEvent(testFile, txid: 'testtxid');
|
||||
expect(resp.toString(), 'mxc://example.com/AQwafuaFswefuhsfAFAgsw');
|
||||
expect(resp.toString(), '\$event10');
|
||||
});
|
||||
|
||||
test('pushRuleState', () async {
|
||||
|
|
|
|||
Loading…
Reference in New Issue