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

♻️ Refactor activitypub content storage

Browse Source
This commit is contained in:
LittleSheep
2025-12-30 23:37:57 +08:00
parent 8dc01c8a85
commit 6aa6833163
26 changed files with 3339 additions and 919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
DysonNetwork.Sphere/Post/PostActionController.cs
View File

@@ -113,7 +113,7 @@ public class PostActionController(
Visibility = request.Visibility ?? Shared.Models.PostVisibility.Public,
PublishedAt = request.PublishedAt,
Type = request.Type ?? Shared.Models.PostType.Moment,
Meta = request.Meta,
Metadata = request.Meta,
EmbedView = request.EmbedView,
Publisher = publisher,
};
@@ -161,15 +161,15 @@ public class PostActionController(
try
{
var pollEmbed = await polls.MakePollEmbed(request.PollId.Value);
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
embeds.Add(EmbeddableBase.ToDictionary(pollEmbed));
post.Meta["embeds"] = embeds;
post.Metadata["embeds"] = embeds;
}
catch (Exception ex)
{
@@ -191,15 +191,15 @@ public class PostActionController(
return BadRequest("You can only share funds that you created.");
var fundEmbed = new FundEmbed { Id = request.FundId.Value };
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
embeds.Add(EmbeddableBase.ToDictionary(fundEmbed));
post.Meta["embeds"] = embeds;
post.Metadata["embeds"] = embeds;
}
catch (RpcException ex) when (ex.StatusCode == Grpc.Core.StatusCode.NotFound)
{
@@ -213,8 +213,8 @@ public class PostActionController(
if (request.ThumbnailId is not null)
{
post.Meta ??= new Dictionary<string, object>();
post.Meta["thumbnail"] = request.ThumbnailId;
post.Metadata ??= new Dictionary<string, object>();
post.Metadata["thumbnail"] = request.ThumbnailId;
}
try
@@ -454,7 +454,7 @@ public class PostActionController(
return NotFound();
var accountId = Guid.Parse(currentUser.Id);
if (!await pub.IsMemberWithRole(post.PublisherId, accountId, PublisherMemberRole.Editor))
if (post.PublisherId == null || !await pub.IsMemberWithRole(post.PublisherId.Value, accountId, PublisherMemberRole.Editor))
return StatusCode(403, "You are not an editor of this publisher");
if (request.Mode == Shared.Models.PostPinMode.RealmPage && post.RealmId != null)
@@ -518,7 +518,7 @@ public class PostActionController(
return NotFound();
var accountId = Guid.Parse(currentUser.Id);
if (!await pub.IsMemberWithRole(post.PublisherId, accountId, PublisherMemberRole.Editor))
if (post.PublisherId == null || !await pub.IsMemberWithRole(post.PublisherId.Value, accountId, PublisherMemberRole.Editor))
return StatusCode(403, "You are not an editor of this publisher");
if (post is { PinMode: Shared.Models.PostPinMode.RealmPage, RealmId: not null })
@@ -622,7 +622,7 @@ public class PostActionController(
if (request.Type is not null)
post.Type = request.Type.Value;
if (request.Meta is not null)
post.Meta = request.Meta;
post.Metadata = request.Meta;
// The same, this field can be null, so update it anyway.
post.EmbedView = request.EmbedView;
@@ -634,19 +634,19 @@ public class PostActionController(
try
{
var pollEmbed = await polls.MakePollEmbed(request.PollId.Value);
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
// Remove all old poll embeds
embeds.RemoveAll(e =>
e.TryGetValue("type", out var type) && type.ToString() == "poll"
);
embeds.Add(EmbeddableBase.ToDictionary(pollEmbed));
post.Meta["embeds"] = embeds;
post.Metadata["embeds"] = embeds;
}
catch (Exception ex)
{
@@ -655,13 +655,13 @@ public class PostActionController(
}
else
{
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
// Remove all old poll embeds
embeds.RemoveAll(e => e.TryGetValue("type", out var type) && type.ToString() == "poll");
}
@@ -681,19 +681,19 @@ public class PostActionController(
return BadRequest("You can only share funds that you created.");
var fundEmbed = new FundEmbed { Id = request.FundId.Value };
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
// Remove all old fund embeds
embeds.RemoveAll(e =>
e.TryGetValue("type", out var type) && type.ToString() == "fund"
);
embeds.Add(EmbeddableBase.ToDictionary(fundEmbed));
post.Meta["embeds"] = embeds;
post.Metadata["embeds"] = embeds;
}
catch (RpcException ex) when (ex.StatusCode == Grpc.Core.StatusCode.NotFound)
{
@@ -706,26 +706,26 @@ public class PostActionController(
}
else
{
post.Meta ??= new Dictionary<string, object>();
post.Metadata ??= new Dictionary<string, object>();
if (
!post.Meta.TryGetValue("embeds", out var existingEmbeds)
!post.Metadata.TryGetValue("embeds", out var existingEmbeds)
|| existingEmbeds is not List<EmbeddableBase>
)
post.Meta["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Meta["embeds"];
post.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)post.Metadata["embeds"];
// Remove all old fund embeds
embeds.RemoveAll(e => e.TryGetValue("type", out var type) && type.ToString() == "fund");
}
if (request.ThumbnailId is not null)
{
post.Meta ??= new Dictionary<string, object>();
post.Meta["thumbnail"] = request.ThumbnailId;
post.Metadata ??= new Dictionary<string, object>();
post.Metadata["thumbnail"] = request.ThumbnailId;
}
else
{
post.Meta ??= new Dictionary<string, object>();
post.Meta.Remove("thumbnail");
post.Metadata ??= new Dictionary<string, object>();
post.Metadata.Remove("thumbnail");
}
// The realm is the same as well as the poll

4
DysonNetwork.Sphere/Post/PostController.cs
View File

@@ -336,7 +336,7 @@ public class PostController(
.ToListAsync();
var accountsProto = await remoteAccountsHelper.GetAccountBatch(
reactions.Select(r => r.AccountId).ToList()
reactions.Where(r => r.AccountId.HasValue).Select(r => r.AccountId!.Value).ToList()
);
var accounts = accountsProto.ToDictionary(
a => Guid.Parse(a.Id),
@@ -344,7 +344,7 @@ public class PostController(
);
foreach (var reaction in reactions)
if (accounts.TryGetValue(reaction.AccountId, out var account))
if (reaction.AccountId.HasValue && accounts.TryGetValue(reaction.AccountId.Value, out var account))
reaction.Account = account;
return Ok(reactions);

68
DysonNetwork.Sphere/Post/PostService.cs
View File

@@ -170,7 +170,7 @@ public partial class PostService(
var accounts = scope.ServiceProvider.GetRequiredService<AccountService.AccountServiceClient>();
try
{
var members = await pub.GetPublisherMembers(post.RepliedPost.PublisherId);
var members = await pub.GetPublisherMembers(post.RepliedPost.PublisherId!.Value);
var queryRequest = new GetAccountBatchRequest();
queryRequest.Id.AddRange(members.Select(m => m.AccountId.ToString()));
var queryResponse = await accounts.GetAccountBatchAsync(queryRequest);
@@ -301,15 +301,10 @@ public partial class PostService(
return item;
// Initialize meta dictionary if null
item.Meta ??= new Dictionary<string, object>();
// Initialize the embeds' array if it doesn't exist
if (!item.Meta.TryGetValue("embeds", out var existingEmbeds) || existingEmbeds is not List<EmbeddableBase>)
{
item.Meta["embeds"] = new List<Dictionary<string, object>>();
}
var embeds = (List<Dictionary<string, object>>)item.Meta["embeds"];
item.Metadata ??= new Dictionary<string, object>();
if (!item.Metadata.TryGetValue("embeds", out var existingEmbeds) || existingEmbeds is not List<EmbeddableBase>)
item.Metadata["embeds"] = new List<Dictionary<string, object>>();
var embeds = (List<Dictionary<string, object>>)item.Metadata["embeds"];
// Process up to 3 links to avoid excessive processing
const int maxLinks = 3;
@@ -340,13 +335,12 @@ public partial class PostService(
}
}
item.Meta["embeds"] = embeds;
item.Metadata["embeds"] = embeds;
return item;
}
/// <summary>
/// Process link previews for a post in the background
/// Process link previews for a post in background
/// This method is designed to be called from a background task
/// </summary>
/// <param name="post">The post to process link previews for</param>
@@ -362,17 +356,17 @@ public partial class PostService(
var updatedPost = await PreviewPostLinkAsync(post);
// If embeds were added, update the post in the database
if (updatedPost.Meta != null &&
updatedPost.Meta.TryGetValue("embeds", out var embeds) &&
if (updatedPost.Metadata != null &&
updatedPost.Metadata.TryGetValue("embeds", out var embeds) &&
embeds is List<Dictionary<string, object>> { Count: > 0 } embedsList)
{
// Get a fresh copy of the post from the database
var dbPost = await dbContext.Posts.FindAsync(post.Id);
if (dbPost != null)
{
// Update the meta field with the new embeds
dbPost.Meta ??= new Dictionary<string, object>();
dbPost.Meta["embeds"] = embedsList;
// Update the metadata field with the new embeds
dbPost.Metadata ??= new Dictionary<string, object>();
dbPost.Metadata["embeds"] = embedsList;
// Save changes to the database
dbContext.Update(dbPost);
@@ -431,7 +425,7 @@ public partial class PostService(
throw new InvalidOperationException("Replies can only be pinned in the reply page.");
if (post.RepliedPost == null) throw new ArgumentNullException(nameof(post.RepliedPost));
if (!await ps.IsMemberWithRole(post.RepliedPost.PublisherId, accountId,
if (!await ps.IsMemberWithRole(post.RepliedPost.PublisherId!.Value, accountId,
Shared.Models.PublisherMemberRole.Editor))
throw new InvalidOperationException("Only editors of original post can pin replies.");
@@ -439,7 +433,7 @@ public partial class PostService(
}
else
{
if (!await ps.IsMemberWithRole(post.PublisherId, accountId, Shared.Models.PublisherMemberRole.Editor))
if (post.PublisherId == null || !await ps.IsMemberWithRole(post.PublisherId.Value, accountId, Shared.Models.PublisherMemberRole.Editor))
throw new InvalidOperationException("Only editors can pin replies.");
post.PinMode = pinMode;
@@ -458,13 +452,13 @@ public partial class PostService(
{
if (post.RepliedPost == null) throw new ArgumentNullException(nameof(post.RepliedPost));
if (!await ps.IsMemberWithRole(post.RepliedPost.PublisherId, accountId,
if (!await ps.IsMemberWithRole(post.RepliedPost.PublisherId!.Value, accountId,
Shared.Models.PublisherMemberRole.Editor))
throw new InvalidOperationException("Only editors of original post can unpin replies.");
}
else
{
if (!await ps.IsMemberWithRole(post.PublisherId, accountId, Shared.Models.PublisherMemberRole.Editor))
if (post.PublisherId == null || !await ps.IsMemberWithRole(post.PublisherId.Value, accountId, Shared.Models.PublisherMemberRole.Editor))
throw new InvalidOperationException("Only editors can unpin posts.");
}
@@ -493,12 +487,14 @@ public partial class PostService(
bool isSelfReact
)
{
var isExistingReaction = await db.Set<SnPostReaction>()
.AnyAsync(r => r.PostId == post.Id && r.AccountId == reaction.AccountId);
var isExistingReaction = reaction.AccountId.HasValue &&
await db.Set<SnPostReaction>()
.AnyAsync(r => r.PostId == post.Id && r.AccountId == reaction.AccountId.Value);
if (isRemoving)
await db.PostReactions
.Where(r => r.PostId == post.Id && r.Symbol == reaction.Symbol && r.AccountId == reaction.AccountId)
.Where(r => r.PostId == post.Id && r.Symbol == reaction.Symbol &&
reaction.AccountId.HasValue && r.AccountId == reaction.AccountId.Value)
.ExecuteDeleteAsync();
else
db.PostReactions.Add(reaction);
@@ -539,7 +535,8 @@ public partial class PostService(
var accounts = scope.ServiceProvider.GetRequiredService<AccountService.AccountServiceClient>();
try
{
var members = await pub.GetPublisherMembers(post.PublisherId);
if (post.PublisherId == null) return;
var members = await pub.GetPublisherMembers(post.PublisherId.Value);
var queryRequest = new GetAccountBatchRequest();
queryRequest.Id.AddRange(members.Select(m => m.AccountId.ToString()));
var queryResponse = await accounts.GetAccountBatchAsync(queryRequest);
@@ -675,15 +672,15 @@ public partial class PostService(
foreach (var post in posts)
{
if (publishers.TryGetValue(post.PublisherId, out var publisher))
if (post.PublisherId.HasValue && publishers.TryGetValue(post.PublisherId.Value, out var publisher))
post.Publisher = publisher;
if (post.RepliedPost?.PublisherId != null &&
publishers.TryGetValue(post.RepliedPost.PublisherId, out var repliedPublisher))
publishers.TryGetValue(post.RepliedPost.PublisherId.Value, out var repliedPublisher))
post.RepliedPost.Publisher = repliedPublisher;
if (post.ForwardedPost?.PublisherId != null &&
publishers.TryGetValue(post.ForwardedPost.PublisherId, out var forwardedPublisher))
publishers.TryGetValue(post.ForwardedPost.PublisherId.Value, out var forwardedPublisher))
post.ForwardedPost.Publisher = forwardedPublisher;
}
@@ -780,7 +777,7 @@ public partial class PostService(
// Check publication status - either published or user is member
var isPublished = post.PublishedAt != null && now >= post.PublishedAt;
var isMember = publishersId.Contains(post.PublisherId);
var isMember = post.PublisherId.HasValue && publishersId.Contains(post.PublisherId.Value);
if (!isPublished && !isMember)
return false;
@@ -967,7 +964,8 @@ public partial class PostService(
{
var sender = await accountsHelper.GetAccount(accountId);
var members = await pub.GetPublisherMembers(post.PublisherId);
if (post.PublisherId == null) return;
var members = await pub.GetPublisherMembers(post.PublisherId.Value);
var queryRequest = new GetAccountBatchRequest();
queryRequest.Id.AddRange(members.Select(m => m.AccountId.ToString()));
var queryResponse = await accounts.GetAccountBatchAsync(queryRequest);
@@ -1021,7 +1019,7 @@ public static class PostQueryExtensions
source = isListing switch
{
true when currentUser is not null => source.Where(e =>
e.Visibility != Shared.Models.PostVisibility.Unlisted || publishersId.Contains(e.PublisherId)),
e.Visibility != Shared.Models.PostVisibility.Unlisted || (e.PublisherId.HasValue && publishersId.Contains(e.PublisherId.Value))),
true => source.Where(e => e.Visibility != Shared.Models.PostVisibility.Unlisted),
_ => source
};
@@ -1032,10 +1030,10 @@ public static class PostQueryExtensions
.Where(e => e.Visibility == Shared.Models.PostVisibility.Public);
return source
.Where(e => (e.PublishedAt != null && now >= e.PublishedAt) || publishersId.Contains(e.PublisherId))
.Where(e => e.Visibility != Shared.Models.PostVisibility.Private || publishersId.Contains(e.PublisherId))
.Where(e => (e.PublishedAt != null && now >= e.PublishedAt) || (e.PublisherId.HasValue && publishersId.Contains(e.PublisherId.Value)))
.Where(e => e.Visibility != Shared.Models.PostVisibility.Private || publishersId.Contains(e.PublisherId.Value))
.Where(e => e.Visibility != Shared.Models.PostVisibility.Friends ||
(e.Publisher.AccountId != null && userFriends.Contains(e.Publisher.AccountId.Value)) ||
publishersId.Contains(e.PublisherId));
publishersId.Contains(e.PublisherId.Value));
}
}