squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MastoAPI: Add blocking to AccountView.

Browse Source
This commit is contained in:
Roger Braun 2017-11-03 08:23:31 +01:00
parent 9b63647aff
commit 33beb51da4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/account_view.ex
View File

@ -55,7 +55,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
id: target.id, id: target.id,
following: User.following?(user, target), following: User.following?(user, target),
followed_by: User.following?(target, user), followed_by: User.following?(target, user),
blocking: false, blocking: User.blocks?(user, target),
muting: false, muting: false,
requested: false, requested: false,
domain_blocking: false domain_blocking: false

3
test/web/mastodon_api/account_view_test.exs
View File

@ -51,12 +51,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
other_user = insert(:user) other_user = insert(:user)
{:ok, user} = User.follow(user, other_user) {:ok, user} = User.follow(user, other_user)
{:ok, user} = User.block(user, other_user)
expected = %{ expected = %{
id: other_user.id, id: other_user.id,
following: true, following: true,
followed_by: false, followed_by: false,
blocking: false, blocking: true,
muting: false, muting: false,
requested: false, requested: false,
domain_blocking: false domain_blocking: false