Commit 3b8e5bcb authored by kaniini's avatar kaniini

fix most tests

parent dd66cc2c
......@@ -134,7 +134,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
%{
id: to_string(activity.id),
uri: object.data["id"],
url: object.data["external_url"] || object["id"],
url: object.data["external_url"] || object.data["id"],
account: AccountView.render("account.json", %{user: user}),
in_reply_to_id: reply_to && to_string(reply_to.id),
in_reply_to_account_id: reply_to_user && to_string(reply_to_user.id),
......@@ -149,7 +149,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
muted: false,
sensitive: sensitive,
spoiler_text: object.data["summary"] || "",
visibility: get_visibility(object),
visibility: get_visibility(object.data),
media_attachments: attachments |> Enum.take(4),
mentions: mentions,
# fix,
......
......@@ -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
[]
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment