hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix local mention regex so it works on newlines in HTML (with a preceding tag)

signup-info-prompt
Eugen Rochko 2016-09-10 10:19:50 +02:00
parent 457625591d
commit 7d45a4e692
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account.rb
View File

@ -35,7 +35,7 @@ class Account < ApplicationRecord
has_many :media_attachments, dependent: :destroy 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) def follow!(other_account)
self.active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account) self.active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)