diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
| commit | bca3825c17dd2087f826d9269bb80537bd4ff395 (patch) | |
| tree | 51043b99ec56d263f9d126091afb923292a9e301 /app/lib/activitypub/activity/create.rb | |
| parent | 91da921dbb51f55bc926c3997ae558d735292a67 (diff) | |
| parent | cfb2ed78231758a79af038a964ab7f7b7b35274e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 56c24680a..000b77df5 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -148,12 +148,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def process_hashtag(tag) return if tag['name'].blank? - hashtag = tag['name'].gsub(/\A#/, '').mb_chars.downcase - hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag) - - return if @tags.include?(hashtag) - - @tags << hashtag + Tag.find_or_create_by_names(tag['name']) do |hashtag| + @tags << hashtag unless @tags.include?(hashtag) + end rescue ActiveRecord::RecordInvalid nil end |