about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-10-27 18:54:26 +0200
committerThibaut Girka <thib@sitedethib.com>2018-10-27 18:54:26 +0200
commitc13cfeac0952b112140d48a076d685730ff39b06 (patch)
tree304e82845e241ed35840e5e578dd496efb3f74a4 /app/lib
parent5bb8563f6c0ec9021d6e70d85544147e6c2d0f44 (diff)
parenteef8d9a5f7d07bf785c6a7184e01374e211c6d7f (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/lib')
-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)