Merge commit from fork

2025-12-15 08:48:53 +00:00 · 2025-12-08 15:44:08 +01:00
parent 140e011e73
commit ef1af11956
14 changed files with 15 additions and 15 deletions
--- a/app/controllers/api/v1/polls_controller.rb
+++ b/app/controllers/api/v1/polls_controller.rb
@@ -17,7 +17,7 @@ class Api::V1::PollsController < Api::BaseController
  def set_poll
    @poll = Poll.attached.find(params[:id])
    authorize @poll.status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
    not_found
  end