mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-07-02 03:45:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/tusk' into 'develop'

Browse source 
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
parent 403f9d118d c1d07da4e1
commit 14a762a213
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

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

4
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -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

2
lib/pleroma/web/router.ex
View file

@ -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

4
test/web/mastodon_api/account_view_test.exs
View file

@ -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})