mirror of
https://github.com/nostrlabs-io/notepush.git
synced 2025-06-15 19:38:24 +00:00
Merge pull request #7 from danieldaquino/#2434
Fix issue with multiple device tokens
This commit is contained in:
@ -307,6 +307,15 @@ impl NotificationManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn is_pubkey_token_pair_registered(
|
||||||
|
&self,
|
||||||
|
pubkey: &PublicKey,
|
||||||
|
device_token: &str,
|
||||||
|
) -> Result<bool, Box<dyn std::error::Error>> {
|
||||||
|
let current_device_tokens = self.get_user_device_tokens(pubkey).await?;
|
||||||
|
Ok(current_device_tokens.contains(&device_token.to_string()))
|
||||||
|
}
|
||||||
|
|
||||||
async fn is_pubkey_registered(
|
async fn is_pubkey_registered(
|
||||||
&self,
|
&self,
|
||||||
pubkey: &PublicKey,
|
pubkey: &PublicKey,
|
||||||
@ -421,7 +430,7 @@ impl NotificationManager {
|
|||||||
pubkey: nostr::PublicKey,
|
pubkey: nostr::PublicKey,
|
||||||
device_token: &str,
|
device_token: &str,
|
||||||
) -> Result<(), Box<dyn std::error::Error>> {
|
) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
if self.is_pubkey_registered(&pubkey).await? {
|
if self.is_pubkey_token_pair_registered(&pubkey, &device_token).await? {
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
self.save_user_device_info(pubkey, device_token).await
|
self.save_user_device_info(pubkey, device_token).await
|
||||||
|
Reference in New Issue
Block a user