X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fgopher%2Fserver.ex;h=bf87e51ec2a300efe46e4a1b8a9979ee88119ffe;hb=8cbda7c0ee3694fdc86ebde89ac26e3c3695e89d;hp=cccde155abe366981509436b31099b7c3a550f38;hpb=4e5aa3b3a0c0c90ef42aadfb3eaf415955cf86b2;p=akkoma

diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex
index cccde155a..bf87e51ec 100644
--- a/lib/pleroma/gopher/server.ex
+++ b/lib/pleroma/gopher/server.ex
@@ -50,7 +50,12 @@ 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
@@ -71,8 +76,13 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do
     |> Enum.map(fn activity ->
       user = User.get_cached_by_ap_id(activity.data["actor"])
 
+      object = activity.data["object"]
+      like_count = object["like_count"] || 0
+      announcement_count = object["announcement_count"] || 0
+
       link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <>
-        info(HtmlSanitizeEx.strip_tags(activity.data["object"]["content"]))
+        info("#{like_count} likes, #{announcement_count} repeats") <>
+        "\r\n" <> info(HtmlSanitizeEx.strip_tags(String.replace(activity.data["object"]["content"], "<br>", "\n"))
     end)
     |> Enum.join("\r\n")
   end