summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/status_controller.ex19
-rw-r--r--test/pleroma/web/mastodon_api/controllers/status_controller_test.exs1
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
index b051fca74..834222740 100644
--- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex
@@ -21,7 +21,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.ScheduledActivityView
- alias Pleroma.Web.OAuth.Token
+ # alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.RateLimiter
@@ -420,14 +420,15 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do
)
end
- 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, :generator, %{type: "Application", name: client_name, url: website})
- else
- Map.put(params, :generator, nil)
- end
- end
+ # Deactivated for 2.3.0
+ # 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, :generator, %{type: "Application", name: client_name, url: website})
+ # else
+ # Map.put(params, :generator, nil)
+ # end
+ # end
defp put_application(params, _), do: Map.put(params, :generator, nil)
end
diff --git a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index bd385bccd..e76c2760d 100644
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@ -358,6 +358,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
assert activity.data["cc"] == []
end
+ @tag :skip
test "discloses application metadata when enabled" do
user = insert(:user, disclose_client: true)
%{user: _user, token: token, conn: conn} = oauth_access(["write:statuses"], user: user)