db/migrate/20090305050212_update_twitter_message.rb script/twitter @@ -145,6 +145,7 @@ class Person < ActiveRecord::Base validates_confirmation_of :password, :if => Proc.new { Person.logged_in } validates_uniqueness_of :alternate_email, :allow_nil => true, :if => Proc.new { Person.logged_in } validates_uniqueness_of :feed_code, :allow_nil => true + validates_uniqueness_of :twitter_account, :allow_nil => true, :allow_blank => true validates_format_of :website, :allow_nil => true, :allow_blank => true, :with => /^https?\:\/\/.+/, :message => "has an incorrect format (are you missing 'http://' at the beginning?)" validates_format_of :business_website, :allow_nil => true, :allow_blank => true, :with => /^https?\:\/\/.+/, :message => "has an incorrect format (are you missing 'http://' at the beginning?)" validates_format_of :business_email, :allow_nil => true, :allow_blank => true, :with => VALID_EMAIL_ADDRESS, :message => 'has an incorrect format (something@example.com)' app/models/person.rb @@ -21,14 +21,12 @@ class TwitterMessage < ActiveRecord::Base belongs_to :person validates_presence_of :twitter_screen_name + validates_uniqueness_of :twitter_message_id def validate if TwitterMessage.count('*', :conditions => ['created_at >= ?', 1.minutes.ago]) > MAX_MESSAGES_PER_MINUTE errors.add_to_base('Too many messages per minute.') end - unless self.person - errors.add(:twitter_screen_name, 'Twitter screen name unknown.') - end end def twitter_screen_name=(screen_name) @@ -38,41 +36,45 @@ class TwitterMessage < ActiveRecord::Base def build_reply raise 'No message' unless self.message.to_s.strip.any? - if self.message =~ /^\s*(lookup|phone|mobile|home|work|address)\s*(.+)/ - lookup_name = sql_lcase(sql_concat('first_name', "' '", 'last_name')) - if found = Person.find(:first, :conditions => ["#{lookup_name} like ?", $2.downcase + '%']) \ - and self.person.can_see?(found) - case $1 - when 'lookup', 'phone', 'mobile' - if found.share_mobile_phone_with(self.person) and found.mobile_phone.to_i > 0 - self.reply = "#{found.mobile_phone} - #{found.name}" - else - self.reply = "Mobile number not available for #{found.name}" - end - when 'home' - if found.home_phone.to_i > 0 - self.reply = "#{found.home_phone} - #{found.name}" - else - self.reply = "Home number not available for #{found.name}" - end - when 'work' - if found.share_work_phone_with(self.person) and found.work_phone.to_i > 0 - self.reply = "#{found.work_phone} - #{found.name}" - else - self.reply = "Work number not available for #{found.name}" - end - when 'address' - if found.share_address_with(self.person) and found.address1.to_s.any? and found.city.to_s.any? and found.state.to_s.any? - self.reply = "#{found.family.mapable_address} - #{found.name}" - else - self.reply = "Address not available for #{found.name}" + if self.person + if self.message =~ /^\s*(lookup|phone|mobile|home|work|address)\s*(.+)/ + lookup_name = sql_lcase(sql_concat('first_name', "' '", 'last_name')) + if found = Person.find(:first, :conditions => ["#{lookup_name} like ?", $2.downcase + '%']) \ + and self.person.can_see?(found) + case $1 + when 'lookup', 'phone', 'mobile' + if found.share_mobile_phone_with(self.person) and found.mobile_phone.to_i > 0 + self.reply = "#{found.mobile_phone} - #{found.name}" + else + self.reply = "Mobile number not available for #{found.name}" + end + when 'home' + if found.home_phone.to_i > 0 + self.reply = "#{found.home_phone} - #{found.name}" + else + self.reply = "Home number not available for #{found.name}" + end + when 'work' + if found.share_work_phone_with(self.person) and found.work_phone.to_i > 0 + self.reply = "#{found.work_phone} - #{found.name}" + else + self.reply = "Work number not available for #{found.name}" + end + when 'address' + if found.share_address_with(self.person) and found.address1.to_s.any? and found.city.to_s.any? and found.state.to_s.any? + self.reply = "#{found.family.mapable_address} - #{found.name}" + else + self.reply = "Address not available for #{found.name}" + end end + else + self.reply = 'No one with that name could be found.' end else - self.reply = 'No one with that name could be found.' + self.reply = 'Send "mobile John Doe" or "address John Doe" or similar.' end else - self.reply = 'Send "mobile John Doe" or "address John Doe" or similar.' + self.reply = "I don't recognize your Twitter account. Update your account at #{Setting.get(:url, :site)}" end end end app/models/twitter_message.rb @@ -48,10 +48,6 @@ Name: value: a pretend church for testing OneBody description: Slogan displayed at top of every page. Features: - Twitter Account: - format: string - value: - description: Account name of church Twitter account. Multisite: format: boolean value: false @@ -74,14 +70,6 @@ Features: format: string value: description: Message to display across top of all pages on site (HTML), like an alert - Twitter Password: - format: password - value: - description: Password of church Twitter account. - Jabber Password: - format: password - value: - description: Password of Jabber account. Blog: format: boolean value: true @@ -126,10 +114,6 @@ Features: format: boolean value: false description: Enable Recipe sharing. - Jabber Account: - format: string - value: - description: Account (email address) for connecting to Twitter through Jabber/XMPP. Updates Must Be Approved: format: boolean value: true config/settings.yml app/models/twitter_bot.rb script/twitterbot 93d354f298d7b3da557072caff8825e908eadadd Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/d3408219294ed74409c9c4f10d3e1f6720b3cd9d d3408219294ed74409c9c4f10d3e1f6720b3cd9d 2009-03-04T22:11:48-08:00 2009-03-04T22:11:48-08:00 Redesign Twitter script to be run from cron and no longer use Jabber. 894f58aae1ba31b2203f72d48b05b01bf17b12ea Tim Morgan tim@timmorgan.org