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

Tests to validate client disclosure obeys user setting

Browse source
This commit is contained in:
Mark Felder 2021-02-18 17:23:17 -06:00
commit 63739c5a58
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/mastodon_api/controllers/status_controller.ex
View file

@ -420,9 +420,13 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
)
end
defp put_application(params, %{assigns: %{token: %Token{} = token}} = _conn) do
%{client_name: client_name, website: website} = Repo.preload(token, :app).app
Map.put(params, :application, %{name: client_name, website: website})
defp put_application(params, %{assigns: %{token: %Token{user: %User{} = user} = token}} = _conn) do
if user.disclose_client do
%{client_name: client_name, website: website} = Repo.preload(token, :app).app
Map.put(params, :application, %{name: client_name, website: website})
else
Map.put(params, :application, nil)
end
end
defp put_application(params, _), do: Map.put(params, :application, nil)