sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MastoAPI: Include CW.

This commit is contained in:
Roger Braun 2017-10-31 17:49:47 +01:00
parent 04217f52c9
commit 44295dd49a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -93,7 +93,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
favourited: !!favorited, favourited: !!favorited,
muted: false, muted: false,
sensitive: sensitive, sensitive: sensitive,
spoiler_text: "", spoiler_text: object["summary"] || "",
visibility: "public", visibility: "public",
media_attachments: attachments, media_attachments: attachments,
mentions: mentions, mentions: mentions,

1
test/support/factory.ex
View File

@ -26,6 +26,7 @@ defmodule Pleroma.Factory do
"likes" => [], "likes" => [],
"like_count" => 0, "like_count" => 0,
"context" => "2hu", "context" => "2hu",
"summary" => "2hu",
"tag" => ["2hu"], "tag" => ["2hu"],
"emoji" => %{ "emoji" => %{
"2hu" => "corndog.png" "2hu" => "corndog.png"

2
test/web/mastodon_api/status_view_test.exs
View File

@ -32,7 +32,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
favourited: false, favourited: false,
muted: false, muted: false,
sensitive: false, sensitive: false,
spoiler_text: "", spoiler_text: note.data["object"]["summary"],
visibility: "public", visibility: "public",
media_attachments: [], media_attachments: [],
mentions: [], mentions: [],