mirror of
https://github.com/block/buzz.git
synced 2026-08-18 06:50:31 +02:00
**Category:** new-feature **User Impact:** Mobile now keeps each community’s appearance in sync with desktop, including theme, accent, and system-mode preference. **Problem:** Appearance choices were device-local, so the same account could look different between desktop and mobile. Live sync could also stop after the relay closed a subscription. **Solution:** Store each community’s encrypted appearance preference on its relay using the shared desktop wire contract, restore it from a local identity-scoped cache, and apply replacement events live. Closed subscriptions now recover with guarded backoff and fetch the latest preference so no update is lost during the gap. <details> <summary>File changes</summary> **mobile/lib/app.dart** Connects community appearance state to the authenticated app lifecycle. **mobile/lib/features/settings/accent_picker_page.dart** Aligns mobile accent choices and selection behavior with the shared catalog. **mobile/lib/features/settings/settings_page/appearance_section.dart** Clarifies the active appearance and hides accent controls when the Buzz theme owns its neutral accent. **mobile/lib/features/settings/theme_picker_page.dart** Persists catalog theme choices through the community-scoped provider. **mobile/lib/shared/theme/accent_colors.dart** Matches desktop’s accent catalog and wire values. **mobile/lib/shared/theme/buzz_theme.dart** Keeps Buzz visually neutral without discarding the user’s stored accent for other themes. **mobile/lib/shared/theme/community_theme_preference.dart** Defines and validates the versioned desktop-compatible appearance payload. **mobile/lib/shared/theme/community_theme_provider.dart** Coordinates cache-first appearance loading with account and community changes. **mobile/lib/shared/theme/community_theme_sync.dart** Adds encrypted NIP-78 relay persistence, live replacement handling, deterministic ordering, safe seeding, and resilient subscription recovery. **mobile/lib/shared/theme/theme.dart** Exports the community appearance modules. **mobile/test/features/settings/theme_picker_page_test.dart** Covers the updated settings behavior. **mobile/test/shared/crypto/nip44_interop_test.dart** Proves Dart decrypts a desktop-produced nostr-rs NIP-44 v2 preference. **mobile/test/shared/theme/buzz_theme_test.dart** Covers Buzz’s neutral rendering and stored-accent restoration. **mobile/test/shared/theme/community_theme_preference_test.dart** Covers wire parsing, validation, migration, and future-version handling. **mobile/test/shared/theme/community_theme_sync_test.dart** Covers cache/relay lifecycle, replacement ordering, switching races, absence-only seeding, and closed-subscription recovery. </details> ## Reproduction steps 1. Sign into desktop and mobile with the same account and join the same community relay. 2. On desktop, choose a distinctive non-Buzz theme and accent; mobile should update without a local toggle. 3. Restart mobile and confirm it restores the same appearance. 4. Change the mobile theme and accent and confirm desktop follows. 5. Leave mobile idle or backgrounded through a relay reconnect, then change desktop again; mobile should resubscribe and catch up automatically. 6. Switch communities and confirm each community restores only its own appearance. --------- Signed-off-by: Taylor Ho <taylorkmho@gmail.com> Co-authored-by: npub1223z34hd7vtwc6qj4s7flsxkj644nlre2nthu7lrrmkumhu3xddsrx9r6w <52a228d6edf316ec6812ac3c9fc0d696ab59fc7954d77e7be31eedcddf91335b@buzz.block.builderlab.xyz>
231 lines
7.3 KiB
Dart
231 lines
7.3 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|
import 'package:nostr/nostr.dart' as nostr;
|
|
|
|
import '../crypto/nip44.dart';
|
|
import '../relay/relay.dart';
|
|
import 'accent_colors.dart';
|
|
import 'community_theme_preference.dart';
|
|
import 'community_theme_sync.dart';
|
|
import 'theme_provider.dart';
|
|
|
|
class CommunityThemeNotifier extends Notifier<CommunityThemePreference> {
|
|
CommunityThemeSyncManager? _manager;
|
|
late CommunityThemeStorage _storage;
|
|
String? _pubkey;
|
|
String? _relayUrl;
|
|
Future<void> _persistenceQueue = Future<void>.value();
|
|
int _localRevision = 0;
|
|
CommunityThemePreference? _scopedLocalPreference;
|
|
String? _scopedLocalPubkey;
|
|
String? _scopedLocalRelayUrl;
|
|
|
|
@override
|
|
CommunityThemePreference build() {
|
|
_manager?.dispose();
|
|
_manager = null;
|
|
|
|
_storage = ref.watch(communityThemeStorageProvider);
|
|
final config = ref.watch(relayConfigProvider);
|
|
final session = ref.watch(relaySessionProvider);
|
|
final pubkey = pubkeyFromNsec(config.nsec);
|
|
_pubkey = pubkey;
|
|
_relayUrl = config.baseUrl;
|
|
|
|
if (pubkey == null || config.nsec == null) {
|
|
final legacy = _storage.legacyPreference();
|
|
unawaited(_storage.writeLegacy(legacy));
|
|
return legacy;
|
|
}
|
|
|
|
final cached = _storage.read(pubkey, config.baseUrl);
|
|
final dirty = _storage.readOutbox(pubkey, config.baseUrl);
|
|
final inMemoryLocal =
|
|
_scopedLocalPubkey == pubkey && _scopedLocalRelayUrl == config.baseUrl
|
|
? _scopedLocalPreference
|
|
: null;
|
|
if (inMemoryLocal == null) {
|
|
_scopedLocalPreference = null;
|
|
_scopedLocalPubkey = pubkey;
|
|
_scopedLocalRelayUrl = config.baseUrl;
|
|
}
|
|
final fallback = _storage.hasMigrated(pubkey)
|
|
? defaultCommunityTheme
|
|
: _storage.legacyPreference();
|
|
final initial = inMemoryLocal ?? dirty ?? cached ?? fallback;
|
|
|
|
if (session.status == SessionStatus.connected) {
|
|
late final CommunityThemeSyncManager manager;
|
|
manager = CommunityThemeSyncManager(
|
|
pubkey: pubkey,
|
|
relaySession: ref.read(relaySessionProvider.notifier),
|
|
signedEventRelay: SignedEventRelay(
|
|
session: ref.read(relaySessionProvider.notifier),
|
|
nsec: config.nsec!,
|
|
),
|
|
crypto: _crypto(config.nsec!, pubkey),
|
|
onRemote: (remote) => _applyRemote(manager, remote),
|
|
onPublished: (preference) {
|
|
if (_scopedLocalPubkey == pubkey &&
|
|
_scopedLocalRelayUrl == config.baseUrl &&
|
|
_scopedLocalPreference == preference) {
|
|
_scopedLocalPreference = null;
|
|
}
|
|
unawaited(_storage.clearOutbox(pubkey, config.baseUrl, preference));
|
|
},
|
|
);
|
|
_manager = manager;
|
|
final pending = inMemoryLocal ?? dirty;
|
|
if (pending != null) manager.publish(pending);
|
|
Future.microtask(() async {
|
|
final result = await manager.initialize();
|
|
if (_manager != manager) return;
|
|
if (result.status == CommunityThemeRemoteStatus.absent) {
|
|
final seedRevision = _localRevision;
|
|
await _enqueuePersistence(() async {
|
|
if (_manager != manager || _localRevision != seedRevision) return;
|
|
final currentDirty = _storage.readOutbox(pubkey, config.baseUrl);
|
|
final seed =
|
|
currentDirty ?? _storage.read(pubkey, config.baseUrl) ?? state;
|
|
if (!await _storage.write(pubkey, config.baseUrl, seed)) return;
|
|
if (_manager != manager || _localRevision != seedRevision) return;
|
|
if (!await _storage.writeOutbox(pubkey, config.baseUrl, seed)) {
|
|
return;
|
|
}
|
|
if (_manager == manager && _localRevision == seedRevision) {
|
|
manager.publish(seed);
|
|
}
|
|
});
|
|
}
|
|
if (result.status == CommunityThemeRemoteStatus.valid ||
|
|
result.status == CommunityThemeRemoteStatus.absent) {
|
|
await _storage.markMigrated(pubkey);
|
|
}
|
|
});
|
|
ref.onDispose(manager.dispose);
|
|
}
|
|
return initial;
|
|
}
|
|
|
|
void setMode(ThemeMode mode) {
|
|
var theme = state.theme;
|
|
if (mode == ThemeMode.system) {
|
|
theme = schemeForAppearanceMode(theme, mode) ?? theme;
|
|
} else {
|
|
final effective = effectiveTheme(theme, mode);
|
|
if (effective != null) theme = effective.name;
|
|
}
|
|
_save(
|
|
CommunityThemePreference(
|
|
theme: theme,
|
|
accent: state.accent,
|
|
followSystem: mode == ThemeMode.system,
|
|
),
|
|
);
|
|
}
|
|
|
|
void setTheme(String? theme) {
|
|
_save(
|
|
CommunityThemePreference(
|
|
theme: theme ?? defaultSchemeName,
|
|
accent: state.accent,
|
|
followSystem: state.followSystem,
|
|
),
|
|
);
|
|
}
|
|
|
|
void setAccent(int index) {
|
|
if (index < 0 || index >= accentColors.length) return;
|
|
_save(
|
|
CommunityThemePreference(
|
|
theme: state.theme,
|
|
accent: accentColors[index].wireValue,
|
|
followSystem: state.followSystem,
|
|
),
|
|
);
|
|
}
|
|
|
|
void _save(CommunityThemePreference preference) {
|
|
if (preference == state) return;
|
|
state = preference;
|
|
_localRevision++;
|
|
final pubkey = _pubkey;
|
|
final relayUrl = _relayUrl;
|
|
if (pubkey == null || relayUrl == null) {
|
|
unawaited(_storage.writeLegacy(preference));
|
|
return;
|
|
}
|
|
_scopedLocalPreference = preference;
|
|
_scopedLocalPubkey = pubkey;
|
|
_scopedLocalRelayUrl = relayUrl;
|
|
_manager?.stage(preference);
|
|
unawaited(
|
|
_enqueuePersistence(
|
|
() => _persistAndPublish(pubkey, relayUrl, preference),
|
|
),
|
|
);
|
|
}
|
|
|
|
Future<void> _enqueuePersistence(Future<void> Function() operation) {
|
|
final result = _persistenceQueue.then((_) => operation());
|
|
_persistenceQueue = result.catchError((Object _) {});
|
|
return result;
|
|
}
|
|
|
|
Future<void> _persistAndPublish(
|
|
String pubkey,
|
|
String relayUrl,
|
|
CommunityThemePreference preference,
|
|
) async {
|
|
if (!await _storage.write(pubkey, relayUrl, preference)) return;
|
|
if (!await _storage.writeOutbox(pubkey, relayUrl, preference)) return;
|
|
if (_pubkey == pubkey && _relayUrl == relayUrl) {
|
|
final manager = _manager;
|
|
if (manager != null) {
|
|
manager.stage(preference);
|
|
manager.publishStaged(preference);
|
|
}
|
|
}
|
|
}
|
|
|
|
void _applyRemote(
|
|
CommunityThemeSyncManager manager,
|
|
RemoteCommunityTheme remote,
|
|
) {
|
|
if (_manager != manager) return;
|
|
final pubkey = _pubkey;
|
|
final relayUrl = _relayUrl;
|
|
if (pubkey != null &&
|
|
relayUrl != null &&
|
|
_storage.readOutbox(pubkey, relayUrl) != null) {
|
|
final dirty = _storage.readOutbox(pubkey, relayUrl)!;
|
|
manager.publish(dirty);
|
|
return;
|
|
}
|
|
state = remote.preference;
|
|
if (pubkey != null && relayUrl != null) {
|
|
unawaited(_storage.write(pubkey, relayUrl, remote.preference));
|
|
}
|
|
}
|
|
}
|
|
|
|
CommunityThemeCrypto _crypto(String nsec, String pubkey) {
|
|
final privateHex = nostr.Nip19.decode(payload: nsec).data;
|
|
final key = getConversationKey(privateHex, pubkey);
|
|
return CommunityThemeCrypto(
|
|
encrypt: (plaintext) => nip44Encrypt(key, plaintext),
|
|
decrypt: (ciphertext) => nip44Decrypt(key, ciphertext),
|
|
);
|
|
}
|
|
|
|
final communityThemeStorageProvider = Provider<CommunityThemeStorage>(
|
|
(ref) => CommunityThemeStorage(ref.watch(savedPrefsProvider)),
|
|
);
|
|
|
|
final communityThemeProvider =
|
|
NotifierProvider<CommunityThemeNotifier, CommunityThemePreference>(
|
|
CommunityThemeNotifier.new,
|
|
);
|