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

🐛 Fix Sphere Rewind

Browse Source
This commit is contained in:
LittleSheep
2025-12-27 20:49:33 +08:00
parent 07445ebc25
commit 2bffbf18a3
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DysonNetwork.Pass/Startup/BroadcastEventHandler.cs
View File

@@ -175,7 +175,7 @@ public class BroadcastEventHandler(
AccountId = evt.AccountId, AccountId = evt.AccountId,
Status = status, Status = status,
UpdatedAt = SystemClock.Instance.GetCurrentInstant() UpdatedAt = SystemClock.Instance.GetCurrentInstant()
}, GrpcTypeHelper.SerializerOptionsWithIgnore)).ToByteArray() }, GrpcTypeHelper.SerializerOptionsWithoutIgnore)).ToByteArray()
); );
logger.LogInformation("Broadcasted status update for user {AccountId}", evt.AccountId); logger.LogInformation("Broadcasted status update for user {AccountId}", evt.AccountId);
@@ -214,7 +214,7 @@ public class BroadcastEventHandler(
AccountId = evt.AccountId, AccountId = evt.AccountId,
Status = status, Status = status,
UpdatedAt = SystemClock.Instance.GetCurrentInstant() UpdatedAt = SystemClock.Instance.GetCurrentInstant()
}, GrpcTypeHelper.SerializerOptionsWithIgnore)).ToByteArray() }, GrpcTypeHelper.SerializerOptionsWithoutIgnore)).ToByteArray()
); );
logger.LogInformation("Broadcasted status update for user {AccountId}", evt.AccountId); logger.LogInformation("Broadcasted status update for user {AccountId}", evt.AccountId);

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

@@ -727,13 +727,13 @@ public class SubscriptionService(
} }
// Update gift status and link // Update gift status and link
gift.Status = DysonNetwork.Shared.Models.GiftStatus.Redeemed; gift.Status = Shared.Models.GiftStatus.Redeemed;
gift.RedeemedAt = now; gift.RedeemedAt = now;
gift.RedeemerId = redeemer.Id; gift.RedeemerId = redeemer.Id;
gift.SubscriptionId = sameTypeSubscription.Id; gift.SubscriptionId = sameTypeSubscription.Id;
gift.UpdatedAt = now; gift.UpdatedAt = now;
using var transaction = await db.Database.BeginTransactionAsync(); await using var transaction = await db.Database.BeginTransactionAsync();
try try
{ {
db.WalletSubscriptions.Update(sameTypeSubscription); db.WalletSubscriptions.Update(sameTypeSubscription);

6
DysonNetwork.Shared/Proto/GrpcTypeHelper.cs
View File

@@ -14,7 +14,7 @@ namespace DysonNetwork.Shared.Proto;
public abstract class GrpcTypeHelper public abstract class GrpcTypeHelper
{ {
public static readonly JsonSerializerOptions? SerializerOptionsWithIgnore = new JsonSerializerOptions() public static readonly JsonSerializerOptions? SerializerOptionsWithoutIgnore = new JsonSerializerOptions()
{ {
NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals, NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower, PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower,
@@ -161,10 +161,10 @@ public abstract class GrpcTypeHelper
}; };
} }
public static ByteString ConvertObjectToByteString(object? obj) public static ByteString ConvertObjectToByteString(object? obj, bool withoutIgnore = true)
{ {
return ByteString.CopyFromUtf8( return ByteString.CopyFromUtf8(
JsonSerializer.Serialize(obj, SerializerOptions) JsonSerializer.Serialize(obj, withoutIgnore ? SerializerOptionsWithoutIgnore : SerializerOptions)
); );
} }

2
DysonNetwork.Sphere/Rewind/SphereRewindServiceGrpc.cs
View File

@@ -268,7 +268,7 @@ public class SphereRewindServiceGrpc(
{ {
ServiceId = "sphere", ServiceId = "sphere",
AccountId = request.AccountId, AccountId = request.AccountId,
Data = GrpcTypeHelper.ConvertObjectToByteString(data), Data = GrpcTypeHelper.ConvertObjectToByteString(data, withoutIgnore: true),
}; };
} }
} }

4
DysonNetwork.Sphere/WebReader/EmbeddableBase.cs
View File

@@ -31,11 +31,11 @@ public abstract class EmbeddableBase
{ {
var jsonRaw = JsonSerializer.Serialize( var jsonRaw = JsonSerializer.Serialize(
input, input,
GrpcTypeHelper.SerializerOptionsWithIgnore GrpcTypeHelper.SerializerOptionsWithoutIgnore
); );
return JsonSerializer.Deserialize<Dictionary<string, object>>( return JsonSerializer.Deserialize<Dictionary<string, object>>(
jsonRaw, jsonRaw,
GrpcTypeHelper.SerializerOptionsWithIgnore GrpcTypeHelper.SerializerOptionsWithoutIgnore
); );
} }
} }