diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-02 14:12:43 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-02 14:12:43 +0200 |
| commit | 32a95d73daf94a1186ccdbcdc9ce0f91b559119c (patch) | |
| tree | 51e5412520d61452d9d4efde3a864c17e86135aa /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | 6dd8335477ff3adc2dda5fe4e45b0e1b38dc5b9b (diff) | |
| download | pleroma-32a95d73daf94a1186ccdbcdc9ce0f91b559119c.tar.gz | |
Add twkn timeline.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 8 |
1 files changed, 8 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 b5b829ca0..4b329a21f 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -41,6 +41,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end end + def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do + statuses = TwitterAPI.fetch_public_and_external_statuses(user, params) + {:ok, json} = Poison.encode(statuses) + + conn + |> json_reply(200, json) + end + def public_timeline(%{assigns: %{user: user}} = conn, params) do statuses = TwitterAPI.fetch_public_statuses(user, params) {:ok, json} = Poison.encode(statuses) |