X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=575bf9b2dcb20d3bc0ded04ea0abdb406cb6d0f1;hb=e49b583147748be73062acc92ea510f6f55a503a;hp=ad29d21d77d464622c2bf73b0cf775b5d83accab;hpb=becf7dced6c051326f33dd201ac25d38af341b24;p=akkoma diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex index ad29d21d7..575bf9b2d 100644 --- a/lib/pleroma/formatter.ex +++ b/lib/pleroma/formatter.ex @@ -136,7 +136,12 @@ defmodule Pleroma.Formatter do HTML.filter_tags(text) end - def html_escape(text, format) when format in ["text/plain", "text/x.misskeymarkdown"] do + def html_escape(text, "text/x.misskeymarkdown") do + text + |> HTML.filter_tags() + end + + def html_escape(text, "text/plain") do Regex.split(@link_regex, text, include_captures: true) |> Enum.map_every(2, fn chunk -> {:safe, part} = Phoenix.HTML.html_escape(chunk)