diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-29 18:18:22 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-29 18:18:22 +0300 |
| commit | ce47017c8927b8b2d31668d5e32e387d80739502 (patch) | |
| tree | be77acd4dc0c6b9d7b6cb8515470e1dae3212aa7 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | f1f7a11222f4689f000825147d16b366d915f393 (diff) | |
| parent | 57e58d26029388a5831cd2ac3fbc419c27c4d7c6 (diff) | |
| download | pleroma-ce47017c8927b8b2d31668d5e32e387d80739502.tar.gz | |
Merge develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 21e6c555a..31e86685a 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -101,9 +101,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |> Map.put("blocking_user", user) |> Map.put("user", user) - activities = - ActivityPub.fetch_activities([user.ap_id | user.following], params) - |> ActivityPub.contain_timeline(user) + activities = ActivityPub.fetch_activities([user.ap_id | user.following], params) conn |> put_view(ActivityView) @@ -440,7 +438,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do true <- user.local, true <- user.info.confirmation_pending, true <- user.info.confirmation_token == token, - info_change <- User.Info.confirmation_changeset(user.info, :confirmed), + info_change <- User.Info.confirmation_changeset(user.info, need_confirmation: false), changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change), {:ok, _} <- User.update_and_set_cache(changeset) do conn |