]> cat aescling's git repositories - mastodon.git/commitdiff
Ignore invalid hashtags on remote statuses instead of rejecting them (#9118)
authorThibG <thib@sitedethib.com>
Fri, 26 Oct 2018 20:48:35 +0000 (22:48 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Fri, 26 Oct 2018 20:48:35 +0000 (22:48 +0200)
Fixes #9115

app/lib/activitypub/activity/create.rb

index ea9017b8277f9f18f932f645ad32156a30f9a851..f1b38b18ab65a1ae1d6fa58c1e3cfcc4ff761521 100644 (file)
@@ -129,7 +129,7 @@ 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_create(name: hashtag)
+    hashtag = Tag.where(name: hashtag).first_or_create!(name: hashtag)
 
     return if @tags.include?(hashtag)