sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'features/masto-account-view-rights' into 'develop' 

Web.MastodonAPI.AccountView: Add is_moderator and is_admin

Closes #557

See merge request pleroma/pleroma!718
This commit is contained in:
Haelwenn 2019-01-27 09:45:51 +00:00
parent 7175793304 a65c188593
commit b58e4ddb10
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
# Pleroma extension # Pleroma extension
pleroma: %{ pleroma: %{
confirmation_pending: user_info.confirmation_pending, confirmation_pending: user_info.confirmation_pending,
tags: user.tags tags: user.tags,
is_moderator: user.info.is_moderator,
is_admin: user.info.is_admin
} }
} }
end end

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

@ -61,7 +61,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
}, },
pleroma: %{ pleroma: %{
confirmation_pending: false, confirmation_pending: false,
tags: [] tags: [],
is_admin: false,
is_moderator: false
} }
} }
@ -102,7 +104,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
}, },
pleroma: %{ pleroma: %{
confirmation_pending: false, confirmation_pending: false,
tags: [] tags: [],
is_admin: false,
is_moderator: false
} }
} }