Exclude unlisted, private and direct toots from affecting trends (#7686)
This commit is contained in:
		
							parent
							
								
									0ce5339a7b
								
							
						
					
					
						commit
						1e938b966e
					
				@ -83,7 +83,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 | 
				
			|||||||
    return if status.tags.include?(hashtag)
 | 
					    return if status.tags.include?(hashtag)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    status.tags << hashtag
 | 
					    status.tags << hashtag
 | 
				
			||||||
    TrendingTags.record_use!(hashtag, status.account, status.created_at)
 | 
					    TrendingTags.record_use!(hashtag, status.account, status.created_at) if status.public_visibility?
 | 
				
			||||||
  rescue ActiveRecord::RecordInvalid
 | 
					  rescue ActiveRecord::RecordInvalid
 | 
				
			||||||
    nil
 | 
					    nil
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
				
			|||||||
@ -7,7 +7,7 @@ class ProcessHashtagsService < BaseService
 | 
				
			|||||||
    tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |name|
 | 
					    tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |name|
 | 
				
			||||||
      tag = Tag.where(name: name).first_or_create(name: name)
 | 
					      tag = Tag.where(name: name).first_or_create(name: name)
 | 
				
			||||||
      status.tags << tag
 | 
					      status.tags << tag
 | 
				
			||||||
      TrendingTags.record_use!(tag, status.account, status.created_at)
 | 
					      TrendingTags.record_use!(tag, status.account, status.created_at) if status.public_visibility?
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user