Merge pull request #1274 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

1 files changed, 10 insertions, 0 deletions

diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index ae962aa1d..ae72f9ace 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -4,15 +4,25 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
   attributes :id, :content, :starts_at, :ends_at, :all_day,
              :published_at, :updated_at
 
+  attribute :read, if: :current_user?
+
   has_many :mentions
   has_many :tags, serializer: REST::StatusSerializer::TagSerializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
   has_many :reactions, serializer: REST::ReactionSerializer
 
+  def current_user?
+    !current_user.nil?
+  end
+
   def id
     object.id.to_s
   end
 
+  def read
+    object.announcement_mutes.where(account: current_user.account).exists?
+  end
+
   def content
     Formatter.instance.linkify(object.text)
   end