From 117acdd17f2b0c2f55eb3affa1233189149049e7 Mon Sep 17 00:00:00 2001 From: Maxwell Salzberg Date: Thu, 26 Jan 2012 23:51:10 -0800 Subject: [PATCH] move mention regex to a constant in mention --- app/models/mention.rb | 2 ++ app/models/status_message.rb | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/mention.rb b/app/models/mention.rb index 2899725e4..58e6f4375 100644 --- a/app/models/mention.rb +++ b/app/models/mention.rb @@ -3,6 +3,8 @@ # the COPYRIGHT file. class Mention < ActiveRecord::Base + REGEX = /@\{([^;]+); ([^\}]+)\}/ + belongs_to :post belongs_to :person validates :post, :presence => true diff --git a/app/models/status_message.rb b/app/models/status_message.rb index 96014b452..cc71788d2 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -85,8 +85,7 @@ class StatusMessage < Post end def format_mentions(text, opts = {}) - regex = /@\{([^;]+); ([^\}]+)\}/ - form_message = text.to_str.gsub(regex) do |matched_string| + form_message = text.to_str.gsub(Mention::REGEX) do |matched_string| people = self.mentioned_people person = people.detect{ |p| p.diaspora_handle == $~[2] unless p.nil? @@ -129,8 +128,7 @@ class StatusMessage < Post end def mentioned_people_from_string - regex = /@\{([^;]+); ([^\}]+)\}/ - identifiers = self.raw_message.scan(regex).map do |match| + identifiers = self.raw_message.scan(Mention::REGEX).map do |match| match.last end identifiers.empty? ? [] : Person.where(:diaspora_handle => identifiers)