diff --git a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py index 307391f..85f7e7c 100644 --- a/nostr_dvm/tasks/content_discovery_currently_popular_followers.py +++ b/nostr_dvm/tasks/content_discovery_currently_popular_followers.py @@ -2,7 +2,8 @@ import json import os from datetime import timedelta from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, NostrDatabase, \ - ClientBuilder, Filter, NegentropyOptions, NegentropyDirection, init_logger, LogLevel, Event, EventId, Kind + ClientBuilder, Filter, NegentropyOptions, NegentropyDirection, init_logger, LogLevel, Event, EventId, Kind, \ + RelayOptions from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv from nostr_dvm.utils import definitions @@ -98,6 +99,9 @@ class DicoverContentCurrentlyPopularFollowers(DVMTaskInterface): cli.add_relay("wss://relay.damus.io") cli.add_relay("wss://nos.lol") cli.add_relay("wss://pablof7z.nostr1.com") + #add nostr band, too. + ropts = RelayOptions().ping(False) + cli.add_relay_with_opts("wss://nostr.band", ropts) cli.connect() diff --git a/nostr_dvm/tasks/discovery_censor_wot.py b/nostr_dvm/tasks/discovery_censor_wot.py index f24301f..35559e0 100644 --- a/nostr_dvm/tasks/discovery_censor_wot.py +++ b/nostr_dvm/tasks/discovery_censor_wot.py @@ -3,7 +3,7 @@ import os from datetime import timedelta from threading import Thread -from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind +from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind, RelayOptions from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv from nostr_dvm.utils.admin_utils import AdminConfig @@ -70,6 +70,10 @@ class DiscoverNonFollowers(DVMTaskInterface): # cli.add_relay("wss://relay.nostr.band") for relay in self.dvm_config.RELAY_LIST: cli.add_relay(relay) + #add nostr band, too. + ropts = RelayOptions().ping(False) + cli.add_relay_with_opts("wss://nostr.band", ropts) + cli.connect() options = DVMTaskInterface.set_options(request_form) diff --git a/nostr_dvm/tasks/discovery_inactive_follows.py b/nostr_dvm/tasks/discovery_inactive_follows.py index bdf31aa..0c81cdd 100644 --- a/nostr_dvm/tasks/discovery_inactive_follows.py +++ b/nostr_dvm/tasks/discovery_inactive_follows.py @@ -3,7 +3,7 @@ import os from datetime import timedelta from threading import Thread -from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind +from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind, RelayOptions from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv from nostr_dvm.utils.admin_utils import AdminConfig @@ -25,7 +25,7 @@ Params: None class DiscoverInactiveFollows(DVMTaskInterface): KIND: Kind = EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY TASK: str = "inactive-follows" - FIX_COST: float = 50 + FIX_COST: float = 0 client: Client dvm_config: DVMConfig @@ -75,12 +75,17 @@ class DiscoverInactiveFollows(DVMTaskInterface): cli = Client.with_opts(signer, opts) for relay in self.dvm_config.RELAY_LIST: cli.add_relay(relay) + + #add nostr band, too. + ropts = RelayOptions().ping(False) + cli.add_relay_with_opts("wss://nostr.band", ropts) + cli.connect() options = DVMTaskInterface.set_options(request_form) step = 20 - followers_filter = Filter().author(PublicKey.from_hex(options["user"])).kind(Kind(3)) + followers_filter = Filter().author(PublicKey.parse(options["user"])).kind(Kind(3)) followers = cli.get_events_of([followers_filter], timedelta(seconds=self.dvm_config.RELAY_TIMEOUT)) @@ -89,10 +94,12 @@ class DiscoverInactiveFollows(DVMTaskInterface): newest = 0 best_entry = followers[0] for entry in followers: + print(len(best_entry.tags())) if entry.created_at().as_secs() > newest: newest = entry.created_at().as_secs() best_entry = entry + print(best_entry.as_json()) followings = [] ns.dic = {} diff --git a/nostr_dvm/tasks/discovery_nonfollowers.py b/nostr_dvm/tasks/discovery_nonfollowers.py index cf38b42..b925174 100644 --- a/nostr_dvm/tasks/discovery_nonfollowers.py +++ b/nostr_dvm/tasks/discovery_nonfollowers.py @@ -3,7 +3,7 @@ import os from datetime import timedelta from threading import Thread -from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind +from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, Kind, RelayOptions from nostr_dvm.interfaces.dvmtaskinterface import DVMTaskInterface, process_venv from nostr_dvm.utils.admin_utils import AdminConfig @@ -71,6 +71,10 @@ class DiscoverNonFollowers(DVMTaskInterface): # cli.add_relay("wss://relay.nostr.band") for relay in self.dvm_config.RELAY_LIST: cli.add_relay(relay) + #add nostr band, too. + ropts = RelayOptions().ping(False) + cli.add_relay_with_opts("wss://nostr.band", ropts) + cli.connect() options = DVMTaskInterface.set_options(request_form)