forked from coracle/caravel
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0775f867e8 |
@@ -151,11 +151,7 @@ impl Billing {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
tracing::info!(
|
tracing::info!(source, relay_count = relays.len(), "reconciling relay billing state");
|
||||||
source,
|
|
||||||
relay_count = relays.len(),
|
|
||||||
"reconciling relay billing state"
|
|
||||||
);
|
|
||||||
|
|
||||||
for relay in relays {
|
for relay in relays {
|
||||||
if let Err(error) = self.sync_relay_subscription_for_relay(&relay).await {
|
if let Err(error) = self.sync_relay_subscription_for_relay(&relay).await {
|
||||||
@@ -769,9 +765,8 @@ impl Billing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub async fn stripe_create_customer(&self, tenant_pubkey: &str) -> Result<String> {
|
pub async fn stripe_create_customer(&self, tenant_pubkey: &str) -> Result<String> {
|
||||||
let short_pubkey: String = tenant_pubkey.chars().take(8).collect();
|
let short_pubkey: String = tenant_pubkey.chars().take(12).collect();
|
||||||
let nostr_name = self.robot.fetch_nostr_name(tenant_pubkey).await;
|
let display_name = format!("Caravel tenant {short_pubkey}");
|
||||||
let display_name = nostr_name.unwrap_or_else(|| short_pubkey.clone());
|
|
||||||
let idempotency_key = self.idempotency_key(&["create_customer", tenant_pubkey]);
|
let idempotency_key = self.idempotency_key(&["create_customer", tenant_pubkey]);
|
||||||
|
|
||||||
let resp = self
|
let resp = self
|
||||||
@@ -1003,7 +998,8 @@ impl Billing {
|
|||||||
customer_id: &str,
|
customer_id: &str,
|
||||||
price_id: &str,
|
price_id: &str,
|
||||||
) -> Result<(String, String)> {
|
) -> Result<(String, String)> {
|
||||||
let idempotency_key = self.idempotency_key(&["create_subscription", customer_id, price_id]);
|
let idempotency_key =
|
||||||
|
self.idempotency_key(&["create_subscription", customer_id, price_id]);
|
||||||
let resp = self
|
let resp = self
|
||||||
.http
|
.http
|
||||||
.post(format!("{STRIPE_API}/subscriptions"))
|
.post(format!("{STRIPE_API}/subscriptions"))
|
||||||
@@ -1730,4 +1726,5 @@ mod tests {
|
|||||||
assert_eq!(billing.stripe_secret_key, "sk_test_dummy");
|
assert_eq!(billing.stripe_secret_key, "sk_test_dummy");
|
||||||
assert_eq!(billing.stripe_webhook_secret, "whsec_test_dummy");
|
assert_eq!(billing.stripe_webhook_secret, "whsec_test_dummy");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -160,25 +160,6 @@ impl Robot {
|
|||||||
Ok(relays)
|
Ok(relays)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn fetch_nostr_name(&self, pubkey: &str) -> Option<String> {
|
|
||||||
let pubkey = PublicKey::parse(pubkey).ok()?;
|
|
||||||
let filter = Filter::new().author(pubkey).kind(Kind::Metadata).limit(1);
|
|
||||||
let events = self
|
|
||||||
.indexer_client
|
|
||||||
.fetch_events(filter, Duration::from_secs(5))
|
|
||||||
.await
|
|
||||||
.ok()?;
|
|
||||||
let event = events.into_iter().max_by_key(|e| e.created_at)?;
|
|
||||||
let content: serde_json::Value = serde_json::from_str(&event.content).ok()?;
|
|
||||||
let name = content
|
|
||||||
.get("display_name")
|
|
||||||
.or_else(|| content.get("name"))
|
|
||||||
.and_then(|v| v.as_str())
|
|
||||||
.map(|s| s.trim().to_string())
|
|
||||||
.filter(|s| !s.is_empty())?;
|
|
||||||
Some(name)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn fetch_messaging_relays_from_outbox(
|
async fn fetch_messaging_relays_from_outbox(
|
||||||
&self,
|
&self,
|
||||||
recipient: &str,
|
recipient: &str,
|
||||||
|
|||||||
Reference in New Issue
Block a user