Add User and Status View tests
This commit is contained in:
parent
9af466790a
commit
93e8382d75
|
@ -198,7 +198,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|
|||
|
||||
data = if activity_id, do: Map.put(data, "id", activity_id), else: data
|
||||
|
||||
{:ok, activity} = insert(data, local)
|
||||
{:ok, activity = %Activity{}} = insert(data, local)
|
||||
|
||||
announcements = [ap_id | (object.data["announcements"] || [])] |> Enum.uniq
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
defmodule Pleroma.Web.TwitterAPI.StatusController do
|
||||
use Pleroma.Web, :controller
|
||||
alias Pleroma.{Activity, Repo, Object, User, Misc}
|
||||
alias Pleroma.{Activity, Repo, Object, User}
|
||||
alias Pleroma.Web.TwitterAPI.{ErrorView, TwitterAPI, UserController}
|
||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ defmodule Pleroma.Web.TwitterAPI.UserController do
|
|||
|
||||
def unfollow(%{assigns: %{user: follower}} = conn, params) do
|
||||
case find_user(conn, params) do
|
||||
{:ok, unfollowed = %User{ap_id: unfollowed_id}} ->
|
||||
{:ok, unfollowed = %User{}} ->
|
||||
case User.unfollow(follower, unfollowed) do
|
||||
{:ok, follower = %User{ap_id: ap_id}, %Activity{data: %{"id" => id}}} ->
|
||||
{:ok, _activity} = ActivityPub.insert(%{
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
||||
alias Pleroma.{User, Activity, Repo, Object, Misc}
|
||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
|
||||
|
||||
import Ecto.Query
|
||||
|
||||
def to_for_user_and_mentions(user, mentions) do
|
||||
default_to = [
|
||||
|
|
|
@ -13,7 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.StatusView do
|
|||
}) do
|
||||
{activity, user} = render_activity(assigns)
|
||||
|
||||
announced_activity = Activity.get_by_ap_id(ap_id)
|
||||
[announced_activity = %Activity{}] = Activity.all_by_object_ap_id(ap_id)
|
||||
text = "#{user.nickname} retweeted a status."
|
||||
retweeted_status = render("show.json",
|
||||
Map.merge(assigns, %{activity: announced_activity})
|
||||
|
@ -35,8 +35,7 @@ defmodule Pleroma.Web.TwitterAPI.StatusView do
|
|||
}) do
|
||||
{activity, %User{nickname: nickname}} = render_activity(assigns)
|
||||
text = "#{nickname} favorited a status."
|
||||
|
||||
%Activity{id: liked_activity_id} = Activity.get_by_ap_id(liked_id)
|
||||
[%Activity{id: liked_activity_id}] = Activity.all_by_object_ap_id(liked_id)
|
||||
|
||||
Map.merge(activity, %{
|
||||
"in_reply_to_status_id" => liked_activity_id,
|
||||
|
@ -83,7 +82,10 @@ defmodule Pleroma.Web.TwitterAPI.StatusView do
|
|||
like_count = object["like_count"] || 0
|
||||
favorited = Misc.to_boolean(assigns[:for] && assigns[:for].ap_id in (object["likes"] || []))
|
||||
|
||||
mentions = assigns[:mentions] || []
|
||||
mentions = to
|
||||
|> Enum.map(fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end)
|
||||
|> Enum.filter(&Misc.to_boolean/1)
|
||||
|
||||
attentions = to
|
||||
|> Enum.map(fn (ap_id) -> Enum.find(mentions, fn(user) -> ap_id == user.ap_id end) end)
|
||||
|> Enum.filter(&Misc.to_boolean/1)
|
||||
|
@ -122,10 +124,11 @@ defmodule Pleroma.Web.TwitterAPI.StatusView do
|
|||
|
||||
defp render_activity(assigns = %{
|
||||
activity: activity = %Activity{
|
||||
id: activity_id,
|
||||
data: %{"published" => created_at, "id" => external_url, "actor" => actor_id}
|
||||
},
|
||||
}) do
|
||||
user = User.get_cached_by_ap_id(actor_id)
|
||||
user = %User{} = User.get_cached_by_ap_id(actor_id)
|
||||
{%{
|
||||
"attachments" => [],
|
||||
"attentions" => [],
|
||||
|
@ -133,7 +136,7 @@ defmodule Pleroma.Web.TwitterAPI.StatusView do
|
|||
"external_url" => external_url,
|
||||
"fave_num" => 0,
|
||||
"favorited" => false,
|
||||
"id" => activity.id,
|
||||
"id" => activity_id,
|
||||
"in_reply_to_status_id" => nil,
|
||||
"is_local" => true,
|
||||
"is_post_verb" => false,
|
||||
|
|
|
@ -0,0 +1,131 @@
|
|||
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do
|
||||
use Pleroma.DataCase
|
||||
alias Pleroma.{User, Activity, Object}
|
||||
alias Pleroma.Web.TwitterAPI.{AttachmentView, UserView, StatusView}
|
||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||
alias Pleroma.Builders.UserBuilder
|
||||
import Pleroma.Factory
|
||||
|
||||
test "an announce activity" do
|
||||
user = insert(:user)
|
||||
%Activity{data: %{"id" => note_ap_id, "object" => %{"id" => object_id}}} = insert(:note_activity)
|
||||
object = Object.get_by_ap_id(object_id)
|
||||
|
||||
{:ok,
|
||||
announce_activity = %Activity{id: announce_id, data: %{"type" => "Announce"}},
|
||||
_object} = ActivityPub.announce(user, object)
|
||||
|
||||
status = StatusView.render("show.json", %{activity: announce_activity, for: user})
|
||||
assert status["id"] == announce_id
|
||||
assert status["user"] == UserView.render("show.json", %{user: user, for: user})
|
||||
|
||||
note_activity = Activity.get_by_ap_id(note_ap_id)
|
||||
retweeted_status = StatusView.render("show.json", %{activity: note_activity, for: user})
|
||||
assert retweeted_status["repeated"] == true
|
||||
assert retweeted_status["id"] == note_activity.id
|
||||
assert status["statusnet_conversation_id"] == retweeted_status["statusnet_conversation_id"]
|
||||
|
||||
assert status["retweeted_status"] == retweeted_status
|
||||
end
|
||||
|
||||
test "a like activity" do
|
||||
user = insert(:user)
|
||||
%Activity{id: note_id, data: %{"id" => note_ap_id, "object" => %{"id" => object_id}}} = insert(:note_activity)
|
||||
object = Object.get_by_ap_id(object_id)
|
||||
|
||||
{:ok, like_activity = %Activity{id: like_id, data: %{"type" => "Like"}}, _object} = ActivityPub.like(user, object)
|
||||
status = StatusView.render("show.json", %{activity: like_activity})
|
||||
|
||||
assert status["id"] == like_id
|
||||
assert status["in_reply_to_status_id"] == note_id
|
||||
|
||||
note_activity = Activity.get_by_ap_id(note_ap_id)
|
||||
liked_status = StatusView.render("show.json", %{activity: note_activity, for: user})
|
||||
assert liked_status["favorited"] == true
|
||||
end
|
||||
|
||||
test "an activity" do
|
||||
{:ok, user} = UserBuilder.insert
|
||||
# {:ok, mentioned_user } = UserBuilder.insert(%{nickname: "shp", ap_id: "shp"})
|
||||
mentioned_user = insert(:user, %{nickname: "shp"})
|
||||
|
||||
# {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
|
||||
follower = insert(:user, %{following: [User.ap_followers(user)]})
|
||||
|
||||
object = %Object{
|
||||
data: %{
|
||||
"type" => "Image",
|
||||
"url" => [
|
||||
%{
|
||||
"type" => "Link",
|
||||
"mediaType" => "image/jpg",
|
||||
"href" => "http://example.org/image.jpg"
|
||||
}
|
||||
],
|
||||
"uuid" => 1
|
||||
}
|
||||
}
|
||||
|
||||
content_html = "Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
|
||||
content = HtmlSanitizeEx.strip_tags(content_html)
|
||||
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
|
||||
|
||||
{:ok, convo_object} = Object.context_mapping("2hu") |> Repo.insert
|
||||
|
||||
activity = %Activity{
|
||||
id: 1,
|
||||
data: %{
|
||||
"type" => "Create",
|
||||
"id" => "id",
|
||||
"to" => [
|
||||
User.ap_followers(user),
|
||||
"https://www.w3.org/ns/activitystreams#Public",
|
||||
mentioned_user.ap_id
|
||||
],
|
||||
"actor" => user.ap_id,
|
||||
"object" => %{
|
||||
"published" => date,
|
||||
"type" => "Note",
|
||||
"content" => content_html,
|
||||
"inReplyToStatusId" => 213123,
|
||||
"attachment" => [
|
||||
object
|
||||
],
|
||||
"like_count" => 5,
|
||||
"announcement_count" => 3,
|
||||
"context" => "2hu"
|
||||
},
|
||||
"published" => date,
|
||||
"context" => "2hu"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
expected_status = %{
|
||||
"id" => activity.id,
|
||||
"user" => UserView.render("show.json", %{user: user, for: follower}),
|
||||
"is_local" => true,
|
||||
"attentions" => [],
|
||||
"statusnet_html" => content_html,
|
||||
"text" => content,
|
||||
"is_post_verb" => true,
|
||||
"created_at" => "Tue May 24 13:26:08 +0000 2016",
|
||||
"in_reply_to_status_id" => 213123,
|
||||
"statusnet_conversation_id" => convo_object.id,
|
||||
"attachments" => [
|
||||
AttachmentView.render("show.json", %{attachment: object})
|
||||
],
|
||||
"attentions" => [
|
||||
UserView.render("short.json", %{user: mentioned_user})
|
||||
],
|
||||
"fave_num" => 5,
|
||||
"repeat_num" => 3,
|
||||
"favorited" => false,
|
||||
"repeated" => false,
|
||||
"external_url" => activity.data["id"],
|
||||
"source" => "api"
|
||||
}
|
||||
|
||||
assert StatusView.render("show.json", %{activity: activity, for: follower}) == expected_status
|
||||
end
|
||||
end
|
|
@ -0,0 +1,80 @@
|
|||
defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
use Pleroma.DataCase
|
||||
|
||||
alias Pleroma.User
|
||||
alias Pleroma.Web.TwitterAPI.UserView
|
||||
alias Pleroma.Builders.UserBuilder
|
||||
|
||||
import Pleroma.Factory
|
||||
|
||||
setup do
|
||||
user = insert(:user)
|
||||
[user: user]
|
||||
end
|
||||
|
||||
test "A user with an avatar object", %{user: user} do
|
||||
image = "image"
|
||||
user = %{ user | avatar: %{ "url" => [%{"href" => image}] }}
|
||||
represented = UserView.render("show.json", %{user: user})
|
||||
assert represented["profile_image_url"] == image
|
||||
end
|
||||
|
||||
test "A user" do
|
||||
note_activity = insert(:note_activity)
|
||||
user = User.get_cached_by_ap_id(note_activity.data["actor"])
|
||||
follower = insert(:user)
|
||||
second_follower = insert(:user)
|
||||
|
||||
User.follow(follower, user)
|
||||
User.follow(second_follower, user)
|
||||
User.follow(user, follower)
|
||||
|
||||
user = Repo.get!(User, user.id)
|
||||
|
||||
image = "https://placehold.it/48x48"
|
||||
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
"name" => user.name,
|
||||
"screen_name" => user.nickname,
|
||||
"description" => user.bio,
|
||||
"favourites_count" => 0,
|
||||
"statuses_count" => 1,
|
||||
"friends_count" => 1,
|
||||
"followers_count" => 2,
|
||||
"profile_image_url" => image,
|
||||
"profile_image_url_https" => image,
|
||||
"profile_image_url_profile_size" => image,
|
||||
"profile_image_url_original" => image,
|
||||
"following" => false,
|
||||
"rights" => %{},
|
||||
"statusnet_profile_url" => user.ap_id
|
||||
}
|
||||
|
||||
assert represented == UserView.render("show.json", %{user: user})
|
||||
end
|
||||
|
||||
test "A user for a given other follower", %{user: user} do
|
||||
{:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
|
||||
image = "https://placehold.it/48x48"
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
"name" => user.name,
|
||||
"screen_name" => user.nickname,
|
||||
"description" => user.bio,
|
||||
"favourites_count" => 0,
|
||||
"statuses_count" => 0,
|
||||
"friends_count" => 0,
|
||||
"followers_count" => 1,
|
||||
"profile_image_url" => image,
|
||||
"profile_image_url_https" => image,
|
||||
"profile_image_url_profile_size" => image,
|
||||
"profile_image_url_original" => image,
|
||||
"following" => true,
|
||||
"rights" => %{},
|
||||
"statusnet_profile_url" => user.ap_id
|
||||
}
|
||||
|
||||
assert represented == UserView.render("show.json", %{user: user, for: follower})
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue