diff --git a/DysonNetwork.Sphere/Chat/ChatRoom.cs b/DysonNetwork.Sphere/Chat/ChatRoom.cs index 73eb46e..639493a 100644 --- a/DysonNetwork.Sphere/Chat/ChatRoom.cs +++ b/DysonNetwork.Sphere/Chat/ChatRoom.cs @@ -2,9 +2,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; using DysonNetwork.Shared.Data; -using DysonNetwork.Shared.Proto; using NodaTime; -using Account = DysonNetwork.Pass.Account.Account; namespace DysonNetwork.Sphere.Chat; @@ -75,7 +73,7 @@ public class ChatMember : ModelBase public Guid ChatRoomId { get; set; } public ChatRoom ChatRoom { get; set; } = null!; public Guid AccountId { get; set; } - [NotMapped] public Account? Account { get; set; } + [NotMapped] public AccountReference? Account { get; set; } [NotMapped] public AccountStatusReference? Status { get; set; } [MaxLength(1024)] public string? Nick { get; set; } @@ -108,7 +106,7 @@ public class ChatMemberTransmissionObject : ModelBase public Guid Id { get; set; } public Guid ChatRoomId { get; set; } public Guid AccountId { get; set; } - [NotMapped] public Account Account { get; set; } = null!; + [NotMapped] public AccountReference Account { get; set; } = null!; [MaxLength(1024)] public string? Nick { get; set; } diff --git a/DysonNetwork.Sphere/Chat/ChatRoomService.cs b/DysonNetwork.Sphere/Chat/ChatRoomService.cs index 0a4af47..a3a0ada 100644 --- a/DysonNetwork.Sphere/Chat/ChatRoomService.cs +++ b/DysonNetwork.Sphere/Chat/ChatRoomService.cs @@ -2,7 +2,7 @@ using DysonNetwork.Shared.Cache; using DysonNetwork.Shared.Registry; using Microsoft.EntityFrameworkCore; using NodaTime; -using Account = DysonNetwork.Pass.Account.Account; +using Account = DysonNetwork.Shared.Data.AccountReference; namespace DysonNetwork.Sphere.Chat; diff --git a/DysonNetwork.Sphere/DysonNetwork.Sphere.csproj b/DysonNetwork.Sphere/DysonNetwork.Sphere.csproj index 7775f38..1b7b4f2 100644 --- a/DysonNetwork.Sphere/DysonNetwork.Sphere.csproj +++ b/DysonNetwork.Sphere/DysonNetwork.Sphere.csproj @@ -161,7 +161,6 @@ - diff --git a/DysonNetwork.Sphere/Poll/Poll.cs b/DysonNetwork.Sphere/Poll/Poll.cs index e7778d6..fac9b6a 100644 --- a/DysonNetwork.Sphere/Poll/Poll.cs +++ b/DysonNetwork.Sphere/Poll/Poll.cs @@ -2,7 +2,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json; using System.Text.Json.Serialization; -using DysonNetwork.Pass.Account; using DysonNetwork.Shared.Data; using NodaTime; @@ -64,5 +63,5 @@ public class PollAnswer : ModelBase public Guid AccountId { get; set; } public Guid PollId { get; set; } [JsonIgnore] public Poll? Poll { get; set; } - [NotMapped] public Account? Account { get; set; } + [NotMapped] public AccountReference? Account { get; set; } } diff --git a/DysonNetwork.Sphere/Poll/PollController.cs b/DysonNetwork.Sphere/Poll/PollController.cs index 46a492d..e56e2ce 100644 --- a/DysonNetwork.Sphere/Poll/PollController.cs +++ b/DysonNetwork.Sphere/Poll/PollController.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.Text.Json; +using DysonNetwork.Shared.Data; using DysonNetwork.Shared.Proto; using DysonNetwork.Shared.Registry; using Microsoft.AspNetCore.Authorization; @@ -116,7 +117,7 @@ public class PollController( { var protoValue = answeredAccounts.FirstOrDefault(a => a.Id == answer.AccountId.ToString()); if (protoValue is not null) - answer.Account = Pass.Account.Account.FromProtoValue(protoValue); + answer.Account = AccountReference.FromProtoValue(protoValue); } } diff --git a/DysonNetwork.Sphere/Publisher/Publisher.cs b/DysonNetwork.Sphere/Publisher/Publisher.cs index 9f826d1..52b56fd 100644 --- a/DysonNetwork.Sphere/Publisher/Publisher.cs +++ b/DysonNetwork.Sphere/Publisher/Publisher.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore; using NodaTime; using NodaTime.Serialization.Protobuf; using VerificationMark = DysonNetwork.Shared.Data.VerificationMark; -using Account = DysonNetwork.Pass.Account.Account; +using Account = DysonNetwork.Shared.Data.AccountReference; namespace DysonNetwork.Sphere.Publisher; diff --git a/DysonNetwork.Sphere/Publisher/PublisherController.cs b/DysonNetwork.Sphere/Publisher/PublisherController.cs index fcf3fb2..70e8784 100644 --- a/DysonNetwork.Sphere/Publisher/PublisherController.cs +++ b/DysonNetwork.Sphere/Publisher/PublisherController.cs @@ -34,7 +34,7 @@ public class PublisherController( var account = await accounts.GetAccountAsync( new GetAccountRequest { Id = publisher.AccountId.Value.ToString() } ); - publisher.Account = Pass.Account.Account.FromProtoValue(account); + publisher.Account = AccountReference.FromProtoValue(account); return Ok(publisher); } diff --git a/DysonNetwork.Sphere/Publisher/PublisherService.cs b/DysonNetwork.Sphere/Publisher/PublisherService.cs index 1165b24..27ba956 100644 --- a/DysonNetwork.Sphere/Publisher/PublisherService.cs +++ b/DysonNetwork.Sphere/Publisher/PublisherService.cs @@ -382,7 +382,7 @@ public class PublisherService( public async Task LoadMemberAccount(PublisherMember member) { var account = await accountsHelper.GetAccount(member.AccountId); - member.Account = Pass.Account.Account.FromProtoValue(account); + member.Account = AccountReference.FromProtoValue(account); return member; } @@ -394,7 +394,7 @@ public class PublisherService( return members.Select(m => { if (accounts.TryGetValue(m.AccountId, out var account)) - m.Account = Pass.Account.Account.FromProtoValue(account); + m.Account = AccountReference.FromProtoValue(account); return m; }).ToList(); } diff --git a/DysonNetwork.Sphere/Realm/Realm.cs b/DysonNetwork.Sphere/Realm/Realm.cs index af8aafd..8d733d4 100644 --- a/DysonNetwork.Sphere/Realm/Realm.cs +++ b/DysonNetwork.Sphere/Realm/Realm.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using DysonNetwork.Pass.Account; using DysonNetwork.Shared.Data; using DysonNetwork.Sphere.Chat; using Microsoft.EntityFrameworkCore; @@ -48,7 +47,7 @@ public class RealmMember : ModelBase public Guid RealmId { get; set; } public Realm Realm { get; set; } = null!; public Guid AccountId { get; set; } - [NotMapped] public Account? Account { get; set; } + [NotMapped] public AccountReference? Account { get; set; } [NotMapped] public AccountStatusReference? Status { get; set; } public int Role { get; set; } = RealmMemberRole.Normal; diff --git a/DysonNetwork.Sphere/Realm/RealmService.cs b/DysonNetwork.Sphere/Realm/RealmService.cs index 6afc257..9ee2153 100644 --- a/DysonNetwork.Sphere/Realm/RealmService.cs +++ b/DysonNetwork.Sphere/Realm/RealmService.cs @@ -1,5 +1,6 @@ using DysonNetwork.Shared; using DysonNetwork.Shared.Cache; +using DysonNetwork.Shared.Data; using DysonNetwork.Shared.Proto; using DysonNetwork.Shared.Registry; using DysonNetwork.Sphere.Localization; @@ -73,7 +74,7 @@ public class RealmService( public async Task LoadMemberAccount(RealmMember member) { var account = await accountsHelper.GetAccount(member.AccountId); - member.Account = Pass.Account.Account.FromProtoValue(account); + member.Account = AccountReference.FromProtoValue(account); return member; } @@ -85,7 +86,7 @@ public class RealmService( return members.Select(m => { if (accounts.TryGetValue(m.AccountId, out var account)) - m.Account = Pass.Account.Account.FromProtoValue(account); + m.Account = AccountReference.FromProtoValue(account); return m; }).ToList(); } diff --git a/DysonNetwork.Sphere/Sticker/Sticker.cs b/DysonNetwork.Sphere/Sticker/Sticker.cs index dd125e0..c145656 100644 --- a/DysonNetwork.Sphere/Sticker/Sticker.cs +++ b/DysonNetwork.Sphere/Sticker/Sticker.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using DysonNetwork.Pass.Account; using DysonNetwork.Shared.Data; using Microsoft.EntityFrameworkCore; @@ -46,5 +45,5 @@ public class StickerPackOwnership : ModelBase public Guid PackId { get; set; } public StickerPack Pack { get; set; } = null!; public Guid AccountId { get; set; } - [NotMapped] public Account Account { get; set; } = null!; + [NotMapped] public AccountReference Account { get; set; } = null!; } diff --git a/DysonNetwork.Sphere/WebReader/WebArticle.cs b/DysonNetwork.Sphere/WebReader/WebArticle.cs index cfa9049..1945804 100644 --- a/DysonNetwork.Sphere/WebReader/WebArticle.cs +++ b/DysonNetwork.Sphere/WebReader/WebArticle.cs @@ -1,7 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; -using DysonNetwork.Pass.Account; using DysonNetwork.Shared.Data; namespace DysonNetwork.Sphere.WebReader; @@ -54,5 +53,5 @@ public class WebFeedSubscription : ModelBase public Guid FeedId { get; set; } public WebFeed Feed { get; set; } = null!; public Guid AccountId { get; set; } - [NotMapped] public Account Account { get; set; } = null!; + [NotMapped] public AccountReference Account { get; set; } = null!; } \ No newline at end of file