src/main.rs

@@ -21,8 +21,7 @@ use rustyline::config::Configurer;
 use rustyline::error::ReadlineError;
 use rustyline::DefaultEditor;
 use std::collections::{HashMap, VecDeque};
-use std::env;
+use std::env::{args, var};
-use std::env::{args};
 use std::fs;
 use std::fs::File;
 use std::io::{BufRead, BufReader, Write};
@@ -148,7 +147,7 @@ async fn main() -> Result<()> {
             .inspect(|_| { or_warn!(fs::remove_file(key_file)); }));
     }
 
-    let keys_entry = Entry::new("mostr", &env::var("MOSTR_ID").unwrap_or("keys".to_string()))?;
+    let keys_entry = Entry::new("mostr", "keys")?;
     let keys =
         if args.peek().is_some_and(|arg| arg.trim_start_matches('-') == "import") {
             args.next();
@@ -190,7 +189,7 @@ async fn main() -> Result<()> {
 
     let relays_file = config_dir.join("relays");
     // TODO use NewRelay message for all relays
-    match env::var("MOSTR_RELAY") {
+    match var("MOSTR_RELAY") {
         Ok(relay) => {
             or_warn!(client.add_relay(relay).await);
         }

src/tasks.rs

@@ -158,7 +158,7 @@ impl TasksRelay {
         metadata: Option<Metadata>,
     ) -> Self {
         let mut new = Self::with_sender(EventSender::from(url, tx, keys));
-        metadata.map(|m| new.users.insert(keys.public_key(), m, Timestamp::now()));
+        metadata.map(|m| new.users.insert(keys.public_key(), m));
         new
     }
 
@@ -1228,7 +1228,7 @@ impl TasksRelay {
         match event.kind {
             Kind::GitIssue => self.add_task(event),
             Kind::Metadata => match Metadata::from_json(event.content.as_str()) {
-                Ok(metadata) => { self.users.insert(event.pubkey, metadata, event.created_at); }
+                Ok(metadata) => { self.users.insert(event.pubkey, metadata); }
                 Err(e) => warn!("Cannot parse metadata: {} from {:?}", e, event),
             },
             Kind::Bookmarks => {

src/tasks/nostr_users.rs

@@ -1,13 +1,10 @@
-use itertools::Itertools;
+use nostr_sdk::{Keys, Metadata, PublicKey, Tag};
-use nostr_sdk::{Keys, Metadata, PublicKey, Tag, Timestamp};
 use std::collections::HashMap;
 use std::str::FromStr;
-use log::debug;
 
 #[derive(Default, Debug, Clone, PartialEq, Eq)]
 pub struct NostrUsers {
     users: HashMap<PublicKey, Metadata>,
-    user_times: HashMap<PublicKey, Timestamp>,
 }
 
 impl NostrUsers {
@@ -26,14 +23,11 @@ impl NostrUsers {
         if let Ok(key) = PublicKey::from_str(term) {
             return self.users.get_key_value(&key);
         }
-        self.users.iter()
+        self.users.iter().find(|(k, v)|
-            .sorted_unstable_by_key(|(k, v)| self.get_user_time(k))
+            // TODO regex word boundary
-            .rev()
+            v.name.as_ref().is_some_and(|n| n.to_ascii_lowercase().starts_with(term)) ||
-            .find(|(k, v)|
+                v.display_name.as_ref().is_some_and(|n| n.to_ascii_lowercase().starts_with(term)) ||
-                // TODO regex word boundary
+                (term.len() > 4 && k.to_string().starts_with(term)))
-                v.name.as_ref().is_some_and(|n| n.to_ascii_lowercase().starts_with(term)) ||
-                    v.display_name.as_ref().is_some_and(|n| n.to_ascii_lowercase().starts_with(term)) ||
-                    (term.len() > 4 && k.to_string().starts_with(term)))
     }
 
     pub(crate) fn get_displayname(&self, pubkey: &PublicKey) -> String {
@@ -48,21 +42,8 @@ impl NostrUsers {
             .unwrap_or_else(|| format!("{:.6}", pubkey.to_string()))
     }
 
-    fn get_user_time(&self, pubkey: &PublicKey) -> u64 {
+    pub(super) fn insert(&mut self, pubkey: PublicKey, metadata: Metadata) {
-        match self.user_times.get(pubkey) {
+        self.users.insert(pubkey, metadata);
-            Some(t) => t.as_u64(),
-            None => Timestamp::zero().as_u64(),
-        }
-    }
-
-    pub(super) fn insert(&mut self, pubkey: PublicKey, metadata: Metadata, timestamp: Timestamp) {
-        if self.get_user_time(&pubkey) < timestamp.as_u64() {
-            debug!("Inserting user metadata for {}", pubkey);
-            self.users.insert(pubkey, metadata);
-            self.user_times.insert(pubkey, timestamp);
-        } else {
-            debug!("Skipping older user metadata for {}", pubkey);
-        }
     }
 
     pub(super) fn create(&mut self, pubkey: PublicKey) {
@@ -76,7 +57,7 @@ impl NostrUsers {
 fn test_user_extract() {
     let keys = Keys::generate();
     let mut users = NostrUsers::default();
-    users.insert(keys.public_key, Metadata::new().display_name("Tester Jo"), Timestamp::now());
+    users.insert(keys.public_key, Metadata::new().display_name("Tester Jo"));
     assert_eq!(crate::kinds::extract_tags("Hello @test", &users),
                ("Hello".to_string(), vec![Tag::public_key(keys.public_key)]));
 }