From 2e207ef054225c026c4a5210bb14caa7cbe97907 Mon Sep 17 00:00:00 2001 From: Vishal <64505169+vishalxl@users.noreply.github.com> Date: Sat, 19 Nov 2022 15:51:12 +0530 Subject: [PATCH] enabled relay argument new relay is added to list of relays used. --- bin/nostr_console.dart | 19 +++++++++++++++++-- lib/settings.dart | 7 ++++--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/bin/nostr_console.dart b/bin/nostr_console.dart index 5c42725..f67c5be 100644 --- a/bin/nostr_console.dart +++ b/bin/nostr_console.dart @@ -112,10 +112,21 @@ Future main(List arguments) async { print("You can create your own private key from ${gWarningColor}astral.ninja, branle.netlify.app$gColorEndMarker, or other such tools.\n"); } + // handle relay related argument if( argResults[relayArg] != null) { - defaultServerUrl = argResults[relayArg]; - print("Going to use relay: $defaultServerUrl"); + String newRelay = argResults[relayArg]; + if( newRelay.startsWith("wss://")) { + if( !gListRelayUrls1.contains(newRelay)) { + print("Also going to use new relay: $newRelay apart from the relays $gListRelayUrls1"); + gListRelayUrls1.add( newRelay); + } else { + print("The given relay $newRelay is already present in the default relays for the app, which are $gListRelayUrls1"); + } + } else { + print("The provided relay does not start with wss:// so not going to use it."); + } } + if( argResults[lastdaysArg] != null) { gNumLastDays = int.parse(argResults[lastdaysArg]); print("Going to show posts for last $gNumLastDays days"); @@ -285,10 +296,14 @@ Future main(List arguments) async { gDefaultNumWaitSeconds = gDefaultNumWaitSeconds ~/4; } + // get event for user getUserEvents(gListRelayUrls1, userPublicKey, limitPerSubscription, getSecondsDaysAgo(limitSelfEvents)); getMentionEvents(gListRelayUrls2, userPublicKey, limitPerSubscription, getSecondsDaysAgo(limitSelfEvents)); // from relay group 2 + // get other user events getMultiUserEvents(gListRelayUrls1, gDefaultFollows, limitPerSubscription, getSecondsDaysAgo(limitFollowPosts)); + + // get group and meta info events getKindEvents([0, 3, 40, 41, 140, 141], gListRelayUrls1, 3 * limitPerSubscription, getSecondsDaysAgo(limitMetaInfoEvents)); // get all type 3 etc getKindEvents([42, 142], gListRelayUrls1, limitPerSubscription * 3, getSecondsDaysAgo( limitFollowPosts)); // get all type 3 etc diff --git a/lib/settings.dart b/lib/settings.dart index 07d4192..6ea0f19 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -44,12 +44,13 @@ const String relayNostrInfo = 'wss://relay.nostr.info'; String defaultServerUrl = "wss://relay.damus.io"; List gListRelayUrls1 = [ defaultServerUrl, - relayNostrInfo, - "wss://nostr.oxtr.dev" + //relayNostrInfo, + "wss://nostr-relay.wlvs.space" ]; List gListRelayUrls2 = [ - "wss://nostr-relay.wlvs.space", + + "wss://nostr.oxtr.dev", "wss://nostr.ono.re" ];