diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-02 12:55:21 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-02 12:55:21 +0300 |
| commit | 8481158ba838cfb6ce29926788e59159f1b1543e (patch) | |
| tree | d3a5eafe99b154f5c9e5e08e22b9a08c49330ee5 /lib/pleroma/web/common_api/common_api.ex | |
| parent | ca5dc7d5d64c7c95ab5357d62c6b78297382344e (diff) | |
| parent | 764a50f8a671cca69ca1f616754660506f8c18d8 (diff) | |
| download | pleroma-8481158ba838cfb6ce29926788e59159f1b1543e.tar.gz | |
Merge branch 'develop' into frontend-dl-task
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index c05a6c544..027b3dc30 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.CommonAPI do @@ -315,8 +315,9 @@ defmodule Pleroma.Web.CommonAPI do with %Activity{ actor: ^user_ap_id, data: %{"type" => "Create"}, - object: %Object{data: %{"type" => "Note"}} + 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), {:ok, _user} <- User.add_pinnned_activity(user, activity) do {:ok, activity} |