nostrs: Rename event_id_from_bech32_or_hex

nostrs/src/event_id.rs

@@ -1,6 +1,6 @@
 use nostr_sdk::prelude::{EventId, FromBech32};
 
-pub fn event_id_from_bech32_or_hex(s: &str) -> anyhow::Result<EventId> {
+pub fn event_id_from_hex_or_bech32(s: &str) -> anyhow::Result<EventId> {
     Ok(EventId::from_hex(s).or_else(|_| EventId::from_bech32(s))?)
 }
 
@@ -13,8 +13,8 @@ mod tests {
         let hex = "027f70a8d7d0894dca117255d23c9a00b07ea99037f765b94f1ce71626b23375";
         let bech32 = "note1qflhp2xh6zy5mjs3wf2ay0y6qzc8a2vsxlmktw20rnn3vf4jxd6sr0xc5a";
         assert_eq!(
-            event_id_from_bech32_or_hex(hex)?,
-            event_id_from_bech32_or_hex(bech32)?
+            event_id_from_hex_or_bech32(hex)?,
+            event_id_from_hex_or_bech32(bech32)?
         );
         Ok(())
     }

nostrs/src/handler/text_note/delete.rs

@@ -1,8 +1,8 @@
-use crate::{client::new_client, event_id::event_id_from_bech32_or_hex};
+use crate::{client::new_client, event_id::event_id_from_hex_or_bech32};
 
 // NIP-09 <https://github.com/nostr-protocol/nips/blob/master/09.md>
 pub async fn handle(event_id: String) -> anyhow::Result<()> {
-    let event_id = event_id_from_bech32_or_hex(event_id.as_str())?;
+    let event_id = event_id_from_hex_or_bech32(event_id.as_str())?;
     let client = new_client().await?;
     client.delete_event::<String>(event_id, None).await?;
     Ok(())

nostrs/src/handler/text_note/dislike.rs

@@ -3,11 +3,11 @@ use std::time::Duration;
 use anyhow::bail;
 use nostr_sdk::prelude::{Kind, SubscriptionFilter};
 
-use crate::{client::new_client, event_id::event_id_from_bech32_or_hex};
+use crate::{client::new_client, event_id::event_id_from_hex_or_bech32};
 
 // NIP-25 <https://github.com/nostr-protocol/nips/blob/master/25.md>
 pub async fn handle(event_id: String) -> anyhow::Result<()> {
-    let event_id = event_id_from_bech32_or_hex(event_id.as_str())?;
+    let event_id = event_id_from_hex_or_bech32(event_id.as_str())?;
     let filter = SubscriptionFilter::new()
         .kind(Kind::TextNote)
         .id(event_id.to_hex())

nostrs/src/handler/text_note/like.rs

@@ -3,11 +3,11 @@ use std::time::Duration;
 use anyhow::bail;
 use nostr_sdk::prelude::{Kind, SubscriptionFilter};
 
-use crate::{client::new_client, event_id::event_id_from_bech32_or_hex};
+use crate::{client::new_client, event_id::event_id_from_hex_or_bech32};
 
 // NIP-25 <https://github.com/nostr-protocol/nips/blob/master/25.md>
 pub async fn handle(event_id: String) -> anyhow::Result<()> {
-    let event_id = event_id_from_bech32_or_hex(event_id.as_str())?;
+    let event_id = event_id_from_hex_or_bech32(event_id.as_str())?;
     let filter = SubscriptionFilter::new()
         .kind(Kind::TextNote)
         .id(event_id.to_hex())