mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
Brings the Flutter app's emoji and thread surfaces up to desktop parity. ## Emoji - **Full emoji-mart dataset** generated from the same `@emoji-mart/data` set desktop uses (1,870 emoji, 8 categories), committed as an asset — so shortcodes, names, and keywords are identical across clients. `just mobile-emoji-data` regenerates it. - **Rebuilt the tray**: search (a Dart port of desktop's tiered `emojiSearch` ranking, extended to names and keywords), a frequently-used section, and one continuous scroll with pinned section headers. The category rail is a shortcut into that list, not a page switcher, and spans the full width the search field uses. Custom emoji share the native glyph size and cell. - **Reaction pills** match desktop's geometry, and the count shows at 1. - **Emoji-only messages** render at 36px with 1.45em inline custom emoji, matching desktop's `emojiOnly` treatment. - **Positive-emoji burst** ported from desktop's `EmojiBurstProvider`, suppressed under reduced motion. ## Threads - **Top-down layout** — head first under the app bar, replies flowing down, like desktop's thread panel. The old reversed list bottom-anchored the content and jammed the head against the composer. - **Tap a channel message to open its thread**; long-press still opens the action sheet. - **Live reactions.** The thread's relay query is one-shot and its `kinds` filter carries only content rows, so a reaction event could not reach an open thread at all, and `allMessages` was a snapshot frozen when the route was pushed — a new pill only appeared after leaving and re-entering, which refetched. The live channel events are now unioned into the thread's list. The burst is also route-guarded, since the channel timeline stays mounted underneath and was claiming it first. - The `+` affordance follows the channel: replies stay bare until they carry a reaction, and the head keeps a standing `+`. ## Keyboard A deliberate downward drag past ~48px dismisses the keyboard; short scrolls leave it alone. Applies to the channel list, the thread list, and the compose bar (via a raw `Listener`, so it can't steal the field's tap or selection drags). True finger-tracking dismissal is out of scope — Flutter only offers `manual`/`onDrag`, and 1:1 tracking needs a native `UIScrollView` proxy plus Android's `WindowInsetsAnimationController`. ## Testing `just mobile-check` and `just mobile-test` pass (965 tests). New coverage for emoji search ranking, dataset parsing, the emoji-only predicate, tray scroll/rail behavior, reaction pills and the burst, and both thread fixes above. `just ci` green. --------- Signed-off-by: kenny lopez <klopez4212@gmail.com> Signed-off-by: npub12zsjdqx8dud99s9h47xmk9lq93vryf7zjrae8wdrmma52cg5yglseyulst <50a12680c76f1a52c0b7af8dbb17e02c583227c290fb93b9a3defb456114223f@buzz.block.builderlab.xyz> Signed-off-by: klopez4212 <klopez4212@gmail.com> Co-authored-by: npub12zsjdqx8dud99s9h47xmk9lq93vryf7zjrae8wdrmma52cg5yglseyulst <50a12680c76f1a52c0b7af8dbb17e02c583227c290fb93b9a3defb456114223f@buzz.block.builderlab.xyz>
155 lines
4.6 KiB
Dart
155 lines
4.6 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
|
|
import '../../shared/relay/relay.dart';
|
|
import 'pending_local_messages_provider.dart';
|
|
|
|
class ThreadRepliesArgs {
|
|
final String channelId;
|
|
final String rootId;
|
|
|
|
const ThreadRepliesArgs({required this.channelId, required this.rootId});
|
|
|
|
@override
|
|
bool operator ==(Object other) =>
|
|
identical(this, other) ||
|
|
other is ThreadRepliesArgs &&
|
|
channelId == other.channelId &&
|
|
rootId == other.rootId;
|
|
|
|
@override
|
|
int get hashCode => Object.hash(channelId, rootId);
|
|
}
|
|
|
|
class _ThreadCursor {
|
|
final int createdAt;
|
|
final String eventId;
|
|
|
|
const _ThreadCursor({required this.createdAt, required this.eventId});
|
|
}
|
|
|
|
final threadRepliesProvider =
|
|
FutureProvider.family<List<NostrEvent>, ThreadRepliesArgs>((
|
|
ref,
|
|
args,
|
|
) async {
|
|
final session = ref.watch(relaySessionProvider.notifier);
|
|
final replies = <NostrEvent>[];
|
|
_ThreadCursor? cursor;
|
|
for (var page = 0; page < 500; page++) {
|
|
final events = await session.queryRelay([
|
|
_threadRepliesFilter(args, cursor),
|
|
]);
|
|
replies.addAll(events);
|
|
if (events.length < 200) return replies;
|
|
final last = events.last;
|
|
cursor = _ThreadCursor(createdAt: last.createdAt, eventId: last.id);
|
|
}
|
|
throw Exception('Thread ${args.rootId} exceeded the page safety limit.');
|
|
});
|
|
|
|
NostrFilter _threadRepliesFilter(
|
|
ThreadRepliesArgs args,
|
|
_ThreadCursor? cursor,
|
|
) {
|
|
return NostrFilter(
|
|
kinds: EventKind.channelTimelineContentKinds,
|
|
tags: {
|
|
'#e': [args.rootId],
|
|
'#h': [args.channelId],
|
|
},
|
|
limit: 200,
|
|
extensions: {
|
|
'depth_limit': 64,
|
|
if (cursor != null) 'thread_cursor': cursor.createdAt,
|
|
if (cursor != null) 'thread_cursor_id': cursor.eventId,
|
|
},
|
|
);
|
|
}
|
|
|
|
class ThreadLocalRepliesNotifier extends Notifier<List<NostrEvent>> {
|
|
final ThreadRepliesArgs args;
|
|
|
|
ThreadLocalRepliesNotifier(this.args);
|
|
|
|
@override
|
|
List<NostrEvent> build() => const [];
|
|
|
|
void add(NostrEvent event) {
|
|
state = _mergeReplies(state, [event]);
|
|
}
|
|
|
|
void remove(String eventId) {
|
|
state = state.where((event) => event.id != eventId).toList();
|
|
}
|
|
|
|
void confirm(Set<String> eventIds) {
|
|
if (!state.any((event) => eventIds.contains(event.id))) return;
|
|
state = state.where((event) => !eventIds.contains(event.id)).toList();
|
|
}
|
|
}
|
|
|
|
final threadLocalRepliesProvider =
|
|
NotifierProvider.family<
|
|
ThreadLocalRepliesNotifier,
|
|
List<NostrEvent>,
|
|
ThreadRepliesArgs
|
|
>(ThreadLocalRepliesNotifier.new);
|
|
|
|
/// Relay-backed replies merged with signed local replies that are still
|
|
/// waiting for acknowledgement.
|
|
final threadRepliesWithLocalProvider =
|
|
Provider.family<AsyncValue<List<NostrEvent>>, ThreadRepliesArgs>((
|
|
ref,
|
|
args,
|
|
) {
|
|
final relayReplies = ref.watch(threadRepliesProvider(args));
|
|
final localReplies = ref.watch(threadLocalRepliesProvider(args));
|
|
final authoritative = relayReplies.value;
|
|
if (authoritative != null && localReplies.isNotEmpty) {
|
|
final authoritativeIds = authoritative.map((event) => event.id).toSet();
|
|
if (localReplies.any((event) => authoritativeIds.contains(event.id))) {
|
|
Future.microtask(() {
|
|
ref
|
|
.read(threadLocalRepliesProvider(args).notifier)
|
|
.confirm(authoritativeIds);
|
|
ref
|
|
.read(pendingLocalMessagesProvider(args.channelId).notifier)
|
|
.confirm(authoritativeIds);
|
|
});
|
|
}
|
|
}
|
|
if (localReplies.isEmpty) return relayReplies;
|
|
return relayReplies.when(
|
|
data: (events) => AsyncData(_mergeReplies(events, localReplies)),
|
|
loading: () => AsyncData(localReplies),
|
|
error: (error, stackTrace) => AsyncData(localReplies),
|
|
);
|
|
});
|
|
|
|
/// Union two event lists by id, newest-wins, in timeline order.
|
|
///
|
|
/// The thread view needs this to fold the channel's live socket events into its
|
|
/// own one-shot query result: the query asks for content kinds only, so
|
|
/// reactions, edits, and deletions that land while a thread is open never reach
|
|
/// it on their own.
|
|
List<NostrEvent> mergeThreadEvents(
|
|
Iterable<NostrEvent> first,
|
|
Iterable<NostrEvent> second,
|
|
) => _mergeReplies(first, second);
|
|
|
|
List<NostrEvent> _mergeReplies(
|
|
Iterable<NostrEvent> first,
|
|
Iterable<NostrEvent> second,
|
|
) {
|
|
final byId = <String, NostrEvent>{};
|
|
for (final event in [...first, ...second]) {
|
|
byId[event.id] = event;
|
|
}
|
|
return byId.values.toList()..sort((a, b) {
|
|
final createdAt = a.createdAt.compareTo(b.createdAt);
|
|
return createdAt != 0 ? createdAt : a.id.compareTo(b.id);
|
|
});
|
|
}
|