From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 19 May 2018 07:30:02 +0000 (+0000)
Subject: activitypub transmogrifier: handle hubzilla AP actor quirks
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=2051530868720a23715cbb0d1a1286a6ae1a6507;p=akkoma

activitypub transmogrifier: handle hubzilla AP actor quirks
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 491ad3705..3e1977f96 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -401,6 +401,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
           "url" => [%{"href" => data["image"]["url"]}]
         }
 
+    data = Transmogrifier.maybe_fix_user_object(data)
+
     user_data = %{
       ap_id: data["id"],
       info: %{
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 463d1e59d..c10d27dcd 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -495,4 +495,17 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
       Repo.delete_all(q)
     end
   end
+
+  def maybe_fix_user_url(data) do
+    if is_map(data["url"]) do
+      data = Map.put(data, "url", data["url"]["href"])
+    end
+
+    data
+  end
+
+  def maybe_fix_user_object(data) do
+    data
+    |> maybe_fix_user_url
+  end
 end