chore: Improve Request Screening (#101)

* open chat while screening

* close panel on ignore

* bypass screening

* .

* improve settings

* refine modal

* .

* .

* .

* .

* .

crates/common/src/display.rs

@@ -1,6 +1,10 @@
+use std::sync::Arc;
+
+use anyhow::{anyhow, Error};
 use global::constants::IMAGE_RESIZE_SERVICE;
-use gpui::SharedString;
+use gpui::{Image, ImageFormat, SharedString};
 use nostr_sdk::prelude::*;
+use qrcode_generator::QrCodeEcc;
 
 const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";
 
@@ -45,6 +49,53 @@ impl DisplayProfile for Profile {
     }
 }
 
+pub trait TextUtils {
+    fn to_public_key(&self) -> Result<PublicKey, Error>;
+    fn to_qr(&self) -> Option<Arc<Image>>;
+}
+
+impl TextUtils for String {
+    fn to_public_key(&self) -> Result<PublicKey, Error> {
+        if self.starts_with("nprofile1") {
+            Ok(Nip19Profile::from_bech32(self)?.public_key)
+        } else if self.starts_with("npub1") {
+            Ok(PublicKey::parse(self)?)
+        } else {
+            Err(anyhow!("Invalid public key"))
+        }
+    }
+
+    fn to_qr(&self) -> Option<Arc<Image>> {
+        let Ok(bytes) = qrcode_generator::to_png_to_vec_from_str(self, QrCodeEcc::Medium, 256)
+        else {
+            return None;
+        };
+
+        Some(Arc::new(Image::from_bytes(ImageFormat::Png, bytes)))
+    }
+}
+
+impl TextUtils for &str {
+    fn to_public_key(&self) -> Result<PublicKey, Error> {
+        if self.starts_with("nprofile1") {
+            Ok(Nip19Profile::from_bech32(self)?.public_key)
+        } else if self.starts_with("npub1") {
+            Ok(PublicKey::parse(self)?)
+        } else {
+            Err(anyhow!("Invalid public key"))
+        }
+    }
+
+    fn to_qr(&self) -> Option<Arc<Image>> {
+        let Ok(bytes) = qrcode_generator::to_png_to_vec_from_str(self, QrCodeEcc::Medium, 256)
+        else {
+            return None;
+        };
+
+        Some(Arc::new(Image::from_bytes(ImageFormat::Png, bytes)))
+    }
+}
+
 pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> SharedString {
     let Ok(pubkey) = public_key.to_bech32();
 

crates/common/src/event.rs

@@ -0,0 +1,47 @@
+use std::collections::HashSet;
+use std::hash::{DefaultHasher, Hash, Hasher};
+
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+
+pub trait EventUtils {
+    fn uniq_id(&self) -> u64;
+    fn all_pubkeys(&self) -> Vec<PublicKey>;
+    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool;
+}
+
+impl EventUtils for Event {
+    fn uniq_id(&self) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        let mut pubkeys: Vec<PublicKey> = vec![];
+
+        // Add all public keys from event
+        pubkeys.push(self.pubkey);
+        pubkeys.extend(self.tags.public_keys().collect::<Vec<_>>());
+
+        // Generate unique hash
+        pubkeys
+            .into_iter()
+            .unique()
+            .sorted()
+            .collect::<Vec<_>>()
+            .hash(&mut hasher);
+
+        hasher.finish()
+    }
+
+    fn all_pubkeys(&self) -> Vec<PublicKey> {
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
+        public_keys.push(self.pubkey);
+
+        public_keys
+    }
+
+    fn compare_pubkeys(&self, other: &[PublicKey]) -> bool {
+        let pubkeys = self.all_pubkeys();
+        let a: HashSet<_> = pubkeys.iter().collect();
+        let b: HashSet<_> = other.iter().collect();
+
+        a == b
+    }
+}

crates/common/src/lib.rs

@@ -1,62 +1,6 @@
-use std::collections::HashSet;
-use std::hash::{DefaultHasher, Hash, Hasher};
-use std::sync::Arc;
-
-use anyhow::anyhow;
-use gpui::{Image, ImageFormat};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use qrcode_generator::QrCodeEcc;
-
 pub mod debounced_delay;
 pub mod display;
+pub mod event;
 pub mod handle_auth;
 pub mod nip05;
 pub mod nip96;
-
-pub fn room_hash(event: &Event) -> u64 {
-    let mut hasher = DefaultHasher::new();
-    let mut pubkeys: Vec<PublicKey> = vec![];
-
-    // Add all public keys from event
-    pubkeys.push(event.pubkey);
-    pubkeys.extend(event.tags.public_keys().collect::<Vec<_>>());
-
-    // Generate unique hash
-    pubkeys
-        .into_iter()
-        .unique()
-        .sorted()
-        .collect::<Vec<_>>()
-        .hash(&mut hasher);
-
-    hasher.finish()
-}
-
-pub fn parse_pubkey_from_str(content: &str) -> Result<PublicKey, anyhow::Error> {
-    if content.starts_with("nprofile1") {
-        Ok(Nip19Profile::from_bech32(content)?.public_key)
-    } else if content.starts_with("npub1") {
-        Ok(PublicKey::parse(content)?)
-    } else {
-        Err(anyhow!("Invalid public key"))
-    }
-}
-
-pub fn string_to_qr(data: &str) -> Option<Arc<Image>> {
-    let Ok(bytes) = qrcode_generator::to_png_to_vec_from_str(data, QrCodeEcc::Medium, 256) else {
-        return None;
-    };
-
-    Some(Arc::new(Image::from_bytes(ImageFormat::Png, bytes)))
-}
-
-pub fn compare<T>(a: &[T], b: &[T]) -> bool
-where
-    T: Eq + Hash,
-{
-    let a: HashSet<_> = a.iter().collect();
-    let b: HashSet<_> = b.iter().collect();
-
-    a == b
-}