From 20403c00967bac425473cc74c64d5ed0ecd8d7f9 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Wed, 27 Jun 2018 21:35:43 -0700 Subject: [PATCH] Expose content & summary separately from activity_view api --- lib/pleroma/web/twitter_api/views/activity_view.ex | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex index 62ce3b7b..a5700ab8 100644 --- a/lib/pleroma/web/twitter_api/views/activity_view.ex +++ b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -231,22 +231,26 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do summary = activity.data["object"]["summary"] content = object["content"] - content = + summary = if !!summary and summary != "" do - "#{activity.data["object"]["summary"]}
#{content}" + HtmlSanitizeEx.strip_tags(summary) else - content + "" end html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"]) + combined_html = "
#{summary}
#{html}
" + %{ "id" => activity.id, "uri" => activity.data["object"]["id"], "user" => UserView.render("show.json", %{user: user, for: opts[:for]}), - "statusnet_html" => html, + "statusnet_html" => combined_html, + "content" => html, + "summary" => summary, "text" => HtmlSanitizeEx.strip_tags(content), "is_local" => activity.local, "is_post_verb" => true,