From ab36e0ef72a52e5cc184d63cda0fe411c8b4086a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 28 May 2018 05:21:04 +0200
Subject: [PATCH] Record trending tags from ActivityPub, too (#7647)
---
app/lib/activitypub/activity/create.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 010ed1bb5f..869749f1ec 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -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
--
GitLab