Merge branch 'fix/tusk' into 'develop'

Fix signin and initial loading with Tusk

See merge request pleroma/pleroma!333
This commit is contained in:
kaniini 2018-09-07 23:47:43 +00:00
commit 14a762a213
4 changed files with 12 additions and 2 deletions

View file

@ -1188,4 +1188,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
json(conn, []) json(conn, [])
end end
end end
def filters(conn, _) do
json(conn, [])
end
end end

View file

@ -75,8 +75,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
followed_by: User.following?(target, user), followed_by: User.following?(target, user),
blocking: User.blocks?(user, target), blocking: User.blocks?(user, target),
muting: false, muting: false,
muting_notifications: false,
requested: false, requested: false,
domain_blocking: false domain_blocking: false,
showing_reblogs: false
} }
end end

View file

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

View file

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