Rebase to current 4.3.0-alpha-glitch-soc, update theming files

app/controllers/api/v1/conversations_controller.rb.orig

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+class Api::V1::ConversationsController < Api::BaseController
+  LIMIT = 20
+
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:conversations' }, except: :index
+  before_action :require_user!
+  before_action :set_conversation, except: :index
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    @conversations = paginated_conversations
+    render json: @conversations, each_serializer: REST::ConversationSerializer, relationships: StatusRelationshipsPresenter.new(@conversations.map(&:last_status), current_user&.account_id)
+  end
+
+  def read
+    @conversation.update!(unread: false)
+    render json: @conversation, serializer: REST::ConversationSerializer
+  end
+
+  def unread
+    @conversation.update!(unread: true)
+    render json: @conversation, serializer: REST::ConversationSerializer
+  end
+
+  def destroy
+    @conversation.destroy!
+    render_empty
+  end
+
+  private
+
+  def set_conversation
+    @conversation = AccountConversation.where(account: current_account).find(params[:id])
+  end
+
+  def paginated_conversations
+    AccountConversation.where(account: current_account)
+                       .includes(
+                         account: :account_stat,
+                         last_status: [
+                           :media_attachments,
+                           :preview_cards,
+                           :status_stat,
+                           :tags,
+                           {
+                             active_mentions: [account: :account_stat],
+                             account: :account_stat,
+                           },
+                         ]
+                       )
+<<<<<<< HEAD
+                       .to_a_paginated_by_id(limit_param(LIMIT), params_slice(:max_id, :since_id, :min_id))
+=======
+                       .to_a_paginated_by_id(limit_param(LIMIT), **params_slice(:max_id, :since_id, :min_id))
+>>>>>>> 3e1724e97 (Fix multiple N+1s in ConversationsController (#25134))
+  end
+
+  def insert_pagination_headers
+    set_pagination_headers(next_path, prev_path)
+  end
+
+  def next_path
+    api_v1_conversations_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_conversations_url pagination_params(min_id: pagination_since_id) unless @conversations.empty?
+  end
+
+  def pagination_max_id
+    @conversations.last.last_status_id
+  end
+
+  def pagination_since_id
+    @conversations.first.last_status_id
+  end
+
+  def records_continue?
+    @conversations.size == limit_param(LIMIT)
+  end
+
+  def pagination_params(core_params)
+    params.slice(:limit).permit(:limit).merge(core_params)
+  end
+end

app/controllers/api/v1/statuses/histories_controller.rb.orig

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::HistoriesController < Api::BaseController
+  include Authorization
+
+  before_action -> { authorize_if_got_token! :read, :'read:statuses' }
+  before_action :set_status
+
+  def show
+<<<<<<< HEAD
+    cache_if_unauthenticated!
+=======
+>>>>>>> f8930a67a (Change /api/v1/statuses/:id/history to always return at least one item (#25510))
+    render json: status_edits, each_serializer: REST::StatusEditSerializer
+  end
+
+  private
+
+  def status_edits
+    @status.edits.includes(:account, status: [:account]).to_a.presence || [@status.build_snapshot(at_time: @status.edited_at || @status.created_at)]
+  end
+
+  def set_status
+    @status = Status.find(params[:status_id])
+    authorize @status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+end

app/controllers/api/v1/statuses/reblogs_controller.rb.orig

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::ReblogsController < Api::BaseController
+  include Authorization
+  include Redisable
+  include Lockable
+
+  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }
+  before_action :require_user!
+  before_action :set_reblog, only: [:create]
+
+  override_rate_limit_headers :create, family: :statuses
+
+  def create
+<<<<<<< HEAD
+    with_redis_lock("reblog:#{current_account.id}:#{@reblog.id}") do
+=======
+    with_lock("reblog:#{current_account.id}:#{@reblog.id}") do
+>>>>>>> 1301af60e (Fix race condition when reblogging a status (#25016))
+      @status = ReblogService.new.call(current_account, @reblog, reblog_params)
+    end
+
+    render json: @status, serializer: REST::StatusSerializer
+  end
+
+  def destroy
+    @status = current_account.statuses.find_by(reblog_of_id: params[:status_id])
+
+    if @status
+      authorize @status, :unreblog?
+      @reblog = @status.reblog
+      count = [@reblog.reblogs_count - 1, 0].max
+      @status.discard
+      RemovalWorker.perform_async(@status.id)
+    else
+      @reblog = Status.find(params[:status_id])
+      count = @reblog.reblogs_count
+      authorize @reblog, :show?
+    end
+
+    relationships = StatusRelationshipsPresenter.new([@status], current_account.id, reblogs_map: { @reblog.id => false }, attributes_map: { @reblog.id => { reblogs_count: count } })
+    render json: @reblog, serializer: REST::StatusSerializer, relationships: relationships
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  private
+
+  def set_reblog
+    @reblog = Status.find(params[:status_id])
+    authorize @reblog, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+
+  def reblog_params
+    params.permit(:visibility)
+  end
+end