diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-23 19:30:02 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-10-23 19:30:02 +0300 |
| commit | c0246309a5013b17a405644a0918ec0d3569eaf1 (patch) | |
| tree | 62faffc1033054e2aa1414d85bc0009c004c6910 /lib | |
| parent | 065e9fac12c1ea06eca2ff55a8253d4bc23362e1 (diff) | |
| download | pleroma-c0246309a5013b17a405644a0918ec0d3569eaf1.tar.gz | |
[#1304] Extra bullet-proofing.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
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} -> |