fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 15:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ap-uri-user-search' into 'develop'

Browse source 
transmogrifier: do not try to contain origin of something which doesn't have one

Closes #340

See merge request pleroma/pleroma!389
This commit is contained in:
kaniini 2018-10-25 04:38:46 +00:00
parent 79b1e4465f 5383887bd4
commit 9e9b1bd5ea
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/transmogrifier.ex
View file

@ -37,6 +37,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
@doc """
Checks that an imported AP object's actor matches the domain it came from.
"""
def contain_origin(id, %{"actor" => nil}), do: :error
def contain_origin(id, %{"actor" => actor} = params) do
id_uri = URI.parse(id)
actor_uri = URI.parse(get_actor(params))