glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better json parsing and response handling

Browse source
This commit is contained in:
Nicolas Constant 2021-01-07 19:37:09 -05:00
parent 047abd92f8
commit 608077cd22
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/BirdsiteLive.ActivityPub/Models/Activity.cs
View file

@ -6,7 +6,7 @@ namespace BirdsiteLive.ActivityPub
public class Activity public class Activity
{ {
[JsonProperty("@context")] [JsonProperty("@context")]
public string context { get; set; } public object context { get; set; }
public string id { get; set; } public string id { get; set; }
public string type { get; set; } public string type { get; set; }
public string actor { get; set; } public string actor { get; set; }

4
src/BirdsiteLive.Domain/UserService.cs
View file

@ -115,7 +115,7 @@ namespace BirdsiteLive.Domain
} }
}; };
var result = await _activityPubService.PostDataAsync(acceptFollow, followerHost, activity.apObject); var result = await _activityPubService.PostDataAsync(acceptFollow, followerHost, activity.apObject);
return result == HttpStatusCode.Accepted; return result == HttpStatusCode.Accepted || result == HttpStatusCode.OK;
} }
private string OnlyKeepRoute(string inbox, string host) private string OnlyKeepRoute(string inbox, string host)
@ -159,7 +159,7 @@ namespace BirdsiteLive.Domain
} }
}; };
var result = await _activityPubService.PostDataAsync(acceptFollow, followerHost, activity.apObject.apObject); var result = await _activityPubService.PostDataAsync(acceptFollow, followerHost, activity.apObject.apObject);
return result == HttpStatusCode.Accepted; return result == HttpStatusCode.Accepted || result == HttpStatusCode.OK;
} }
private async Task<SignatureValidationResult> ValidateSignature(string actor, string rawSig, string method, string path, string queryString, Dictionary<string, string> requestHeaders, string body) private async Task<SignatureValidationResult> ValidateSignature(string actor, string rawSig, string method, string path, string queryString, Dictionary<string, string> requestHeaders, string body)

2
src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToSharedInboxTask.cs
View file

@ -51,7 +51,7 @@ namespace BirdsiteLive.Pipeline.Processors.SubTasks
var result = var result =
await _activityPubService.PostNewNoteActivity(note, user.Acct, tweet.Id.ToString(), host, inbox); await _activityPubService.PostNewNoteActivity(note, user.Acct, tweet.Id.ToString(), host, inbox);
if (result == HttpStatusCode.Accepted) if (result == HttpStatusCode.Accepted || result == HttpStatusCode.OK)
syncStatus = tweet.Id; syncStatus = tweet.Id;
else else
throw new Exception("Posting new note activity failed"); throw new Exception("Posting new note activity failed");