Merge branch 'master' into glitch-soc/merge-upstream

2020-02-25 14:28:13 +01:00
parent 0d41fef506 7face973fa
commit 85933bc9ff
13 changed files with 76 additions and 61 deletions
--- a/app/controllers/api/v1/announcements_controller.rb
+++ b/app/controllers/api/v1/announcements_controller.rb
@ -11,7 +11,7 @@ class Api::V1::AnnouncementsController < Api::BaseController
  end

  def dismiss
-    AnnouncementMute.create!(account: current_account, announcement: @announcement)
+    AnnouncementMute.find_or_create_by!(account: current_account, announcement: @announcement)
    render_empty
  end