gearheads
/
mastodon
Archived
2
0
Fork 0

Fix mentions regex to exclude usernames in Medium URLs

gh/stable
Eugen Rochko 2016-03-27 23:51:18 +02:00
parent 039e6f951c
commit c38ad208c3
2 changed files with 25 additions and 1 deletions

View File

@ -31,7 +31,7 @@ class Account < ActiveRecord::Base
has_many :following, through: :active_relationships, source: :target_account has_many :following, through: :active_relationships, source: :target_account
has_many :followers, through: :passive_relationships, source: :account has_many :followers, through: :passive_relationships, source: :account
MENTION_RE = /(?:^|\W)@([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)

View File

@ -111,4 +111,28 @@ RSpec.describe Account, type: :model do
describe '.find_local' do describe '.find_local' do
pending pending
end end
describe 'MENTION_RE' do
subject { Account::MENTION_RE }
it 'matches usernames in the middle of a sentence' do
expect(subject.match('Hello to @alice from me')[1]).to eq 'alice'
end
it 'matches usernames in the beginning of status' do
expect(subject.match('@alice Hey how are you?')[1]).to eq 'alice'
end
it 'matches dot-prepended usernames' do
expect(subject.match('.@alice I want everybody to see this')[1]).to eq 'alice'
end
it 'does not match e-mails' do
expect(subject.match('Drop me an e-mail at alice@example.com')).to be_nil
end
it 'does not match URLs' do
expect(subject.match('Check this out https://medium.com/@alice/some-article#.abcdef123')).to be_nil
end
end
end end