From: David Yip <yipdw@member.fsf.org>
Date: Tue, 24 Oct 2017 23:56:57 +0000 (-0500)
Subject: Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=d9485e6497b46aa16d8d9399389fc614fc5f21eb;p=mastodon.git

Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.

There's nothing useful we can display if the destroy action messes up,
so might as well assert it does and complain loudly if it doesn't.
---

diff --git a/app/controllers/settings/keyword_mutes_controller.rb b/app/controllers/settings/keyword_mutes_controller.rb
index c63626acd..f79e1b320 100644
--- a/app/controllers/settings/keyword_mutes_controller.rb
+++ b/app/controllers/settings/keyword_mutes_controller.rb
@@ -33,12 +33,9 @@ class Settings::KeywordMutesController < ApplicationController
   end
 
   def destroy
-    if @keyword_mute.destroy
-      redirect_to settings_keyword_mutes_path, notice: I18n.t('generic.changes_saved_msg')
-    else
-      # FIXME
-      redirect_to settings_keyword_mutes_path, notice: "huh that didn't work right"
-    end
+    @keyword_mute.destroy!
+
+    redirect_to settings_keyword_mutes_path, notice: I18n.t('generic.changes_saved_msg')
   end
 
   def destroy_all