SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🗑️ Remove the gift redeemed notification

Browse Source
This commit is contained in:
LittleSheep
2025-12-27 20:43:40 +08:00
parent f83fb5d8a9
commit 07445ebc25
1 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
DysonNetwork.Pass/Wallet/SubscriptionService.cs
View File

@@ -747,12 +747,9 @@ public class SubscriptionService(
throw; throw;
} }
await NotifyGiftRedeemed(gift, sameTypeSubscription, redeemer); if (gift.GifterId == redeemer.Id) return (gift, sameTypeSubscription);
if (gift.GifterId != redeemer.Id) var gifter = await db.Accounts.FirstOrDefaultAsync(a => a.Id == gift.GifterId);
{ if (gifter != null) await NotifyGiftClaimedByRecipient(gift, sameTypeSubscription, gifter, redeemer);
var gifter = await db.Accounts.FirstOrDefaultAsync(a => a.Id == gift.GifterId);
if (gifter != null) await NotifyGiftClaimedByRecipient(gift, sameTypeSubscription, gifter, redeemer);
}
return (gift, sameTypeSubscription); return (gift, sameTypeSubscription);
} }
@@ -816,11 +813,8 @@ public class SubscriptionService(
throw; throw;
} }
// Send notification to redeemer
await NotifyGiftRedeemed(gift, subscription, redeemer);
// Send notification to gifter if different from redeemer // Send notification to gifter if different from redeemer
if (gift.GifterId != redeemer.Id) if (gift.GifterId == redeemer.Id) return (gift, subscription);
{ {
var gifter = await db.Accounts.FirstOrDefaultAsync(a => a.Id == gift.GifterId); var gifter = await db.Accounts.FirstOrDefaultAsync(a => a.Id == gift.GifterId);
if (gifter != null) if (gifter != null)
@@ -939,37 +933,6 @@ public class SubscriptionService(
return new string(result); return new string(result);
} }
private async Task NotifyGiftRedeemed(SnWalletGift gift, SnWalletSubscription subscription, SnAccount redeemer)
{
Account.AccountService.SetCultureInfo(redeemer);
var humanReadableName =
SubscriptionTypeData.SubscriptionHumanReadable.TryGetValue(subscription.Identifier, out var humanReadable)
? humanReadable
: subscription.Identifier;
var notification = new PushNotification
{
Topic = "gifts.redeemed",
Title = localizer["GiftRedeemedTitle"],
Body = localizer["GiftRedeemedBody", humanReadableName],
Meta = GrpcTypeHelper.ConvertObjectToByteString(new Dictionary<string, object>
{
["gift_id"] = gift.Id.ToString(),
["subscription_id"] = subscription.Id.ToString()
}),
IsSavable = true
};
await pusher.SendPushNotificationToUserAsync(
new SendPushNotificationToUserRequest
{
UserId = redeemer.Id.ToString(),
Notification = notification
}
);
}
private async Task NotifyGiftClaimedByRecipient(SnWalletGift gift, SnWalletSubscription subscription, SnAccount gifter, SnAccount redeemer) private async Task NotifyGiftClaimedByRecipient(SnWalletGift gift, SnWalletSubscription subscription, SnAccount gifter, SnAccount redeemer)
{ {
Account.AccountService.SetCultureInfo(gifter); Account.AccountService.SetCultureInfo(gifter);