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

🐛 Fix perk subscription getter

Browse Source
This commit is contained in:
LittleSheep
2026-02-04 12:43:09 +08:00
parent e86f630024
commit 12199d99b7
8 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DysonNetwork.Pass/Account/AccountCurrentController.cs
View File

@@ -47,7 +47,7 @@ public class AccountCurrentController(
try
{
var subscription = await remoteSubscription.GetPerkSubscription(account.Id);
if (subscription != null)
if (subscription is not null)
{
account.PerkSubscription = SnWalletSubscription.FromProtoValue(subscription).ToReference();
}
@@ -344,7 +344,7 @@ public class AccountCurrentController(
// Check PerkSubscription via RemoteSubscriptionService instead of relying on currentUser.PerkSubscription
// which is not populated when currentUser comes from HttpContext.Items
var perkSubscription = await remoteSubscription.GetPerkSubscription(currentUser.Id);
if (perkSubscription == null)
if (perkSubscription is null)
return StatusCode(403, ApiError.Unauthorized(
message: "You need to have a subscription to check-in backdated.",
forbidden: true,
@@ -377,7 +377,7 @@ public class AccountCurrentController(
true when !await auth.ValidateCaptcha(captchaToken!) => BadRequest(ApiError.Validation(
new Dictionary<string, string[]>
{
["captchaToken"] = new[] { "Invalid captcha token." }
["captchaToken"] = ["Invalid captcha token."]
}, traceId: HttpContext.TraceIdentifier)),
_ => await events.CheckInDaily(currentUser, backdated)
};

4
DysonNetwork.Pass/Account/AccountEventService.cs
View File

@@ -19,6 +19,7 @@ public class AccountEventService(
RingService.RingServiceClient pusher,
Pass.Leveling.ExperienceService experienceService,
RemotePaymentService payment,
RemoteSubscriptionService subscriptions,
INatsConnection nats
)
{
@@ -223,6 +224,9 @@ public class AccountEventService(
public async Task<bool> CheckInDailyDoAskCaptcha(SnAccount user)
{
var perkSubscription = await subscriptions.GetPerkSubscription(user.Id);
if (perkSubscription is not null) return false;
var cacheKey = $"{CaptchaCacheKey}{user.Id}";
var needsCaptcha = await cache.GetAsync<bool?>(cacheKey);
if (needsCaptcha is not null)

2
DysonNetwork.Pass/Account/AccountPublicController.cs
View File

@@ -32,7 +32,7 @@ public class AccountPublicController(
try
{
var subscription = await remoteSubscription.GetPerkSubscription(account.Id);
if (subscription != null)
if (subscription is not null)
{
account.PerkSubscription = SnWalletSubscription.FromProtoValue(subscription).ToReference();
}

2
DysonNetwork.Pass/Account/AccountService.cs
View File

@@ -768,7 +768,7 @@ public class AccountService(
try
{
var subscription = await remoteSubscription.GetPerkSubscription(account.Id);
if (subscription != null)
if (subscription is not null)
{
account.PerkSubscription = SnWalletSubscription.FromProtoValue(subscription).ToReference();
}

3
DysonNetwork.Pass/Account/AccountServiceGrpc.cs
View File

@@ -297,7 +297,7 @@ public class AccountServiceGrpc(
try
{
var subscription = await remoteSubscription.GetPerkSubscription(account.Id);
if (subscription != null)
if (subscription is not null)
{
account.PerkSubscription = SnWalletSubscription.FromProtoValue(subscription).ToReference();
}
@@ -321,7 +321,6 @@ public class AccountServiceGrpc(
var subscriptions = await remoteSubscription.GetPerkSubscriptions(accountIds);
var subscriptionDict = subscriptions
.Where(s => s != null)
.ToDictionary(
s => Guid.Parse(s.AccountId),
s => SnWalletSubscription.FromProtoValue(s).ToReference()