From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 23 Oct 2019 16:30:02 +0000 (+0300)
Subject: [#1304] Extra bullet-proofing.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=c0246309a5013b17a405644a0918ec0d3569eaf1;p=akkoma

[#1304] Extra bullet-proofing.
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 7fc5051ea..07dde3537 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1164,7 +1164,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     with {:enabled, true} <-
            {:enabled, Pleroma.Config.get([:instance, :external_user_synchronization])},
          {:ok, info} <- fetch_follow_information_for_user(data) do
-      info = Map.merge(data.info, info)
+      info = Map.merge(data[:info] || %{}, info)
       Map.put(data, :info, info)
     else
       {:enabled, false} ->