@@ -245,10 +245,10 @@ defmodule Pleroma.FormatterTest do | |||
end | |||
test "it adds cool emoji" do | |||
text = "I love :moominmamma:" | |||
text = "I love :firefox:" | |||
expected_result = | |||
"I love <img height=\"32px\" width=\"32px\" alt=\"moominmamma\" title=\"moominmamma\" src=\"/finmoji/128px/moominmamma-128.png\" />" | |||
"I love <img height=\"32px\" width=\"32px\" alt=\"firefox\" title=\"firefox\" src=\"/emoji/Firefox.gif\" />" | |||
assert Formatter.emojify(text) == expected_result | |||
end | |||
@@ -269,10 +269,10 @@ defmodule Pleroma.FormatterTest do | |||
end | |||
test "it returns the emoji used in the text" do | |||
text = "I love :moominmamma:" | |||
text = "I love :firefox:" | |||
assert Formatter.get_emoji(text) == [ | |||
{"moominmamma", "/finmoji/128px/moominmamma-128.png", "Finmoji"} | |||
{"firefox", "/emoji/Firefox.gif", ["Gif", "Fun"]} | |||
] | |||
end | |||
@@ -946,7 +946,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do | |||
test "it strips internal fields" do | |||
user = insert(:user) | |||
{:ok, activity} = CommonAPI.post(user, %{"status" => "#2hu :moominmamma:"}) | |||
{:ok, activity} = CommonAPI.post(user, %{"status" => "#2hu :firefox:"}) | |||
{:ok, modified} = Transmogrifier.prepare_outgoing(activity.data) | |||
@@ -40,19 +40,19 @@ defmodule Pleroma.Web.CommonAPITest do | |||
test "it adds emoji in the object" do | |||
user = insert(:user) | |||
{:ok, activity} = CommonAPI.post(user, %{"status" => ":moominmamma:"}) | |||
{:ok, activity} = CommonAPI.post(user, %{"status" => ":firefox:"}) | |||
assert Object.normalize(activity).data["emoji"]["moominmamma"] | |||
assert Object.normalize(activity).data["emoji"]["firefox"] | |||
end | |||
test "it adds emoji when updating profiles" do | |||
user = insert(:user, %{name: ":karjalanpiirakka:"}) | |||
user = insert(:user, %{name: ":firefox:"}) | |||
CommonAPI.update(user) | |||
user = User.get_cached_by_ap_id(user.ap_id) | |||
[karjalanpiirakka] = user.info.source_data["tag"] | |||
[firefox] = user.info.source_data["tag"] | |||
assert karjalanpiirakka["name"] == ":karjalanpiirakka:" | |||
assert firefox["name"] == ":firefox:" | |||
end | |||
describe "posting" do | |||
@@ -37,21 +37,21 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do | |||
end | |||
test "parses emoji from name and bio" do | |||
{:ok, user} = UserBuilder.insert(%{name: ":karjalanpiirakka:", bio: ":perkele:"}) | |||
{:ok, user} = UserBuilder.insert(%{name: ":blank:", bio: ":firefox:"}) | |||
expected = [ | |||
%{ | |||
"type" => "Emoji", | |||
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/finmoji/128px/perkele-128.png"}, | |||
"name" => ":perkele:" | |||
"icon" => %{"type" => "Image", "url" => "#{Endpoint.url()}/emoji/Firefox.gif"}, | |||
"name" => ":firefox:" | |||
}, | |||
%{ | |||
"type" => "Emoji", | |||
"icon" => %{ | |||
"type" => "Image", | |||
"url" => "#{Endpoint.url()}/finmoji/128px/karjalanpiirakka-128.png" | |||
"url" => "#{Endpoint.url()}/emoji/blank.png" | |||
}, | |||
"name" => ":karjalanpiirakka:" | |||
"name" => ":blank:" | |||
} | |||
] | |||
@@ -107,7 +107,7 @@ defmodule Pleroma.Web.Push.ImplTest do | |||
"type" => "Create", | |||
"object" => %{ | |||
"content" => | |||
"<span>Lorem ipsum dolor sit amet</span>, consectetur :bear: adipiscing elit. Fusce sagittis finibus turpis." | |||
"<span>Lorem ipsum dolor sit amet</span>, consectetur :firefox: adipiscing elit. Fusce sagittis finibus turpis." | |||
} | |||
} | |||
} | |||
@@ -129,7 +129,7 @@ defmodule Pleroma.Web.Push.ImplTest do | |||
insert(:note, %{ | |||
data: %{ | |||
"content" => | |||
"<span>Lorem ipsum dolor sit amet</span>, consectetur :bear: adipiscing elit. Fusce sagittis finibus turpis." | |||
"<span>Lorem ipsum dolor sit amet</span>, consectetur :firefox: adipiscing elit. Fusce sagittis finibus turpis." | |||
} | |||
}) | |||
@@ -41,7 +41,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||
input = %{ | |||
"status" => | |||
"Hello again, @shp.<script></script>\nThis is on another :moominmamma: line. #2hu #epic #phantasmagoric", | |||
"Hello again, @shp.<script></script>\nThis is on another :firefox: line. #2hu #epic #phantasmagoric", | |||
"media_ids" => [object.id] | |||
} | |||
@@ -49,7 +49,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||
object = Object.normalize(activity.data["object"]) | |||
expected_text = | |||
"Hello again, <span class='h-card'><a data-user='#{mentioned_user.id}' class='u-url mention' href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :moominmamma: line. <a class='hashtag' data-tag='2hu' href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a class='hashtag' data-tag='epic' href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a class='hashtag' data-tag='phantasmagoric' href='http://localhost:4001/tag/phantasmagoric' rel='tag'>#phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" | |||
"Hello again, <span class='h-card'><a data-user='#{mentioned_user.id}' class='u-url mention' href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :firefox: line. <a class='hashtag' data-tag='2hu' href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a class='hashtag' data-tag='epic' href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a class='hashtag' data-tag='phantasmagoric' href='http://localhost:4001/tag/phantasmagoric' rel='tag'>#phantasmagoric</a><br><a href=\"http://example.org/image.jpg\" class='attachment'>image.jpg</a>" | |||
assert get_in(object.data, ["content"]) == expected_text | |||
assert get_in(object.data, ["type"]) == "Note" | |||
@@ -65,8 +65,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do | |||
assert Enum.member?(get_in(activity.data, ["to"]), "shp") | |||
assert activity.local == true | |||
assert %{"moominmamma" => "http://localhost:4001/finmoji/128px/moominmamma-128.png"} = | |||
object.data["emoji"] | |||
assert %{"firefox" => "http://localhost:4001/emoji/Firefox.gif"} = object.data["emoji"] | |||
# hashtags | |||
assert object.data["tag"] == ["2hu", "epic", "phantasmagoric"] | |||
@@ -91,16 +91,16 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do | |||
test "a create activity with a summary containing emoji" do | |||
{:ok, activity} = | |||
CommonAPI.post(insert(:user), %{ | |||
"spoiler_text" => ":woollysocks: meow", | |||
"spoiler_text" => ":firefox: meow", | |||
"status" => "." | |||
}) | |||
result = ActivityView.render("activity.json", activity: activity) | |||
expected = ":woollysocks: meow" | |||
expected = ":firefox: meow" | |||
expected_html = | |||
"<img height=\"32px\" width=\"32px\" alt=\"woollysocks\" title=\"woollysocks\" src=\"http://localhost:4001/finmoji/128px/woollysocks-128.png\" /> meow" | |||
"<img height=\"32px\" width=\"32px\" alt=\"firefox\" title=\"firefox\" src=\"http://localhost:4001/emoji/Firefox.gif\" /> meow" | |||
assert result["summary"] == expected | |||
assert result["summary_html"] == expected_html | |||