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

Add tags

This commit is contained in:
Maxim Filippov 2019-03-14 01:52:24 +03:00
parent 4872914d32
commit 257d8e78e5
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/mastodon_api/views/admin/account_view.ex
View File

@ -22,7 +22,8 @@ def render("show.json", %{user: user}) do
"nickname" => user.nickname, "nickname" => user.nickname,
"deactivated" => user.info.deactivated, "deactivated" => user.info.deactivated,
"local" => user.local, "local" => user.local,
"roles" => Info.roles(user.info) "roles" => Info.roles(user.info),
"tags" => user.tags
} }
end end
end end

29
test/web/admin_api/admin_api_controller_test.exs
View File

@ -334,7 +334,7 @@ test "/api/pleroma/admin/password_reset" do
describe "GET /api/pleroma/admin/users" do describe "GET /api/pleroma/admin/users" do
test "renders users array for the first page" do test "renders users array for the first page" do
admin = insert(:user, info: %{is_admin: true}) admin = insert(:user, info: %{is_admin: true})
user = insert(:user, local: false) user = insert(:user, local: false, tags: ["foo", "bar"])
conn = conn =
build_conn() build_conn()
@ -350,14 +350,16 @@ test "renders users array for the first page" do
"id" => admin.id, "id" => admin.id,
"nickname" => admin.nickname, "nickname" => admin.nickname,
"roles" => %{"admin" => true, "moderator" => false}, "roles" => %{"admin" => true, "moderator" => false},
"local" => true "local" => true,
"tags" => []
}, },
%{ %{
"deactivated" => user.info.deactivated, "deactivated" => user.info.deactivated,
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => false "local" => false,
"tags" => ["foo", "bar"]
} }
] ]
} }
@ -397,7 +399,8 @@ test "regular search" do
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
] ]
} }
@ -422,7 +425,8 @@ test "regular search with page size" do
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
] ]
} }
@ -441,7 +445,8 @@ test "regular search with page size" do
"id" => user2.id, "id" => user2.id,
"nickname" => user2.nickname, "nickname" => user2.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
] ]
} }
@ -467,7 +472,8 @@ test "only local users" do
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
] ]
} }
@ -493,14 +499,16 @@ test "only local users with no query" do
"id" => admin.id, "id" => admin.id,
"nickname" => admin.nickname, "nickname" => admin.nickname,
"roles" => %{"admin" => true, "moderator" => false}, "roles" => %{"admin" => true, "moderator" => false},
"local" => true "local" => true,
"tags" => []
}, },
%{ %{
"deactivated" => user.info.deactivated, "deactivated" => user.info.deactivated,
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
] ]
} }
@ -522,7 +530,8 @@ test "PATCH /api/pleroma/admin/users/:nickname/toggle_activation" do
"id" => user.id, "id" => user.id,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => true "local" => true,
"tags" => []
} }
end end
end end