diff options
author | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-05-15 17:47:29 +0200 |
commit | f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9 (patch) | |
tree | 3c208baf52e27859491cce07954ac9b1198cbc8f /lib/pleroma/gopher/server.ex | |
parent | 786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5 (diff) | |
parent | 62516be9c462ca206163eaf7822f9ee5c2470453 (diff) | |
download | pleroma-f168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9.tar.gz |
Merge remote-tracking branch 'origin/develop' into conversations-import
Diffstat (limited to 'lib/pleroma/gopher/server.ex')
-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 |