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

fix most tests

Browse source
This commit is contained in:
William Pitcock 2018-11-25 20:56:12 +00:00
commit 3b8e5bcbeb
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/twitter_api/representers/activity_representer.ex
View file

@ -167,14 +167,14 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
tags = if possibly_sensitive, do: Enum.uniq(["nsfw" | tags]), else: tags
{summary, content} = ActivityView.render_content(object)
{summary, content} = ActivityView.render_content(object.data)
html =
HTML.filter_tags(content, User.html_filter_policy(opts[:for]))
|> Formatter.emojify(object.data["emoji"])
video =
if object["type"] == "Video" do
if object.data["type"] == "Video" do
vid = [object.data]
else
[]

2
lib/pleroma/web/twitter_api/views/activity_view.ex
View file

@ -265,7 +265,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityView do
"tags" => tags,
"activity_type" => "post",
"possibly_sensitive" => possibly_sensitive,
"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object),
"visibility" => Pleroma.Web.MastodonAPI.StatusView.get_visibility(object.data),
"summary" => summary
}
end