diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-05-01 12:32:17 -0500 |
| commit | 3c4cab9be18ff543d025177b418ddd0b16050e68 (patch) | |
| tree | 3b4d32c978ecfaa656256509bf390d6ca22c6679 /lib/pleroma/gopher | |
| parent | 9a98f48ec3f438e543a5a621624401bb22a0d44a (diff) | |
| parent | 41d78f91083b5017e6085150bfae71a842f5c47f (diff) | |
| download | pleroma-3c4cab9be18ff543d025177b418ddd0b16050e68.tar.gz | |
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'lib/pleroma/gopher')
| -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..1d2e0785c 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) 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 |