mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Record trending tags from ActivityPub, too (#7647)

pull/525/head^2
Eugen Rochko 2018-05-28 05:21:04 +02:00 committed by Yamagishi Kazutoshi
parent dfbadd6837
commit ab36e0ef72
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
return if tag['name'].blank? return if tag['name'].blank?
hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase 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 rescue ActiveRecord::RecordInvalid
nil nil
end end