pleroma

commit: 14a762a213db0d00550c1421651ef689249c9c57
parent 403f9d118dadcef806044831221d5c67800ce34d
Author: kaniini <nenolod@gmail.com>
Date:   Fri,  7 Sep 2018 23:47:43 +0000

Merge branch 'fix/tusk' into 'develop'

Fix signin and initial loading with Tusk

See merge request pleroma/pleroma!333
Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
4
++++
M
lib/pleroma/web/mastodon_api/views/account_view.ex
4
+++-
M
lib/pleroma/web/router.ex
2
++
M
test/web/mastodon_api/account_view_test.exs
4
+++-

4 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1188,4 +1188,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
       json(conn, [])
     end
   end
+
+  def filters(conn, _) do
+    json(conn, [])
+  end
 end
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -75,8 +75,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView 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
 
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
@@ -162,6 +162,8 @@ defmodule Pleroma.Web.Router do
     delete("/filters/:id", MastodonAPIController, :delete_filter)
 
     get("/suggestions", MastodonAPIController, :suggestions)
+
+    get("/filters", MastodonAPIController, :filters)
   end
 
   scope "/api/web", Pleroma.Web.MastodonAPI do
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
@@ -123,8 +123,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest 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})