From 5db3ab2232bbbbb291c526a212bb63c57f2eaa0a Mon Sep 17 00:00:00 2001 From: Fmar Date: Wed, 6 Nov 2024 16:55:46 +0100 Subject: [PATCH] fix publish warnings --- lib/domain_layer/entities/broadcast_response.dart | 2 +- lib/domain_layer/usecases/follows/follows.dart | 14 +++++++------- lib/domain_layer/usecases/jit_engine.dart | 2 -- lib/domain_layer/usecases/metadatas/metadatas.dart | 7 +++---- lib/domain_layer/usecases/relay_sets_engine.dart | 4 ---- lib/presentation_layer/init.dart | 3 --- lib/tag_count_event_filter.dart | 1 + pubspec.yaml | 2 +- 8 files changed, 13 insertions(+), 22 deletions(-) diff --git a/lib/domain_layer/entities/broadcast_response.dart b/lib/domain_layer/entities/broadcast_response.dart index 0a1f1ec08..35719a9a5 100644 --- a/lib/domain_layer/entities/broadcast_response.dart +++ b/lib/domain_layer/entities/broadcast_response.dart @@ -14,7 +14,7 @@ class NdkBroadcastResponse { /// a map of relays publishing to /// [String] is the relayUrl/identifier /// [Future] is the relay response e.g. OK, err reason - Map> _publishingRelays = {}; + // Map> _publishingRelays = {}; NdkBroadcastResponse({ required this.publishedEvent, diff --git a/lib/domain_layer/usecases/follows/follows.dart b/lib/domain_layer/usecases/follows/follows.dart index 705072e7d..eaf24a99f 100644 --- a/lib/domain_layer/usecases/follows/follows.dart +++ b/lib/domain_layer/usecases/follows/follows.dart @@ -5,7 +5,6 @@ import '../../entities/filter.dart'; import '../../repositories/cache_manager.dart'; import '../../repositories/event_signer.dart'; import '../broadcast/broadcast.dart'; -import '../relay_manager.dart'; import '../requests/requests.dart'; /// Follows usecase @@ -13,16 +12,14 @@ class Follows { final Requests _requests; final Broadcast _broadcast; final CacheManager _cacheManager; - final RelayManager _relayManager; final EventSigner? _signer; Follows({ required Requests requests, required Broadcast broadcast, required CacheManager cacheManager, - required RelayManager relayManager, required EventSigner? signer, - }) : _relayManager = relayManager, + }) : _cacheManager = cacheManager, _requests = requests, _signer = signer, @@ -112,7 +109,8 @@ class Follows { contactList.loadedTimestamp = Helpers.now; contactList.createdAt = Helpers.now; - final bResult = _broadcast.broadcast( + // final bResult = + _broadcast.broadcast( nostrEvent: contactList.toEvent(), specificRelays: customRelays, ); @@ -129,7 +127,8 @@ class Follows { contactList.loadedTimestamp = Helpers.now; contactList.createdAt = Helpers.now; - final bResult = _broadcast.broadcast( + // final bResult = + _broadcast.broadcast( nostrEvent: contactList.toEvent(), ); //await bResult.publishDone; @@ -187,7 +186,8 @@ class Follows { contactList.loadedTimestamp = Helpers.now; contactList.createdAt = Helpers.now; - final bResult = _broadcast.broadcast( + // final bResult = + _broadcast.broadcast( nostrEvent: contactList.toEvent(), specificRelays: customRelays, ); diff --git a/lib/domain_layer/usecases/jit_engine.dart b/lib/domain_layer/usecases/jit_engine.dart index 6a7710ab5..931777258 100644 --- a/lib/domain_layer/usecases/jit_engine.dart +++ b/lib/domain_layer/usecases/jit_engine.dart @@ -1,7 +1,5 @@ import 'dart:async'; -import 'package:ndk/shared/nips/nip01/client_msg.dart'; - import '../../shared/helpers/relay_helper.dart'; import '../../shared/logger/logger.dart'; import '../entities/broadcast_response.dart'; diff --git a/lib/domain_layer/usecases/metadatas/metadatas.dart b/lib/domain_layer/usecases/metadatas/metadatas.dart index 2f1c84788..fb2c75fdd 100644 --- a/lib/domain_layer/usecases/metadatas/metadatas.dart +++ b/lib/domain_layer/usecases/metadatas/metadatas.dart @@ -16,17 +16,15 @@ import '../requests/requests.dart'; class Metadatas { final Requests _requests; final CacheManager _cacheManager; - final RelayManager _relayManager; final Broadcast _broadcast; final EventSigner? _signer; Metadatas({ required Requests requests, required CacheManager cacheManager, - required RelayManager relayManager, required Broadcast broadcast, required EventSigner? signer, - }) : _relayManager = relayManager, + }) : _cacheManager = cacheManager, _requests = requests, _signer = signer, @@ -156,7 +154,8 @@ class Metadatas { } else { event = metadata.toEvent(); } - final bResult = _broadcast.broadcast( + // final bResult = + _broadcast.broadcast( nostrEvent: event, specificRelays: specificRelays, ); diff --git a/lib/domain_layer/usecases/relay_sets_engine.dart b/lib/domain_layer/usecases/relay_sets_engine.dart index 2d00b98da..05559ec3a 100644 --- a/lib/domain_layer/usecases/relay_sets_engine.dart +++ b/lib/domain_layer/usecases/relay_sets_engine.dart @@ -29,18 +29,14 @@ class RelaySetsEngine implements NetworkEngine { final RelayManager _relayManager; - final EventSigner? _signer; - final CacheManager _cacheManager; /// engine that pre-calculates relay sets for gossip RelaySetsEngine({ required RelayManager relayManager, required CacheManager cacheManager, - EventSigner? signer, GlobalState? globalState, }) : _cacheManager = cacheManager, - _signer = signer, _relayManager = relayManager { _globalState = globalState ?? GlobalState(); _relayManager.connect(urls: _relayManager.bootstrapRelays); diff --git a/lib/presentation_layer/init.dart b/lib/presentation_layer/init.dart index c4226ba35..408914352 100644 --- a/lib/presentation_layer/init.dart +++ b/lib/presentation_layer/init.dart @@ -63,7 +63,6 @@ class Initialization { cacheManager: ndkConfig.cache, globalState: globalState, relayManager: relayManager, - signer: ndkConfig.eventSigner, ); break; case NdkEngine.JIT: @@ -99,7 +98,6 @@ class Initialization { follows = Follows( requests: requests, cacheManager: ndkConfig.cache, - relayManager: relayManager, broadcast: broadcast, signer: ndkConfig.eventSigner, ); @@ -107,7 +105,6 @@ class Initialization { metadatas = Metadatas( requests: requests, cacheManager: ndkConfig.cache, - relayManager: relayManager, broadcast: broadcast, signer: ndkConfig.eventSigner, ); diff --git a/lib/tag_count_event_filter.dart b/lib/tag_count_event_filter.dart index 978eae4ce..e8cade57a 100644 --- a/lib/tag_count_event_filter.dart +++ b/lib/tag_count_event_filter.dart @@ -4,6 +4,7 @@ import 'package:ndk/domain_layer/entities/nip_01_event.dart'; import 'domain_layer/entities/contact_list.dart'; import 'domain_layer/entities/nip_65.dart'; +/// filter for too many tags class PTagCountEventFilter extends EventFilter { int maxTagCount; diff --git a/pubspec.yaml b/pubspec.yaml index bdad2c7b1..beddf92d4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: amberflutter: ^0.0.9 logger: ^2.4.0 rxdart: ^0.28.0 - flutter_rust_bridge: 2.6.0 + flutter_rust_bridge: ^2.6.0 rust_lib_ndk: ^0.1.3 #dependency_overrides: