diff options
author | rinpatch <rinpatch@sdf.org> | 2020-02-09 12:15:52 +0000 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2020-02-09 12:15:52 +0000 |
commit | 42f76306e7fe69fc51be00285a4fef8569f54989 (patch) | |
tree | 416bc4048224a5fc9312c4c5834ea5207497a6b7 /lib/pleroma/web/common_api | |
parent | 1629fa2412b877f69c5cf0df09782227827b272b (diff) | |
parent | 06fec99e1d8d4be6cb71551089f2d95e936d6990 (diff) | |
download | pleroma-1.1.9.tar.gz |
Merge branch 'release/1.1.9' into 'stable'v1.1.9
Release/1.1.9
See merge request pleroma/pleroma!2189
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 184ec6021..01ed7b16f 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -328,15 +328,10 @@ defmodule Pleroma.Web.CommonAPI do def pin(id_or_ap_id, %{ap_id: user_ap_id} = user) do with %Activity{ actor: ^user_ap_id, - data: %{ - "type" => "Create" - }, - object: %Object{ - data: %{ - "type" => "Note" - } - } + data: %{"type" => "Create"}, + object: %Object{data: %{"type" => object_type}} } = activity <- get_by_id_or_ap_id(id_or_ap_id), + true <- object_type in ["Note", "Article", "Question"], true <- Visibility.is_public?(activity), %{valid?: true} = info_changeset <- User.Info.add_pinnned_activity(user.info, activity), changeset <- |