logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: cc6689cc203d44e19e9aa14c2ef3a3dad823ef88
parent: 7281ab0b3c0272d9579e253c97e648b273193011
Author: lambda <pleromagit@rogerbraun.net>
Date:   Sat, 15 Dec 2018 15:23:51 +0000

Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'

TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547

Diffstat:

Mlib/pleroma/web/twitter_api/views/activity_view.ex6++++++
1 file changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/twitter_api/views/activity_view.ex b/lib/pleroma/web/twitter_api/views/activity_view.ex @@ -14,6 +14,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do alias Pleroma.HTML import Ecto.Query + require Logger defp query_context_ids([]), do: [] @@ -277,6 +278,11 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do } end + def render("activity.json", %{activity: unhandled_activity}) do + Logger.warn("#{__MODULE__} unhandled activity: #{inspect(unhandled_activity)}") + nil + end + def render_content(%{"type" => "Note"} = object) do summary = object["summary"]