Downcase tags coming in through the TwAPI.

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 50c4279f64c8a5bb8ee24c6a78528df75e2e17de..a8149b7b36801f55934f1f82e30badd86931b418 100644 (file)
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -9,7 +9,7 @@ defmodule Pleroma.Formatter 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 35625f8ff9e7ee096f581279adba913fabfdb493..eb4affab8e21594cc84083fde2167e82ad466de2 100644 (file)
--- a/test/formatter_test.exs
+++ b/test/formatter_test.exs
@@ -16,9 +16,9 @@ defmodule Pleroma.FormatterTest 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"},
         {"#漢字", "漢字"},
         {"#は", "は"}