Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.
		
			
				
	
	
		
			65 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			65 lines
		
	
	
	
		
			1.4 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
# frozen_string_literal: true
 | 
						|
 | 
						|
class FeedInsertWorker
 | 
						|
  include Sidekiq::Worker
 | 
						|
 | 
						|
  def perform(status_id, id, type = :home)
 | 
						|
    @type     = type.to_sym
 | 
						|
    @status   = Status.find(status_id)
 | 
						|
 | 
						|
    case @type
 | 
						|
    when :home
 | 
						|
      @follower = Account.find(id)
 | 
						|
    when :list
 | 
						|
      @list     = List.find(id)
 | 
						|
      @follower = @list.account
 | 
						|
    when :direct
 | 
						|
      @account  = Account.find(id)
 | 
						|
    end
 | 
						|
 | 
						|
    check_and_insert
 | 
						|
  rescue ActiveRecord::RecordNotFound
 | 
						|
    true
 | 
						|
  end
 | 
						|
 | 
						|
  private
 | 
						|
 | 
						|
  def check_and_insert
 | 
						|
    return if feed_filtered?
 | 
						|
 | 
						|
    perform_push
 | 
						|
    perform_notify if notify?
 | 
						|
  end
 | 
						|
 | 
						|
  def feed_filtered?
 | 
						|
    case @type
 | 
						|
    when :home
 | 
						|
      FeedManager.instance.filter?(:home, @status, @follower)
 | 
						|
    when :list
 | 
						|
      FeedManager.instance.filter?(:list, @status, @list)
 | 
						|
    when :direct
 | 
						|
      FeedManager.instance.filter?(:direct, @status, @account)
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  def notify?
 | 
						|
    return false if @type != :home || @status.reblog? || (@status.reply? && @status.in_reply_to_account_id != @status.account_id)
 | 
						|
 | 
						|
    Follow.find_by(account: @follower, target_account: @status.account)&.notify?
 | 
						|
  end
 | 
						|
 | 
						|
  def perform_push
 | 
						|
    case @type
 | 
						|
    when :home
 | 
						|
      FeedManager.instance.push_to_home(@follower, @status)
 | 
						|
    when :list
 | 
						|
      FeedManager.instance.push_to_list(@list, @status)
 | 
						|
    when :direct
 | 
						|
      FeedManager.instance.push_to_direct(@account, @status)
 | 
						|
    end
 | 
						|
  end
 | 
						|
 | 
						|
  def perform_notify
 | 
						|
    NotifyService.new.call(@follower, :status, @status)
 | 
						|
  end
 | 
						|
end
 |