From f35de1ed0d600bd6120635f0272dc2bb47de6639 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Fri, 20 Dec 2024 10:15:11 -0500
Subject: [PATCH] Remove un-needed `Poll.attached` scope (#33368)

---
 .../api/v1/polls/votes_controller.rb          |  2 +-
 app/controllers/api/v1/polls_controller.rb    |  2 +-
 app/models/poll.rb                            |  2 --
 spec/models/poll_spec.rb                      | 19 -------------------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/app/controllers/api/v1/polls/votes_controller.rb b/app/controllers/api/v1/polls/votes_controller.rb
index ad1b82cb52..2833687a38 100644
--- a/app/controllers/api/v1/polls/votes_controller.rb
+++ b/app/controllers/api/v1/polls/votes_controller.rb
@@ -15,7 +15,7 @@ class Api::V1::Polls::VotesController < Api::BaseController
   private
 
   def set_poll
-    @poll = Poll.attached.find(params[:poll_id])
+    @poll = Poll.find(params[:poll_id])
     authorize @poll.status, :show?
   rescue Mastodon::NotPermittedError
     not_found
diff --git a/app/controllers/api/v1/polls_controller.rb b/app/controllers/api/v1/polls_controller.rb
index ffc70a8496..b4c25476e8 100644
--- a/app/controllers/api/v1/polls_controller.rb
+++ b/app/controllers/api/v1/polls_controller.rb
@@ -15,7 +15,7 @@ class Api::V1::PollsController < Api::BaseController
   private
 
   def set_poll
-    @poll = Poll.attached.find(params[:id])
+    @poll = Poll.find(params[:id])
     authorize @poll.status, :show?
   rescue Mastodon::NotPermittedError
     not_found
diff --git a/app/models/poll.rb b/app/models/poll.rb
index c2aa4d0172..b4e0edcd0f 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -39,8 +39,6 @@ class Poll < ApplicationRecord
   validates :expires_at, presence: true, if: :local?
   validates_with PollValidator, on: :create, if: :local?
 
-  scope :attached, -> { where.not(status_id: nil) }
-
   before_validation :prepare_options, if: :local?
   before_validation :prepare_votes_count
   before_validation :prepare_cached_tallies
diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb
index e4e1a36c48..3288119546 100644
--- a/spec/models/poll_spec.rb
+++ b/spec/models/poll_spec.rb
@@ -5,25 +5,6 @@ require 'rails_helper'
 RSpec.describe Poll do
   include_examples 'Expireable'
 
-  describe 'Scopes' do
-    let(:status) { Fabricate(:status) }
-    let(:attached_poll) { Fabricate(:poll, status: status) }
-    let(:not_attached_poll) do
-      Fabricate(:poll).tap do |poll|
-        poll.status = nil
-        poll.save(validate: false)
-      end
-    end
-
-    describe '.attached' do
-      it 'finds the correct records' do
-        results = described_class.attached
-
-        expect(results).to eq([attached_poll])
-      end
-    end
-  end
-
   describe '#reset_votes!' do
     let(:poll) { Fabricate :poll, cached_tallies: [2, 3], votes_count: 5, voters_count: 5 }
     let!(:vote) { Fabricate :poll_vote, poll: }