Use njump with npub and refactor

src/adapters.rs

@@ -6,3 +6,38 @@ pub mod nostr_service;
 pub use nostr_service::NostrService;
 pub mod slack_client_adapter;
 pub use slack_client_adapter::SlackClientAdapterBuilder;
+
+use crate::actors::messages::SupervisorMessage;
+use nostr_sdk::prelude::{nip19::*, PublicKey};
+use ractor::{call_t, ActorRef};
+
+// This function attempts to generate an njump link for a given public key,
+// following a specific order of preference:
+// 1. Njump link with nip05
+// https://njump.me/[email protected]
+// 2. Njump link with npub (Bech32-encoded public key)
+// https://njump.me/npub138he9w0tumwpun4rnrmywlez06259938kz3nmjymvs8px7e9d0js8lrdr2
+// 3. Plain public key if both previous attempts fail
+// 89ef92b9ebe6dc1e4ea398f6477f227e95429627b0a33dc89b640e137b256be5
+async fn njump_or_pubkey(
+ message_dispatcher: ActorRef<SupervisorMessage>,
+ pubkey: PublicKey,
+) -> String {
+ let Ok(maybe_reporter_nip05) =
+ call_t!(message_dispatcher, SupervisorMessage::GetNip05, 100, pubkey)
+ else {
+ return pubkey
+ .to_bech32()
+ .map(|npub| format!("https://njump.me/{}", npub))
+ .unwrap_or_else(|_| pubkey.to_string());
+ };
+
+ if let Some(nip05) = maybe_reporter_nip05 {
+ format!("https://njump.me/{}", nip05)
+ } else {
+ pubkey
+ .to_bech32()
+ .map(|npub| format!("https://njump.me/{}", npub))
+ .unwrap_or_else(|_| pubkey.to_string())
+ }
+}

src/adapters/http_server/slack_interactions_route.rs

@@ -1,11 +1,12 @@
 use super::app_errors::AppError;
 use super::WebAppState;
 use crate::actors::messages::SupervisorMessage;
+use crate::adapters::njump_or_pubkey;
 use crate::domain_objects::{ModerationCategory, ReportRequest, ReportTarget};
-use anyhow::{anyhow, bail, Context, Result};
+use anyhow::{anyhow, Context, Result};
 use axum::{extract::State, routing::post, Extension, Router};
 use nostr_sdk::prelude::*;
-use ractor::{call_t, cast, ActorRef};
+use ractor::{cast, ActorRef};
 use reqwest::Client as ReqwestClient;
 use serde_json::{json, Value};
 use slack_morphism::prelude::*;
