Add tests for emoji in user profiles

Also use the correct field in TwitterAPI...
This commit is contained in:
eal 2018-08-08 09:24:50 +03:00
parent cee63ad3f7
commit ed9738e031
3 changed files with 49 additions and 7 deletions

View file

@ -50,6 +50,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"friends_count" => user_info[:following_count], "friends_count" => user_info[:following_count],
"id" => user.id, "id" => user.id,
"name" => user.name, "name" => user.name,
"name_html" => Formatter.emojify(user.name, emoji),
"profile_image_url" => image, "profile_image_url" => image,
"profile_image_url_https" => image, "profile_image_url_https" => image,
"profile_image_url_profile_size" => image, "profile_image_url_profile_size" => image,
@ -58,7 +59,6 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"delete_others_notice" => !!user.info["is_moderator"] "delete_others_notice" => !!user.info["is_moderator"]
}, },
"screen_name" => user.nickname, "screen_name" => user.nickname,
"screen_name_html" => Formatter.emojify(user.nickname, emoji),
"statuses_count" => user_info[:note_count], "statuses_count" => user_info[:note_count],
"statusnet_profile_url" => user.ap_id, "statusnet_profile_url" => user.ap_id,
"cover_photo" => User.banner_url(user) |> MediaProxy.url(), "cover_photo" => User.banner_url(user) |> MediaProxy.url(),

View file

@ -5,10 +5,21 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
alias Pleroma.User alias Pleroma.User
test "Represent a user account" do test "Represent a user account" do
source_data = %{
"tag" => [
%{
"type" => "Emoji",
"icon" => %{"url" => "/file.png"},
"name" => ":karjalanpiirakka:"
}
]
}
user = user =
insert(:user, %{ insert(:user, %{
info: %{"note_count" => 5, "follower_count" => 3}, info: %{"note_count" => 5, "follower_count" => 3, "source_data" => source_data},
nickname: "shp@shitposter.club", nickname: "shp@shitposter.club",
name: ":karjalanpiirakka: shp",
inserted_at: ~N[2017-08-15 15:47:06.597036] inserted_at: ~N[2017-08-15 15:47:06.597036]
}) })
@ -28,7 +39,14 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
avatar_static: "http://localhost:4001/images/avi.png", avatar_static: "http://localhost:4001/images/avi.png",
header: "http://localhost:4001/images/banner.png", header: "http://localhost:4001/images/banner.png",
header_static: "http://localhost:4001/images/banner.png", header_static: "http://localhost:4001/images/banner.png",
emojis: [], emojis: [
%{
"static_url" => "/file.png",
"url" => "/file.png",
"shortcode" => "karjalanpiirakka",
"visible_in_picker" => false
}
],
fields: [], fields: [],
source: %{ source: %{
note: "", note: "",

View file

@ -20,6 +20,30 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
assert represented["profile_image_url"] == image assert represented["profile_image_url"] == image
end end
test "A user with emoji in username", %{user: user} do
expected =
"<img height='32px' width='32px' alt='karjalanpiirakka' title='karjalanpiirakka' src='/file.png' /> man"
user = %{
user
| info: %{
"source_data" => %{
"tag" => [
%{
"type" => "Emoji",
"icon" => %{"url" => "/file.png"},
"name" => ":karjalanpiirakka:"
}
]
}
}
}
user = %{user | name: ":karjalanpiirakka: man"}
represented = UserView.render("show.json", %{user: user})
assert represented["name_html"] == expected
end
test "A user" do test "A user" do
note_activity = insert(:note_activity) note_activity = insert(:note_activity)
user = User.get_cached_by_ap_id(note_activity.data["actor"]) user = User.get_cached_by_ap_id(note_activity.data["actor"])
@ -40,7 +64,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"id" => user.id, "id" => user.id,
"name" => user.name, "name" => user.name,
"screen_name" => user.nickname, "screen_name" => user.nickname,
"screen_name_html" => user.nickname, "name_html" => user.name,
"description" => HtmlSanitizeEx.strip_tags(user.bio), "description" => HtmlSanitizeEx.strip_tags(user.bio),
"description_html" => HtmlSanitizeEx.strip_tags(user.bio), "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
"created_at" => user.inserted_at |> Utils.format_naive_asctime(), "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
@ -79,7 +103,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"id" => user.id, "id" => user.id,
"name" => user.name, "name" => user.name,
"screen_name" => user.nickname, "screen_name" => user.nickname,
"screen_name_html" => user.nickname, "name_html" => user.name,
"description" => HtmlSanitizeEx.strip_tags(user.bio), "description" => HtmlSanitizeEx.strip_tags(user.bio),
"description_html" => HtmlSanitizeEx.strip_tags(user.bio), "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
"created_at" => user.inserted_at |> Utils.format_naive_asctime(), "created_at" => user.inserted_at |> Utils.format_naive_asctime(),
@ -119,7 +143,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"id" => follower.id, "id" => follower.id,
"name" => follower.name, "name" => follower.name,
"screen_name" => follower.nickname, "screen_name" => follower.nickname,
"screen_name_html" => follower.nickname, "name_html" => follower.name,
"description" => HtmlSanitizeEx.strip_tags(follower.bio), "description" => HtmlSanitizeEx.strip_tags(follower.bio),
"description_html" => HtmlSanitizeEx.strip_tags(follower.bio), "description_html" => HtmlSanitizeEx.strip_tags(follower.bio),
"created_at" => follower.inserted_at |> Utils.format_naive_asctime(), "created_at" => follower.inserted_at |> Utils.format_naive_asctime(),
@ -166,7 +190,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
"id" => user.id, "id" => user.id,
"name" => user.name, "name" => user.name,
"screen_name" => user.nickname, "screen_name" => user.nickname,
"screen_name_html" => user.nickname, "name_html" => user.name,
"description" => HtmlSanitizeEx.strip_tags(user.bio), "description" => HtmlSanitizeEx.strip_tags(user.bio),
"description_html" => HtmlSanitizeEx.strip_tags(user.bio), "description_html" => HtmlSanitizeEx.strip_tags(user.bio),
"created_at" => user.inserted_at |> Utils.format_naive_asctime(), "created_at" => user.inserted_at |> Utils.format_naive_asctime(),