cache blockings for reducing queries.
This commit is contained in:
		
							parent
							
								
									8a58942c80
								
							
						
					
					
						commit
						fd81916e86
					
				
					 3 changed files with 18 additions and 1 deletions
				
			
		|  | @ -7,4 +7,12 @@ class Block < ApplicationRecord | |||
|   belongs_to :target_account, class_name: 'Account', required: true | ||||
| 
 | ||||
|   validates :account_id, uniqueness: { scope: :target_account_id } | ||||
| 
 | ||||
|   after_create :remove_blocking_cache | ||||
|   after_destroy :remove_blocking_cache | ||||
| 
 | ||||
|   def remove_blocking_cache | ||||
|     Rails.cache.delete("blocked_account_ids:#{account_id}") | ||||
|     Rails.cache.delete("blocked_account_ids:#{target_account_id}") | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -8,4 +8,11 @@ class Mute < ApplicationRecord | |||
| 
 | ||||
|   validates :account, :target_account, presence: true | ||||
|   validates :account_id, uniqueness: { scope: :target_account_id } | ||||
| 
 | ||||
|   after_create :remove_blocking_cache | ||||
|   after_destroy :remove_blocking_cache | ||||
| 
 | ||||
|   def remove_blocking_cache | ||||
|     Rails.cache.delete("blocked_account_ids:#{account_id}") | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -180,7 +180,9 @@ class Status < ApplicationRecord | |||
|     private | ||||
| 
 | ||||
|     def filter_timeline(query, account) | ||||
|       blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) | ||||
|       blocked = Rails.cache.fetch("blocked_account_ids:#{account.id}") do | ||||
|         Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) | ||||
|       end | ||||
|       query   = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty?  # Only give us statuses from people we haven't blocked, or muted, or that have blocked us | ||||
|       query   = query.where('accounts.silenced = TRUE') if account.silenced?                  # and if we're hellbanned, only people who are also hellbanned | ||||
|       query | ||||
|  |  | |||
		Reference in a new issue