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

diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
index 17741a7a7..82e241f21 100644
--- a/lib/pleroma/gopher/server.ex
+++ b/lib/pleroma/gopher/server.ex
@@ -50,7 +50,13 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
   end
 
   def info(text) do
-    "#{text}\tfake\(NULL)\t0\r\n"
+    text = String.replace(text, ~r/[\t\n]/, "")
+
+    String.split(text, "\r")
+    |> Enum.map(fn text ->
+      "i#{text}\tfake\(NULL)\t0\r\n"
+    end)
+    |> Enum.join("")
   end
 
   def link(name, selector, type \\ 1) do
@@ -77,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