From 6cac8e3c8b866c71e96ade110b7b1e222dd78751 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sun, 18 Jun 2017 19:04:46 +0200 Subject: [PATCH] Downcase tags coming in through the TwAPI. --- lib/pleroma/formatter.ex | 2 +- test/formatter_test.exs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index 50c4279f6..a8149b7b3 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -9,7 +9,7 @@ def linkify(text) do @tag_regex ~r/\#\w+/u def parse_tags(text) do Regex.scan(@tag_regex, text) - |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, tag} end) + |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, String.downcase(tag)} end) end def parse_mentions(text) do diff --git a/test/formatter_test.exs b/test/formatter_test.exs index 35625f8ff..eb4affab8 100644 --- a/test/formatter_test.exs +++ b/test/formatter_test.exs @@ -16,9 +16,9 @@ test "turning urls into links" do describe ".parse_tags" do test "parses tags in the text" do - text = "Here's a #test. Maybe these are #working or not. What about #漢字? And #は。" + text = "Here's a #Test. Maybe these are #working or not. What about #漢字? And #は。" expected = [ - {"#test", "test"}, + {"#Test", "test"}, {"#working", "working"}, {"#漢字", "漢字"}, {"#は", "は"}