Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.
		
			
				
	
	
		
			33 lines
		
	
	
	
		
			711 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
	
		
			711 B
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class Settings::ExportsController < Settings::BaseController
 | 
						|
  include Authorization
 | 
						|
 | 
						|
  def show
 | 
						|
    @export  = Export.new(current_account)
 | 
						|
    @backups = current_user.backups
 | 
						|
  end
 | 
						|
 | 
						|
  def create
 | 
						|
    raise Mastodon::NotPermittedError unless user_signed_in?
 | 
						|
 | 
						|
    backup = nil
 | 
						|
 | 
						|
    RedisLock.acquire(lock_options) do |lock|
 | 
						|
      if lock.acquired?
 | 
						|
        authorize :backup, :create?
 | 
						|
        backup = current_user.backups.create!
 | 
						|
      else
 | 
						|
        raise Mastodon::RaceConditionError
 | 
						|
      end
 | 
						|
    end
 | 
						|
 | 
						|
    BackupWorker.perform_async(backup.id)
 | 
						|
 | 
						|
    redirect_to settings_export_path
 | 
						|
  end
 | 
						|
 | 
						|
  def lock_options
 | 
						|
    { redis: Redis.current, key: "backup:#{current_user.id}" }
 | 
						|
  end
 | 
						|
end
 |