Rename NIP-35 to NIP-05 (they've been merged)

README.md

@@ -17,7 +17,7 @@ Also, the GUI sucks. It looks horrible. And isn't smartly designed. But form fol
 As of right now you can (if you aren't stopped by some bug):
 
 - [x] **Seeing other people's posts**
-    - [x] **Follow people** by user@domain (NIP-35) or by public key (hex or bech32) plus a relay where they can be found, or by finding them in the feed, clicking their avatar, and choosing to follow them on their page... and unfollow people.
+    - [x] **Follow people** by user@domain (NIP-05) or by public key (hex or bech32) plus a relay where they can be found, or by finding them in the feed, clicking their avatar, and choosing to follow them on their page... and unfollow people.
     - [x] **See a feed of posts from people you follow** including avatars and other user metadata, and reactions to these posts.
     - [X] **See threads related to a post** including ancestors and replies, although it may not be working as good as it will eventually work just yet.
     - [X] **See a list of posts of a person** on their person page
@@ -67,8 +67,8 @@ We intend to support the following features/NIPs:
 
 - [x] NIP-01 - Basic protocol flow description
 - [ ] NIP-02 - Contact List and Petnames
-- [ ] NIP-05 - Mapping Nostr keys to DNS-based internet identifiers (partial)
 - [ ] NIP-04 - Encrypted Direct Message: I doesn't believe this is a good idea to do encrypted messaging this way, as it leaks metadata and has a cryptographic weakness. But it is in common enough usage.
+- [ ] NIP-05 - Mapping Nostr keys to DNS-based internet identifiers (partial)
 - [ ] NIP-08 - Handling Mentions
 - [x] NIP-09 - Event Deletion
 - [x] NIP-10 - Conventions for clients' use of e and p tags in text events
@@ -84,7 +84,6 @@ We intend to support the following features/NIPs:
 - [ ] NIP-25 - Reactions (viewing, not yet creating)
 - [ ] NIP-26 - Delegated Event Signing
 - [ ] NIP-28 - Public Chat
-- [x] NIP-35 - User Discovery
 - [ ] NIP-36 - Sensitive Content
 - [ ] NIP-40 - Expiration Timestamp
 
@@ -199,7 +198,7 @@ terms or conditions.
 
 My public key is ee11a5dff40c19a555f41fe42b48f00e618c91225622ae37b6c2bb67b76c4e49
 
-You can also my NIP-05/NIP-35 address of `mike@mikedilger.com` which will also hook you up with the relays I post to.
+You can also my NIP-05 address of `mike@mikedilger.com` which will also hook you up with the relays I post to.
 
 Note: I will rollover my public key once gossip is my daily driver.
 

src/error.rs

@@ -24,7 +24,7 @@ pub enum Error {
     #[error("NIP-05 public key not found")]
     Nip05NotFound,
 
-    #[error("NIP-35 relays not found")]
+    #[error("NIP-05 relays not found")]
     Nip35NotFound,
 
     #[error("Nostr: {0}")]

src/globals.rs

@@ -140,7 +140,7 @@ impl Globals {
         desired_events.retain(|&id, _| !events.contains_key(&id));
     }
 
-    async fn get_desired_events_prelude() -> Result<(), Error> {
+    pub async fn get_local_desired_events() -> Result<(), Error> {
         Self::trim_desired_events().await;
 
         // Load from database
@@ -172,7 +172,7 @@ impl Globals {
     }
 
     pub async fn get_desired_events() -> Result<(HashMap<Url, Vec<Id>>, Vec<Id>), Error> {
-        Globals::get_desired_events_prelude().await?;
+        Globals::get_local_desired_events().await?;
 
         let desired_events = GLOBALS.desired_events.read().await;
         let mut output: HashMap<Url, Vec<Id>> = HashMap::new();

src/ui/help/mod.rs

@@ -31,7 +31,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
             ui.label("This is a core concept. Gossip doesn't fetch posts from the same relays it is configured to post to. It trys to fetch posts from whereever your followers post them, so you need to configure at least one relay for each person you follow. Gossip will then dynamically figure out where they actually post (if it finds them at all) and keep things updated as they change where they post to. A lot of other clients are not operating like this, they are pulling from the same relays they push to and this author thinks that will not scale. Right now, these other clients work because relays are copying messages from each other somehow.");
             ui.add_space(10.0);
 
-            ui.label("NIP-35 makes this easy, since it specifies how users can share their public key AND their relays via a webserver that they control. For example, you can follow me at `mike@mikedilger.com`. That's all you need to type in.");
+            ui.label("NIP-05 makes this easy, since it specifies how users can share their public key AND their relays via a webserver that they control. For example, you can follow me at `mike@mikedilger.com`. That's all you need to type in.");
             ui.add_space(10.0);
 
             ui.label("Other ways of following people include pasting their public key (hex or bech32 format) and typing in a relay URL which should start with 'ws'.  NOTE: use CTRL-V to paste, other forms of pasting (X11 middle click) won't work.");
@@ -42,7 +42,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
                 if ui.link("People > Follow Someone New").clicked() {
                     app.page = Page::PeopleFollow;
                 }
-                ui.label("page and add people to follow. If you don't know anybody, you can follow me at NIP-35 DNS ID mike@mikedilger.com and you can find other people through me (posts I reply to or quote).");
+                ui.label("page and add people to follow. If you don't know anybody, you can follow me at NIP-05 DNS ID mike@mikedilger.com and you can find other people through me (posts I reply to or quote).");
             });
             ui.add_space(10.0);
 
@@ -92,7 +92,7 @@ pub(super) fn update(app: &mut GossipUi, ctx: &Context, _frame: &mut eframe::Fra
                 if ui.link("Relays").clicked() {
                     app.page = Page::Relays;
                 }
-                ui.label("page and tick a half dozen relays that you intend to post to. If your webserver serves a nostr.json file, you can follow NIP-35 and use the same relays in that file.");
+                ui.label("page and tick a half dozen relays that you intend to post to. If your webserver serves a nostr.json file, you can follow NIP-05 and use the same relays in that file.");
             });
             ui.add_space(10.0);
 

src/ui/people/follow.rs

@@ -17,7 +17,7 @@ pub(super) fn update(app: &mut GossipUi, _ctx: &Context, _frame: &mut eframe::Fr
     ui.separator();
     ui.add_space(10.0);
 
-    ui.heading("NIP-35: Follow a DNS ID");
+    ui.heading("NIP-05: Follow a DNS ID");
 
     ui.horizontal(|ui| {
         ui.label("Enter user@domain");