Merge branch 'release/1.0.0-alpha.40'

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.0-alpha.40] - 2023-09-28
+
+### Refactor
+
+- Update `get_wallet_handle` function for clarity
+
 ## [1.0.0-alpha.39] - 2023-09-28
 
 ### Refactor

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lilnouns-bots"
-version = "1.0.0-alpha.39"
+version = "1.0.0-alpha.40"
 authors = ["Milad Nekofar <milad@nekofar.com>"]
 edition = "2021"
 description = "Our bots are designed to keep the Lil Nouns DAO community informed and engaged."

src/utils/ens.rs

@@ -38,13 +38,11 @@ pub async fn get_domain_field(domain: &str, field: &str) -> Result<String> {
 }
 
 pub async fn get_wallet_handle(address: &str, field: &str) -> String {
-  return if let Ok(domain) = get_domain_name(address).await {
-    if let Ok(handle) = get_domain_field(domain.as_str(), field).await {
-      format!("@{}", handle)
-    } else {
-      domain
-    }
-  } else {
-    get_short_address(address)
-  };
+  match get_domain_name(address).await {
+    Ok(domain) => match get_domain_field(&domain, field).await {
+      Ok(handle) if !handle.is_empty() => format!("@{}", handle),
+      _ => domain,
+    },
+    Err(_) => get_short_address(address),
+  }
 }