chore: Set correct stories start position

onboarding
Christian Pauly 4 years ago
parent 7daf34c13e
commit 74a3d0d52e

@ -140,6 +140,7 @@ class StoryPageController extends State<StoryPage> {
index++; index++;
}); });
_restartTimer(); _restartTimer();
maybeSetReadMarker();
} }
DateTime _holdedAt = DateTime.fromMicrosecondsSinceEpoch(0); DateTime _holdedAt = DateTime.fromMicrosecondsSinceEpoch(0);
@ -198,71 +199,89 @@ class StoryPageController extends State<StoryPage> {
Future<void>? loadStory; Future<void>? loadStory;
Future<void> _loadStory() async { Future<void> _loadStory() async {
final client = Matrix.of(context).client; try {
await client.roomsLoading; final client = Matrix.of(context).client;
await client.accountDataLoading; await client.roomsLoading;
final room = client.getRoomById(roomId); await client.accountDataLoading;
if (room == null) return; final room = client.getRoomById(roomId);
if (room.membership != Membership.join) { if (room == null) return;
final joinedFuture = room.client.onSync.stream if (room.membership != Membership.join) {
.where((u) => u.rooms?.join?.containsKey(room.id) ?? false) final joinedFuture = room.client.onSync.stream
.first; .where((u) => u.rooms?.join?.containsKey(room.id) ?? false)
await room.join(); .first;
await joinedFuture; await room.join();
} await joinedFuture;
final timeline = this.timeline = await room.getTimeline(); }
timeline.requestKeys(); final timeline = this.timeline = await room.getTimeline();
var events = timeline.requestKeys();
timeline.events.where((e) => e.type == EventTypes.Message).toList(); var events =
timeline.events.where((e) => e.type == EventTypes.Message).toList();
final hasOutdatedEvents = events.removeOutdatedEvents();
final hasOutdatedEvents = events.removeOutdatedEvents();
// Request history if possible
if (!hasOutdatedEvents && // Request history if possible
timeline.events.first.type != EventTypes.RoomCreate && if (!hasOutdatedEvents &&
events.length < 30) { timeline.events.first.type != EventTypes.RoomCreate &&
try { events.length < 30) {
await timeline.requestHistory(historyCount: 100); try {
events = await timeline
timeline.events.where((e) => e.type == EventTypes.Message).toList(); .requestHistory(historyCount: 100)
events.removeOutdatedEvents(); .timeout(const Duration(seconds: 5));
} catch (e, s) { events = timeline.events
Logs().d('Unable to request history in stories', e, s); .where((e) => e.type == EventTypes.Message)
.toList();
events.removeOutdatedEvents();
} catch (e, s) {
Logs().d('Unable to request history in stories', e, s);
}
} }
}
max = events.length; max = events.length;
if (events.isNotEmpty) { if (events.isNotEmpty) {
_restartTimer(); _restartTimer();
} }
// Preload images and videos // Preload images and videos
events events
.where((event) => {MessageTypes.Image, MessageTypes.Video} .where((event) => {MessageTypes.Image, MessageTypes.Video}
.contains(event.messageType)) .contains(event.messageType))
.forEach((event) => downloadAndDecryptAttachment(event, .forEach((event) => downloadAndDecryptAttachment(
event.messageType == MessageTypes.Video && PlatformInfos.isMobile)); event,
event.messageType == MessageTypes.Video &&
if (!events.last.receipts PlatformInfos.isMobile));
.any((receipt) => receipt.user.id == room.client.userID)) {
for (var j = 0; j < events.length; j++) { // Reverse list
if (events[j] this.events.clear();
.receipts this.events.addAll(events.reversed.toList());
.any((receipt) => receipt.user.id == room.client.userID)) {
index = j; // Set start position
room.setReadMarker( if (this.events.isNotEmpty) {
events[index].eventId, final receiptId = room.roomAccountData['m.receipt']?.content
mRead: events[index].eventId, .tryGetMap<String, dynamic>(room.client.userID!)
); ?.tryGet<String>('event_id');
break; index = this.events.indexWhere((event) => event.eventId == receiptId);
} index++;
if (index >= this.events.length) index = 0;
} }
maybeSetReadMarker();
} catch (e, s) {
Logs().e('Unable to load story', e, s);
} }
this.events.clear();
this.events.addAll(events.reversed.toList());
return; return;
} }
void maybeSetReadMarker() {
final currentEvent = this.currentEvent;
if (currentEvent == null) return;
final room = currentEvent.room;
if (!currentSeenByUsers.any((u) => u.id == u.room.client.userID)) {
room.setReadMarker(
currentEvent.eventId,
mRead: currentEvent.eventId,
);
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
loadStory ??= _loadStory(); loadStory ??= _loadStory();

@ -97,7 +97,10 @@ class StoryView extends StatelessWidget {
Text( Text(
L10n.of(context)!.thisUserHasNotPostedAnythingYet, L10n.of(context)!.thisUserHasNotPostedAnythingYet,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: const TextStyle(fontSize: 20), style: const TextStyle(
fontSize: 20,
color: Colors.white,
),
), ),
], ],
), ),

Loading…
Cancel
Save