Kieran/zap-stream-core
1
0
Fork 0
mirror of https://github.com/v0l/zap-stream-core.git synced 2025-06-16 17:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: api responses

Browse Source
This commit is contained in:
Kieran
2025-06-06 12:47:36 +01:00
parent b295d7e7be
commit d4157e9690
1 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
crates/zap-stream/src/api.rs
View File

@ -103,7 +103,12 @@ impl Api {
} }
(&Method::GET, Route::Topup) => { (&Method::GET, Route::Topup) => {
let auth = check_nip98_auth(&req, &self.settings.public_url)?; let auth = check_nip98_auth(&req, &self.settings.public_url)?;
let url: Url = req.uri().to_string().parse()?; let full_url = format!(
"{}{}",
self.settings.public_url.trim_end_matches('/'),
req.uri()
);
let url: Url = full_url.parse()?;
let amount: usize = url let amount: usize = url
.query_pairs() .query_pairs()
.find_map(|(k, v)| if k == "amount" { Some(v) } else { None }) .find_map(|(k, v)| if k == "amount" { Some(v) } else { None })
@ -121,7 +126,12 @@ impl Api {
} }
(&Method::POST, Route::Withdraw) => { (&Method::POST, Route::Withdraw) => {
let auth = check_nip98_auth(&req, &self.settings.public_url)?; let auth = check_nip98_auth(&req, &self.settings.public_url)?;
let url: Url = req.uri().to_string().parse()?; let full_url = format!(
"{}{}",
self.settings.public_url.trim_end_matches('/'),
req.uri()
);
let url: Url = full_url.parse()?;
let invoice = url let invoice = url
.query_pairs() .query_pairs()
.find_map(|(k, v)| { .find_map(|(k, v)| {
@ -344,10 +354,9 @@ impl Api {
let invoice_response = response.into_inner(); let invoice_response = response.into_inner();
// Create payment entry for this topup invoice // Create payment entry for this topup invoice
let payment_hash = hex::decode(&invoice_response.r_hash)?;
self.db self.db
.create_payment( .create_payment(
&payment_hash, &invoice_response.r_hash,
uid, uid,
Some(&invoice_response.payment_request), Some(&invoice_response.payment_request),
amount as u64 * 1000, // Convert to milli-sats amount as u64 * 1000, // Convert to milli-sats
@ -364,9 +373,14 @@ impl Api {
async fn update_event(&self, pubkey: &PublicKey, patch_event: PatchEvent) -> Result<()> { async fn update_event(&self, pubkey: &PublicKey, patch_event: PatchEvent) -> Result<()> {
let uid = self.db.upsert_user(&pubkey.to_bytes()).await?; let uid = self.db.upsert_user(&pubkey.to_bytes()).await?;
if let Some(stream_id) = patch_event.id { if patch_event
.id
.as_ref()
.map(|i| !i.is_empty())
.unwrap_or(false)
{
// Update specific stream // Update specific stream
let stream_uuid = Uuid::parse_str(&stream_id)?; let stream_uuid = Uuid::parse_str(&patch_event.id.unwrap())?;
let mut stream = self.db.get_stream(&stream_uuid).await?; let mut stream = self.db.get_stream(&stream_uuid).await?;
// Verify user owns this stream // Verify user owns this stream
@ -526,19 +540,20 @@ impl Api {
let items = payments let items = payments
.into_iter() .into_iter()
.filter(|p| p.is_paid) // Only include paid payments like C# version
.map(|p| HistoryEntry { .map(|p| HistoryEntry {
payment_hash: hex::encode(p.payment_hash), created: p.created.timestamp() as u64,
amount: p.amount as i64, entry_type: match p.payment_type {
timestamp: p.created.timestamp(), zap_stream_db::PaymentType::Withdrawal => 1, // Debit
payment_type: match p.payment_type { _ => 0, // Credit (TopUp, Zap, Credit, AdmissionFee)
zap_stream_db::PaymentType::TopUp => "topup".to_string(), },
zap_stream_db::PaymentType::Zap => "zap".to_string(), amount: p.amount as f64 / 1000.0, // Convert from milli-sats to sats
zap_stream_db::PaymentType::Credit => "credit".to_string(), desc: match p.payment_type {
zap_stream_db::PaymentType::Withdrawal => "withdrawal".to_string(), zap_stream_db::PaymentType::Withdrawal => Some("Withdrawal".to_string()),
zap_stream_db::PaymentType::AdmissionFee => "admission_fee".to_string(), zap_stream_db::PaymentType::Credit => Some("Admin Credit".to_string()),
zap_stream_db::PaymentType::Zap => p.nostr.clone(), // Nostr content
_ => None,
}, },
is_paid: p.is_paid,
fee: p.fee,
}) })
.collect(); .collect();
@ -671,12 +686,11 @@ struct ForwardResponse {
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]
struct HistoryEntry { struct HistoryEntry {
pub payment_hash: String, pub created: u64,
pub amount: i64, #[serde(rename = "type")]
pub timestamp: i64, pub entry_type: i32,
pub payment_type: String, pub amount: f64,
pub is_paid: bool, pub desc: Option<String>,
pub fee: u64,
} }
#[derive(Deserialize, Serialize)] #[derive(Deserialize, Serialize)]