Skip to content

Commit 988adb7

Browse files
committed
fix(mobile): address agent mention review feedback
Signed-off-by: kenny lopez <[email protected]>
1 parent 5e2b80b commit 988adb7

5 files changed

Lines changed: 105 additions & 32 deletions

File tree

‎mobile/lib/features/channels/agent_activity/working_bots_provider.dart‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@ import '../channel_typing_provider.dart';
88
///
99
/// Used by both the members button badge and the members sheet to avoid
1010
/// duplicating the bot-typing cross-reference logic.
11-
final workingBotPubkeysProvider = Provider.family<Set<String>, String>((
12-
ref,
13-
channelId,
14-
) {
15-
final typingEntries = ref.watch(channelTypingProvider(channelId));
16-
final membersAsync = ref.watch(channelMembersProvider(channelId));
17-
final allMembers = membersAsync.asData?.value ?? const <ChannelMember>[];
11+
final workingBotPubkeysProvider = Provider.autoDispose
12+
.family<Set<String>, String>((ref, channelId) {
13+
final typingEntries = ref.watch(channelTypingProvider(channelId));
14+
final membersAsync = ref.watch(channelMembersProvider(channelId));
15+
final allMembers = membersAsync.asData?.value ?? const <ChannelMember>[];
1816

19-
final botPubkeys = <String>{
20-
for (final m in allMembers)
21-
if (m.isBot) m.pubkey.toLowerCase(),
22-
};
17+
final botPubkeys = <String>{
18+
for (final m in allMembers)
19+
if (m.isBot) m.pubkey.toLowerCase(),
20+
};
2321

24-
return <String>{
25-
for (final e in typingEntries)
26-
if (botPubkeys.contains(e.pubkey.toLowerCase())) e.pubkey.toLowerCase(),
27-
};
28-
});
22+
return <String>{
23+
for (final e in typingEntries)
24+
if (botPubkeys.contains(e.pubkey.toLowerCase()))
25+
e.pubkey.toLowerCase(),
26+
};
27+
});

