From 608077cd22c6cbbd958968bc155a0b04e4c5095d Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Thu, 7 Jan 2021 19:37:09 -0500
Subject: [PATCH 1/3] better json parsing and response handling

---
 src/BirdsiteLive.ActivityPub/Models/Activity.cs               | 2 +-
 src/BirdsiteLive.Domain/UserService.cs                        | 4 ++--
 .../Processors/SubTasks/SendTweetsToSharedInboxTask.cs        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/BirdsiteLive.ActivityPub/Models/Activity.cs b/src/BirdsiteLive.ActivityPub/Models/Activity.cs
index 0ad51f2..8c78091 100644
--- a/src/BirdsiteLive.ActivityPub/Models/Activity.cs
+++ b/src/BirdsiteLive.ActivityPub/Models/Activity.cs
@@ -6,7 +6,7 @@ namespace BirdsiteLive.ActivityPub
     public class Activity
     {
         [JsonProperty("@context")]
-        public string context { get; set; }
+        public object context { get; set; }
         public string id { get; set; }
         public string type { get; set; }
         public string actor { get; set; }
diff --git a/src/BirdsiteLive.Domain/UserService.cs b/src/BirdsiteLive.Domain/UserService.cs
index 42feb39..02323ea 100644
--- a/src/BirdsiteLive.Domain/UserService.cs
+++ b/src/BirdsiteLive.Domain/UserService.cs
@@ -115,7 +115,7 @@ namespace BirdsiteLive.Domain
                 }
             };
             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)
@@ -159,7 +159,7 @@ namespace BirdsiteLive.Domain
                 }
             };
             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)
diff --git a/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToSharedInboxTask.cs b/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToSharedInboxTask.cs
index bdebdcd..5c6af76 100644
--- a/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToSharedInboxTask.cs
+++ b/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToSharedInboxTask.cs
@@ -51,7 +51,7 @@ namespace BirdsiteLive.Pipeline.Processors.SubTasks
                     var result =
                         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;
                     else
                         throw new Exception("Posting new note activity failed");

From fcf1a802ff75ab9bb534c26afd07133b2387f837 Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Sat, 9 Jan 2021 14:12:51 -0500
Subject: [PATCH 2/3] better response handling

---
 .../Processors/SubTasks/SendTweetsToInboxTask.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToInboxTask.cs b/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToInboxTask.cs
index eb1fb36..77644cf 100644
--- a/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToInboxTask.cs
+++ b/src/BirdsiteLive.Pipeline/Processors/SubTasks/SendTweetsToInboxTask.cs
@@ -49,7 +49,7 @@ namespace BirdsiteLive.Pipeline.Processors.SubTasks
                     var note = _statusService.GetStatus(user.Acct, tweet);
                     var result = await _activityPubService.PostNewNoteActivity(note, user.Acct, tweet.Id.ToString(), follower.Host, inbox);
 
-                    if (result == HttpStatusCode.Accepted)
+                    if (result == HttpStatusCode.Accepted || result == HttpStatusCode.OK)
                         syncStatus = tweet.Id;
                     else
                         throw new Exception("Posting new note activity failed");

From 9527faa66f72003fbe2b796d9b68c1f7c19ee08e Mon Sep 17 00:00:00 2001
From: Nicolas Constant <github@nicolas-constant.com>
Date: Sat, 9 Jan 2021 14:47:49 -0500
Subject: [PATCH 3/3] road to 0.3.2

---
 src/BirdsiteLive/BirdsiteLive.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BirdsiteLive/BirdsiteLive.csproj b/src/BirdsiteLive/BirdsiteLive.csproj
index 4e0282b..283c3c8 100644
--- a/src/BirdsiteLive/BirdsiteLive.csproj
+++ b/src/BirdsiteLive/BirdsiteLive.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>0.3.1</Version>
+    <Version>0.3.2</Version>
   </PropertyGroup>
 
   <ItemGroup>