aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authordtluna <dtluna@openmailbox.org>2017-04-13 15:15:09 +0300
committerdtluna <dtluna@openmailbox.org>2017-04-13 15:15:09 +0300
commit84c20128100ad5b074720c44a24375b809a0ce09 (patch)
treee7c7a935c7dfac3363e9d162479c22e2ceea471d /lib/pleroma/web/twitter_api/twitter_api.ex
parent59a406d94cbb1df2f3c7b6b7844f1141cc661f7c (diff)
parentd2bf099ae66b7332128c854f322bb8a00eb62212 (diff)
downloadpleroma-84c20128100ad5b074720c44a24375b809a0ce09.tar.gz
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex2
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 0a942e880..0217b28d6 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