diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-30 21:23:35 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-30 21:23:35 +0300 |
| commit | d2cb18b2a342b990cc47dfdc42adb843c3db1b5e (patch) | |
| tree | 2982108b486fe8361fba5f22c53491bb265924b4 /lib/pleroma/web/common_api | |
| parent | 657277ffc0d3d25be4376ed629057a2d2cefb2e1 (diff) | |
| parent | 66380d36d540751f59445c8a65e9747ce5475ee5 (diff) | |
| download | pleroma-d2cb18b2a342b990cc47dfdc42adb843c3db1b5e.tar.gz | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index f8df1e2ea..f71c67a3d 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -11,6 +11,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Utils + alias Pleroma.Web.ActivityPub.Visibility import Pleroma.Web.CommonAPI.Utils @@ -284,12 +285,11 @@ defmodule Pleroma.Web.CommonAPI do }, object: %Object{ data: %{ - "to" => object_to, "type" => "Note" } } } = activity <- get_by_id_or_ap_id(id_or_ap_id), - true <- Enum.member?(object_to, "https://www.w3.org/ns/activitystreams#Public"), + true <- Visibility.is_public?(activity), %{valid?: true} = info_changeset <- User.Info.add_pinnned_activity(user.info, activity), changeset <- |