gitea/app-boilerplate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nostr publish event fix

Browse Source
This commit is contained in:
gitea
2025-11-06 21:43:09 +01:00
parent 120a04c69f
commit 947fb667cf
7 changed files with 207 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ui/navigation/app_router.dart
+1
View File
@@ -105,6 +105,7 @@ class AppRouter {
builder: (_) => NostrEventsScreen(
nostrService: nostrService,
syncEngine: syncEngine,
sessionService: sessionService,
),
settings: settings,
);
lib/ui/navigation/main_navigation_scaffold.dart
+1
View File
@@ -87,6 +87,7 @@ class _MainNavigationScaffoldState extends State<MainNavigationScaffold> {
return NostrEventsScreen(
nostrService: widget.nostrService,
syncEngine: widget.syncEngine,
sessionService: widget.sessionService,
);
case 3:
return SessionScreen(
lib/ui/nostr_events/nostr_events_screen.dart
+50 -453
View File
@@ -1,19 +1,23 @@
import 'package:flutter/material.dart';
import '../../data/nostr/nostr_service.dart';
import '../../data/sync/sync_engine.dart';
import '../../data/session/session_service.dart';
import '../../data/nostr/models/nostr_keypair.dart';
import '../../data/nostr/models/nostr_event.dart';
import '../../data/nostr/models/nostr_relay.dart';
import '../../data/sync/sync_engine.dart';
import '../relay_management/relay_management_screen.dart';
import '../relay_management/relay_management_controller.dart';
/// Screen for displaying and testing Nostr events.
class NostrEventsScreen extends StatefulWidget {
final NostrService? nostrService;
final SyncEngine? syncEngine;
final SessionService? sessionService;
const NostrEventsScreen({
super.key,
this.nostrService,
this.syncEngine,
this.sessionService,
});
@override
@@ -21,229 +25,15 @@ class NostrEventsScreen extends StatefulWidget {
}
class _NostrEventsScreenState extends State<NostrEventsScreen> {
NostrKeyPair? _keyPair;
List<NostrRelay> _relays = [];
Map<String, bool> _connectionStatus = {};
List<String> _events = [];
bool _isLoading = false;
final TextEditingController _nsecController = TextEditingController();
final TextEditingController _npubController = TextEditingController();
final TextEditingController _hexPrivateKeyController = TextEditingController();
bool _showImportFields = false;
@override
void initState() {
super.initState();
_loadRelays();
_generateKeyPair();
}
@override
void dispose() {
_nsecController.dispose();
_npubController.dispose();
_hexPrivateKeyController.dispose();
super.dispose();
}
void _loadRelays() {
if (widget.nostrService == null) return;
setState(() {
_relays = widget.nostrService!.getRelays();
_connectionStatus = {
for (var relay in _relays) relay.url: relay.isConnected
};
});
}
void _generateKeyPair() {
if (widget.nostrService == null) return;
setState(() {
_keyPair = widget.nostrService!.generateKeyPair();
_nsecController.clear();
_npubController.clear();
_hexPrivateKeyController.clear();
_showImportFields = false;
});
}
void _importFromNsec() {
final nsec = _nsecController.text.trim();
if (nsec.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Please enter an nsec key'),
backgroundColor: Colors.orange,
),
);
return;
}
try {
setState(() {
_keyPair = NostrKeyPair.fromNsec(nsec);
_showImportFields = false;
});
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Keypair imported from nsec'),
backgroundColor: Colors.green,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Failed to import nsec: ${e.toString()}'),
backgroundColor: Colors.red,
),
);
}
}
void _importFromNpub() {
final npub = _npubController.text.trim();
if (npub.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Please enter an npub key'),
backgroundColor: Colors.orange,
),
);
return;
}
try {
setState(() {
_keyPair = NostrKeyPair.fromNpub(npub);
_showImportFields = false;
});
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Public key imported from npub (note: cannot sign events without private key)'),
backgroundColor: Colors.orange,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Failed to import npub: ${e.toString()}'),
backgroundColor: Colors.red,
),
);
}
}
void _importFromHexPrivateKey() {
final hexKey = _hexPrivateKeyController.text.trim();
if (hexKey.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Please enter a hex private key'),
backgroundColor: Colors.orange,
),
);
return;
}
try {
setState(() {
_keyPair = NostrKeyPair.fromHexPrivateKey(hexKey);
_showImportFields = false;
});
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Keypair imported from hex private key'),
backgroundColor: Colors.green,
),
);
} catch (e) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Failed to import hex key: ${e.toString()}'),
backgroundColor: Colors.red,
),
);
}
}
Future<void> _connectToRelay(String relayUrl) async {
if (widget.nostrService == null) return;
setState(() {
_isLoading = true;
});
try {
await widget.nostrService!.connectRelay(relayUrl).timeout(
const Duration(seconds: 5),
onTimeout: () {
throw Exception('Connection timeout');
},
);
setState(() {
_connectionStatus[relayUrl] = true;
_isLoading = false;
});
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Connected to $relayUrl'),
backgroundColor: Colors.green,
),
);
}
_loadRelays();
} catch (e) {
setState(() {
_connectionStatus[relayUrl] = false;
_isLoading = false;
});
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Failed to connect: ${e.toString()}'),
backgroundColor: Colors.red,
),
);
}
}
}
Future<void> _disconnectFromRelay(String relayUrl) async {
if (widget.nostrService == null) return;
widget.nostrService!.disconnectRelay(relayUrl);
setState(() {
_connectionStatus[relayUrl] = false;
});
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
content: Text('Disconnected from $relayUrl'),
),
);
}
_loadRelays();
}
Future<void> _publishTestEvent() async {
if (widget.nostrService == null || _keyPair == null) {
if (widget.nostrService == null) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Nostr service or keypair not available'),
content: Text('Nostr service not available'),
backgroundColor: Colors.red,
),
);
@@ -251,11 +41,27 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
return;
}
if (_relays.isEmpty) {
// Check if user is logged in with Nostr
final currentUser = widget.sessionService?.currentUser;
if (currentUser == null || currentUser.nostrPrivateKey == null) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('No relays configured. Add relays in Settings.'),
content: Text('Please log in with Nostr (nsec key) to publish events.'),
backgroundColor: Colors.orange,
),
);
}
return;
}
// Get relays
final relays = widget.nostrService!.getRelays();
if (relays.isEmpty) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('No relays configured. Add relays in Relay Management.'),
backgroundColor: Colors.orange,
),
);
@@ -267,30 +73,18 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
_isLoading = true;
});
if (_keyPair!.privateKey.isEmpty) {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Cannot publish: No private key available. Import nsec or hex private key.'),
backgroundColor: Colors.red,
),
);
}
setState(() {
_isLoading = false;
});
return;
}
try {
// Reconstruct keypair from stored nsec
final keyPair = NostrKeyPair.fromNsec(currentUser.nostrPrivateKey!);
// Create a test event
final event = NostrEvent.create(
content: 'Test event from Flutter app - ${DateTime.now().toIso8601String()}',
kind: 1, // Text note
privateKey: _keyPair!.privateKey,
privateKey: keyPair.privateKey,
);
// Publish to all connected relays
// Publish to all enabled relays
final results = await widget.nostrService!.publishEventToAllRelays(event);
setState(() {
@@ -330,16 +124,6 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
return Scaffold(
appBar: AppBar(
title: const Text('Nostr Events'),
actions: [
IconButton(
icon: const Icon(Icons.refresh),
onPressed: () {
_loadRelays();
_generateKeyPair();
},
tooltip: 'Refresh',
),
],
),
body: _isLoading
? const Center(child: CircularProgressIndicator())
@@ -348,10 +132,6 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildKeyPairSection(),
const SizedBox(height: 24),
_buildRelaysSection(),
const SizedBox(height: 24),
_buildActionsSection(),
if (_events.isNotEmpty) ...[
const SizedBox(height: 24),
@@ -363,201 +143,6 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
);
}
Widget _buildKeyPairSection() {
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'Keypair',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
TextButton.icon(
onPressed: () {
setState(() {
_showImportFields = !_showImportFields;
});
},
icon: Icon(_showImportFields ? Icons.visibility_off : Icons.import_export),
label: Text(_showImportFields ? 'Hide Import' : 'Import Key'),
),
],
),
const SizedBox(height: 12),
if (_keyPair != null) ...[
const Text(
'Public Key:',
style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
),
SelectableText(
_keyPair!.publicKey,
style: const TextStyle(fontSize: 11, fontFamily: 'monospace'),
),
const SizedBox(height: 8),
if (_keyPair!.privateKey.isNotEmpty) ...[
const Text(
'Private Key:',
style: TextStyle(fontSize: 12, fontWeight: FontWeight.bold),
),
SelectableText(
_keyPair!.privateKey,
style: const TextStyle(fontSize: 11, fontFamily: 'monospace'),
),
] else ...[
const Text(
'Private Key: (not available - imported from npub only)',
style: TextStyle(fontSize: 12, color: Colors.orange),
),
],
] else ...[
const Text('No keypair generated'),
],
const SizedBox(height: 12),
if (_showImportFields) ...[
const Divider(),
const SizedBox(height: 8),
const Text(
'Import Key',
style: TextStyle(fontSize: 14, fontWeight: FontWeight.bold),
),
const SizedBox(height: 8),
TextField(
controller: _nsecController,
decoration: const InputDecoration(
labelText: 'nsec (private key)',
hintText: 'nsec1...',
border: OutlineInputBorder(),
helperText: 'Enter your nsec private key',
),
),
const SizedBox(height: 8),
ElevatedButton(
onPressed: _importFromNsec,
child: const Text('Import from nsec'),
),
const SizedBox(height: 16),
TextField(
controller: _npubController,
decoration: const InputDecoration(
labelText: 'npub (public key)',
hintText: 'npub1...',
border: OutlineInputBorder(),
helperText: 'Enter npub to view only (cannot sign events)',
),
),
const SizedBox(height: 8),
ElevatedButton(
onPressed: _importFromNpub,
child: const Text('Import from npub'),
),
const SizedBox(height: 16),
TextField(
controller: _hexPrivateKeyController,
decoration: const InputDecoration(
labelText: 'Hex Private Key',
hintText: '64 hex characters',
border: OutlineInputBorder(),
helperText: 'Enter private key in hex format (64 characters)',
),
),
const SizedBox(height: 8),
ElevatedButton(
onPressed: _importFromHexPrivateKey,
child: const Text('Import from Hex'),
),
const Divider(),
const SizedBox(height: 8),
],
ElevatedButton.icon(
onPressed: _generateKeyPair,
icon: const Icon(Icons.refresh),
label: const Text('Generate New Keypair'),
),
],
),
),
);
}
Widget _buildRelaysSection() {
return Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'Relays',
style: TextStyle(
fontSize: 18,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 12),
if (_relays.isEmpty)
const Text(
'No relays configured.\nAdd relays in Settings → Relay Management.',
style: TextStyle(color: Colors.grey),
)
else
..._relays.map((relay) => _buildRelayItem(relay)),
],
),
),
);
}
Widget _buildRelayItem(NostrRelay relay) {
final isConnected = _connectionStatus[relay.url] ?? false;
return Card(
margin: const EdgeInsets.only(bottom: 8),
color: isConnected ? Colors.green.shade50 : Colors.grey.shade50,
child: ListTile(
title: Text(
relay.url,
style: const TextStyle(fontSize: 14, fontFamily: 'monospace'),
),
subtitle: Text(
isConnected ? 'Connected' : 'Disconnected',
style: TextStyle(
color: isConnected ? Colors.green : Colors.grey,
),
),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
isConnected ? Icons.check_circle : Icons.cancel,
color: isConnected ? Colors.green : Colors.grey,
),
const SizedBox(width: 8),
if (isConnected)
IconButton(
icon: const Icon(Icons.close, size: 20),
onPressed: () => _disconnectFromRelay(relay.url),
tooltip: 'Disconnect',
)
else
IconButton(
icon: const Icon(Icons.play_arrow, size: 20),
onPressed: () => _connectToRelay(relay.url),
tooltip: 'Connect',
),
],
),
),
);
}
Widget _buildActionsSection() {
return Card(
child: Padding(
@@ -584,13 +169,25 @@ class _NostrEventsScreenState extends State<NostrEventsScreen> {
const SizedBox(height: 8),
TextButton.icon(
onPressed: () {
// Navigate to Settings where Relay Management is accessible
// The bottom navigation bar will handle switching to Settings tab
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Go to Settings tab to manage relays'),
),
);
if (widget.nostrService != null && widget.syncEngine != null) {
Navigator.of(context).push(
MaterialPageRoute(
builder: (_) => RelayManagementScreen(
controller: RelayManagementController(
nostrService: widget.nostrService!,
syncEngine: widget.syncEngine!,
),
),
),
);
} else {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(
content: Text('Nostr service not available'),
backgroundColor: Colors.red,
),
);
}
},
icon: const Icon(Icons.settings),
label: const Text('Manage Relays'),
lib/ui/session/session_screen.dart
+111
View File
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import '../../data/session/session_service.dart';
import '../../data/firebase/firebase_service.dart';
import '../../data/nostr/nostr_service.dart';
import '../../data/nostr/models/nostr_keypair.dart';
/// Screen for user session management (login/logout).
class SessionScreen extends StatefulWidget {
@@ -31,6 +32,7 @@ class _SessionScreenState extends State<SessionScreen> {
bool _isLoading = false;
bool _useFirebaseAuth = false;
bool _useNostrLogin = false;
NostrKeyPair? _generatedKeyPair;
@override
void initState() {
@@ -437,6 +439,115 @@ class _SessionScreenState extends State<SessionScreen> {
),
const SizedBox(height: 24),
if (_useNostrLogin) ...[
// Key pair generation section
if (widget.nostrService != null) ...[
Card(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Text(
'Generate Key Pair',
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
ElevatedButton.icon(
onPressed: () {
setState(() {
_generatedKeyPair = widget.nostrService!.generateKeyPair();
});
},
icon: const Icon(Icons.refresh, size: 18),
label: const Text('Generate'),
),
],
),
if (_generatedKeyPair != null) ...[
const SizedBox(height: 16),
// npub display
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'npub (Public Key):',
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 4),
SelectableText(
_generatedKeyPair!.toNpub(),
style: const TextStyle(
fontSize: 11,
fontFamily: 'monospace',
),
),
],
),
),
const SizedBox(width: 8),
IconButton(
icon: const Icon(Icons.content_copy),
tooltip: 'Copy to field',
onPressed: () {
_nostrKeyController.text = _generatedKeyPair!.toNpub();
},
),
],
),
const SizedBox(height: 12),
// nsec display
Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text(
'nsec (Private Key):',
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 4),
SelectableText(
_generatedKeyPair!.toNsec(),
style: const TextStyle(
fontSize: 11,
fontFamily: 'monospace',
),
),
],
),
),
const SizedBox(width: 8),
IconButton(
icon: const Icon(Icons.content_copy),
tooltip: 'Copy to field',
onPressed: () {
_nostrKeyController.text = _generatedKeyPair!.toNsec();
},
),
],
),
],
],
),
),
),
const SizedBox(height: 16),
],
TextField(
controller: _nostrKeyController,
decoration: const InputDecoration(