projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
[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 9a4954de87dda94136aa7127a5645e20ba0920fa..26bfb79af16d5e5b0d90cda5c9f69f3137d9db9a 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@
-4,7
+4,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.{Activity, User}
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.ObjectRepresenter
alias Pleroma.{Activity, User}
- alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
+ alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView
, ActivityView
}
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Formatter
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Formatter
@@
-99,7
+99,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
) do
created_at = created_at |> Utils.date_to_asctime()
) do
created_at = created_at |> Utils.date_to_asctime()
- text = "#{user.nickname} undid the action at #{undid_activity}"
+ text = "#{user.nickname} undid the action at #{undid_activity
["id"]
}"
%{
"id" => activity.id,
%{
"id" => activity.id,
@@
-164,14
+164,7
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
- summary = activity.data["object"]["summary"]
-
- content =
- if !!summary and summary != "" do
- "<span>#{activity.data["object"]["summary"]}</span><br />#{content}</span>"
- else
- content
- end
+ {summary, content} = ActivityView.render_content(object)
html =
HtmlSanitizeEx.basic_html(content)
html =
HtmlSanitizeEx.basic_html(content)
@@
-197,7
+190,9
@@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"external_url" => object["external_url"] || object["id"],
"tags" => tags,
"activity_type" => "post",
"external_url" => object["external_url"] || object["id"],
"tags" => tags,
"activity_type" => "post",
- "possibly_sensitive" => possibly_sensitive
+ "possibly_sensitive" => possibly_sensitive,
+ "visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
+ "summary" => object["summary"]
}
end
}
end