@@ -79,27 +80,14 @@ async fn slack_message(
  maybe_category: Option<ModerationCategory>,
  slack_username: String,
 ) -> Result<String, AppError> {
- let reporter_nip05_markdown =
- match try_njump(message_dispatcher.clone(), report_request.reporter_pubkey()).await {
- Ok(nip05) => nip05,
- Err(e) => {
- info!("Failed to get nip05 link for reporter: {}", e);
- format!("`{}`", report_request.reporter_pubkey())
- }
- };
-
- let reported_nip05_markdown = match try_njump(
+ let reporter_nip05_markdown = njump_or_pubkey(
  message_dispatcher.clone(),
- &report_request.target().pubkey(),
+ *report_request.reporter_pubkey(),
  )
- .await
- {
- Ok(nip05) => nip05,
- Err(e) => {
- info!("Failed to get nip05 link for reported: {}", e);
- format!("`{}`", report_request.target().pubkey())
- }
- };
+ .await;
+
+ let reported_nip05_markdown =
+ njump_or_pubkey(message_dispatcher.clone(), report_request.target().pubkey()).await;
 
  if let Some(moderated_report) = report_request.report(maybe_category.as_ref())? {
  let report_id = moderated_report.id();
@@ -244,31 +232,6 @@ fn slack_skipped_message(
  trimmed_string
 }
 
-async fn try_njump(
- message_dispatcher: ActorRef<SupervisorMessage>,
- pubkey: &PublicKey,
-) -> Result<String> {
- let maybe_reporter_nip05 = match call_t!(
- message_dispatcher,
- SupervisorMessage::GetNip05,
- 100,
- *pubkey
- ) {
- Ok(nip05) => nip05,
- Err(e) => {
- bail!("Failed to get nip05 link {}", e);
- }
- };
-
- Ok(maybe_reporter_nip05
- .as_ref()
- .map(|nip05| format!("https://njump.me/{}", nip05))
- .unwrap_or(format!(
- "`{}`",
- pubkey.to_bech32().unwrap_or(pubkey.to_string())
- )))
-}
-
 fn parse_slack_action(
  block_actions_event: SlackInteractionBlockActionsEvent,
 ) -> Result<(Url, String, ReportRequest, Option<ModerationCategory>), AppError> {
@@ -451,8 +414,8 @@ mod tests {
  .unwrap();
 
  let slack_actions_event = create_slack_actions_event(
- &slack_username,
- &category_name,
+ slack_username,
+ category_name,
  &reporter_pubkey,
  &reporter_text,
  &reported_event,
@@ -487,8 +450,8 @@ mod tests {
  .unwrap();
 
  let slack_actions_event = create_slack_actions_event(
- &slack_username,
- &category_name,
+ slack_username,
+ category_name,
  &reporter_pubkey,
  &reporter_text,
  &reported_event,

src/adapters/slack_client_adapter.rs

@@ -1,12 +1,11 @@
 use crate::actors::messages::SupervisorMessage;
 use crate::actors::{SlackClientPort, SlackClientPortBuilder};
+use crate::adapters::njump_or_pubkey;
 use crate::domain_objects::{ModerationCategory, ReportRequest};
 use anyhow::Result;
 use hyper_rustls::HttpsConnector;
 use hyper_util::client::legacy::connect::HttpConnector;
-use nostr_sdk::prelude::PublicKey;
-use nostr_sdk::ToBech32;
-use ractor::{call_t, ActorRef};
+use ractor::ActorRef;
 use slack_morphism::prelude::*;
 use std::env;
 use tracing::info;
@@ -41,43 +40,15 @@ impl SlackClientAdapter {
 
  Ok(())
  }
-
- // This fn is currently duplicated and lives too in the http client adapter.
- // It should be moved to a shared place at some point
- async fn try_njump(&self, pubkey: PublicKey) -> Result<String> {
- let maybe_reporter_nip05 =
- call_t!(self.nostr_actor, SupervisorMessage::GetNip05, 100, pubkey)?;
-
- Ok(maybe_reporter_nip05
- .as_ref()
- .map(|nip05| format!("https://njump.me/{}", nip05))
- .unwrap_or(format!(
- "`{}`",
- pubkey.to_bech32().unwrap_or(pubkey.to_string())
- )))
- }
 }
 
 #[ractor::async_trait]
 impl SlackClientPort for SlackClientAdapter {
  async fn write_message(&self, report_request: &ReportRequest) -> Result<()> {
  let reported_pubkey_or_nip05_link =
- match self.try_njump(report_request.target().pubkey()).await {
- Ok(link) => link,
- Err(e) => {
- info!("Failed to get nip05 link: {}", e);
- format!("`{}`", report_request.target().pubkey())
- }
- };
-
+ njump_or_pubkey(self.nostr_actor.clone(), report_request.target().pubkey()).await;
  let reporter_pubkey_or_nip05_link =
- match self.try_njump(*report_request.reporter_pubkey()).await {
- Ok(link) => link,
- Err(e) => {
- info!("Failed to get nip05 link: {}", e);
- format!("`{}`", report_request.target().pubkey())
- }
- };
+ njump_or_pubkey(self.nostr_actor.clone(), *report_request.reporter_pubkey()).await;
 
  let message = PubkeyReportRequestMessage::new(
  report_request,