X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=fbcbca9796e7e6dba95b9b32b8dba5a94d204a78;hb=4524721fba0582774b7c38fdc1f270c43fd8d53b;hp=7ccd7e7bb8bdcad4dbfa7ab2020ef670e3f43949;hpb=d761b1543af537fb6f1013c0930449c7c6a26941;p=akkoma

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 7ccd7e7bb..fbcbca979 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -7,9 +7,10 @@ defmodule Pleroma.Formatter do
   end
 
   @tag_regex ~r/\#\w+/u
-  def parse_tags(text) do
+  def parse_tags(text, data \\ %{}) do
     Regex.scan(@tag_regex, text)
     |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, String.downcase(tag)} end)
+    |> (fn map -> if data["sensitive"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
   end
 
   def parse_mentions(text) do
@@ -125,6 +126,5 @@ defmodule Pleroma.Formatter do
 
   def get_custom_emoji() do
     @emoji
-    |> Enum.into %{}
   end
 end