summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/disclose_client.fix1
-rw-r--r--lib/pleroma/web/plugs/o_auth_plug.ex2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/disclose_client.fix b/changelog.d/disclose_client.fix
new file mode 100644
index 000000000..938abc930
--- /dev/null
+++ b/changelog.d/disclose_client.fix
@@ -0,0 +1 @@
+Client application data was always missing from the status
diff --git a/lib/pleroma/web/plugs/o_auth_plug.ex b/lib/pleroma/web/plugs/o_auth_plug.ex
index b59ac9d3e..488968691 100644
--- a/lib/pleroma/web/plugs/o_auth_plug.ex
+++ b/lib/pleroma/web/plugs/o_auth_plug.ex
@@ -52,7 +52,7 @@ defmodule Pleroma.Web.Plugs.OAuthPlug do
where: t.token == ^token
)
- with %Token{user_id: user_id} = token_record <- Repo.one(token_query),
+ with %Token{user_id: user_id} = token_record <- Repo.one(token_query) |> Repo.preload(:user),
false <- is_nil(user_id),
%User{} = user <- User.get_cached_by_id(user_id) do
{:ok, user, token_record}