Merge branch 'csv-export' into 'develop'

Add option to return all friends in twitter api.

Closes #602

See merge request pleroma/pleroma!833
This commit is contained in:
kaniini 2019-02-18 03:59:46 +00:00
commit 3f38a05571
2 changed files with 12 additions and 1 deletions

View file

@ -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