projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
[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 cf97ab746858900880060f6fd2f6b197fbdcd004..d2a4dd3669fa5fae8f24734fecb1b216136cf879 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-3,22
+3,19
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
alias Pleroma.User
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.User
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.CommonAPI.Utils
-
- defp image_url(%{"url" => [ %{ "href" => href } | t ]}), do: href
- defp image_url(_), do: nil
+ alias Pleroma.Web.MediaProxy
def render("accounts.json", %{users: users} = opts) do
render_many(users, AccountView, "account.json", opts)
end
def render("account.json", %{user: user}) do
def render("accounts.json", %{users: users} = opts) do
render_many(users, AccountView, "account.json", opts)
end
def render("account.json", %{user: user}) do
- image = User.avatar_url(user)
+ image = User.avatar_url(user) |> MediaProxy.url()
+ header = User.banner_url(user) |> MediaProxy.url()
user_info = User.user_info(user)
user_info = User.user_info(user)
- header = image_url(user.info["banner"]) || "https://placehold.it/700x335"
-
%{
%{
- id:
user.id
,
+ id:
to_string(user.id)
,
username: hd(String.split(user.nickname, "@")),
acct: user.nickname,
display_name: user.name,
username: hd(String.split(user.nickname, "@")),
acct: user.nickname,
display_name: user.name,
@@
-43,7
+40,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
def render("mention.json", %{user: user}) do
%{
def render("mention.json", %{user: user}) do
%{
- id:
user.id
,
+ id:
to_string(user.id)
,
acct: user.nickname,
username: hd(String.split(user.nickname, "@")),
url: user.ap_id
acct: user.nickname,
username: hd(String.split(user.nickname, "@")),
url: user.ap_id
@@
-52,7
+49,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
def render("relationship.json", %{user: user, target: target}) do
%{
def render("relationship.json", %{user: user, target: target}) do
%{
- id: t
arget.id
,
+ id: t
o_string(target.id)
,
following: User.following?(user, target),
followed_by: User.following?(target, user),
blocking: User.blocks?(user, target),
following: User.following?(user, target),
followed_by: User.following?(target, user),
blocking: User.blocks?(user, target),