diff options
| author | lain <lain@soykaf.club> | 2018-05-28 12:39:49 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-05-28 12:39:49 +0200 |
| commit | 461f201caae68cd781240fa40f8b6502ba7e57cb (patch) | |
| tree | 344698862dbb47b2021a30dcce16366bd9788e89 | |
| parent | 3ece4a3ebc05ecc00be6f0a8247d8ca819dc8624 (diff) | |
| parent | 8216d5e40e31970b450524d39b634a84f6ec415c (diff) | |
| download | pleroma-461f201caae68cd781240fa40f8b6502ba7e57cb.tar.gz pleroma-461f201caae68cd781240fa40f8b6502ba7e57cb.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
| -rw-r--r-- | lib/pleroma/formatter.ex | 4 | ||||
| -rw-r--r-- | test/formatter_test.exs | 4 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_test.exs | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 53e2c204f..df7ffbc41 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -200,7 +200,9 @@ defmodule Pleroma.Formatter do ap_id = info["source_data"]["url"] || ap_id short_match = String.split(match, "@") |> tl() |> hd() - {uuid, "<span><a href='#{ap_id}'>@<span>#{short_match}</span></a></span>"} + + {uuid, + "<span><a class='mention' href='#{ap_id}'>@<span>#{short_match}</span></a></span>"} end) {subs, uuid_text} diff --git a/test/formatter_test.exs b/test/formatter_test.exs index e89b36663..c2b3d4ac0 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -109,9 +109,9 @@ defmodule Pleroma.FormatterTest do Enum.each(subs, fn {uuid, _} -> assert String.contains?(text, uuid) end) expected_text = - "<span><a href='#{gsimg.ap_id}'>@<span>gsimg</span></a></span> According to <span><a href='#{ + "<span><a class='mention' href='#{gsimg.ap_id}'>@<span>gsimg</span></a></span> According to <span><a class='mention' href='#{ "https://archeme/@archaeme" - }'>@<span>archaeme</span></a></span>, that is @daggsy. Also hello <span><a href='#{ + }'>@<span>archaeme</span></a></span>, that is @daggsy. Also hello <span><a class='mention' href='#{ archaeme_remote.ap_id }'>@<span>archaeme</span></a></span>" diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index 4716abb84..edacb312d 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -35,7 +35,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do {:ok, activity = %Activity{}} = TwitterAPI.create_status(user, input) expected_text = - "Hello again, <span><a href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :moominmamma: line. <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a 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><a class='mention' href='shp'>@<span>shp</span></a></span>.<script></script><br>This is on another :moominmamma: line. <a href='http://localhost:4001/tag/2hu' rel='tag'>#2hu</a> <a href='http://localhost:4001/tag/epic' rel='tag'>#epic</a> <a 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(activity.data, ["object", "content"]) == expected_text assert get_in(activity.data, ["object", "type"]) == "Note" |