logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 4f03bb22998b9713d84dc8e81a3d63bb60c5b648
parent: ab2e5ba989720932bacf0b6c6db5dc27e762a9bb
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 30 Sep 2018 05:32:56 +0000

Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'

activitypub: fix error condition match

See merge request pleroma/pleroma!365

Diffstat:

Mlib/pleroma/web/activity_pub/activity_pub.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -756,7 +756,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do {:ok, activity} <- Transmogrifier.handle_incoming(params) do {:ok, Object.normalize(activity.data["object"])} else - {:reject, nil} -> + {:error, {:reject, nil}} -> {:reject, nil} object = %Object{} ->