Merge branch 'main' into glitch-soc/merge-upstream

2023-01-26 19:31:39 +01:00
parent 7acf26e777 13a2abacc8
commit fad6633156
3 changed files with 23 additions and 5 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -122,7 +122,7 @@ class Status < ApplicationRecord
                   :tags,
                   :preview_cards,
                   :preloadable_poll,
-                   account: [:account_stat, :user],
+                   account: [:account_stat, user: :role],
                   active_mentions: { account: :account_stat },
                   reblog: [
                     :application,
@ -132,7 +132,7 @@ class Status < ApplicationRecord
                     :conversation,
                     :status_stat,
                     :preloadable_poll,
-                     account: [:account_stat, :user],
+                     account: [:account_stat, user: :role],
                     active_mentions: { account: :account_stat },
                   ],
                   thread: { account: :account_stat }