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

Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.

2 files changed, 0 insertions, 94 deletions

diff --git a/app/controllers/api/v1/filters/keywords_controller.rb b/app/controllers/api/v1/filters/keywords_controller.rb
deleted file mode 100644
index d3718a137..000000000
--- a/app/controllers/api/v1/filters/keywords_controller.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Filters::KeywordsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
-  before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
-  before_action :require_user!
-
-  before_action :set_keywords, only: :index
-  before_action :set_keyword, only: [:show, :update, :destroy]
-
-  def index
-    render json: @keywords, each_serializer: REST::FilterKeywordSerializer
-  end
-
-  def create
-    @keyword = current_account.custom_filters.find(params[:filter_id]).keywords.create!(resource_params)
-
-    render json: @keyword, serializer: REST::FilterKeywordSerializer
-  end
-
-  def show
-    render json: @keyword, serializer: REST::FilterKeywordSerializer
-  end
-
-  def update
-    @keyword.update!(resource_params)
-
-    render json: @keyword, serializer: REST::FilterKeywordSerializer
-  end
-
-  def destroy
-    @keyword.destroy!
-    render_empty
-  end
-
-  private
-
-  def set_keywords
-    filter = current_account.custom_filters.includes(:keywords).find(params[:filter_id])
-    @keywords = filter.keywords
-  end
-
-  def set_keyword
-    @keyword = CustomFilterKeyword.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
-  end
-
-  def resource_params
-    params.permit(:keyword, :whole_word)
-  end
-end
diff --git a/app/controllers/api/v1/filters/statuses_controller.rb b/app/controllers/api/v1/filters/statuses_controller.rb
deleted file mode 100644
index b6bed306f..000000000
--- a/app/controllers/api/v1/filters/statuses_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Filters::StatusesController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read, :'read:filters' }, only: [:index, :show]
-  before_action -> { doorkeeper_authorize! :write, :'write:filters' }, except: [:index, :show]
-  before_action :require_user!
-
-  before_action :set_status_filters, only: :index
-  before_action :set_status_filter, only: [:show, :destroy]
-
-  def index
-    render json: @status_filters, each_serializer: REST::FilterStatusSerializer
-  end
-
-  def create
-    @status_filter = current_account.custom_filters.find(params[:filter_id]).statuses.create!(resource_params)
-
-    render json: @status_filter, serializer: REST::FilterStatusSerializer
-  end
-
-  def show
-    render json: @status_filter, serializer: REST::FilterStatusSerializer
-  end
-
-  def destroy
-    @status_filter.destroy!
-    render_empty
-  end
-
-  private
-
-  def set_status_filters
-    filter = current_account.custom_filters.includes(:statuses).find(params[:filter_id])
-    @status_filters = filter.statuses
-  end
-
-  def set_status_filter
-    @status_filter = CustomFilterStatus.includes(:custom_filter).where(custom_filter: { account: current_account }).find(params[:id])
-  end
-
-  def resource_params
-    params.permit(:status_id)
-  end
-end