aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-27 19:22:31 +0000
committerkaniini <nenolod@gmail.com>2018-12-27 19:22:31 +0000
commit02866a42afde69f40724648757f6bdaab5a66d17 (patch)
tree0e0580cc9b29d7e27e6ca1f0792ec7e154782b4b /lib/pleroma/web/twitter_api
parent92b114499fff967caca7ab21b391d156aad1e544 (diff)
parente4562105e77dd2d580921a07f05907a63da1d826 (diff)
downloadpleroma-02866a42afde69f40724648757f6bdaab5a66d17.tar.gz
Merge branch 'feature/exclude_reblogs' into 'develop'
Implement exclude_reblogs and include_rts See merge request pleroma/pleroma!598
Diffstat (limited to 'lib/pleroma/web/twitter_api')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index c25cb0876..7ae850d71 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -130,6 +130,15 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def user_timeline(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.get_user(user, params) do
{:ok, target_user} ->
+ # Twitter and ActivityPub use a different name and sense for this parameter.
+ {include_rts, params} = Map.pop(params, "include_rts")
+
+ params =
+ case include_rts do
+ x when x == "false" or x == "0" -> Map.put(params, "exclude_reblogs", "true")
+ _ -> params
+ end
+
activities = ActivityPub.fetch_user_activities(target_user, user, params)
conn