forked from AkkomaGang/akkoma
Apply incoming custom emoji.
This commit is contained in:
parent
16b1fcd271
commit
959e993c7d
3 changed files with 18 additions and 6 deletions
|
@ -95,8 +95,14 @@ def parse_mentions(text) do
|
||||||
|
|
||||||
@emoji @finmoji_with_filenames
|
@emoji @finmoji_with_filenames
|
||||||
|
|
||||||
def emojify(text) do
|
def emojify(text, additional \\ nil) do
|
||||||
Enum.reduce(@emoji, text, fn ({emoji, file}, text) ->
|
all_emoji = if additional do
|
||||||
|
@emoji ++ Map.to_list(additional)
|
||||||
|
else
|
||||||
|
@emoji
|
||||||
|
end
|
||||||
|
|
||||||
|
Enum.reduce(all_emoji, text, fn ({emoji, file}, text) ->
|
||||||
String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{file}' />")
|
String.replace(text, ":#{emoji}:", "<img height='32px' width='32px' alt='#{emoji}' title='#{emoji}' src='#{file}' />")
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -135,11 +135,13 @@ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = ac
|
||||||
tags = activity.data["object"]["tag"] || []
|
tags = activity.data["object"]["tag"] || []
|
||||||
possibly_sensitive = Enum.member?(tags, "nsfw")
|
possibly_sensitive = Enum.member?(tags, "nsfw")
|
||||||
|
|
||||||
|
html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
|
||||||
|
|
||||||
%{
|
%{
|
||||||
"id" => activity.id,
|
"id" => activity.id,
|
||||||
"uri" => activity.data["object"]["id"],
|
"uri" => activity.data["object"]["id"],
|
||||||
"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
|
"user" => UserView.render("show.json", %{user: user, for: opts[:for]}),
|
||||||
"statusnet_html" => HtmlSanitizeEx.basic_html(content) |> Formatter.emojify,
|
"statusnet_html" => html,
|
||||||
"text" => HtmlSanitizeEx.strip_tags(content),
|
"text" => HtmlSanitizeEx.strip_tags(content),
|
||||||
"is_local" => activity.local,
|
"is_local" => activity.local,
|
||||||
"is_post_verb" => true,
|
"is_post_verb" => true,
|
||||||
|
|
|
@ -70,7 +70,7 @@ test "an activity" do
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
content_html = "<script>alert('YAY')</script>Some content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
|
content_html = "<script>alert('YAY')</script>Some :2hu: content mentioning <a href='#{mentioned_user.ap_id}'>@shp</shp>"
|
||||||
content = HtmlSanitizeEx.strip_tags(content_html)
|
content = HtmlSanitizeEx.strip_tags(content_html)
|
||||||
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
|
date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601
|
||||||
|
|
||||||
|
@ -99,7 +99,10 @@ test "an activity" do
|
||||||
"like_count" => 5,
|
"like_count" => 5,
|
||||||
"announcement_count" => 3,
|
"announcement_count" => 3,
|
||||||
"context" => "2hu",
|
"context" => "2hu",
|
||||||
"tag" => ["content", "mentioning", "nsfw"]
|
"tag" => ["content", "mentioning", "nsfw"],
|
||||||
|
"emoji" => %{
|
||||||
|
"2hu" => "corndog.png"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"published" => date,
|
"published" => date,
|
||||||
"context" => "2hu"
|
"context" => "2hu"
|
||||||
|
@ -107,12 +110,13 @@ test "an activity" do
|
||||||
local: false
|
local: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
expected_html = "alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{mentioned_user.ap_id}\">@shp</a>"
|
||||||
|
|
||||||
expected_status = %{
|
expected_status = %{
|
||||||
"id" => activity.id,
|
"id" => activity.id,
|
||||||
"user" => UserView.render("show.json", %{user: user, for: follower}),
|
"user" => UserView.render("show.json", %{user: user, for: follower}),
|
||||||
"is_local" => false,
|
"is_local" => false,
|
||||||
"statusnet_html" => HtmlSanitizeEx.basic_html(content_html),
|
"statusnet_html" => expected_html,
|
||||||
"text" => content,
|
"text" => content,
|
||||||
"is_post_verb" => true,
|
"is_post_verb" => true,
|
||||||
"created_at" => "Tue May 24 13:26:08 +0000 2016",
|
"created_at" => "Tue May 24 13:26:08 +0000 2016",
|
||||||
|
|
Loading…
Reference in a new issue