diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
| commit | c88a5d32514f4ed78e4b9216198db62e8799ffe4 (patch) | |
| tree | bc979f2522156be74138491114892e7acbeaafcb /lib/pleroma/web/common_api/common_api.ex | |
| parent | 41e0304757c5a0d9778f7e685c9ddf481f0e15cb (diff) | |
| parent | 66575061851f13355958fd292ee545462bf191c0 (diff) | |
| download | pleroma-c88a5d32514f4ed78e4b9216198db62e8799ffe4.tar.gz | |
Merge branch 'develop' into feature/hide-follows-remote
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 44af6a773..2db58324b 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -300,8 +300,7 @@ defmodule Pleroma.Web.CommonAPI do } } = activity <- get_by_id_or_ap_id(id_or_ap_id), true <- Visibility.is_public?(activity), - %{valid?: true} = info_changeset <- - User.Info.add_pinnned_activity(user.info, activity), + %{valid?: true} = info_changeset <- User.Info.add_pinnned_activity(user.info, activity), changeset <- Ecto.Changeset.change(user) |> Ecto.Changeset.put_embed(:info, info_changeset), {:ok, _user} <- User.update_and_set_cache(changeset) do |