1
0
mirror of https://github.com/mastodon/mastodon synced 2024-11-24 07:06:18 +09:00

Record trending tags from ActivityPub, too (#7647)

This commit is contained in:
Eugen Rochko 2018-05-28 05:21:04 +02:00 committed by Yamagishi Kazutoshi
parent dfbadd6837
commit ab36e0ef72

View File

@ -78,9 +78,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if tag['name'].blank?
hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase
hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag)
hashtag = Tag.where(name: hashtag).first_or_create(name: hashtag)
status.tags << hashtag unless status.tags.include?(hashtag)
return if status.tags.include?(hashtag)
status.tags << hashtag
TrendingTags.record_use!(hashtag, status.account, status.created_at)
rescue ActiveRecord::RecordInvalid
nil
end