squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
activitypub: fix error condition match

See merge request pleroma/pleroma!365
This commit is contained in:
kaniini 2018-09-30 05:32:56 +00:00
commit 4f03bb2299
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -756,7 +756,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
{:ok, activity} <- Transmogrifier.handle_incoming(params) do {:ok, activity} <- Transmogrifier.handle_incoming(params) do
{:ok, Object.normalize(activity.data["object"])} {:ok, Object.normalize(activity.data["object"])}
else else
{:reject, nil} -> {:error, {:reject, nil}} ->
{:reject, nil} {:reject, nil}
object = %Object{} -> object = %Object{} ->