Merge pull request #2095 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

3 files changed, 23 insertions, 5 deletions

diff --git a/app/models/status.rb b/app/models/status.rb
index 14b7a39fe..4e4d960a4 100644
--- 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 }
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 6152d54f7..c4e281b80 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -26,6 +26,16 @@ class REST::AccountSerializer < ActiveModel::Serializer
     end
   end
 
+  class RoleSerializer < ActiveModel::Serializer
+    attributes :id, :name, :color
+
+    def id
+      object.id.to_s
+    end
+  end
+
+  has_many :roles, serializer: RoleSerializer, if: :local?
+
   class FieldSerializer < ActiveModel::Serializer
     include FormattingHelper
 
@@ -118,6 +128,14 @@ class REST::AccountSerializer < ActiveModel::Serializer
     object.silenced?
   end
 
+  def roles
+    if object.suspended?
+      []
+    else
+      [object.user.role].compact.filter { |role| role.highlighted? }
+    end
+  end
+
   def noindex
     object.user_prefers_noindex?
   end
diff --git a/spec/fabricators/user_role_fabricator.rb b/spec/fabricators/user_role_fabricator.rb
index 28f76c8c4..ed0a7dc1f 100644
--- a/spec/fabricators/user_role_fabricator.rb
+++ b/spec/fabricators/user_role_fabricator.rb
@@ -1,5 +1,5 @@
 Fabricator(:user_role) do
   name        "MyString"
-  color       "MyString"
-  permissions ""
-end
\ No newline at end of file
+  color       ""
+  permissions 0
+end