moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
This commit is contained in:
lambda 2018-12-15 15:23:51 +00:00
parent 7281ab0b3c 84b9a9d497
commit cc6689cc20
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pleroma/web/twitter_api/views/activity_view.ex
View File

@ -14,6 +14,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
alias Pleroma.HTML alias Pleroma.HTML
import Ecto.Query import Ecto.Query
require Logger
defp query_context_ids([]), do: [] defp query_context_ids([]), do: []
@ -277,6 +278,11 @@ def render(
} }
end 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 def render_content(%{"type" => "Note"} = object) do
summary = object["summary"] summary = object["summary"]