about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-10-26 22:48:35 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-10-26 22:48:35 +0200
commite53cc673e717e913e2538a560d02d31c7c02496a (patch)
tree681f49a9c107a160b6a08078600fd15cb5e36a60
parent82e7988afcde5b19b99ad9ecf7973560a8a17f7f (diff)
Ignore invalid hashtags on remote statuses instead of rejecting them (#9118)
Fixes #9115
-rw-r--r--app/lib/activitypub/activity/create.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index ea9017b82..f1b38b18a 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -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)