Merge branch 'master' into unstable

mikedilger · Jan 25, 2025 · 1cb4712 · 1cb4712
2 parents 0e9b49c + 1ffe783
commit 1cb4712
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/gossip-lib/src/dm_channel.rs b/gossip-lib/src/dm_channel.rs
@@ -84,10 +84,7 @@ impl DmChannel {
     pub fn from_event(event: &Event, my_pubkey: Option<PublicKey>) -> Option<DmChannel> {
         let my_pubkey = match my_pubkey {
             Some(pk) => pk,
-            None => match GLOBALS.identity.public_key() {
-                Some(pk) => pk,
-                None => return None,
-            },
+            None => GLOBALS.identity.public_key()?,
         };
 
         if event.kind == EventKind::EncryptedDirectMessage {

diff --git a/gossip-lib/src/globals.rs b/gossip-lib/src/globals.rs
@@ -300,10 +300,7 @@ impl Globals {
     }
 
     pub fn get_your_nprofile() -> Option<Profile> {
-        let public_key = match GLOBALS.identity.public_key() {
-            Some(pk) => pk,
-            None => return None,
-        };
+        let public_key = GLOBALS.identity.public_key()?;
 
         let mut profile = Profile {
             pubkey: public_key,

diff --git a/gossip-lib/src/process/mod.rs b/gossip-lib/src/process/mod.rs
@@ -515,7 +515,7 @@ pub(crate) fn process_relationships_of_event(
             if t.tagname() == "l" {
                 if t.value() != "" {
                     label = t.value();
-                    if t.get_index(2) != "" {
+                    if !t.get_index(2).is_empty() {
                         namespace = t.get_index(2);
                     }
                 }