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

2020-02-03 09:22:58 +01:00
parent 4cd2d13bd2 3adc722d1c
commit 369201a425
23 changed files with 179 additions and 52 deletions
--- a/app/controllers/api/v1/announcements_controller.rb
+++ b/app/controllers/api/v1/announcements_controller.rb
@ -19,11 +19,7 @@ class Api::V1::AnnouncementsController < Api::BaseController

  def set_announcements
    @announcements = begin
-      scope = Announcement.published
-
-      scope.merge!(Announcement.without_muted(current_account)) unless truthy_param?(:with_dismissed)
-
-      scope.chronological
+      Announcement.published.chronological
    end
  end