logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: fa4bd898f13ccf43b7a6400de04d2d0fcb0c00dc
parent: 692919c7d260b85eb653089765d7f10425c06cf9
Author: lambda <lain@soykaf.club>
Date:   Tue, 14 May 2019 15:41:37 +0000

Merge branch 'fix/gopher' into 'develop'

gopher: fix rendering of post content (closes #895)

Closes #895

See merge request pleroma/pleroma!1150

Diffstat:

Mlib/pleroma/gopher/server.ex6+++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 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