aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-18 03:59:46 +0000
committerkaniini <nenolod@gmail.com>2019-02-18 03:59:46 +0000
commit3f38a055715a8140524f4f55073d5b936d076fb4 (patch)
tree9e0e2f7109d6b5a14baf0609e1dededd2a4a6b04 /lib
parent28a249bef23ffc13fb5e00acac150675001eb959 (diff)
parent38e15930cb7e8aec4742eb85da26955b4c08e8ce (diff)
downloadpleroma-3f38a055715a8140524f4f55073d5b936d076fb4.tar.gz
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api. Closes #602 See merge request pleroma/pleroma!833
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex3
1 files changed, 3 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 c2f0dc2a9..a8ef0a8ca 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -524,6 +524,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def friends(%{assigns: %{user: for_user}} = conn, params) do
{:ok, page} = Ecto.Type.cast(:integer, params["page"] || 1)
+ {:ok, export} = Ecto.Type.cast(:boolean, params["all"] || false)
+
+ page = if export, do: nil, else: page
with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params),
{:ok, friends} <- User.get_friends(user, page) do