X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fgopher%2Fserver.ex;h=82e241f21904025ea6c40f51286a5ffad0d0532c;hb=2d775bf1be5ddf0a8c5553ef15dde55c2483c1d4;hp=ede99a7380b64010d9b4144235d49056e37a9e2a;hpb=fe1dcf0027f62c86020ae2f473ada5fff87b8302;p=akkoma

diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
index ede99a738..82e241f21 100644
--- a/lib/pleroma/gopher/server.ex
+++ b/lib/pleroma/gopher/server.ex
@@ -50,9 +50,10 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
   end
 
   def info(text) do
-    text = String.replace(text, ~r/[\t\n]/, " ")
+    text = String.replace(text, ~r/[\t\n]/, "")
+
     String.split(text, "\r")
-    |> Enum.map(fn (text) ->
+    |> Enum.map(fn text ->
       "i#{text}\tfake\(NULL)\t0\r\n"
     end)
     |> Enum.join("")
@@ -82,7 +83,12 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
 
       link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <>
         info("#{like_count} likes, #{announcement_count} repeats") <>
-        "\r\n" <> info(HtmlSanitizeEx.strip_tags(activity.data["object"]["content"]))
+        "\r\n" <>
+        info(
+          HtmlSanitizeEx.strip_tags(
+            String.replace(activity.data["object"]["content"], "<br>", "\r")
+          )
+        )
     end)
     |> Enum.join("\r\n")
   end