diff options
author | ThibG <thib@sitedethib.com> | 2019-07-29 23:37:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-29 23:37:14 +0200 |
commit | f48c7689d230b915ed740a4774736bd5998cbc66 (patch) | |
tree | 3d883f06fe8e3abbc5653e029ac8612ae114f135 /app/lib/activitypub/activity/create.rb | |
parent | a4a81c5434c73139f7c1d66f2687039237c5208a (diff) | |
parent | 51411267fda00db576230a270a10e31992378c18 (diff) |
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |