don't query for mentioned people if mention syntax isn't present in message text.

This commit is contained in:
danielgrippi 2011-07-03 20:36:46 -07:00
parent 829c86823d
commit 511a651377
2 changed files with 10 additions and 6 deletions

View file

@ -25,6 +25,7 @@ class StatusMessage < Post
serialize :youtube_titles, Hash
before_create :build_tags
after_create :create_mentions
def text(opts = {})
self.formatted_message(opts)
@ -46,9 +47,9 @@ class StatusMessage < Post
end
def format_mentions(text, opts = {})
people = self.mentioned_people
regex = /@\{([^;]+); ([^\}]+)\}/
form_message = text.gsub(regex) do |matched_string|
people = self.mentioned_people
person = people.detect{ |p|
p.diaspora_handle == $~[2] unless p.nil?
}

View file

@ -17,11 +17,6 @@ describe StatusMessage do
end
describe '.before_create' do
it 'calls create_mentions' do
status = Factory.build(:status_message)
status.should_receive(:create_mentions)
status.save
end
it 'calls build_tags' do
status = Factory.build(:status_message)
status.should_receive(:build_tags)
@ -29,6 +24,14 @@ describe StatusMessage do
end
end
describe '.after_create' do
it 'calls create_mentions' do
status = Factory.build(:status_message)
status.should_receive(:create_mentions)
status.save
end
end
describe '#diaspora_handle=' do
it 'sets #author' do
person = Factory.create(:person)