Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 07:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove un-needed Poll.attached scope (#33368)

Browse Source
This commit is contained in:
Matt Jankowski
2024-12-20 10:15:11 -05:00
committed by GitHub
parent b648c64e2e
commit f35de1ed0d
4 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/polls/votes_controller.rb
View File

@@ -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

2
app/controllers/api/v1/polls_controller.rb
View File

@@ -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

2
app/models/poll.rb
View File

@@ -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