Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)

Also, fix some n+1 queries Resolve #10365
2019-03-28 04:44:59 +01:00 · 2019-03-28 04:44:59 +01:00 · f1bc90ab50
commit f1bc90ab50
parent f46f67d984
15 changed files with 45 additions and 43 deletions
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@ -155,7 +155,7 @@ class PostStatusService < BaseService
      text: @text,
      media_attachments: @media || [],
      thread: @in_reply_to,
-      owned_poll_attributes: poll_attributes,
+      poll_attributes: poll_attributes,
      sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
      spoiler_text: @options[:spoiler_text] || '',
      visibility: @visibility,