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

🐛 Fix message pack cache serilaize issue in sticker

Browse Source
This commit is contained in:
LittleSheep
2025-12-03 22:09:56 +08:00
parent e49a1ec49a
commit 4faa1a4b64
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
DysonNetwork.Shared/Models/Sticker.cs
View File

@@ -1,6 +1,7 @@
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using MessagePack;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace DysonNetwork.Shared.Models; namespace DysonNetwork.Shared.Models;
@@ -9,15 +10,21 @@ namespace DysonNetwork.Shared.Models;
public class SnSticker : ModelBase, IIdentifiedResource public class SnSticker : ModelBase, IIdentifiedResource
{ {
public Guid Id { get; set; } = Guid.NewGuid(); public Guid Id { get; set; } = Guid.NewGuid();
[MaxLength(128)] public string Slug { get; set; } = null!;
[MaxLength(128)]
public string Slug { get; set; } = null!;
// Outdated fields, for backward compability // Outdated fields, for backward compability
[MaxLength(32)] public string? ImageId { get; set; } [MaxLength(32)]
public string? ImageId { get; set; }
[Column(TypeName = "jsonb")] public SnCloudFileReferenceObject? Image { get; set; } = null!; [Column(TypeName = "jsonb")]
public SnCloudFileReferenceObject? Image { get; set; } = null!;
public Guid PackId { get; set; } public Guid PackId { get; set; }
[JsonIgnore] public StickerPack Pack { get; set; } = null!;
[JsonIgnore]
public StickerPack Pack { get; set; } = null!;
public string ResourceIdentifier => $"sticker/{Id}"; public string ResourceIdentifier => $"sticker/{Id}";
} }
@@ -26,12 +33,22 @@ public class SnSticker : ModelBase, IIdentifiedResource
public class StickerPack : ModelBase public class StickerPack : ModelBase
{ {
public Guid Id { get; set; } = Guid.NewGuid(); public Guid Id { get; set; } = Guid.NewGuid();
[MaxLength(1024)] public string Name { get; set; } = null!;
[MaxLength(4096)] public string Description { get; set; } = string.Empty;
[MaxLength(128)] public string Prefix { get; set; } = null!;
[MaxLength(1024)]
public string Name { get; set; } = null!;
[MaxLength(4096)]
public string Description { get; set; } = string.Empty;
[MaxLength(128)]
public string Prefix { get; set; } = null!;
[IgnoreMember]
public List<SnSticker> Stickers { get; set; } = []; public List<SnSticker> Stickers { get; set; } = [];
[JsonIgnore] public List<StickerPackOwnership> Ownerships { get; set; } = [];
[IgnoreMember]
[JsonIgnore]
public List<StickerPackOwnership> Ownerships { get; set; } = [];
public Guid PublisherId { get; set; } public Guid PublisherId { get; set; }
public SnPublisher Publisher { get; set; } = null!; public SnPublisher Publisher { get; set; } = null!;
@@ -44,5 +61,7 @@ public class StickerPackOwnership : ModelBase
public Guid PackId { get; set; } public Guid PackId { get; set; }
public StickerPack Pack { get; set; } = null!; public StickerPack Pack { get; set; } = null!;
public Guid AccountId { get; set; } public Guid AccountId { get; set; }
[NotMapped] public SnAccount Account { get; set; } = null!;
[NotMapped]
public SnAccount Account { get; set; } = null!;
} }