From 7d45a4e692a9990db2f4e6ef65490b9d57de5844 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 10 Sep 2016 10:19:50 +0200 Subject: [PATCH] Fix local mention regex so it works on newlines in HTML (with a preceding tag) --- app/models/account.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/account.rb b/app/models/account.rb index 8792b90ea..1767f72e2 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -35,7 +35,7 @@ class Account < ApplicationRecord has_many :media_attachments, dependent: :destroy - MENTION_RE = /(?:^|\s|\.)@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i + MENTION_RE = /(?:^|\s|\.|>)@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i def follow!(other_account) self.active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)