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

🐛 Trying to fix activity handler

Browse Source
This commit is contained in:
LittleSheep
2026-01-01 01:26:14 +08:00
parent 14d5254461
commit 78f1d0ecd3
1 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
DysonNetwork.Sphere/ActivityPub/ActivityPubActivityHandler.cs
View File

@@ -564,6 +564,23 @@ public class ActivityPubActivityHandler(
};
}
private static int? TryGetIntValue(Dictionary<string, object> dict, string key)
{
var value = dict.GetValueOrDefault(key);
if (value == null)
return null;
return value switch
{
int i => i,
long l => (int)l,
JsonElement { ValueKind: JsonValueKind.Number } element => element.TryGetInt32(out var result)
? result
: (int?)element.GetDouble(),
_ => null
};
}
private static Dictionary<string, object>? ConvertToDictionary(object? value)
{
if (value == null)
@@ -579,6 +596,7 @@ public class ActivityPubActivityHandler(
{
result[property.Name] = ConvertJsonElementToObject(property.Value);
}
return result;
}
@@ -616,18 +634,27 @@ public class ActivityPubActivityHandler(
private static List<SnCloudFileReferenceObject>? ParseAttachments(object? value)
{
if (value is JsonElement { ValueKind: JsonValueKind.Array } element)
if (value == null)
return null;
var attachments = value switch
{
return element.EnumerateArray()
.Select(attachment => new SnCloudFileReferenceObject
JsonElement { ValueKind: JsonValueKind.Array } element
=> element.EnumerateArray().Select(ConvertJsonElementToObject).ToList(),
List<object> list => list,
_ => null
};
return attachments?.OfType<Dictionary<string, object>>()
.Select(dict => new SnCloudFileReferenceObject
{
Id = Guid.NewGuid().ToString(),
Name = attachment.GetProperty("name").GetString() ?? string.Empty,
Url = attachment.GetProperty("url").GetString(),
MimeType = attachment.GetProperty("mediaType").GetString(),
Width = attachment.GetProperty("width").GetInt32(),
Height = attachment.GetProperty("height").GetInt32(),
Blurhash = attachment.GetProperty("blurhash").GetString(),
Name = GetStringValue(dict, "name") ?? string.Empty,
Url = GetStringValue(dict, "url"),
MimeType = GetStringValue(dict, "mediaType"),
Width = TryGetIntValue(dict, "width"),
Height = TryGetIntValue(dict, "height"),
Blurhash = GetStringValue(dict, "blurhash"),
FileMeta = new Dictionary<string, object?>(),
UserMeta = new Dictionary<string, object?>(),
Size = 0,
@@ -637,26 +664,29 @@ public class ActivityPubActivityHandler(
.ToList();
}
return null;
}
private static List<ContentMention>? ParseMentions(object? value)
{
if (value is JsonElement { ValueKind: JsonValueKind.Array } element)
if (value == null)
return null;
var tags = value switch
{
return element.EnumerateArray()
.Where(e => e.GetProperty("type").GetString() == "Mention")
.Select(mention => new ContentMention
JsonElement { ValueKind: JsonValueKind.Array } element
=> element.EnumerateArray().Select(ConvertJsonElementToObject).ToList(),
List<object> list => list,
_ => null
};
return tags?.Where(tag => tag is Dictionary<string, object> dict && GetStringValue(dict, "type") == "Mention")
.Select(tag => (Dictionary<string, object>)tag)
.Select(dict => new ContentMention
{
Username = mention.GetProperty("name").GetString(),
ActorUri = mention.GetProperty("href").GetString()
Username = GetStringValue(dict, "name"),
ActorUri = GetStringValue(dict, "href")
})
.ToList();
}
return null;
}
private static Dictionary<string, object> BuildMetadataFromActivity(Dictionary<string, object> objectDict)
{
var metadata = new Dictionary<string, object>();