From: ThibG <thib@sitedethib.com>
Date: Fri, 25 May 2018 12:26:45 +0000 (+0200)
Subject: Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cdbdf7f98bb45439908cb23d0dfae228d59b3c1f;p=mastodon.git

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 ab1d63cd4..010ed1bb5 100644
--- 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