projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mastodon API: ensure the notification endpoint doesn't return less than the requested...
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/account_view.ex
b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 45fffaad2e5901037088ed9a27a4be168ec26d5f..9fc06bf9d39187bf51f7675ce78b2fc3fc7ab93a 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-182,12
+182,14
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
bot = user.actor_type in ["Application", "Service"]
emojis =
bot = user.actor_type in ["Application", "Service"]
emojis =
- Enum.map(user.emoji, fn {shortcode, url} ->
+ Enum.map(user.emoji, fn {shortcode, raw_url} ->
+ url = MediaProxy.url(raw_url)
+
%{
%{
-
"shortcode" =>
shortcode,
-
"url" =>
url,
-
"static_url" =>
url,
-
"visible_in_picker" =>
false
+
shortcode:
shortcode,
+
url:
url,
+
static_url:
url,
+
visible_in_picker:
false
}
end)
}
end)
@@
-233,6
+235,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
# Pleroma extension
pleroma: %{
# Pleroma extension
pleroma: %{
+ ap_id: user.ap_id,
confirmation_pending: user.confirmation_pending,
tags: user.tags,
hide_followers_count: user.hide_followers_count,
confirmation_pending: user.confirmation_pending,
tags: user.tags,
hide_followers_count: user.hide_followers_count,