diff options
| author | lain <lain@soykaf.club> | 2019-05-01 18:40:41 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-05-01 18:40:41 +0200 |
| commit | 45f790becc2cc63ac000c6432fe8c84e0b589822 (patch) | |
| tree | 724d0e8ce5f10807cc25efc2434454bf38c5a52c /lib/pleroma/gopher/server.ex | |
| parent | 4908e0eeee2ecb58b204198c20720d52548b6f4a (diff) | |
| parent | d107919b3d8b2275ddb7b17846cab182682098a7 (diff) | |
| download | pleroma-45f790becc2cc63ac000c6432fe8c84e0b589822.tar.gz | |
Merge remote-tracking branch 'origin/develop' into conversations_three
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..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 |