diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-30 00:59:40 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-06-30 00:59:40 +0000 |
| commit | 4a1c36e18f8c6c22e63a5ad996276cd2a2aeef81 (patch) | |
| tree | 03c4dd10abf10286de495e8df7ccf23407ab0efb /lib | |
| parent | 9b1e75bac8f6e042e7f70e4f29cc60fa96000323 (diff) | |
| parent | 4c60a562a7392294683caae71827d0053a3c3466 (diff) | |
| download | pleroma-4a1c36e18f8c6c22e63a5ad996276cd2a2aeef81.tar.gz | |
Merge branch 'fix/pin-unlisted' into 'develop'
Fix not being able to pin unlisted posts
Closes #1038
See merge request pleroma/pleroma!1364
Diffstat (limited to 'lib')
| -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 <- |