pleroma

commit: f2dc706f6f8913e21d2a21e5c6ca4e411afc559a
parent f646b0554fd081c2ea28ba9a45e90033aa06f736
Author: feld <feld@feld.me>
Date:   Wed, 31 Jul 2024 18:38:49 +0000

Merge branch 'fix/disclose_client' into 'develop'

Fix User.disclose_client never working correctly

See merge request pleroma/pleroma!4199
Diffstat:
A
changelog.d/disclose_client.fix
1
+
M
lib/pleroma/web/plugs/o_auth_plug.ex
2
+-

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/changelog.d/disclose_client.fix 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
@@ -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}