chore: improve data requests (#81)

* refactor

* refactor

* add documents

* clean up

* refactor

* clean up

* refactor identity

* .

* .

* rename

crates/common/src/display.rs

@@ -0,0 +1,48 @@
+use global::constants::IMAGE_RESIZE_SERVICE;
+use gpui::SharedString;
+use nostr_sdk::prelude::*;
+
+const FALLBACK_IMG: &str = "https://image.nostr.build/c30703b48f511c293a9003be8100cdad37b8798b77a1dc3ec6eb8a20443d5dea.png";
+
+pub trait DisplayProfile {
+    fn avatar_url(&self, proxy: bool) -> SharedString;
+    fn display_name(&self) -> SharedString;
+}
+
+impl DisplayProfile for Profile {
+    fn avatar_url(&self, proxy: bool) -> SharedString {
+        self.metadata()
+            .picture
+            .as_ref()
+            .filter(|picture| !picture.is_empty())
+            .map(|picture| {
+                if proxy {
+                    format!(
+                        "{IMAGE_RESIZE_SERVICE}/?url={picture}&w=100&h=100&fit=cover&mask=circle&default={FALLBACK_IMG}&n=-1"
+                    )
+                    .into()
+                } else {
+                    picture.into()
+                }
+            })
+            .unwrap_or_else(|| "brand/avatar.png".into())
+    }
+
+    fn display_name(&self) -> SharedString {
+        if let Some(display_name) = self.metadata().display_name.as_ref() {
+            if !display_name.is_empty() {
+                return display_name.into();
+            }
+        }
+
+        if let Some(name) = self.metadata().name.as_ref() {
+            if !name.is_empty() {
+                return name.into();
+            }
+        }
+
+        let pubkey = self.public_key().to_hex();
+
+        format!("{}:{}", &pubkey[0..4], &pubkey[pubkey.len() - 4..]).into()
+    }
+}

crates/common/src/lib.rs

@@ -1,51 +1,51 @@
-use std::collections::HashSet;
-use std::hash::{DefaultHasher, Hash, Hasher};
-use std::sync::Arc;
-
-use gpui::{Image, ImageFormat};
-use itertools::Itertools;
-use nostr_sdk::prelude::*;
-use qrcode_generator::QrCodeEcc;
-
-pub mod debounced_delay;
-pub mod handle_auth;
-pub mod nip05;
-pub mod nip96;
-pub mod profile;
-
-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 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
-}
+use std::collections::HashSet;
+use std::hash::{DefaultHasher, Hash, Hasher};
+use std::sync::Arc;
+
+use gpui::{Image, ImageFormat};
+use itertools::Itertools;
+use nostr_sdk::prelude::*;
+use qrcode_generator::QrCodeEcc;
+
+pub mod debounced_delay;
+pub mod display;
+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 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
+}