projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'preload-fixups-2' into preloadfixups
[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 5326b02c637c312cb8197e3b7ccaf7ccf58633b4..a6e64b4ab77b620f1b97fd07aae00a0a6c815e67 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-35,7
+35,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
end
def render("show.json", %{user: user} = opts) do
end
def render("show.json", %{user: user} = opts) do
- if User.visible_for
?(user, opts[:for])
do
+ if User.visible_for
(user, opts[:for]) == :visible
do
do_render("show.json", opts)
else
%{}
do_render("show.json", opts)
else
%{}
@@
-179,7
+179,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
0
end
0
end
- bot = user.actor_type
in ["Application", "Service"]
+ bot = user.actor_type
== "Service"
emojis =
Enum.map(user.emoji, fn {shortcode, raw_url} ->
emojis =
Enum.map(user.emoji, fn {shortcode, raw_url} ->
@@
-235,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,