hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

WebPush: Don't break on contentless chat messages.

Browse source
This commit is contained in:
lain 2020-06-06 09:46:07 +02:00
commit 4e8c0eecd5
2 changed files with 32 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/push/impl.ex
View file

@ -124,6 +124,13 @@ defmodule Pleroma.Web.Push.Impl do
def format_body(activity, actor, object, mastodon_type \\ nil)
def format_body(_activity, actor, %{data: %{"type" => "ChatMessage", "content" => content}}, _) do
case content do
nil -> "@#{actor.nickname}: (Attachment)"
content -> "@#{actor.nickname}: #{Utils.scrub_html_and_truncate(content, 80)}"
end
end
def format_body(
%{activity: %{data: %{"type" => "Create"}}},
actor,