hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

Browse source 
# Conflicts:
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/activity_pub/transmogrifier.ex
This commit is contained in:
Ivan Tashkinov 2019-10-21 11:05:09 +03:00
commit a11a7176d5
14 changed files with 159 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/activity_pub/views/user_view.ex
View file

@ -55,7 +55,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
"owner" => user.ap_id,
"publicKeyPem" => public_key
},
"endpoints" => endpoints
"endpoints" => endpoints,
"invisible" => User.invisible?(user)
}
|> Map.merge(Utils.make_json_ld_header())
end