X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fweb%2Ftwitter_api%2Fviews%2Fuser_view_test.exs;h=9f8bf4cdcfda9fe5cd92ff31d4bb4c241b6163e1;hb=4b3ec5351466f8615b32e62cc4e6215f8a80b105;hp=7b32894221fc0ffb7ffaf6391a9f0b564b5b2c0d;hpb=678f572144bfd861793c0b72061b04cdb9b7c991;p=akkoma

diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs
index 7b3289422..9f8bf4cdc 100644
--- a/test/web/twitter_api/views/user_view_test.exs
+++ b/test/web/twitter_api/views/user_view_test.exs
@@ -2,7 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
   use Pleroma.DataCase
 
   alias Pleroma.User
-  alias Pleroma.Web.TwitterAPI.{UserView, Utils}
+  alias Pleroma.Web.TwitterAPI.UserView
+  alias Pleroma.Web.CommonAPI.Utils
   alias Pleroma.Builders.UserBuilder
 
   import Pleroma.Factory
@@ -14,7 +15,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
 
   test "A user with an avatar object", %{user: user} do
     image = "image"
-    user = %{ user | avatar: %{ "url" => [%{"href" => image}] }}
+    user = %{user | avatar: %{"url" => [%{"href" => image}]}}
     represented = UserView.render("show.json", %{user: user})
     assert represented["profile_image_url"] == image
   end
@@ -29,17 +30,18 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
     User.follow(follower, user)
     User.follow(second_follower, user)
     User.follow(user, follower)
+    {:ok, user} = User.update_follower_count(user)
+    Cachex.put(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
 
-    user = Repo.get!(User, user.id)
-
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
 
     represented = %{
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
-      "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+      "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 1,
       "friends_count" => 1,
@@ -49,10 +51,15 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "profile_image_url_profile_size" => image,
       "profile_image_url_original" => image,
       "following" => false,
-      "rights" => %{},
+      "follows_you" => false,
+      "statusnet_blocking" => false,
+      "rights" => %{
+        "delete_others_notice" => false
+      },
       "statusnet_profile_url" => user.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     assert represented == UserView.render("show.json", %{user: user})
@@ -61,13 +68,15 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
   test "A user for a given other follower", %{user: user} do
     {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
     {:ok, user} = User.update_follower_count(user)
-    image = "https://placehold.it/48x48"
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
     represented = %{
       "id" => user.id,
       "name" => user.name,
       "screen_name" => user.nickname,
       "description" => HtmlSanitizeEx.strip_tags(user.bio),
-      "created_at" => user.inserted_at |> Utils.format_naive_asctime,
+      "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
       "favourites_count" => 0,
       "statuses_count" => 0,
       "friends_count" => 0,
@@ -77,12 +86,97 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
       "profile_image_url_profile_size" => image,
       "profile_image_url_original" => image,
       "following" => true,
-      "rights" => %{},
+      "follows_you" => false,
+      "statusnet_blocking" => false,
+      "rights" => %{
+        "delete_others_notice" => false
+      },
       "statusnet_profile_url" => user.ap_id,
-      "cover_photo" => nil,
-      "background_image" => nil
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
     }
 
     assert represented == UserView.render("show.json", %{user: user, for: follower})
   end
+
+  test "A user that follows you", %{user: user} do
+    follower = insert(:user)
+    {:ok, follower} = User.follow(follower, user)
+    {:ok, user} = User.update_follower_count(user)
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
+    represented = %{
+      "id" => follower.id,
+      "name" => follower.name,
+      "screen_name" => follower.nickname,
+      "description" => HtmlSanitizeEx.strip_tags(follower.bio),
+      "created_at" => follower.inserted_at |> Utils.format_naive_asctime(),
+      "favourites_count" => 0,
+      "statuses_count" => 0,
+      "friends_count" => 1,
+      "followers_count" => 0,
+      "profile_image_url" => image,
+      "profile_image_url_https" => image,
+      "profile_image_url_profile_size" => image,
+      "profile_image_url_original" => image,
+      "following" => false,
+      "follows_you" => true,
+      "statusnet_blocking" => false,
+      "rights" => %{
+        "delete_others_notice" => false
+      },
+      "statusnet_profile_url" => follower.ap_id,
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
+    }
+
+    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)
+    User.block(blocker, user)
+    image = "http://localhost:4001/images/avi.png"
+    banner = "http://localhost:4001/images/banner.png"
+
+    represented = %{
+      "id" => user.id,
+      "name" => user.name,
+      "screen_name" => user.nickname,
+      "description" => HtmlSanitizeEx.strip_tags(user.bio),
+      "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
+      "favourites_count" => 0,
+      "statuses_count" => 0,
+      "friends_count" => 0,
+      "followers_count" => 0,
+      "profile_image_url" => image,
+      "profile_image_url_https" => image,
+      "profile_image_url_profile_size" => image,
+      "profile_image_url_original" => image,
+      "following" => false,
+      "follows_you" => false,
+      "statusnet_blocking" => true,
+      "rights" => %{
+        "delete_others_notice" => false
+      },
+      "statusnet_profile_url" => user.ap_id,
+      "cover_photo" => banner,
+      "background_image" => nil,
+      "is_local" => true
+    }
+
+    blocker = Repo.get(User, blocker.id)
+    assert represented == UserView.render("show.json", %{user: user, for: blocker})
+  end
 end