Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index ab1d63cd496e11a38cce0d53cdc085c370e8ee05..010ed1bb5f042ff0724b346d6e13c494dd0b5d2e 100644 (file)
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -80,7 +80,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase
     hashtag = Tag.where(name: hashtag).first_or_initialize(name: hashtag)
 
-    status.tags << hashtag
+    status.tags << hashtag unless status.tags.include?(hashtag)
   rescue ActiveRecord::RecordInvalid
     nil
   end