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

Add moderator function.

Browse Source
This commit is contained in:
lain 2018-02-20 18:44:50 +01:00
parent 1bc34de4df
commit 5bc810c452
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/twitter_api/views/user_view.ex
View File

@ -41,7 +41,9 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"profile_image_url_https" => image, "profile_image_url_https" => image,
"profile_image_url_profile_size" => image, "profile_image_url_profile_size" => image,
"profile_image_url_original" => image, "profile_image_url_original" => image,
"rights" => %{}, "rights" => %{
"delete_others_notice" => !!user.info["is_moderator"]
},
"screen_name" => user.nickname, "screen_name" => user.nickname,
"statuses_count" => user_info[:note_count], "statuses_count" => user_info[:note_count],
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,

23
test/web/twitter_api/views/user_view_test.exs
View File

@ -53,7 +53,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false, "following" => false,
"follows_you" => false, "follows_you" => false,
"statusnet_blocking" => false, "statusnet_blocking" => false,
"rights" => %{}, "rights" => %{
"delete_others_notice" => false
},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil, "background_image" => nil,
@ -86,7 +88,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => true, "following" => true,
"follows_you" => false, "follows_you" => false,
"statusnet_blocking" => false, "statusnet_blocking" => false,
"rights" => %{}, "rights" => %{
"delete_others_notice" => false
},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil, "background_image" => nil,
@ -120,7 +124,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false, "following" => false,
"follows_you" => true, "follows_you" => true,
"statusnet_blocking" => false, "statusnet_blocking" => false,
"rights" => %{}, "rights" => %{
"delete_others_notice" => false
},
"statusnet_profile_url" => follower.ap_id, "statusnet_profile_url" => follower.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil, "background_image" => nil,
@ -130,6 +136,13 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
assert represented == UserView.render("show.json", %{user: follower, for: user}) assert represented == UserView.render("show.json", %{user: follower, for: user})
end end
test "a user that is a moderator" do
user = insert(:user, %{info: %{"is_moderator" => true}})
represented = UserView.render("show.json", %{user: user, for: user})
assert represented["rights"]["delete_others_notice"]
end
test "A blocked user for the blocker" do test "A blocked user for the blocker" do
user = insert(:user) user = insert(:user)
blocker = insert(:user) blocker = insert(:user)
@ -154,7 +167,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"following" => false, "following" => false,
"follows_you" => false, "follows_you" => false,
"statusnet_blocking" => true, "statusnet_blocking" => true,
"rights" => %{}, "rights" => %{
"delete_others_notice" => false
},
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => banner, "cover_photo" => banner,
"background_image" => nil, "background_image" => nil,