nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exclude unlisted, private and direct toots from affecting trends (#7686)

This commit is contained in:
Eugen Rochko 2018-05-31 16:47:28 +02:00 committed by GitHub
parent 0ce5339a7b
commit 1e938b966e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View File

@ -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

2
app/services/process_hashtags_service.rb
View File

@ -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