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

diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 27e2adc16..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