‎mobile/lib/features/channels/compose_bar/markdown_editing_controller.dart‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,13 @@ class _MarkdownEditingController extends TextEditingController {
256256
// The visual chip replaces the `@` placeholder. Keep the label as
257257
// invisible source text so the text span still has one character per
258258
// source character, preserving native cursor and deletion behavior.
259-
spans.add(TextSpan(text: label, style: _hiddenMentionTextStyle(style)));
259+
spans.add(
260+
TextSpan(
261+
text: label,
262+
semanticsLabel: '',
263+
style: _hiddenMentionTextStyle(style),
264+
),
265+
);
260266
offset = match.end;
261267
}
262268
if (offset < source.length) {
@@ -354,6 +360,7 @@ class _ComposerAgentMentionChip extends StatelessWidget {
354360

355361
return Semantics(
356362
label: 'Agent mention: $label',
363+
excludeSemantics: true,
357364
child: Container(
358365
key: const ValueKey('composer-agent-mention-chip'),
359366
padding: const EdgeInsets.fromLTRB(

‎mobile/lib/shared/mentions/agent_identity_provider.dart‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ Map<String, String> mentionNamesWithDirectoryLabels({
143143
final names = Map<String, String>.from(profileMentionNames);
144144
for (final pubkey in mentionPubkeys) {
145145
final normalizedPubkey = pubkey.toLowerCase();
146+
if (names[normalizedPubkey]?.trim().isEmpty == true) {
147+
names.remove(normalizedPubkey);
148+
}
146149
final directoryName = directoryDisplayNames[normalizedPubkey];
147150
if (!names.containsKey(normalizedPubkey) && directoryName != null) {
148151
names[normalizedPubkey] = directoryName;
@@ -187,14 +190,9 @@ class _ChannelBotRoleSubscription extends Notifier<int> {
187190
final session = ref.read(relaySessionProvider.notifier);
188191
try {
189192
final unsubscribe = await session.subscribe(
190-
NostrFilter(
191-
kinds: const [39002],
192-
tags: {
193-
'#h': [channelId],
194-
},
195-
since: DateTime.now().millisecondsSinceEpoch ~/ 1000,
196-
limit: 1,
197-
),
193+
NostrFilters.channelMembers(
194+
channelId,
195+
).copyWithSince(DateTime.now().millisecondsSinceEpoch ~/ 1000),
198196
(_) {
199197
if (_isCurrent(subscriptionVersion)) {
200198
state++;

‎mobile/test/features/channels/compose_bar_test.dart‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2292,6 +2292,7 @@ void main() {
22922292
testWidgets(
22932293
'renders chips only for selected agents outside code and composition',
22942294
(tester) async {
2295+
final semantics = tester.ensureSemantics();
22952296
final signer = nostr.Keys.generate();
22962297
await tester.pumpWidget(
22972298
_buildComposeBar(
@@ -2324,6 +2325,11 @@ void main() {
23242325
find.byKey(const ValueKey('composer-agent-mention-chip')),
23252326
findsOneWidget,
23262327
);
2328+
expect(
2329+
find.bySemanticsLabel('Agent mention: Helper Bot'),
2330+
findsOneWidget,
2331+
);
2332+
expect(find.bySemanticsLabel('Helper Bot'), findsNothing);
23272333

23282334
await tester.enterText(find.byType(TextField), '`@Helper Bot`');
23292335
await tester.pump();
@@ -2343,6 +2349,7 @@ void main() {
23432349
findsOneWidget,
23442350
);
23452351
await tester.pump(const Duration(milliseconds: 250));
2352+
semantics.dispose();
23462353
},
23472354
);
23482355

‎mobile/test/shared/mentions/agent_identity_provider_test.dart‎

Lines changed: 69 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:async';
22

33
import 'package:flutter_test/flutter_test.dart';
44
import 'package:hooks_riverpod/hooks_riverpod.dart';
5+
import 'package:buzz/features/channels/agent_activity/working_bots_provider.dart';
56
import 'package:buzz/features/channels/channel_management_provider.dart';
67
import 'package:buzz/shared/mentions/agent_identity_provider.dart';
78
import 'package:buzz/shared/relay/relay.dart';
@@ -28,7 +29,7 @@ void main() {
2829
});
2930
await relaySession.subscribed;
3031
expect(relaySession.liveFilters.single.kinds, const [39002]);
31-
expect(relaySession.liveFilters.single.tags['#h'], [_channelId]);
32+
expect(relaySession.liveFilters.single.tags['#d'], [_channelId]);
3233

3334
relaySession.emit(_membershipEvent(role: 'member'));
3435
await _pumpEventQueue();
@@ -95,6 +96,44 @@ void main() {
9596

9697
expect(relaySession.unsubscribeCount, 1);
9798
});
99+
100+
test(
101+
'does not retain a live role subscription through working bots',
102+
() async {
103+
final relaySession = _MembershipRelaySessionNotifier([
104+
_membershipEvent(role: 'bot'),
105+
]);
106+
final container = ProviderContainer(
107+
overrides: [relaySessionProvider.overrideWith(() => relaySession)],
108+
);
109+
addTearDown(container.dispose);
110+
final keepAlive = container.listen(
111+
workingBotPubkeysProvider(_channelId),
112+
(_, _) {},
113+
fireImmediately: true,
114+
);
115+
116+
await relaySession.subscribed;
117+
keepAlive.close();
118+
await container.pump();
119+
120+
expect(relaySession.unsubscribeCount, 1);
121+
},
122+
);
123+
124+
test('blank profile labels defer to the directory label', () {
125+
const pubkey = 'deadbeef0123456789';
126+
127+
expect(
128+
mentionNamesWithDirectoryLabels(
129+
mentionPubkeys: const [pubkey],
130+
profileMentionNames: const {pubkey: ' '},
131+
directoryDisplayNames: const {pubkey: 'Directory bot'},
132+
agentMentionPubkeys: const {pubkey},
133+
),
134+
const {pubkey: 'Directory bot'},
135+
);
136+
});
98137
}
99138

100139
const _channelId = '11111111-1111-4111-8111-111111111111';
@@ -107,7 +146,7 @@ NostrEvent _membershipEvent({required String role}) => NostrEvent(
107146
createdAt: 1,
108147
kind: 39002,
109148
tags: [
110-
['h', _channelId],
149+
['d', _channelId],
111150
['p', _agentPubkey, 'wss://relay.example', role],
112151
],
113152
content: '',
@@ -122,7 +161,7 @@ Future<void> _pumpEventQueue() async {
122161
class _MembershipRelaySessionNotifier extends RelaySessionNotifier {
123162
final List<NostrEvent> _memberships;
124163
final List<NostrFilter> liveFilters = [];
125-
final List<void Function(NostrEvent)> _listeners = [];
164+
final List<_LiveSubscription> _subscriptions = [];
126165
final Completer<void> _subscribed = Completer<void>();
127166
var unsubscribeCount = 0;
128167
var _membershipIndex = 0;
@@ -149,17 +188,40 @@ class _MembershipRelaySessionNotifier extends RelaySessionNotifier {
149188
void Function(String message)? onClosed,
150189
}) async {
151190
liveFilters.add(filter);
152-
_listeners.add(onEvent);
191+
final subscription = _LiveSubscription(filter, onEvent);
192+
_subscriptions.add(subscription);
153193
if (!_subscribed.isCompleted) _subscribed.complete();
154194
return () {
155195
unsubscribeCount++;
156-
_listeners.remove(onEvent);
196+
_subscriptions.remove(subscription);
157197
};
158198
}
159199

160200
void emit(NostrEvent event) {
161-
for (final listener in List.of(_listeners)) {
162-
listener(event);
201+
for (final subscription in List.of(_subscriptions)) {
202+
if (_matches(subscription.filter, event)) {
203+
subscription.onEvent(event);
204+
}
163205
}
164206
}
165207
}
208+
209+
class _LiveSubscription {
210+
final NostrFilter filter;
211+
final void Function(NostrEvent) onEvent;
212+
213+
const _LiveSubscription(this.filter, this.onEvent);
214+
}
215+
216+
bool _matches(NostrFilter filter, NostrEvent event) {
217+
if (!filter.kinds.contains(event.kind)) return false;
218+
return filter.tags.entries.every((entry) {
219+
final tagName = entry.key.substring(1);
220+
return event.tags.any(
221+
(tag) =>
222+
tag.isNotEmpty &&
223+
tag.first == tagName &&
224+
tag.skip(1).any(entry.value.contains),
225+
);
226+
});
227+
}

0 commit comments

Comments
 (0)