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

Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.

2 files changed, 39 insertions, 0 deletions

diff --git a/app/serializers/rest/poll_serializer.rb b/app/serializers/rest/poll_serializer.rb
new file mode 100644
index 000000000..b02e8ca93
--- /dev/null
+++ b/app/serializers/rest/poll_serializer.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class REST::PollSerializer < ActiveModel::Serializer
+  attributes :id, :expires_at, :expired,
+             :multiple, :votes_count
+
+  has_many :dynamic_options, key: :options
+
+  attribute :voted, if: :current_user?
+
+  def id
+    object.id.to_s
+  end
+
+  def dynamic_options
+    if !object.expired? && object.hide_totals?
+      object.unloaded_options
+    else
+      object.loaded_options
+    end
+  end
+
+  def expired
+    object.expired?
+  end
+
+  def voted
+    object.votes.where(account: current_user.account).exists?
+  end
+
+  def current_user?
+    !current_user.nil?
+  end
+
+  class OptionSerializer < ActiveModel::Serializer
+    attributes :title, :votes_count
+  end
+end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index b72eebb10..7185121d6 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -23,6 +23,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
+  has_one :poll, serializer: REST::PollSerializer
 
   def id
     object.id.to_s