From e53cc673e717e913e2538a560d02d31c7c02496a Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 26 Oct 2018 22:48:35 +0200
Subject: [PATCH] Ignore invalid hashtags on remote statuses instead of
rejecting them (#9118)
Fixes #9115
---
app/lib/activitypub/activity/create.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index ea9017b827..f1b38b18ab 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)
--
GitLab