mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-11-10 02:05:12 +00:00
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:
commit
b58e4ddb10
|
@ -112,7 +112,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
|
|||
# Pleroma extension
|
||||
pleroma: %{
|
||||
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
|
||||
|
|
|
@ -61,7 +61,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
|
|||
},
|
||||
pleroma: %{
|
||||
confirmation_pending: false,
|
||||
tags: []
|
||||
tags: [],
|
||||
is_admin: false,
|
||||
is_moderator: false
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -102,7 +104,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
|
|||
},
|
||||
pleroma: %{
|
||||
confirmation_pending: false,
|
||||
tags: []
|
||||
tags: [],
|
||||
is_admin: false,
|
||||
is_moderator: false
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue