marisa/ActivityPubD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better json management

Browse Source
This commit is contained in:
𝑀𝒶𝓇𝒾𝓈𝒶
2024-02-21 13:49:13 -03:00
parent f9dedca988
commit 9c5eb45d95
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/ap/actor.d
View File

@@ -33,19 +33,16 @@ class Actor : ASObject {
super(json);
with (this) {
inbox = json.requiredKey!"inbox".str;
outbox = json.requiredKey!"outbox".str;
following = json.requiredKey!"following".str;
followers = json.requiredKey!"followers".str;
required(json, "inbox", inbox);
required(json, "outbox", outbox);
required(json, "following", following);
required(json, "followers", followers);
liked = json.checkKey!string("liked");
streams = json.checkKey!string("streams");
preferredUsername = json.checkKey!string("preferredUsername");
optional(json, "liked", liked);
optional(json, "streams", streams);
optional(json, "preferredUsername", preferredUsername);
if (JSONValue* j = "endpoints" in json)
endpoints = ActorEndpoints.fromJson(*j);
else
endpoints = ActorEndpoints();
endpoints = ActorEndpoints.fromJson(json.optional!JSONValue("endpoints"));
raw = json;
}
@@ -64,12 +61,12 @@ struct ActorEndpoints {
ActorEndpoints endpoints = ActorEndpoints();
with (endpoints) {
proxyUrl = json.checkKey!string("proxyUrl");
oauthAuthorizationEndpoint = json.checkKey!string("oauthAuthorizationEndpoint");
oauthTokenEndpoint = json.checkKey!string("oauthTokenEndpoint");
provideClientKey = json.checkKey!string("provideClientKey");
signClientKey = json.checkKey!string("signClientKey");
sharedInbox = json.checkKey!string("sharedInbox");
optional(json, "proxyUrl", proxyUrl);
optional(json, "oauthAuthorizationEndpoint", oauthAuthorizationEndpoint);
optional(json, "oauthTokenEndpoint", oauthTokenEndpoint);
optional(json, "provideClientKey", provideClientKey);
optional(json, "signClientKey", signClientKey);
optional(json, "sharedInbox", sharedInbox);
}
return endpoints;