mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
**Category:** improvement **User Impact:** Mobile users can scan Activity as a focused conversation inbox and open the exact unread message or thread represented by each item. ## Context Mobile's Activity tab had not kept pace with Desktop: it presented isolated event headlines, advertised categories that were often empty, and opened a channel without clearly landing on the selected item. This PR brings the Mobile surface toward the conversation-oriented direction explored in Clay Delk's Desktop [Inbox refactor PR #2045](https://github.com/block/buzz/pull/2045), while adapting it to Mobile rather than copying the Desktop split-pane implementation. The related product/UX discussion is captured in the originating [Buzz thread](buzz://message?channel=a9bbc0e5-d25d-4740-849c-93c34bb578a4&id=a7d9a4d33dcd8c6bf0dc67d81c328892b9e38dedaa8548920224ef388301b6ab). ## UX decisions in this PR - **Conversation-oriented, not event-oriented:** related updates collapse into one row per thread/DM conversation, represented by the latest update and ordered by latest activity. Separate top-level conversations in the same channel remain separate rows. - **Resume at the oldest unread:** tapping a grouped row opens the represented canonical message/thread/DM at its oldest unread item, rather than merely opening the channel at an arbitrary position. - **Desktop-aligned row hierarchy:** rows lead with a full avatar and sender, followed by contextual location/type metadata, unread dot + time, and a two-line preview. A **New** boundary separates unread and read content. - **Mobile-native navigation:** Mobile keeps a single-column `Activity → canonical conversation → Back` flow. It does not introduce Desktop's persistent detail pane. - **Compact filtering:** the old horizontal chip rail becomes a compact filter menu so the source set fits a phone viewport without horizontal scanning. Filters are All, Mentions, Threads, Needs Action, Activity, Agents, Reminders, and Drafts. - **Focused source semantics:** All covers personally relevant work—DMs, mentions, thread replies, needs-action events, owned-agent activity, due reminders, and active drafts—rather than becoming a generic stream of every channel message. Mobile's standalone Activity source is currently limited to DM traffic because it does not have Desktop's aggregated channel-activity feed. - **Shared read behavior:** rows project canonical channel/thread/message markers, support unread-only and mark-all-read, and use local overrides only where canonical markers cannot represent an item. - **Reminders and drafts are real data:** reminders use the same encrypted NIP-ER events as Desktop. Drafts persist device-local composer state, restore on return, survive failed sends, and clear after successful sends. - **Explain navigation failures:** an unavailable destination produces an explanatory message rather than silently doing nothing or falling back to an unrelated channel position. ## Implementation summary - Adds a Mobile inbox model for conversation grouping, category priority, contextual labels, sorting, filtering, and oldest-unread targets. - Expands relay-backed sources for mentions, approvals, owned-agent lifecycle events, and DM traffic. - Adds fail-closed NIP-ER reminder decryption and device-local compose-draft persistence. - Redesigns Activity rows, boundaries, filters, unread controls, and empty/loading states. - Routes rows through Mobile's existing canonical channel/thread screens with precise target IDs. - Adds model, provider, widget, reminder, read-state, draft-lifecycle, and deep-link coverage. ## Reproduction steps 1. Run Mobile and open **Activity**. 2. Confirm full avatars, sender-first rows, context labels, unread indicators, timestamps, two-line previews, and the compact filter control. 3. Open the filter menu and verify All, Mentions, Threads, Needs Action, Activity, Agents, Reminders, and Drafts. 4. Tap a grouped thread row and confirm the canonical conversation opens at its oldest unread message. 5. Mark rows read/unread, enable unread-only mode, and use mark-all-read; confirm state agrees with the channel/thread destination. 6. Type without sending in a channel or thread, leave, and confirm the draft appears in Activity and restores in the composer. ## Screenshots | Before — merge-base `dd222a509` | After — PR head `52ad40aee` | |---|---| | <img width="1206" height="2622" alt="image" src="https://github.com/user-attachments/assets/ae961b08-bf8a-4bd5-b487-f6321ae8d85b" /> | <img width="1206" height="2622" alt="image" src="https://github.com/user-attachments/assets/bcbe7ab0-552a-417c-9e85-7a85eb4592ee" /> | Recaptured on the same authenticated iPhone 17 simulator, account, theme, and Activity view, at this PR's current merge-base (`dd222a509`) and head (`52ad40aee`). Both frames were taken within a few minutes on the same live feed, so the visible conversation set overlaps closely (the recent Ned/Bart/Tommy items appear in both). The compared change is the row *structure*: Before leads with an `@ Mention` headline over a small inline avatar and a horizontal chip rail; After leads with a full avatar, a compact `labelMedium` sender label, contextual "Mentioned in" metadata, and a filter menu. The sender username now renders at the same compact scale the old `@ Mention` label used. ## Verification - Current rebased head: `5bd87f4f4` on `origin/main` at `dd222a509`; GitHub reports the PR mergeable. - `flutter analyze` — clean at `5bd87f4f4`. - Full Mobile suite — 698 passed, 1 skipped, 4 failed; all four failures reproduce identically on clean `origin/main` (`channels_page_test` create-channel sheet and three `compose_bar_test` agent-mention cases). - The prior PR-specific `home_page_test` failures were fixed by providing the Activity local-state dependency in that harness. - Independent code and simulator UI review — approved. - Post-rebase GitHub checks are running. --------- Signed-off-by: Taylor Ho <taylorkmho@gmail.com> Signed-off-by: npub14vtk7pvazqrq9639qu7e560wnqtl0d53ca4gjuvq6jzf3k2el23qqlwa7f <ab176f059d100602ea25073d9a69ee9817f7b691c76a897180d48498d959faa2@buzz.block.builderlab.xyz> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz> Co-authored-by: npub14vtk7pvazqrq9639qu7e560wnqtl0d53ca4gjuvq6jzf3k2el23qqlwa7f <ab176f059d100602ea25073d9a69ee9817f7b691c76a897180d48498d959faa2@buzz.block.builderlab.xyz>
225 lines
6.3 KiB
Dart
225 lines
6.3 KiB
Dart
import 'dart:convert';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
import 'package:nostr/nostr.dart' as nostr;
|
|
|
|
import '../../shared/crypto/nip44.dart';
|
|
import '../../shared/relay/relay.dart';
|
|
|
|
/// NIP-ER event reminder kind — matches desktop's `KIND_EVENT_REMINDER`.
|
|
const kindEventReminder = 30300;
|
|
|
|
/// Message a reminder points at. Mirrors desktop's `ReminderTarget`.
|
|
@immutable
|
|
class ReminderTarget {
|
|
final String eventId;
|
|
final String channelId;
|
|
final String preview;
|
|
final String authorPubkey;
|
|
|
|
const ReminderTarget({
|
|
required this.eventId,
|
|
required this.channelId,
|
|
required this.preview,
|
|
required this.authorPubkey,
|
|
});
|
|
}
|
|
|
|
/// A decrypted NIP-ER reminder. Mirrors desktop's `Reminder`.
|
|
@immutable
|
|
class Reminder {
|
|
/// The `d`-tag (unique reminder identity).
|
|
final String id;
|
|
|
|
/// Unix seconds when due; null for done/cancelled reminders.
|
|
final int? notBefore;
|
|
|
|
final String status; // "pending" | "done" | "cancelled"
|
|
final ReminderTarget? target;
|
|
final String? note;
|
|
final int createdAt;
|
|
final String eventId;
|
|
|
|
const Reminder({
|
|
required this.id,
|
|
required this.notBefore,
|
|
required this.status,
|
|
required this.target,
|
|
required this.note,
|
|
required this.createdAt,
|
|
required this.eventId,
|
|
});
|
|
|
|
bool isDue(int nowUnixSeconds) =>
|
|
status == 'pending' && notBefore != null && notBefore! <= nowUnixSeconds;
|
|
}
|
|
|
|
/// Parse NIP-ER `not_before`: ASCII digits, no leading zero except "0".
|
|
/// Mirrors desktop's `parseNotBefore` strictness.
|
|
int? parseNotBefore(String raw) {
|
|
if (!RegExp(r'^(0|[1-9][0-9]*)$').hasMatch(raw)) return null;
|
|
return int.tryParse(raw);
|
|
}
|
|
|
|
/// Validate decrypted reminder plaintext — desktop's `parseReminderContent`.
|
|
/// Off-shape content fails closed (returns null).
|
|
({String status, ReminderTarget? target, String? note})? parseReminderContent(
|
|
String plaintext,
|
|
) {
|
|
final Object? parsed;
|
|
try {
|
|
parsed = jsonDecode(plaintext);
|
|
} catch (_) {
|
|
return null;
|
|
}
|
|
if (parsed is! Map<String, dynamic>) return null;
|
|
|
|
final status = parsed['status'];
|
|
if (status != 'pending' && status != 'done' && status != 'cancelled') {
|
|
return null;
|
|
}
|
|
final note = parsed['note'];
|
|
if (note != null && note is! String) return null;
|
|
|
|
ReminderTarget? target;
|
|
final rawTarget = parsed['target'];
|
|
if (rawTarget != null) {
|
|
if (rawTarget is! Map<String, dynamic>) return null;
|
|
final eventId = rawTarget['eventId'];
|
|
final channelId = rawTarget['channelId'];
|
|
final preview = rawTarget['preview'];
|
|
final authorPubkey = rawTarget['authorPubkey'];
|
|
if (eventId is! String ||
|
|
channelId is! String ||
|
|
preview is! String ||
|
|
authorPubkey is! String) {
|
|
return null;
|
|
}
|
|
target = ReminderTarget(
|
|
eventId: eventId,
|
|
channelId: channelId,
|
|
preview: preview,
|
|
authorPubkey: authorPubkey,
|
|
);
|
|
}
|
|
|
|
final noteText = note as String?;
|
|
if (target == null && (noteText == null || noteText.isEmpty)) return null;
|
|
|
|
return (status: status as String, target: target, note: noteText);
|
|
}
|
|
|
|
/// Decode one kind:30300 event into a [Reminder], or null when malformed.
|
|
Reminder? decodeReminderEvent(
|
|
NostrEvent event, {
|
|
required String Function(String ciphertext) decrypt,
|
|
}) {
|
|
String? dTag;
|
|
int? notBefore;
|
|
for (final tag in event.tags) {
|
|
if (tag.length >= 2 && tag[0] == 'd') dTag ??= tag[1];
|
|
if (tag.length >= 2 && tag[0] == 'not_before') {
|
|
notBefore ??= parseNotBefore(tag[1]);
|
|
}
|
|
}
|
|
if (dTag == null) return null;
|
|
|
|
final String plaintext;
|
|
try {
|
|
plaintext = decrypt(event.content);
|
|
} catch (_) {
|
|
return null;
|
|
}
|
|
final content = parseReminderContent(plaintext);
|
|
if (content == null) return null;
|
|
|
|
return Reminder(
|
|
id: dTag,
|
|
notBefore: notBefore,
|
|
status: content.status,
|
|
target: content.target,
|
|
note: content.note,
|
|
createdAt: event.createdAt,
|
|
eventId: event.id,
|
|
);
|
|
}
|
|
|
|
/// Fetches the user's NIP-ER reminders (kind 30300, self-encrypted). These
|
|
/// are the same relay events Buzz Desktop reads and writes, so reminders
|
|
/// created on Desktop appear here and vice versa.
|
|
class RemindersNotifier extends AsyncNotifier<List<Reminder>> {
|
|
@override
|
|
Future<List<Reminder>> build() {
|
|
ref.watch(relayConfigProvider);
|
|
ref.watch(relaySessionProvider);
|
|
return _fetch();
|
|
}
|
|
|
|
Future<List<Reminder>> _fetch() async {
|
|
final config = ref.read(relayConfigProvider);
|
|
final myPk = ref.read(myPubkeyProvider);
|
|
final nsec = config.nsec?.trim();
|
|
if (myPk == null || nsec == null || nsec.isEmpty) return const [];
|
|
|
|
final String privkeyHex;
|
|
try {
|
|
privkeyHex = nostr.Nip19.decode(payload: nsec).data;
|
|
} catch (_) {
|
|
return const [];
|
|
}
|
|
if (privkeyHex.isEmpty) return const [];
|
|
final conversationKey = getConversationKey(privkeyHex, myPk);
|
|
|
|
final session = ref.read(relaySessionProvider.notifier);
|
|
final events = await session.fetchHistory(
|
|
NostrFilter(
|
|
kinds: const [kindEventReminder],
|
|
authors: [myPk],
|
|
limit: 200,
|
|
),
|
|
);
|
|
|
|
// Parameterized-replaceable: keep only the newest event per d-tag.
|
|
final newestByDTag = <String, NostrEvent>{};
|
|
for (final event in events) {
|
|
final dTag = event.getTagValue('d');
|
|
if (dTag == null) continue;
|
|
final existing = newestByDTag[dTag];
|
|
if (existing == null || event.createdAt > existing.createdAt) {
|
|
newestByDTag[dTag] = event;
|
|
}
|
|
}
|
|
|
|
final reminders = <Reminder>[];
|
|
for (final event in newestByDTag.values) {
|
|
final reminder = decodeReminderEvent(
|
|
event,
|
|
decrypt: (ciphertext) => nip44Decrypt(conversationKey, ciphertext),
|
|
);
|
|
if (reminder != null) reminders.add(reminder);
|
|
}
|
|
reminders.sort(
|
|
(a, b) =>
|
|
(a.notBefore ?? a.createdAt).compareTo(b.notBefore ?? b.createdAt),
|
|
);
|
|
return reminders;
|
|
}
|
|
|
|
Future<void> refresh() async {
|
|
state = await AsyncValue.guard(_fetch);
|
|
}
|
|
}
|
|
|
|
final remindersProvider =
|
|
AsyncNotifierProvider<RemindersNotifier, List<Reminder>>(
|
|
RemindersNotifier.new,
|
|
);
|
|
|
|
/// Count of due pending reminders — powers the filter badge.
|
|
final dueReminderCountProvider = Provider<int>((ref) {
|
|
final reminders = ref.watch(remindersProvider).value ?? const <Reminder>[];
|
|
final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
|
|
return reminders.where((r) => r.isDue(now)).length;
|
|
});
|