projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma 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 546cc0ed5daf362076dbdae731f31d1d424cb36e..a5420f48094916010d4b76ac726b38c95b0a540c 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-86,7
+86,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
0
end
0
end
- bot =
(user.source_data["type"] || "Person")
in ["Application", "Service"]
+ bot =
user.actor_type
in ["Application", "Service"]
emojis =
(user.source_data["tag"] || [])
emojis =
(user.source_data["tag"] || [])
@@
-137,7
+137,8
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
sensitive: false,
fields: user.raw_fields,
pleroma: %{
sensitive: false,
fields: user.raw_fields,
pleroma: %{
- discoverable: user.discoverable
+ discoverable: user.discoverable,
+ actor_type: user.actor_type
}
},
}
},