diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-28 18:30:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-28 18:30:36 +0000 |
| commit | 1cd825519c34762490fa44e7aa0cccf2a72826b6 (patch) | |
| tree | 30890879ca31f1d3ce077120bc0936bf7c6d5fcb /lib | |
| parent | e1de866f95c7740d64070ff023b4bdcc013decc4 (diff) | |
| parent | d8cc96cb1f9e2a4e736f6830529e8aa9a5d289d8 (diff) | |
| download | pleroma-1cd825519c34762490fa44e7aa0cccf2a72826b6.tar.gz | |
Merge branch 'fix/public-timeline-auth' into 'develop'
Fix Twitter timelines for private instances
See merge request pleroma/pleroma!602
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 7ae850d71..92b7386da 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -662,7 +662,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do json_reply(conn, 403, json) end - def only_if_public_instance(conn = %{conn: %{assigns: %{user: _user}}}, _), do: conn + def only_if_public_instance(%{assigns: %{user: %User{}}} = conn, _), do: conn def only_if_public_instance(conn, _) do if Keyword.get(Application.get_env(:pleroma, :instance), :public) do |