Merge branch 'kb_development' into kb_migration

2023-04-26 11:38:30 +09:00 · 2023-04-26 11:38:30 +09:00 · ce5a9f2500
commit ce5a9f2500
parent c34a3fb93b a18b0578bf
9 changed files with 50 additions and 27 deletions
--- a/app/controllers/api/v1/lists_controller.rb
+++ b/app/controllers/api/v1/lists_controller.rb
@ -31,6 +31,7 @@ class Api::V1::ListsController < Api::BaseController
  end

  def destroy
+    raise Mastodon::ValidationError, I18n.t('antennas.errors.remove_list_with_antenna') if Antenna.where(list_id: @list.id).any?
    @list.destroy!
    render_empty
  end