From: Francis Dinh Date: Sun, 20 May 2018 02:02:13 +0000 (-0400) Subject: Pass user instead of their ap_id to User.block X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;ds=sidebyside;h=a9141d88aad331cfe6573e1d6b3d77f5dab70be7;hp=3b706ea493cbb3ee1202fba96d3c2e509c07fb64;p=akkoma Pass user instead of their ap_id to User.block --- diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 887ffe2d0..47b84a469 100644 --- a/lib/pleroma/web/activity_pub/transmogrifier.ex +++ b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -266,7 +266,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do %User{} = blocker = User.get_or_fetch_by_ap_id(blocker), {:ok, activity} <- ActivityPub.block(blocker, blocked, false) do User.unfollow(blocker, blocked) - User.block(blocker, blocked.ap_id) + User.block(blocker, blocked) {:ok, activity} else e -> :error