Skip to content

Commit 72466da

Browse files
committed
Seed Solo read markers before exposing initial unread badges
Signed-off-by: kenny lopez <[email protected]>
1 parent 92d88ec commit 72466da

2 files changed

Lines changed: 169 additions & 17 deletions

File tree

Lines changed: 79 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,86 @@
1+
import 'dart:async';
2+
13
import 'package:hooks_riverpod/hooks_riverpod.dart';
24
import '../../../shared/me/me_sync.dart';
35
import '../../../shared/read_state/read_state_provider.dart';
6+
import '../../../shared/read_state/read_state_time.dart';
7+
import '../../../shared/relay/relay.dart';
48
import '../channel_unread.dart';
59
import '../channels_provider.dart';
610

7-
/// Solo uses the same observed events and read marks as Home, before tab visits.
8-
final meUnreadChannelIdsProvider = Provider<Set<String>>((ref) {
9-
final organization = ref.watch(meGroupsProvider).value;
10-
final channels = ref.watch(channelsProvider).value ?? [];
11-
final reads = ref.watch(readStateProvider);
12-
if (organization == null) return const {};
13-
return computeUnreadChannelIds(
14-
channels: channels.where(
15-
(c) =>
16-
c.isMember && !c.isArchived && organization.channels.contains(c.id),
17-
),
18-
readState: reads,
19-
channelsNotifier: ref.read(channelsProvider.notifier),
20-
);
11+
/// Solo uses Home's initial read baseline even before the tab is visited.
12+
final meUnreadChannelIdsProvider =
13+
NotifierProvider<MeUnreadChannelIds, Set<String>>(MeUnreadChannelIds.new);
14+
15+
/// Seeds initial history once per channel and identity before displaying unread.
16+
class MeUnreadChannelIds extends Notifier<Set<String>> {
17+
@override
18+
Set<String> build() {
19+
final organization = ref.watch(meGroupsProvider).value;
20+
final channels = ref.watch(channelsProvider).value ?? [];
21+
final reads = ref.watch(readStateProvider);
22+
final seeds = ref.watch(_initialSeedsProvider);
23+
final baselines = seeds.baselines;
24+
final seeded = seeds.completed;
25+
if (!reads.isReady || organization == null) return const {};
26+
final active = channels
27+
.where(
28+
(c) =>
29+
c.isMember &&
30+
!c.isArchived &&
31+
organization.channels.contains(c.id),
32+
)
33+
.toList();
34+
final pending = active.where((c) => !seeded.contains(c.id)).toList();
35+
for (final channel in pending) {
36+
// Capture before deferring: a newer event must not move this baseline.
37+
baselines.putIfAbsent(
38+
channel.id,
39+
() => dateTimeToUnixSeconds(channel.lastMessageAt),
40+
);
41+
}
42+
var disposed = false;
43+
ref.onDispose(() => disposed = true);
44+
if (pending.isNotEmpty) {
45+
scheduleMicrotask(() {
46+
if (disposed) return;
47+
final notifier = ref.read(readStateProvider.notifier);
48+
for (final channel in pending) {
49+
final baseline = baselines[channel.id];
50+
if (ref.read(readStateProvider).effectiveTimestamp(channel.id) ==
51+
null &&
52+
baseline != null) {
53+
notifier.seedContextRead(channel.id, baseline);
54+
}
55+
// Empty chats also complete initialization; their first event is new.
56+
seeded.add(channel.id);
57+
}
58+
state = computeUnreadChannelIds(
59+
channels: active,
60+
readState: ref.read(readStateProvider),
61+
channelsNotifier: ref.read(channelsProvider.notifier),
62+
);
63+
});
64+
}
65+
return computeUnreadChannelIds(
66+
channels: active.where(
67+
(c) => seeded.contains(c.id) || reads.effectiveTimestamp(c.id) != null,
68+
),
69+
readState: reads,
70+
channelsNotifier: ref.read(channelsProvider.notifier),
71+
);
72+
}
73+
}
74+
75+
// Retain the captured baseline across channel/read-marker rebuilds, but never
76+
// across an identity, community, or read-state initialization boundary.
77+
final _initialSeedsProvider = Provider((ref) {
78+
ref.watch(readStateProvider.select((s) => (s.pubkey, s.isReady)));
79+
ref.watch(relayConfigProvider.select((c) => c.baseUrl));
80+
return _InitialSeeds();
2181
});
82+
83+
class _InitialSeeds {
84+
final baselines = <String, int?>{};
85+
final completed = <String>{};
86+
}

‎mobile/test/features/channels/me/me_unread_test.dart‎

Lines changed: 90 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ Channel chat(String id, {bool member = true, bool archived = false}) => Channel(
2222
description: '',
2323
createdBy: 'owner',
2424
createdAt: DateTime(2026),
25+
lastMessageAt: DateTime.fromMillisecondsSinceEpoch(20000),
2526
memberCount: 2,
2627
isMember: member,
2728
archivedAt: archived ? DateTime(2026) : null,
2829
);
2930

3031
class _Channels extends ChannelsNotifier {
31-
final all = [
32+
var all = [
3233
chat('solo'),
3334
chat('ordinary'),
3435
chat('archived', archived: true),
@@ -58,16 +59,32 @@ class _Channels extends ChannelsNotifier {
5859
};
5960
void reply() {
6061
timestamp++;
62+
all = [
63+
for (final c in all)
64+
c.copyWith(
65+
lastMessageAt: DateTime.fromMillisecondsSinceEpoch(timestamp * 1000),
66+
),
67+
];
6168
state = AsyncData([...all]);
6269
}
6370
}
6471

6572
class _Reads extends ReadStateNotifier {
73+
final bool empty;
74+
_Reads({this.empty = false});
75+
@override
76+
void seedContextRead(String key, int timestamp) => read(key, timestamp);
6677
@override
67-
ReadStateState build() => const ReadStateState(
78+
ReadStateState build() => ReadStateState(
6879
isReady: true,
6980
pubkey: 'owner',
70-
contexts: {'solo': 10},
81+
contexts: empty ? {} : {'solo': 10},
82+
version: 0,
83+
);
84+
void resetIdentity() => state = const ReadStateState(
85+
isReady: true,
86+
pubkey: 'other-owner',
87+
contexts: {},
7188
version: 0,
7289
);
7390
void read(String key, int timestamp) =>
@@ -90,6 +107,76 @@ const organization = MeGroups(
90107
);
91108

92109
void main() {
110+
for (final duringSeed in [false, true]) {
111+
test(
112+
'fresh Solo history is gated; new reply during seeding=$duringSeed badges',
113+
() async {
114+
SharedPreferences.setMockInitialValues({});
115+
final prefs = await SharedPreferences.getInstance();
116+
final channels = _Channels();
117+
final reads = _Reads(empty: true);
118+
final container = ProviderContainer(
119+
overrides: [
120+
savedPrefsProvider.overrideWithValue(prefs),
121+
channelsProvider.overrideWith(() => channels),
122+
readStateProvider.overrideWith(() => reads),
123+
meGroupsProvider.overrideWith(
124+
(ref) =>
125+
Stream.value(const MeGroups(channels: ['solo', 'ordinary'])),
126+
),
127+
],
128+
);
129+
addTearDown(container.dispose);
130+
container.listen(channelsProvider, (_, _) {});
131+
container.listen(meGroupsProvider, (_, _) {});
132+
await container.read(channelsProvider.future);
133+
await container.read(meGroupsProvider.future);
134+
final observed = <Set<String>>[];
135+
container.listen(
136+
meUnreadChannelIdsProvider,
137+
(_, next) => observed.add(next),
138+
fireImmediately: true,
139+
);
140+
expect(container.read(meUnreadChannelIdsProvider), isEmpty);
141+
if (duringSeed) {
142+
channels.reply();
143+
expect(container.read(meUnreadChannelIdsProvider), isEmpty);
144+
}
145+
await container.pump();
146+
expect(
147+
container.read(readStateProvider).effectiveTimestamp('solo'),
148+
20,
149+
);
150+
if (!duringSeed) {
151+
expect(observed.every((ids) => ids.isEmpty), isTrue);
152+
channels.reply();
153+
}
154+
await container.pump();
155+
expect(container.read(meUnreadChannelIdsProvider), {
156+
'solo',
157+
'ordinary',
158+
});
159+
expect(
160+
container.read(readStateProvider).effectiveTimestamp('solo'),
161+
20,
162+
);
163+
reads.resetIdentity();
164+
expect(container.read(meUnreadChannelIdsProvider), isEmpty);
165+
await container.pump();
166+
expect(
167+
container.read(readStateProvider).effectiveTimestamp('solo'),
168+
21,
169+
);
170+
expect(container.read(meUnreadChannelIdsProvider), isEmpty);
171+
channels.reply();
172+
await container.pump();
173+
expect(container.read(meUnreadChannelIdsProvider), {
174+
'solo',
175+
'ordinary',
176+
});
177+
},
178+
);
179+
}
93180
testWidgets(
94181
'Solo retains live unread row, collapsed section, and tab indication',
95182
(tester) async {

0 commit comments

Comments
 (0)