From 730a3b0807abf714d513fa3e5faf42355d5417ca Mon Sep 17 00:00:00 2001 From: Believethehype <1097224+believethehype@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:14:50 +0200 Subject: [PATCH] add dvm for alternative wot approach by pippellia-btc --- nostr_dvm/interfaces/dvmtaskinterface.py | 4 +- nostr_dvm/tasks/people_discovery_mywot.py | 414 ++++++++++++++++++++++ nostr_dvm/utils/wot_utils.py | 8 + tests/discovery_people.py | 29 +- tests/test_dvm_client.py | 9 +- 5 files changed, 433 insertions(+), 31 deletions(-) create mode 100644 nostr_dvm/tasks/people_discovery_mywot.py diff --git a/nostr_dvm/interfaces/dvmtaskinterface.py b/nostr_dvm/interfaces/dvmtaskinterface.py index bb0820d..36e01e2 100644 --- a/nostr_dvm/interfaces/dvmtaskinterface.py +++ b/nostr_dvm/interfaces/dvmtaskinterface.py @@ -84,12 +84,12 @@ class DVMTaskInterface: if self.dvm_config.USE_OWN_VENV: dir = r'cache/venvs/' + os.path.basename(dvm_config.SCRIPT).split(".py")[0] pip_location = 'bin/pip' - if platform == "win32": + if platform == "win32" or platform == "nt": pip_location = dir + '/Scripts/pip' if not os.path.isdir(dir): print("Creating Venv: " + dir) - create(dir, with_pip=True, upgrade_deps=True) + create(dir, with_pip=True, upgrade_deps=False) self.dependencies.append(("nostr-dvm", "nostr-dvm")) for (module, package) in self.dependencies: print("Installing Venv Module: " + module) diff --git a/nostr_dvm/tasks/people_discovery_mywot.py b/nostr_dvm/tasks/people_discovery_mywot.py new file mode 100644 index 0000000..a86b5a5 --- /dev/null +++ b/nostr_dvm/tasks/people_discovery_mywot.py @@ -0,0 +1,414 @@ +import asyncio +import csv +import json +import os +import time +from datetime import timedelta + +import networkx as nx +import pandas as pd +from nostr_sdk import Client, Timestamp, PublicKey, Tag, Keys, Options, SecretKey, NostrSigner, NostrDatabase, \ + 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 +from nostr_dvm.utils.admin_utils import AdminConfig +from nostr_dvm.utils.definitions import EventDefinitions +from nostr_dvm.utils.dvmconfig import DVMConfig, build_default_config +from nostr_dvm.utils.nip88_utils import NIP88Config, check_and_set_d_tag_nip88, check_and_set_tiereventid_nip88 +from nostr_dvm.utils.nip89_utils import NIP89Config, check_and_set_d_tag, create_amount_tag +from nostr_dvm.utils.output_utils import post_process_list_to_events, post_process_list_to_users +from nostr_dvm.utils.wot_utils import build_network_from, save_network, load_network, print_results, \ + convert_index_to_hex + +""" +This File contains a Module to discover users followed by users you follow, based on WOT +Accepted Inputs: none +Outputs: A list of users +Params: None +""" + + +class DiscoverPeopleMyWOT(DVMTaskInterface): + KIND: Kind = EventDefinitions.KIND_NIP90_PEOPLE_DISCOVERY + TASK: str = "discover-people" + FIX_COST: float = 0 + dvm_config: DVMConfig + request_form = None + last_schedule: int + db_since = 3600 + db_name = "db/nostr_followlists.db" + personalized = True + result = "" + + async def init_dvm(self, name, dvm_config: DVMConfig, nip89config: NIP89Config, nip88config: NIP88Config = None, + admin_config: AdminConfig = None, options=None): + + dvm_config.SCRIPT = os.path.abspath(__file__) + self.request_form = {"jobID": "generic"} + opts = { + "max_results": 50, + } + self.request_form['options'] = json.dumps(opts) + + self.last_schedule = Timestamp.now().as_secs() + + if self.options.get("db_name"): + self.db_name = self.options.get("db_name") + if self.options.get("db_since"): + self.db_since = int(self.options.get("db_since")) + + use_logger = False + if use_logger: + init_logger(LogLevel.DEBUG) + + if self.dvm_config.UPDATE_DATABASE: + await self.sync_db() + if not self.personalized: + self.result = await self.calculate_result(self.request_form) + + async def is_input_supported(self, tags, client=None, dvm_config=None): + for tag in tags: + if tag.as_vec()[0] == 'i': + input_value = tag.as_vec()[1] + input_type = tag.as_vec()[2] + if input_type != "text": + return False + return True + + async def create_request_from_nostr_event(self, event, client=None, dvm_config=None): + self.dvm_config = dvm_config + + request_form = {"jobID": event.id().to_hex()} + + # default values + max_results = 50 + user = event.author().to_hex() + print(user) + hops = 2 + dunbar = 1000 + + for tag in event.tags(): + if tag.as_vec()[0] == 'i': + input_type = tag.as_vec()[2] + elif tag.as_vec()[0] == 'param': + param = tag.as_vec()[1] + if param == "max_results": # check for param type + max_results = int(tag.as_vec()[2]) + elif param == "user": # check for param type + user = tag.as_vec()[2] + print(user) + elif param == "hops": # check for param type + hops = int(tag.as_vec()[2]) + print(hops) + elif param == "dunbar": # check for param type + dunbar = int(tag.as_vec()[2]) + print(dunbar) + + options = { + "user": user, + "max_results": max_results, + "hops": hops, + "dunbar": dunbar, + } + request_form['options'] = json.dumps(options) + return request_form + + async def process(self, request_form): + # if the dvm supports individual results, recalculate it every time for the request + if self.personalized: + return await self.calculate_result(request_form) + # else return the result that gets updated once every scheduled update. In this case on database update. + else: + return self.result + + + async def calculate_result(self, request_form): + from types import SimpleNamespace + ns = SimpleNamespace() + use_files = False + options = self.set_options(request_form) + file = "db/" + options["user"] + ".json" + try: + print("Deleting existing file, creating new one") + os.remove(file) + except: + print("Creating new file") + # sync the database, this might take a while if it's empty or hasn't been updated in a long time + + + #hop1 + user_id = PublicKey.parse(options["user"]).to_hex() + + index_map, G = await build_network_from(options["user"], depth=int(options["hops"]), max_batch=500, max_time_request=10) + if use_files: + save_network(index_map, G, options["user"]) + + if use_files: + # loading the database + print('loading the database...') + tic = time.time() + + index_map, G = load_network(options["user"]) + + toc = time.time() + print(f'finished in {toc - tic} seconds') + + # computing the pagerank + print('computing global pagerank...') + tic = time.time() + + pr = nx.pagerank(G, tol=1e-12) + + #await print_results(pr, index_map, int(options["max_results"]), getmetadata=False) + result = await convert_index_to_hex(pr, index_map, int(options["max_results"])) + print(result) + toc = time.time() + print(f'finished in {toc - tic} seconds') + + + + + + #sorted_nodes = sorted([(node, pagerank) for node, pagerank in result.items()], + # key=lambda x: pr[x[1]], + # reverse=True)[:int(options["max_results"])] + for node in result.items(): + print(str(node[0]) + "," + str(node[1])) + + result_list = [] + for entry in result.items(): + # print(EventId.parse(entry[0]).to_bech32() + "/" + EventId.parse(entry[0]).to_hex() + ": " + str(entry[1])) + e_tag = Tag.parse(["p", str(entry[0]), str(entry[1])]) + result_list.append(e_tag.as_vec()) + + if self.dvm_config.LOGLEVEL.value >= LogLevel.DEBUG.value: + print("[" + self.dvm_config.NIP89.NAME + "] Filtered " + str( + len(result_list)) + " fitting events.") + return json.dumps(result_list) + + async def post_process(self, result, event): + """Overwrite the interface function to return a social client readable format, if requested""" + for tag in event.tags(): + if tag.as_vec()[0] == 'output': + format = tag.as_vec()[1] + if format == "text/plain": # check for output type + result = post_process_list_to_users(result) + + # if not text/plain, don't post-process + return result + + async def schedule(self, dvm_config): + if dvm_config.SCHEDULE_UPDATES_SECONDS == 0: + return 0 + else: + if Timestamp.now().as_secs() >= self.last_schedule + dvm_config.SCHEDULE_UPDATES_SECONDS: + if self.dvm_config.UPDATE_DATABASE: + await self.sync_db() + self.last_schedule = Timestamp.now().as_secs() + if not self.personalized: + self.result = await self.calculate_result(self.request_form) + return 1 + + async def sync_db(self): + + opts = (Options().wait_for_send(False).send_timeout(timedelta(seconds=self.dvm_config.RELAY_LONG_TIMEOUT))) + sk = SecretKey.from_hex(self.dvm_config.PRIVATE_KEY) + keys = Keys.parse(sk.to_hex()) + signer = NostrSigner.keys(keys) + database = await NostrDatabase.sqlite(self.db_name) + cli = ClientBuilder().signer(signer).database(database).opts(opts).build() + + for relay in self.dvm_config.RECONCILE_DB_RELAY_LIST: + await cli.add_relay(relay) + + await cli.connect() + + timestamp_since = Timestamp.now().as_secs() - self.db_since + since = Timestamp.from_secs(timestamp_since) + + filter1 = Filter().kind(Kind(3)) + + # filter = Filter().author(keys.public_key()) + if self.dvm_config.LOGLEVEL.value >= LogLevel.DEBUG.value: + print("[" + self.dvm_config.NIP89.NAME + "] Syncing notes of the last " + str( + self.db_since) + " seconds.. this might take a while..") + dbopts = NegentropyOptions().direction(NegentropyDirection.DOWN) + await cli.reconcile(filter1, dbopts) + await cli.database().delete(Filter().until(Timestamp.from_secs( + Timestamp.now().as_secs() - self.db_since))) # Clear old events so db doesn't get too full. + await cli.shutdown() + if self.dvm_config.LOGLEVEL.value >= LogLevel.DEBUG.value: + print( + "[" + self.dvm_config.NIP89.NAME + "] Done Syncing Notes of the last " + str( + self.db_since) + " seconds..") + + +async def analyse_users(user_ids=None, dunbar=100000000): + if user_ids is None: + user_ids = [] + try: + user_keys = [] + for npub in user_ids: + try: + user_keys.append(PublicKey.parse(npub)) + except Exception as e: + print(npub) + print(e) + + database = await NostrDatabase.sqlite("db/nostr_followlists.db") + followers_filter = Filter().authors(user_keys).kind(Kind(3)) + followers = await database.query([followers_filter]) + allfriends = [] + if len(followers) > 0: + for follower in followers: + frens = [] + if len(follower.tags()) < dunbar: + for tag in follower.tags(): + if tag.as_vec()[0] == "p": + frens.append(tag.as_vec()[1]) + allfriends.append(Friend(follower.author().to_hex(), frens)) + else: + print("Skipping friend: " + follower.author().to_hex() + "Following: " + str(len(follower.tags())) + " npubs") + + return allfriends + else: + print("no followers") + return [] + except Exception as e: + print(e) + return [] + + +class Friend(object): + def __init__(self, user_id, friends): + self.user_id = user_id + self.friends = friends + + +def write_to_csv(friends, file="friends222.csv"): + with open(file, 'a') as f: + writer = csv.writer(f) + for friend in friends: + for fren in friend.friends: + row = [friend.user_id, fren] + writer.writerow(row) + + +# We build an example here that we can call by either calling this file directly from the main directory, +# or by adding it to our playground. You can call the example and adjust it to your needs or redefine it in the +# playground or elsewhere +def build_example(name, identifier, admin_config, options, cost=0, update_rate=180, processing_msg=None, + update_db=True): + dvm_config = build_default_config(identifier) + dvm_config.USE_OWN_VENV = False + dvm_config.SHOWLOG = True + dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate # Every 10 minutes + dvm_config.UPDATE_DATABASE = update_db + # Activate these to use a subscription based model instead + # dvm_config.SUBSCRIPTION_REQUIRED = True + # dvm_config.SUBSCRIPTION_DAILY_COST = 1 + dvm_config.FIX_COST = cost + dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg + admin_config.LUD16 = dvm_config.LN_ADDRESS + + image = "https://image.nostr.build/3cdd70113e05375e6240f2ecca5d9f4ee783ab386b00cc07ca907b601ab91a85.jpg", + + # Add NIP89 + nip89info = { + "name": name, + "image": image, + "picture": image, + "about": "I show notes that are currently popular", + "lud16": dvm_config.LN_ADDRESS, + "encryptionSupported": True, + "cashuAccepted": True, + "personalized": False, + "amount": create_amount_tag(cost), + "nip90Params": { + "max_results": { + "required": False, + "values": [], + "description": "The number of maximum results to return (default currently 100)" + } + } + } + + nip89config = NIP89Config() + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip89config.CONTENT = json.dumps(nip89info) + + # admin_config.UPDATE_PROFILE = False + # admin_config.REBROADCAST_NIP89 = False + + return DiscoverPeopleWOT(name=name, dvm_config=dvm_config, nip89config=nip89config, + admin_config=admin_config, options=options) + + +def build_example_subscription(name, identifier, admin_config, options, update_rate=180, processing_msg=None, + update_db=True): + dvm_config = build_default_config(identifier) + dvm_config.USE_OWN_VENV = False + dvm_config.SHOWLOG = True + dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate # Every 3 minutes + dvm_config.UPDATE_DATABASE = update_db + # Activate these to use a subscription based model instead + # dvm_config.SUBSCRIPTION_DAILY_COST = 1 + dvm_config.FIX_COST = 0 + dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg + admin_config.LUD16 = dvm_config.LN_ADDRESS + + image = "https://image.nostr.build/3cdd70113e05375e6240f2ecca5d9f4ee783ab386b00cc07ca907b601ab91a85.jpg", + # Add NIP89 + nip89info = { + "name": name, + "image": image, + "picture": image, + "about": "I show notes that are currently popular all over Nostr. I'm also used for testing subscriptions.", + "lud16": dvm_config.LN_ADDRESS, + "encryptionSupported": True, + "cashuAccepted": True, + "subscription": True, + "personalized": False, + "nip90Params": { + "max_results": { + "required": False, + "values": [], + "description": "The number of maximum results to return (default currently 100)" + } + } + } + + nip89config = NIP89Config() + nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip89config.CONTENT = json.dumps(nip89info) + + nip88config = NIP88Config() + nip88config.DTAG = check_and_set_d_tag_nip88(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) + nip88config.TIER_EVENT = check_and_set_tiereventid_nip88(identifier, "1") + nip89config.NAME = name + nip88config.IMAGE = nip89info["image"] + nip88config.TITLE = name + nip88config.AMOUNT_DAILY = 100 + nip88config.AMOUNT_MONTHLY = 2000 + nip88config.CONTENT = "Subscribe to the DVM for unlimited use during your subscription" + nip88config.PERK1DESC = "Unlimited requests" + nip88config.PERK2DESC = "Support NostrDVM & NostrSDK development" + nip88config.PAYMENT_VERIFIER_PUBKEY = "5b5c045ecdf66fb540bdf2049fe0ef7f1a566fa427a4fe50d400a011b65a3a7e" + + # admin_config.UPDATE_PROFILE = False + # admin_config.REBROADCAST_NIP89 = False + # admin_config.REBROADCAST_NIP88 = False + + # admin_config.FETCH_NIP88 = True + # admin_config.EVENTID = "" + # admin_config.PRIVKEY = dvm_config.PRIVATE_KEY + + return DiscoverPeopleMyWOT(name=name, dvm_config=dvm_config, nip89config=nip89config, + nip88config=nip88config, options=options, + admin_config=admin_config) + + +if __name__ == '__main__': + process_venv(DiscoverPeopleMyWOT) diff --git a/nostr_dvm/utils/wot_utils.py b/nostr_dvm/utils/wot_utils.py index 7ddc2a0..9d7d1f7 100644 --- a/nostr_dvm/utils/wot_utils.py +++ b/nostr_dvm/utils/wot_utils.py @@ -622,6 +622,14 @@ async def print_results(graph, index_map, show_results_num, getmetadata=True): name, nip05, lud16 = await get_metadata(key) print(name + "(" + key + ") " + str(graph[item])) +async def convert_index_to_hex(graph, index_map, show_results_num): + result = {} + for item in islice(graph, show_results_num): + key = next((pubkey for pubkey, id in index_map.items() if id == item), None) + result[key] = graph[item] + + return result + def test(): # WARNING, DEPENDING ON DEPTH THIS TAKES LONG diff --git a/tests/discovery_people.py b/tests/discovery_people.py index 57fc4ed..14b69fb 100644 --- a/tests/discovery_people.py +++ b/tests/discovery_people.py @@ -6,6 +6,7 @@ from pathlib import Path import dotenv from nostr_sdk import init_logger, LogLevel, Keys, NostrLibrary +from nostr_dvm.tasks.people_discovery_mywot import DiscoverPeopleMyWOT from nostr_dvm.tasks.people_discovery_wot import DiscoverPeopleWOT from nostr_dvm.utils.admin_utils import AdminConfig from nostr_dvm.utils.dvmconfig import build_default_config @@ -20,27 +21,8 @@ update_profile = False global_update_rate = 1200 # set this high on first sync so db can fully sync before another process trys to. use_logger = True -AVOID_PAID_OUTBOX_RELAY_LIST = ["wss://nostrelay.yeghro.site", "wss://nostr.wine", "wss://filter.nostr.wine" - "wss://nostr21.com", "wss://nostr.bitcoiner.social", "wss://nostr.orangepill.dev", - "wss://relay.lnpay.me", "wss://relay.snort.social", "wss://relay.minds.com/nostr/v1/ws", - "wss://nostr-pub.semisol.dev", "wss://mostr.mostr.pub", "wss://relay.mostr.pub", "wss://minds.com", - "wss://yabu.me", "wss://relay.yozora.world", "wss://filter.nostr.wine/?global=all", "wss://eden.nostr.land", - "wss://relay.orangepill.ovh", "wss://nostr.jcloud.es", "wss://af.purplerelay.com", "wss://za.purplerelay.com", - "wss://relay.nostrich.land", "wss://relay.nostrplebs.com", "wss://relay.nostrich.land", - "wss://rss.nos.social", "wss://atlas.nostr.land", "wss://puravida.nostr.land", "wss://nostr.inosta.cc", - "wss://relay.orangepill.dev", "wss://no.str.cr", "wss://nostr.milou.lol", "wss://relay.nostr.com.au", - "wss://puravida.nostr.land", "wss://atlas.nostr.land", "wss://nostr-pub.wellorder.net", "wss://eelay.current.fyi", - "wss://nostr.thesamecat.io", "wss://nostr.plebchain.org", "wss://relay.noswhere.com", "wss://nostr.uselessshit.co", - "wss://bitcoiner.social", "wss://relay.stoner.com", "wss://nostr.l00p.org", "wss://relay.nostr.ro", "wss://nostr.kollider.xyz", - "wss://relay.valera.co", "wss://relay.austrich.net", "wss://relay.nostrich.de", "wss://nostr.azte.co", "wss://nostr-relay.schnitzel.world", - "wss://relay.nostriches.org", "wss://happytavern.co", "wss://onlynotes.lol", "wss://offchain.pub", "wss://purplepag.es", "wss://relay.plebstr.com", - "wss://poster.place/relay", "wss://relayable.org", "wss://bbb.santos.lol", "wss://relay.bitheaven.social", "wss://theforest.nostr1.com", - "wss://relay.nostrati.com", "wss://purplerelay.com", "wss://hist.nostr.land", "wss://creatr.nostr.wine", "ws://localhost:4869", - "wss://pyramid.fiatjaf.com", "wss://relay.nos.social", "wss://nostr.thank.eu", "wss://inbox.nostr.wine", "wss://relay.pleb.to", "wss://welcome.nostr.wine", - "wss://relay.nostrview.com", "wss://nostr.land", "wss://eu.purplerelay.com", "wss://xmr.usenostr.org", "wss://relay.pleb.to", "wss://nostr-relay.app" - ] -RECONCILE_DB_RELAY_LIST = ["wss://relay.damus.io"] # , "wss://relay.snort.social"] +#RECONCILE_DB_RELAY_LIST = ["wss://relay.damus.io"] # , "wss://relay.snort.social"] if use_logger: @@ -57,13 +39,12 @@ def build_example_wot(name, identifier, admin_config, options, image, cost=0, up # dvm_config.SHOWLOG = True dvm_config.SCHEDULE_UPDATES_SECONDS = update_rate # Every 10 minutes dvm_config.UPDATE_DATABASE = update_db - dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST + #dvm_config.RECONCILE_DB_RELAY_LIST = RECONCILE_DB_RELAY_LIST dvm_config.LOGLEVEL = LogLevel.DEBUG dvm_config.FIX_COST = cost #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg", #"wss://relay.nostr.net"] dvm_config.CUSTOM_PROCESSING_MESSAGE = processing_msg - dvm_config.AVOID_PAID_OUTBOX_RELAY_LIST = AVOID_PAID_OUTBOX_RELAY_LIST #dvm_config.RELAY_LIST = ["wss://dvms.f7z.io", # "wss://nostr.mom", "wss://nostr.oxtr.dev", "wss://relay.nostr.bg" # ] @@ -92,7 +73,7 @@ def build_example_wot(name, identifier, admin_config, options, image, cost=0, up nip89config = NIP89Config() nip89config.DTAG = check_and_set_d_tag(identifier, name, dvm_config.PRIVATE_KEY, nip89info["image"]) nip89config.CONTENT = json.dumps(nip89info) - return DiscoverPeopleWOT(name=name, dvm_config=dvm_config, nip89config=nip89config, + return DiscoverPeopleMyWOT(name=name, dvm_config=dvm_config, nip89config=nip89config, admin_config=admin_config, options=options) @@ -110,7 +91,7 @@ def playground(): # admin_config_global_popular.EVENTID = "2fea4ee2ccf0fa11db171113ffd7a676f800f34121478b7c9a4e73c2f1990028" # admin_config_global_popular.POW = True custom_processing_msg = ["Looking for people, that npubs in your Web of Trust follow, but you don't"] - update_db = True + update_db = False options_wot = { "db_name": "db/nostr_followlists.db", diff --git a/tests/test_dvm_client.py b/tests/test_dvm_client.py index cad51b2..90c4acd 100644 --- a/tests/test_dvm_client.py +++ b/tests/test_dvm_client.py @@ -208,7 +208,7 @@ async def nostr_client_test_discovery(user, ptag): async def nostr_client_test_discovery_user(user, ptag): keys = Keys.parse(check_and_set_private_key("test_client")) - relay_list = ["wss://relay.damus.io", "wss://dvms.f7z.io", + relay_list = ["wss://relay.primal.net", "wss://dvms.f7z.io", ] relaysTag = Tag.parse(relay_list) @@ -228,7 +228,6 @@ async def nostr_client_test_discovery_user(user, ptag): await client.connect() config = DVMConfig eventid = await send_event(event, client=client, dvm_config=config) - print(eventid.to_hex()) return event.as_json() async def nostr_client_test_discovery_gallery(user, ptag): @@ -326,11 +325,11 @@ async def nostr_client(): # await nostr_client_test_image("a beautiful purple ostrich watching the sunset") # await nostr_client_test_search_profile("dontbelieve") wot = ["99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64"] - await nostr_client_test_discovery("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64", "ab6cdf12ca3ae5109416295b8cd8a53fdec3a9d54beb7a9aee0ebfb67cb4edf7") + #await nostr_client_test_discovery("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64", "ab6cdf12ca3ae5109416295b8cd8a53fdec3a9d54beb7a9aee0ebfb67cb4edf7") #await nostr_client_test_discovery_gallery("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64", "4add3944eb596a27a650f9b954f5ed8dfefeec6ca50473605b0fbb058dd11306") - #await nostr_client_test_disovery_user("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64", - # "58c52fdca7593dffea63ba6f758779d8251c6732f54e9dc0e56d7a1afe1bb1b6") + await nostr_client_test_discovery_user("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64", + "58c52fdca7593dffea63ba6f758779d8251c6732f54e9dc0e56d7a1afe1bb1b6") # await nostr_client_test_censor_filter(wot) # await nostr_client_test_inactive_filter("99bb5591c9116600f845107d31f9b59e2f7c7e09a1ff802e84f1d43da557ca64")