projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stats-daemon' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
representers
/
activity_representer.ex
diff --git
a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index 929e26bf0ff1dfe3bb0f40bce37ab26e1ff54f07..1f11bc9ac5ba09a7f027b327ee49ef1f5d712544 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@
-97,7
+97,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
}
end
}
end
- def to_map(%Activity{data: %{"type" => "Delete", "published" => created_at, "object" =>
deleted_object
}} = activity, %{user: user} = opts) do
+ def to_map(%Activity{data: %{"type" => "Delete", "published" => created_at, "object" =>
_
}} = activity, %{user: user} = opts) do
created_at = created_at |> Utils.date_to_asctime
%{
created_at = created_at |> Utils.date_to_asctime
%{
@@
-135,6
+135,13
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
tags = activity.data["object"]["tag"] || []
possibly_sensitive = Enum.member?(tags, "nsfw")
tags = activity.data["object"]["tag"] || []
possibly_sensitive = Enum.member?(tags, "nsfw")
+ summary = activity.data["object"]["summary"]
+ content = if !!summary and summary != "" do
+ "<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>"
+ else
+ content
+ end
+
html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
%{
html = HtmlSanitizeEx.basic_html(content) |> Formatter.emojify(object["emoji"])
%{