projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#2497] Fixed merge issue.
[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 057f4f4579226bed52da17f841609cb78803e3b0..a6e64b4ab77b620f1b97fd07aae00a0a6c815e67 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-15,13
+15,12
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
def render("index.json", %{users: users} = opts) do
reading_user = opts[:for]
def render("index.json", %{users: users} = opts) do
reading_user = opts[:for]
- # Note: :skip_relationships option is currently intentionally not supported for accounts
relationships_opt =
cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships]
relationships_opt =
cond do
Map.has_key?(opts, :relationships) ->
opts[:relationships]
- is_nil(reading_user) ->
+ is_nil(reading_user)
|| !opts[:embed_relationships]
->
UserRelationship.view_relationships_option(nil, [])
true ->
UserRelationship.view_relationships_option(nil, [])
true ->
@@
-36,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
%{}
@@
-180,27
+179,29
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
0
end
0
end
- bot = user.actor_type
in ["Application", "Service"]
+ bot = user.actor_type
== "Service"
emojis =
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)
relationship =
}
end)
relationship =
- if opts[:skip_relationships] do
- %{}
- else
+ if opts[:embed_relationships] do
render("relationship.json", %{
user: opts[:for],
target: user,
relationships: opts[:relationships]
})
render("relationship.json", %{
user: opts[:for],
target: user,
relationships: opts[:relationships]
})
+ else
+ %{}
end
%{
end
%{
@@
-223,7
+224,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
fields: user.fields,
bot: bot,
source: %{
fields: user.fields,
bot: bot,
source: %{
- note:
prepare_user_bio(user)
,
+ note:
user.raw_bio || ""
,
sensitive: false,
fields: user.raw_fields,
pleroma: %{
sensitive: false,
fields: user.raw_fields,
pleroma: %{
@@
-259,14
+260,6
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
|> maybe_put_unread_notification_count(user, opts[:for])
end
|> maybe_put_unread_notification_count(user, opts[:for])
end
- defp prepare_user_bio(%User{bio: ""}), do: ""
-
- defp prepare_user_bio(%User{bio: bio}) when is_binary(bio) do
- bio |> String.replace(~r(<br */?>), "\n") |> Pleroma.HTML.strip_tags()
- end
-
- defp prepare_user_bio(_), do: ""
-
defp username_from_nickname(string) when is_binary(string) do
hd(String.split(string, "@"))
end
defp username_from_nickname(string) when is_binary(string) do
hd(String.split(string, "@"))
end
@@
-335,7
+328,11
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
defp maybe_put_role(data, _, _), do: data
defp maybe_put_notification_settings(data, %User{id: user_id} = user, %User{id: user_id}) do
defp maybe_put_role(data, _, _), do: data
defp maybe_put_notification_settings(data, %User{id: user_id} = user, %User{id: user_id}) do
- Kernel.put_in(data, [:pleroma, :notification_settings], user.notification_settings)
+ Kernel.put_in(
+ data,
+ [:pleroma, :notification_settings],
+ Map.from_struct(user.notification_settings)
+ )
end
defp maybe_put_notification_settings(data, _, _), do: data
end
defp maybe_put_notification_settings(data, _, _), do: data