Merge branch 'bugfix/gopher-empty-lines' into 'develop'

lib/pleroma/gopher/server.ex: Fix errorneous empty lines

See merge request pleroma/pleroma!270
This commit is contained in:
lambda 2018-08-12 10:55:21 +00:00
commit ae9c4983d7

View file

@ -77,14 +77,14 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <> link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <>
info("#{like_count} likes, #{announcement_count} repeats") <> info("#{like_count} likes, #{announcement_count} repeats") <>
"\r\n" <> "i\tfake\t(NULL)\t0\r\n" <>
info( info(
HtmlSanitizeEx.strip_tags( HtmlSanitizeEx.strip_tags(
String.replace(activity.data["object"]["content"], "<br>", "\r") String.replace(activity.data["object"]["content"], "<br>", "\r")
) )
) )
end) end)
|> Enum.join("\r\n") |> Enum.join("i\tfake\t(NULL)\t0\r\n")
end end
def response("") do def response("") do