diff options
| author | dtluna <dtluna@openmailbox.org> | 2017-04-13 15:36:00 +0300 |
|---|---|---|
| committer | dtluna <dtluna@openmailbox.org> | 2017-04-13 15:36:00 +0300 |
| commit | a8e50d602ba25b2062e0e676e1dd115da64c2565 (patch) | |
| tree | 4921704448e03286876255b0aa0b46badf58e586 /lib/pleroma/web/twitter_api/twitter_api.ex | |
| parent | 65ef18a7157f8cfcc494ad7a72ce083e79e38d26 (diff) | |
| parent | d2bf099ae66b7332128c854f322bb8a00eb62212 (diff) | |
| download | pleroma-a8e50d602ba25b2062e0e676e1dd115da64c2565.tar.gz | |
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 66f78f340..f4ab5bdc6 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -69,7 +69,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end def fetch_friend_statuses(user, opts \\ %{}) do - ActivityPub.fetch_activities(user.following, opts) + ActivityPub.fetch_activities([user.ap_id | user.following], opts) |> activities_to_statuses(%{for: user}) end |