hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/notification-control-part-2' into 'develop'

Browse source 
notification controls, part 2

See merge request pleroma/pleroma!1204
This commit is contained in:
kaniini 2019-06-02 08:25:37 +00:00
commit 5402d04e3c
8 changed files with 84 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/web/twitter_api/views/user_view.ex
View file

@ -121,6 +121,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"tags" => user.tags
}
|> maybe_with_activation_status(user, for_user)
|> with_notification_settings(user, for_user)
}
|> maybe_with_user_settings(user, for_user)
|> maybe_with_role(user, for_user)
@ -132,6 +133,12 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
end
end
defp with_notification_settings(data, %User{id: user_id} = user, %User{id: user_id}) do
Map.put(data, "notification_settings", user.info.notification_settings)
end
defp with_notification_settings(data, _, _), do: data
defp maybe_with_activation_status(data, user, %User{info: %{is_admin: true}}) do
Map.put(data, "deactivated", user.info.deactivated)
end