From 5bc810c452cab97443aed76c16d7f2db5303666b Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 20 Feb 2018 18:44:50 +0100 Subject: [PATCH] Add moderator function. --- .../web/twitter_api/views/user_view.ex | 4 +++- test/web/twitter_api/views/user_view_test.exs | 23 +++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index f49bcc0fb..6fb07f052 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -41,7 +41,9 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "profile_image_url_https" => image, "profile_image_url_profile_size" => image, "profile_image_url_original" => image, - "rights" => %{}, + "rights" => %{ + "delete_others_notice" => !!user.info["is_moderator"] + }, "screen_name" => user.nickname, "statuses_count" => user_info[:note_count], "statusnet_profile_url" => user.ap_id, diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index a687020f0..9e0a8a532 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -53,7 +53,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "following" => false, "follows_you" => false, "statusnet_blocking" => false, - "rights" => %{}, + "rights" => %{ + "delete_others_notice" => false + }, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, @@ -86,7 +88,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "following" => true, "follows_you" => false, "statusnet_blocking" => false, - "rights" => %{}, + "rights" => %{ + "delete_others_notice" => false + }, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, @@ -120,7 +124,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "following" => false, "follows_you" => true, "statusnet_blocking" => false, - "rights" => %{}, + "rights" => %{ + "delete_others_notice" => false + }, "statusnet_profile_url" => follower.ap_id, "cover_photo" => banner, "background_image" => nil, @@ -130,6 +136,13 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do assert represented == UserView.render("show.json", %{user: follower, for: user}) 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 user = insert(:user) blocker = insert(:user) @@ -154,7 +167,9 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "following" => false, "follows_you" => false, "statusnet_blocking" => true, - "rights" => %{}, + "rights" => %{ + "delete_others_notice" => false + }, "statusnet_profile_url" => user.ap_id, "cover_photo" => banner, "background_image" => nil, -- 2.45.2