about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-10 10:19:50 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-10 10:19:50 +0200
commit7d45a4e692a9990db2f4e6ef65490b9d57de5844 (patch)
tree438d0f444b6bc9bc9b22f289143bd461dfb623d4 /app/models
parent457625591d125dc340b46757a986d4d3a33368f9 (diff)
Fix local mention regex so it works on newlines in HTML (with a preceding tag)
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb2
1 files changed, 1 insertions, 1 deletions
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)