mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-23 17:44:24 +00:00
a2a64ecd3e
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
59 lines
1.2 KiB
Ruby
59 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class RemoteInteractionController < ApplicationController
|
|
include Authorization
|
|
|
|
layout 'modal'
|
|
|
|
before_action :set_interaction_type
|
|
before_action :set_status
|
|
before_action :set_body_classes
|
|
before_action :set_pack
|
|
|
|
def new
|
|
@remote_follow = RemoteFollow.new(session_params)
|
|
end
|
|
|
|
def create
|
|
@remote_follow = RemoteFollow.new(resource_params)
|
|
|
|
if @remote_follow.valid?
|
|
session[:remote_follow] = @remote_follow.acct
|
|
redirect_to @remote_follow.interact_address_for(@status)
|
|
else
|
|
render :new
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def resource_params
|
|
params.require(:remote_follow).permit(:acct)
|
|
end
|
|
|
|
def session_params
|
|
{ acct: session[:remote_follow] }
|
|
end
|
|
|
|
def set_status
|
|
@status = Status.find(params[:id])
|
|
authorize @status, :show?
|
|
rescue Mastodon::NotPermittedError
|
|
# Reraise in order to get a 404
|
|
raise ActiveRecord::RecordNotFound
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'modal-layout'
|
|
@hide_header = true
|
|
end
|
|
|
|
def set_pack
|
|
use_pack 'modal'
|
|
end
|
|
|
|
def set_interaction_type
|
|
@interaction_type = %w(reply reblog favourite).include?(params[:type]) ? params[:type] : 'reply'
|
|
end
|
|
end
|