diff options
author | kaniini <nenolod@gmail.com> | 2019-04-19 16:55:33 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-04-19 16:55:33 +0000 |
commit | 9da8b287f8a2c1fda2ca05351d5418321510472b (patch) | |
tree | ef85c774a5450fadc30f9ad2e5beaaca11e2bf02 /lib/pleroma/gopher/server.ex | |
parent | cc93775ebf539598075c0b9afb96c60c8bede6b5 (diff) | |
parent | f9865cf9439e2e9273f55d3b82c1e68166178b07 (diff) | |
download | pleroma-9da8b287f8a2c1fda2ca05351d5418321510472b.tar.gz |
Merge branch 'feature/database-compaction' into 'develop'
database compaction
See merge request pleroma/pleroma!473
Diffstat (limited to 'lib/pleroma/gopher/server.ex')
-rw-r--r-- | lib/pleroma/gopher/server.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/gopher/server.ex b/lib/pleroma/gopher/server.ex index 6a56a6f67..2ebc5d5f7 100644 --- a/lib/pleroma/gopher/server.ex +++ b/lib/pleroma/gopher/server.ex @@ -38,6 +38,7 @@ end defmodule Pleroma.Gopher.Server.ProtocolHandler do alias Pleroma.Activity alias Pleroma.HTML + alias Pleroma.Object alias Pleroma.User alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Visibility @@ -75,14 +76,14 @@ defmodule Pleroma.Gopher.Server.ProtocolHandler do |> Enum.map(fn activity -> user = User.get_cached_by_ap_id(activity.data["actor"]) - object = activity.data["object"] + object = Object.normalize(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("#{like_count} likes, #{announcement_count} repeats") <> "i\tfake\t(NULL)\t0\r\n" <> - info(HTML.strip_tags(String.replace(activity.data["object"]["content"], "<br>", "\r"))) + info(HTML.strip_tags(String.replace(object["content"], "<br>", "\r"))) end) |> Enum.join("i\tfake\t(NULL)\t0\r\n") end |