Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
490d9cf7
Commit
490d9cf7
authored
Mar 13, 2019
by
Maxim Filippov
🌚
Browse files
Add "local" to users admin API
parent
92a0210f
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/mastodon_api/views/admin/account_view.ex
View file @
490d9cf7
...
...
@@ -21,6 +21,7 @@ def render("show.json", %{user: user}) do
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"deactivated"
=>
user
.
info
.
deactivated
,
"local"
=>
user
.
local
,
"roles"
=>
Info
.
roles
(
user
.
info
)
}
end
...
...
test/web/admin_api/admin_api_controller_test.exs
View file @
490d9cf7
...
...
@@ -394,7 +394,8 @@ test "regular search" do
"deactivated"
=>
user
.
info
.
deactivated
,
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
]
}
...
...
@@ -418,7 +419,8 @@ test "regular search with page size" do
"deactivated"
=>
user
.
info
.
deactivated
,
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
]
}
...
...
@@ -436,7 +438,8 @@ test "regular search with page size" do
"deactivated"
=>
user2
.
info
.
deactivated
,
"id"
=>
user2
.
id
,
"nickname"
=>
user2
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
]
}
...
...
@@ -461,7 +464,8 @@ test "only local users" do
"deactivated"
=>
user
.
info
.
deactivated
,
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
]
}
...
...
@@ -486,13 +490,15 @@ test "only local users with no query" do
"deactivated"
=>
admin
.
info
.
deactivated
,
"id"
=>
admin
.
id
,
"nickname"
=>
admin
.
nickname
,
"roles"
=>
%{
"admin"
=>
true
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
true
,
"moderator"
=>
false
},
"local"
=>
true
},
%{
"deactivated"
=>
user
.
info
.
deactivated
,
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
]
}
...
...
@@ -513,7 +519,8 @@ test "PATCH /api/pleroma/admin/users/:nickname/toggle_activation" do
"deactivated"
=>
!user
.
info
.
deactivated
,
"id"
=>
user
.
id
,
"nickname"
=>
user
.
nickname
,
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
}
"roles"
=>
%{
"admin"
=>
false
,
"moderator"
=>
false
},
"local"
=>
true
}
end
end
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment