nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

StatusController: Deactivate application support for now.

Browse source 
Some more things to discuss about, so we'll remove it from 2.3.0
This commit is contained in:
lain 2021-03-02 14:40:47 +01:00
parent cd6aa9bcae
commit 024c11c18d
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.ScheduledActivityView alias Pleroma.Web.MastodonAPI.ScheduledActivityView
alias Pleroma.Web.OAuth.Token # alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.Plugs.OAuthScopesPlug alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.RateLimiter alias Pleroma.Web.Plugs.RateLimiter
@ -420,14 +420,15 @@ def bookmarks(%{assigns: %{user: user}} = conn, params) do
) )
end end
defp put_application(params, %{assigns: %{token: %Token{user: %User{} = user} = token}} = _conn) do # Deactivated for 2.3.0
if user.disclose_client do # defp put_application(params, %{assigns: %{token: %Token{user: %User{} = user} = token}} = _conn) do
%{client_name: client_name, website: website} = Repo.preload(token, :app).app # if user.disclose_client do
Map.put(params, :generator, %{type: "Application", name: client_name, url: website}) # %{client_name: client_name, website: website} = Repo.preload(token, :app).app
else # Map.put(params, :generator, %{type: "Application", name: client_name, url: website})
Map.put(params, :generator, nil) # else
end # Map.put(params, :generator, nil)
end # end
# end
defp put_application(params, _), do: Map.put(params, :generator, nil) defp put_application(params, _), do: Map.put(params, :generator, nil)
end end

1
test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
View file

@ -358,6 +358,7 @@ test "posting a direct status", %{conn: conn} do
assert activity.data["cc"] == [] assert activity.data["cc"] == []
end end
@tag :skip
test "discloses application metadata when enabled" do test "discloses application metadata when enabled" do
user = insert(:user, disclose_client: true) user = insert(:user, disclose_client: true)
%{user: _user, token: token, conn: conn} = oauth_access(["write:statuses"], user: user) %{user: _user, token: token, conn: conn} = oauth_access(["write:statuses"], user: user)