diff options
author | lambda <lain@soykaf.club> | 2019-05-14 15:41:37 +0000 |
---|---|---|
committer | lambda <lain@soykaf.club> | 2019-05-14 15:41:37 +0000 |
commit | fa4bd898f13ccf43b7a6400de04d2d0fcb0c00dc (patch) | |
tree | 0128867a8a0ca5926bd643c9e2e953256b1dcc38 /lib | |
parent | 692919c7d260b85eb653089765d7f10425c06cf9 (diff) | |
parent | 51325fd60cf96e2ae99e09f53264f2ca1e69781b (diff) | |
download | pleroma-fa4bd898f13ccf43b7a6400de04d2d0fcb0c00dc.tar.gz |
Merge branch 'fix/gopher' into 'develop'
gopher: fix rendering of post content (closes #895)
Closes #895
See merge request pleroma/pleroma!1150
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/gopher/server.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex index 1d2e0785c..b3319e137 100644 --- a/lib/pleroma/gopher/server.ex +++ b/lib/pleroma/gopher/server.ex @@ -77,13 +77,13 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do user = User.get_cached_by_ap_id(activity.data["actor"]) object = Object.normalize(activity) - like_count = object["like_count"] || 0 - announcement_count = object["announcement_count"] || 0 + like_count = object.data["like_count"] || 0 + announcement_count = object.data["announcement_count"] || 0 link("Post ##{activity.id} by #{user.nickname}", "/notices/#{activity.id}") <> info("#{like_count} likes, #{announcement_count} repeats") <> "i\tfake\t(NULL)\t0\r\n" <> - info(HTML.strip_tags(String.replace(object["content"], "<br>", "\r"))) + info(HTML.strip_tags(String.replace(object.data["content"], "<br>", "\r"))) end) |> Enum.join("i\tfake\t(NULL)\t0\r\n") end |