From f7d064c0223c5702fcc4dc81751c0524df34befa Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 17 Dec 2020 17:32:12 +0100 Subject: [PATCH] Handle Hubzilla posts better Signed-off-by: Thomas Citharel --- lib/federation/activity_pub/transmogrifier.ex | 2 +- lib/service/http/activity_pub.ex | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/federation/activity_pub/transmogrifier.ex b/lib/federation/activity_pub/transmogrifier.ex index af350fb3..e53a672b 100644 --- a/lib/federation/activity_pub/transmogrifier.ex +++ b/lib/federation/activity_pub/transmogrifier.ex @@ -974,7 +974,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do # Conversation object_data |> Map.put(:creator_id, object_data.actor_id) - |> Map.put(:actor_id, object_data.attributed_to_id) + |> Map.put(:actor_id, object_data.attributed_to_id || object_data.actor_id) end end diff --git a/lib/service/http/activity_pub.ex b/lib/service/http/activity_pub.ex index b48ca9cd..ee5b2163 100644 --- a/lib/service/http/activity_pub.ex +++ b/lib/service/http/activity_pub.ex @@ -20,7 +20,8 @@ defmodule Mobilizon.Service.HTTP.ActivityPub do [{"User-Agent", @user_agent}, {"Accept", "application/activity+json"}] ++ headers}, Tesla.Middleware.FollowRedirects, {Tesla.Middleware.Timeout, timeout: 10_000}, - {Tesla.Middleware.JSON, decode_content_types: ["application/activity+json"]} + {Tesla.Middleware.JSON, + decode_content_types: ["application/activity+json", "application/ld+json"]} ] adapter = {@adapter, opts}