projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mastodon-notification-endpoints' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/status_view.ex
b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 48703e657a0b36a81ac50553fa7544f9a64320be..d97b2acb4c502d712c475416893b9bc17e8c95ac 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-45,7
+45,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
name: "Web",
website: nil
},
name: "Web",
website: nil
},
- language: nil
+ language: nil,
+ emojis: []
}
end
}
end
@@
-93,7
+94,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
favourited: !!favorited,
muted: false,
sensitive: sensitive,
favourited: !!favorited,
muted: false,
sensitive: sensitive,
- spoiler_text: "",
+ spoiler_text:
object["summary"] ||
"",
visibility: "public",
media_attachments: attachments,
mentions: mentions,
visibility: "public",
media_attachments: attachments,
mentions: mentions,