Merge branch 'fix/tusk' into 'develop'

Fix signin and initial loading with Tusk

See merge request pleroma/pleroma!333

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -1188,4 +1188,8 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
       json(conn, [])
     end
   end
+
+  def filters(conn, _) do
+    json(conn, [])
+  end
 end

lib/pleroma/web/mastodon_api/views/account_view.ex

@@ -75,8 +75,10 @@ def render("relationship.json", %{user: user, target: target}) do
       followed_by: User.following?(target, user),
       blocking: User.blocks?(user, target),
       muting: false,
+      muting_notifications: false,
       requested: false,
-      domain_blocking: false
+      domain_blocking: false,
+      showing_reblogs: false
     }
   end
 

lib/pleroma/web/router.ex

@@ -162,6 +162,8 @@ def user_fetcher(username_or_email) do
     delete("/filters/:id", MastodonAPIController, :delete_filter)
 
     get("/suggestions", MastodonAPIController, :suggestions)
+
+    get("/filters", MastodonAPIController, :filters)
   end
 
   scope "/api/web", Pleroma.Web.MastodonAPI do

test/web/mastodon_api/account_view_test.exs

@@ -123,8 +123,10 @@ test "represent a relationship" do
       followed_by: false,
       blocking: true,
       muting: false,
+      muting_notifications: false,
       requested: false,
-      domain_blocking: false
+      domain_blocking: false,
+      showing_reblogs: false
     }
 
     assert expected == AccountView.render("relationship.json", %{user: user, target: other_user})