projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/account_view.ex
b/lib/pleroma/web/admin_api/views/account_view.ex
index 441269162dfc700841ccf4dcf3014a5d96156172..619390ef4e51ce0518bf52882ea4363ab5adfac1 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/account_view.ex
+++ b/
lib/pleroma/web/admin_api/views/account_view.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AccountView do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AccountView do
@@
-7,7
+7,6
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
alias Pleroma.HTML
alias Pleroma.User
alias Pleroma.HTML
alias Pleroma.User
- alias Pleroma.User.Info
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.AdminAPI.AccountView
alias Pleroma.Web.MediaProxy
@@
-34,10
+33,11
@@
defmodule Pleroma.Web.AdminAPI.AccountView do
"avatar" => avatar,
"nickname" => user.nickname,
"display_name" => display_name,
"avatar" => avatar,
"nickname" => user.nickname,
"display_name" => display_name,
- "deactivated" => user.
info.
deactivated,
+ "deactivated" => user.deactivated,
"local" => user.local,
"local" => user.local,
- "roles" => Info.roles(user.info),
- "tags" => user.tags || []
+ "roles" => User.roles(user),
+ "tags" => user.tags || [],
+ "confirmation_pending" => user.confirmation_pending
}
end
}
end