more tests for mailing. the bug was i think we have to restart the resque workers

This reverts commit ab997e2d21.

.gitignore

@@ -1,17 +1,26 @@
+#trademark sillyness
+app/views/home/_show.html.haml
+app/views/home/_show.mobile.haml
+public/images/ball_small.png
+public/images/ball.png
 # Configuration files
 config/app_config.yml
 config/fb_config.yml
 config/oauth_keys.yml
 config/initializers/secret_token.rb
+config/redis.conf
+config/deploy_config.yml
 .bundle
 vendor/bundle/*
+config/database.yml
 
 # Generated files
 log/*
-public/stylesheets/application.css
-public/stylesheets/sessions.css
-public/stylesheets/ui.css
-spec/fixtures/users.yaml
+public/stylesheets/*.css
+public/diaspora
+spec/fixtures/*.y*ml
+spec/fixtures/*.fixture.*
+coverage/*
 
 # Uploded files and local files
 public/uploads/*
@@ -35,3 +44,7 @@ bin/*
 nbproject
 patches-*
 capybara-*.html
+dump.rdb
+
+#Rubinius's JIT
+*.rbc

.pairs

@@ -5,6 +5,8 @@ pairs:
   ms: Maxwell Salzberg; maxwell
   dh: Dan Hansen; ohaibbq
   sm: Sarah Mei; sarah
+  mjs: Michael Sofaer; michael
+  jd: Jeff Dickey; dickeytk
 email:
   prefix: pair
   domain: joindiaspora.com

.rspec

@@ -1,3 +1,3 @@
---color
---require rspec/instafail
---format RSpec::Instafail
+--format Fuubar
+--profile
+--color

Gemfile

@@ -1,77 +1,87 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.1'
+gem 'mysql2', '0.2.6'
+gem 'rails', '3.0.3'
+gem 'foreigner', '0.9.1'
 
 gem 'bundler', '>= 1.0.0'
-gem "chef", :require => false
+gem 'chef', '0.9.12', :require => false
 
-gem "nokogiri", "1.4.3.1"
+gem 'nokogiri', '1.4.3.1'
 
 #Security
 gem 'devise', '1.1.3'
-gem 'devise-mongo_mapper', :git => 'git://github.com/collectiveidea/devise-mongo_mapper'
-gem 'devise_invitable','0.3.5'
+gem 'devise_invitable', :git => 'git://github.com/zhitomirskiyi/devise_invitable.git', :branch => '0.3.5'
 
 #Authentication
-gem 'omniauth'
-gem 'twitter', '0.9.12'
-
-#Mongo
-gem 'mongo_mapper', :branch => 'rails3', :git => 'git://github.com/jnunemaker/mongomapper.git'
-gem 'bson_ext', '1.1'
-gem 'bson', '1.1'
+gem 'omniauth', '0.1.6'
+gem 'twitter', :git => 'git://github.com/jnunemaker/twitter.git', :ref => 'ef122bbb280e229ed343'
 
 #Views
-gem 'haml'
+gem 'haml', '3.0.25'
 gem 'will_paginate', '3.0.pre2'
 
+#Inflected translations
+gem 'i18n-inflector-rails', '~> 1.0'
+
+#Tags
+gem 'acts-as-taggable-on', :git => 'git://github.com/diaspora/acts-as-taggable-on.git'
+
 #Uncatagorized
-gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
-gem 'addressable', :require => 'addressable/uri'
-gem 'json'
-gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.git'
+gem 'roxml', :git => 'git://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
+gem 'addressable', '2.2.2', :require => 'addressable/uri'
+gem 'json', '1.4.6'
+gem 'http_accept_language', :git => 'git://github.com/iain/http_accept_language.git', :ref => '0b78aa7849fc90cf9e12'
 
-#Standards
-gem 'pubsubhubbub'
-
-#EventMachine
-gem 'em-http-request',:ref => 'bf62d67fc72d6e701be5',  :git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'thin'
+gem 'thin', '1.2.8', :require => false
 
 #Websocket
-gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket'
-gem 'magent', :git => 'git://github.com/dcu/magent.git'
+gem 'em-websocket', :git => 'git://github.com/igrigorik/em-websocket', :ref => 'e278f5a1c4db60be7485'
 
 #File uploading
-gem 'carrierwave', :git => 'git://github.com/rsofaer/carrierwave.git' , :branch => 'master' #Untested mongomapper branch
-gem 'mini_magick'
-gem 'aws'
-gem 'fastercsv', :require => false
-gem 'jammit'
+gem 'carrierwave', '0.5.2'
+gem "fog", '0.3.25'
+gem "excon", "0.2.4"
+gem 'mini_magick', '3.2'
+gem 'aws', '2.3.32' # upgrade to 2.4 breaks 1.8 >.<
+
+gem 'fastercsv', '1.5.4', :require => false
+gem 'jammit', '0.5.4'
+gem 'rest-client', '1.6.1'
+gem 'typhoeus'
 
 #Backups
-gem "cloudfiles", :require => false
+gem 'cloudfiles', '1.4.10', :require => false
+
+#Queue
+gem 'resque', '1.10.0'
+gem 'SystemTimer', '1.2.1' unless RUBY_VERSION.include? '1.9' || RUBY_PLATFORM =~ 'win32'
+
+group :development do
+  gem 'capistrano', '2.5.19', :require => false
+  gem 'capistrano-ext', '1.2.1', :require => false
+end
 
 group :test, :development do
-  gem 'factory_girl_rails'
-  gem 'ruby-debug19' if RUBY_VERSION.include? "1.9"
-  gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
+  gem 'factory_girl_rails', :require => false
+  gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
+  gem 'ruby-debug19' if RUBY_VERSION.include? '1.9'
+  gem 'ruby-debug' if defined?(Rubinius).nil? && RUBY_VERSION.include?('1.8')
   gem 'launchy'
 end
 
 group :test do
+  gem 'factory_girl_rails'
+  gem 'fixture_builder', '~> 0.2.0'
   gem 'capybara', '~> 0.3.9'
   gem 'cucumber-rails', '0.3.2'
   gem 'rspec', '>= 2.0.0'
   gem 'rspec-rails', '>= 2.0.0'
-  gem 'mocha'
-  gem 'database_cleaner', '0.5.2'
+  gem 'rcov'
+  gem 'database_cleaner', '0.6.0'
   gem 'webmock', :require => false
   gem 'jasmine', :path => 'vendor/gems/jasmine', :require => false
-  gem 'mongrel', :require => false if RUBY_VERSION.include? "1.8"
-  gem 'rspec-instafail', :require => false
-end
-
-group :deployment do
-  #gem 'sprinkle', :git => 'git://github.com/rsofaer/sprinkle.git'
+  gem 'mongrel', :require => false if RUBY_VERSION.include? '1.8'
+  gem 'rspec-instafail', '>= 0.1.7', :require => false
+  gem 'fuubar'
 end

Gemfile.lock

@@ -1,67 +1,55 @@
 GIT
   remote: git://github.com/Empact/roxml.git
   revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
+  ref: 7ea9a9ffd2338aaef5b0
   specs:
     roxml (3.1.6)
       activesupport (>= 2.3.0)
       nokogiri (>= 1.3.3)
 
 GIT
-  remote: git://github.com/collectiveidea/devise-mongo_mapper
-  revision: fa2f20310e0988295adc192255d3b1cedee1b412
+  remote: git://github.com/diaspora/acts-as-taggable-on.git
+  revision: c3592fe1a906f6ff1cd12766c5cf1152c51eec40
   specs:
-    devise-mongo_mapper (0.0.1)
-      devise (~> 1.1.0)
-
-GIT
-  remote: git://github.com/dcu/magent.git
-  revision: 663d493e0058901d8a2baec00e4d20e867b1359d
-  specs:
-    magent (0.5.2)
-      em-websocket
-      mongo
-      uuidtools
+    acts-as-taggable-on (2.0.6)
+      rails (>= 3.0)
 
 GIT
   remote: git://github.com/iain/http_accept_language.git
   revision: 0b78aa7849fc90cf9e12586af162fa4c408a795d
+  ref: 0b78aa7849fc90cf9e12
   specs:
     http_accept_language (1.0.1)
 
-GIT
-  remote: git://github.com/igrigorik/em-http-request.git
-  revision: bf62d67fc72d6e701be5037e239dd470194b8e45
-  ref: bf62d67fc72d6e701be5
-  specs:
-    em-http-request (0.2.13)
-      addressable (>= 2.0.0)
-      eventmachine (>= 0.12.9)
-
 GIT
   remote: git://github.com/igrigorik/em-websocket
   revision: e278f5a1c4db60be7485859520a069e08bfe1247
+  ref: e278f5a1c4db60be7485
   specs:
     em-websocket (0.2.0)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
 
 GIT
-  remote: git://github.com/jnunemaker/mongomapper.git
-  revision: de8f8f3171f687f8d65b87ba7c7d3b1cb6e3bbe6
-  branch: rails3
+  remote: git://github.com/jnunemaker/twitter.git
+  revision: ef122bbb280e229ed34347c235c68aa9349d0d8e
+  ref: ef122bbb280e229ed343
   specs:
-    mongo_mapper (0.8.6)
-      activemodel (~> 3.0.0)
-      activesupport (~> 3.0.0)
-      plucky (~> 0.3.6)
+    twitter (1.0.0)
+      faraday (~> 0.5.3)
+      faraday_middleware (~> 0.3.0)
+      hashie (~> 0.4.0)
+      multi_json (~> 0.0.5)
+      multi_xml (~> 0.2.0)
+      simple_oauth (~> 0.1.2)
 
 GIT
-  remote: git://github.com/rsofaer/carrierwave.git
-  revision: c3dfbdda2fa227af91fe383bb126f59b991a318f
-  branch: master
+  remote: git://github.com/zhitomirskiyi/devise_invitable.git
+  revision: 85abb5fef4ab4f74db818ed3d8104c2f7d24b94e
+  branch: 0.3.5
   specs:
-    carrierwave (0.5.0)
-      activesupport (~> 3.0)
+    devise_invitable (0.3.5)
+      devise (~> 1.1.0)
 
 PATH
   remote: vendor/gems/jasmine
@@ -77,46 +65,52 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
+    SystemTimer (1.2.1)
     abstract (1.0.0)
-    actionmailer (3.0.1)
-      actionpack (= 3.0.1)
-      mail (~> 2.2.5)
-    actionpack (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
+      i18n (~> 0.4)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.12)
-      rack-test (~> 0.5.4)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-    activesupport (3.0.1)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
     addressable (2.2.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
-    aws (2.3.26)
+    arel (2.0.9)
+    aws (2.3.32)
       activesupport
       http_connection
       uuidtools
       xml-simple
-    bcrypt-ruby (2.1.2)
-    bson (1.1)
-    bson_ext (1.1)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
     bunny (0.6.0)
+    capistrano (2.5.19)
+      highline
+      net-scp (>= 1.0.0)
+      net-sftp (>= 2.0.0)
+      net-ssh (>= 2.0.14)
+      net-ssh-gateway (>= 1.0.0)
+    capistrano-ext (1.2.1)
+      capistrano (>= 1.0.0)
     capybara (0.3.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -124,108 +118,135 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
+    carrierwave (0.5.2)
+      activesupport (~> 3.0)
     cgi_multipart_eof_fix (2.5.0)
     chef (0.9.12)
       bunny (>= 0.6.0)
       erubis
       extlib
       highline
-      json (>= 1.4.4, <= 1.4.6)
+      json (<= 1.4.6, >= 1.4.4)
       mixlib-authentication (>= 1.1.0)
       mixlib-cli (>= 1.1.0)
       mixlib-config (>= 1.1.2)
       mixlib-log (>= 1.2.0)
       moneta
       ohai (>= 0.5.7)
-      rest-client (>= 1.0.4, < 1.7.0)
+      rest-client (< 1.7.0, >= 1.0.4)
       uuidtools
-    childprocess (0.1.4)
+    childprocess (0.1.7)
       ffi (~> 0.6.3)
-    closure-compiler (0.3.3)
+    closure-compiler (1.0.0)
     cloudfiles (1.4.10)
       mime-types (>= 1.16)
     columnize (0.3.2)
     configuration (1.2.0)
     crack (0.1.8)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
+      gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.12)
+    culerity (0.2.15)
     daemons (1.1.0)
-    database_cleaner (0.5.2)
+    database_cleaner (0.6.0)
     devise (1.1.3)
       bcrypt-ruby (~> 2.1.2)
       warden (~> 0.10.7)
-    devise_invitable (0.3.5)
-      devise (~> 1.1.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    excon (0.2.4)
     extlib (0.9.15)
-    factory_girl (1.3.2)
-    factory_girl_rails (1.0)
+    factory_girl (1.3.3)
+    factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
-      rails (>= 3.0.0.beta4)
-    faraday (0.5.3)
+      railties (>= 3.0.0)
+    faraday (0.5.4)
       addressable (~> 2.2.2)
-      multipart-post (~> 1.0.1)
-      rack (>= 1.1.0, < 2)
-    fastercsv (1.5.3)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    faraday_middleware (0.3.2)
+      faraday (~> 0.5.4)
+    fastercsv (1.5.4)
     fastthread (1.0.7)
     ffi (0.6.3)
       rake (>= 0.8.7)
+    fixture_builder (0.2.0)
+    fog (0.3.25)
+      builder
+      excon (>= 0.2.4)
+      formatador (>= 0.0.16)
+      json
+      mime-types
+      net-ssh (~> 2.0.23)
+      nokogiri (~> 1.4.3.1)
+      ruby-hmac
+    foreigner (0.9.1)
+    formatador (0.0.16)
+    fuubar (0.0.3)
+      rspec (~> 2.0)
+      rspec-instafail (~> 0.1.4)
+      ruby-progressbar (~> 0.0.9)
     gem_plugin (0.2.3)
-    gherkin (2.2.9)
+    gherkin (2.3.3)
       json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    haml (3.0.24)
+    haml (3.0.25)
     hashie (0.4.0)
     highline (1.6.1)
     http_connection (1.4.0)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    i18n (0.4.2)
+    i18n (0.5.0)
+    i18n-inflector (2.5.1)
+      i18n (>= 0.4.1)
+    i18n-inflector-rails (1.0.3)
+      actionpack (~> 3.0)
+      i18n-inflector (~> 2.5)
+      railties (~> 3.0)
     jammit (0.5.4)
       closure-compiler (>= 0.1.0)
       yui-compressor (>= 0.9.1)
     json (1.4.6)
-    json_pure (1.4.6)
-    launchy (0.3.7)
+    json_pure (1.5.1)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
-    mail (2.2.10)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mini_magick (3.1)
+    mini_magick (3.2)
       subexec (~> 0.0.4)
     mixlib-authentication (1.1.4)
       mixlib-log
     mixlib-cli (1.2.0)
     mixlib-config (1.1.2)
     mixlib-log (1.2.0)
-    mocha (0.9.10)
-      rake
     moneta (0.6.0)
-    mongo (1.1)
-      bson (>= 1.0.5)
     mongrel (1.1.5)
       cgi_multipart_eof_fix (>= 2.4)
       daemons (>= 1.0.3)
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
     multi_json (0.0.5)
-    multipart-post (1.0.1)
+    multi_xml (0.2.1)
+    multipart-post (1.1.0)
+    mysql2 (0.2.6)
     net-ldap (0.1.1)
+    net-scp (1.0.4)
+      net-ssh (>= 1.99.1)
+    net-sftp (2.0.5)
+      net-ssh (>= 2.0.9)
+    net-ssh (2.0.24)
+    net-ssh-gateway (1.0.1)
+      net-ssh (>= 1.99.1)
     nokogiri (1.4.3.1)
     oa-basic (0.1.6)
       multi_json (~> 0.0.2)
@@ -251,12 +272,12 @@ GEM
       rack-openid (~> 1.2.0)
       ruby-openid-apps-discovery
     oauth (0.4.4)
-    oauth2 (0.1.0)
+    oauth2 (0.1.1)
       faraday (~> 0.5.0)
       multi_json (~> 0.0.4)
     ohai (0.5.8)
       extlib
-      json (>= 1.4.4, <= 1.4.6)
+      json (<= 1.4.6, >= 1.4.4)
       mixlib-cli
       mixlib-config
       mixlib-log
@@ -267,12 +288,7 @@ GEM
       oa-enterprise (= 0.1.6)
       oa-oauth (= 0.1.6)
       oa-openid (= 0.1.6)
-    plucky (0.3.6)
-      mongo (~> 1.1)
     polyglot (0.3.1)
-    pubsubhubbub (0.1.1)
-      em-http-request (>= 0.1.5)
-      eventmachine (>= 0.12.9)
     pyu-ruby-sasl (0.0.3.2)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -280,125 +296,148 @@ GEM
     rack-openid (1.2.0)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.1)
-      actionmailer (= 3.0.1)
-      actionpack (= 3.0.1)
-      activerecord (= 3.0.1)
-      activeresource (= 3.0.1)
-      activesupport (= 3.0.1)
-      bundler (~> 1.0.0)
-      railties (= 3.0.1)
-    railties (3.0.1)
-      actionpack (= 3.0.1)
-      activesupport (= 3.0.1)
-      rake (>= 0.8.4)
-      thor (~> 0.14.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
+    rcov (0.9.9)
+    redis (2.1.1)
+    redis-namespace (0.8.0)
+      redis (< 3.0.0)
+    resque (1.10.0)
+      json (~> 1.4.6)
+      redis-namespace (~> 0.8.0)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     rest-client (1.6.1)
       mime-types (>= 1.16)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.5)
-    rspec-mocks (2.2.0)
-    rspec-rails (2.2.1)
+    rspec-instafail (0.1.7)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.2.0)
+      rspec (~> 2.5.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    ruby-hmac (0.4.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
+    ruby-progressbar (0.0.9)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-client (1.2.18)
-    selenium-rc (2.2.4)
+    selenium-rc (2.3.2)
       selenium-client (>= 1.2.18)
-    selenium-webdriver (0.1.1)
-      childprocess (= 0.1.4)
+    selenium-webdriver (0.1.3)
+      childprocess (~> 0.1.5)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
+    simple_oauth (0.1.4)
+    sinatra (1.2.0)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
     subexec (0.0.4)
     systemu (1.2.0)
     term-ansicolor (1.0.5)
-    thin (1.2.7)
+    thin (1.2.8)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
+    tilt (1.2.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    twitter (0.9.12)
-      hashie (~> 0.4.0)
-      httparty (~> 0.6.1)
-      multi_json (~> 0.0.4)
-      oauth (~> 0.4.3)
-    tzinfo (0.3.23)
-    uuidtools (2.1.1)
+    typhoeus (0.2.4)
+      mime-types
+      mime-types
+    tzinfo (0.3.24)
+    uuidtools (2.1.2)
+    vegas (0.1.8)
+      rack (>= 1.0.0)
     warden (0.10.7)
       rack (>= 1.0.0)
-    webmock (1.6.1)
+    webmock (1.6.2)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
     will_paginate (3.0.pre2)
-    xml-simple (1.0.12)
-    yui-compressor (0.9.1)
+    xml-simple (1.0.14)
+    yui-compressor (0.9.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  addressable
-  aws
-  bson (= 1.1)
-  bson_ext (= 1.1)
+  SystemTimer (= 1.2.1)
+  acts-as-taggable-on!
+  addressable (= 2.2.2)
+  aws (= 2.3.32)
   bundler (>= 1.0.0)
+  capistrano (= 2.5.19)
+  capistrano-ext (= 1.2.1)
   capybara (~> 0.3.9)
-  carrierwave!
-  chef
-  cloudfiles
+  carrierwave (= 0.5.2)
+  chef (= 0.9.12)
+  cloudfiles (= 1.4.10)
   cucumber-rails (= 0.3.2)
-  database_cleaner (= 0.5.2)
+  database_cleaner (= 0.6.0)
   devise (= 1.1.3)
-  devise-mongo_mapper!
-  devise_invitable (= 0.3.5)
-  em-http-request!
+  devise_invitable!
   em-websocket!
+  excon (= 0.2.4)
   factory_girl_rails
-  fastercsv
-  haml
+  fastercsv (= 1.5.4)
+  fixture_builder (~> 0.2.0)
+  fog (= 0.3.25)
+  foreigner (= 0.9.1)
+  fuubar
+  haml (= 3.0.25)
   http_accept_language!
-  jammit
+  i18n-inflector-rails (~> 1.0)
+  jammit (= 0.5.4)
   jasmine!
-  json
+  json (= 1.4.6)
   launchy
-  magent!
-  mini_magick
-  mocha
-  mongo_mapper!
+  mini_magick (= 3.2)
   mongrel
+  mysql2 (= 0.2.6)
   nokogiri (= 1.4.3.1)
-  omniauth
-  pubsubhubbub
-  rails (= 3.0.1)
+  omniauth (= 0.1.6)
+  rails (= 3.0.3)
+  rcov
+  resque (= 1.10.0)
+  rest-client (= 1.6.1)
   roxml!
   rspec (>= 2.0.0)
-  rspec-instafail
+  rspec-instafail (>= 0.1.7)
   rspec-rails (>= 2.0.0)
   ruby-debug
-  thin
-  twitter (= 0.9.12)
+  thin (= 1.2.8)
+  twitter!
+  typhoeus
   webmock
   will_paginate (= 3.0.pre2)

README.md

@@ -3,9 +3,8 @@
 The privacy aware, personally controlled, do-it-all, open source social
 network.
 
-**THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
-**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
-TO BE BROKEN.**
+**THIS IS ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
+**IT IS FUN TO GET RUNNING, BUT EXPECT THINGS TO BE BROKEN.**
 
 ## Installation instructions
 
@@ -47,13 +46,13 @@ We need you to fill out a
 before we can accept your patches.  The agreement gives Diaspora joint
 ownership of the patch so the copyright isn't scattered.  You can find it
 [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq).
-We're currently working on revising it more details on what we're going for can be found [here](http://joindiaspora.com/licensing.html).
+We're currently working on revising it more details on what we're going for can be found [here](http://blog.joindiaspora.com/licensing.html).
 
 ## Resources
 
 Here is our [bug tracker](http://bugs.joindiaspora.com) and our
 [roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can
-find see what the core team is upto [here](http://www.pivotaltracker.com/projects/61641).
+find see what the core team is up to [here](http://www.pivotaltracker.com/projects/61641).
 
 
 Ongoing discussion:
@@ -61,11 +60,13 @@ Ongoing discussion:
 - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
 - [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
 - [Diaspora Q&A site](http://diaspora.shapado.com/)
+- [#diaspora IRC channel](irc://irc.freenode.net/#diaspora)
+  ([join via the web client](http://webchat.freenode.net?channels=diaspora))
 - [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)
   ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev))
 
 More general info and updates about the project can be found on
-[our blog](http://joindiaspora.com),
+[our blog](http://blog.joindiaspora.com),
 [and on Twitter](http://twitter.com/joindiaspora).
 Also, be sure to join the official [mailing list](http://eepurl.com/Vebk).
 

Rakefile

@@ -7,5 +7,6 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
+require 'resque/tasks'
 
 Diaspora::Application.load_tasks

Termfile

@@ -0,0 +1,46 @@
+# Copyright (c) 2010, Diaspora Inc.  This file is
+# licensed under the Affero General Public License version 3 or later.  See
+# the COPYRIGHT file.
+
+# If you do
+#    terminitor start
+# from the Diaspora root directory, it will open a new terminal window with
+# 3 tabs: redis, resque, and jasmine.
+#
+# You need to install the terminitor gem. It's not in the Gemfile because it
+# causes problems on some flavors of linux.
+#    gem install terminitor
+#
+# You should set REDIS_ROOT before running terminitor start.
+# You might want to do that in your .bash_profile.
+#    export REDIS_ROOT=/full/path/to/redis/without/the/bin
+# You can also set DIASPORA_ROOT in a similar way if you don't want it to be
+# the directory this file is in.
+#
+# This will run on OS X and KDE.
+
+def get_var_for(env_var_name)
+  if ENV[env_var_name].nil? || ENV[env_var_name].strip == ""
+    File.dirname(__FILE__)
+  else
+    ENV[env_var_name]
+  end
+end
+
+before { system "sudo ls" } # this ensures redis can start right away
+
+window do
+  tab :name => "redis" do
+    run "cd #{get_var_for('REDIS_ROOT')}"
+    run "sudo ./bin/redis-server"
+  end
+  tab :name => "resque" do
+    run "cd #{get_var_for('DIASPORA_ROOT')}"
+    run "QUEUE=* rake resque:work"
+  end
+  tab :name => "jasmine" do
+    run "cd #{get_var_for('DIASPORA_ROOT')}"
+    run "rake jasmine"
+  end
+end
+

app/controllers/admins_controller.rb

@@ -0,0 +1,27 @@
+class AdminsController < ApplicationController
+  before_filter :authenticate_user!
+  before_filter :redirect_unless_admin
+
+  def user_search
+    user = params[:user] || {}
+    user = user.delete_if {|key, value| value.blank? }
+    params[:user] = user
+
+    if user.keys.count == 0
+      @users = []
+    else
+      @users = User.where(params[:user]).all || []
+    end
+
+    render 'user_search'
+  end
+
+  def admin_inviter
+    opts = {:service => 'email', :identifier => params[:identifier]}
+    existing_user = Invitation.find_existing_user('email', params[:identifier])
+    opts.merge!(:existing_user => existing_user) if existing_user
+    Invitation.create_invitee(opts)
+    flash[:notice] = "invitation sent to #{params[:identifier]}"
+    redirect_to '/admins/user_search'
+  end
+end

app/controllers/application_controller.rb

@@ -3,49 +3,101 @@
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
-  #has_mobile_fu
+  has_mobile_fu
   protect_from_forgery :except => :receive
 
-  # =>before_filter :mobile_except_ipad
-  before_filter :set_contacts_and_status, :except => [:create, :update]
+  before_filter :ensure_http_referer_is_set
+  before_filter :set_header_data, :except => [:create, :update]
   before_filter :count_requests
   before_filter :set_invites
   before_filter :set_locale
+  before_filter :set_git_header if (AppConfig[:git_update] && AppConfig[:git_revision])
+  before_filter :which_action_and_user
+  prepend_before_filter :clear_gc_stats
+  before_filter :set_grammatical_gender
 
-  def set_contacts_and_status
-    if current_user
-      @aspect = nil
-      @aspects = current_user.aspects.fields(:name)
-      @aspects_dropdown_array = @aspects.collect{|x| [x.to_s, x.id]}
-      @contacts = current_user.contacts
-    end
+  inflection_method :grammatical_gender => :gender
+
+  def ensure_http_referer_is_set
+    request.env['HTTP_REFERER'] ||= '/aspects'
   end
 
-  def mobile_except_ipad
-    if is_mobile_device?
-      if request.env["HTTP_USER_AGENT"].include? "iPad"
-        session[:mobile_view] = false 
-      else
-        session[:mobile_view] = true
+  def set_header_data
+    if user_signed_in?
+      if request.format.html?
+        @aspect = nil
+        @object_aspect_ids = []
+        @notification_count = Notification.for(current_user, :unread =>true).count
+        @unread_message_count = ConversationVisibility.sum(:unread, :conditions => "person_id = #{current_user.person.id}")
       end
+      @all_aspects = current_user.aspects
     end
   end
-  
+
   def count_requests
-    @request_count = current_user.requests_for_me.count if current_user
+    @request_count = Request.where(:recipient_id => current_user.person.id).count if current_user
   end
 
   def set_invites
-    if current_user
+    if user_signed_in?
       @invites = current_user.invites
     end
   end
 
-  def set_locale
+  def set_git_header
+    headers['X-Git-Update'] = AppConfig[:git_update]
+    headers['X-Git-Revision'] = AppConfig[:git_revision]
+  end
+
+  def which_action_and_user
+    str = "event=request_with_user controller=#{self.class} action=#{self.action_name} "
     if current_user
+      str << "uid=#{current_user.id} "
+      str << "user_created_at='#{current_user.created_at.to_date.to_s}' user_created_at_unix=#{current_user.created_at.to_i} " if current_user.created_at
+      str << "user_non_pending_contact_count=#{current_user.contacts.size} user_contact_count=#{Contact.unscoped.where(:user_id => current_user.id).size} "
+    else
+      str << 'uid=nil'
+    end
+    Rails.logger.info str
+  end
+
+  def set_locale
+    if user_signed_in?
       I18n.locale = current_user.language
     else
       I18n.locale = request.compatible_language_from AVAILABLE_LANGUAGE_CODES
     end
   end
+  def clear_gc_stats
+    GC.clear_stats if GC.respond_to?(:clear_stats)
+  end
+
+  def redirect_unless_admin
+    admins = AppConfig[:admins]
+    unless admins.present? && admins.include?(current_user.username)
+      redirect_to root_url
+    end
+  end
+
+  def set_grammatical_gender
+    if (user_signed_in? && I18n.inflector.inflected_locale?)
+      gender = current_user.profile.gender.to_s.tr('!()[]"\'`*=|/\#.,-:', '').downcase
+      unless gender.empty?
+        i_langs = I18n.inflector.inflected_locales(:gender)
+        i_langs.delete  I18n.locale
+        i_langs.unshift I18n.locale
+        i_langs.each do |lang|
+          token = I18n.inflector.true_token(gender, :gender, lang)
+          unless token.nil?
+            @grammatical_gender = token
+            break
+          end
+        end
+      end
+    end
+  end
+
+  def grammatical_gender
+    @grammatical_gender || nil
+  end
 end

app/controllers/aspect_memberships_controller.rb

@@ -0,0 +1,67 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+
+class AspectMembershipsController < ApplicationController
+  before_filter :authenticate_user!
+
+  def destroy
+    #note :id is garbage
+
+      @person_id = params[:person_id]
+      @aspect_id = params[:aspect_id]
+
+      @contact = current_user.contact_for(Person.where(:id => @person_id).first)
+      membership = @contact ? @contact.aspect_memberships.where(:aspect_id => @aspect_id).first : nil
+
+      if membership && membership.destroy
+        flash.now[:notice] = I18n.t 'aspect_memberships.destroy.success'
+
+        respond_to do |format|
+          format.js do
+            render :json => {:button_html =>
+                              render_to_string(:partial => 'aspect_memberships/remove_from_aspect',
+                                               :locals => {:aspect => membership.aspect,
+                                                           :person => @contact.person,
+                                                           :contact => @contact }),
+                              :aspect_id => @aspect_id}
+          end
+          format.html{
+            redirect_to :back
+          }
+        end
+      else
+        flash.now[:error] = I18n.t 'aspect_memberships.destroy.failure'
+        errors = membership ? membership.errors.full_messages : t('aspect_memberships.destroy.no_membership')
+        respond_to do |format|
+          format.js  { render :text => errors, :status => 403 }
+          format.html{
+            redirect_to :back
+          }
+      end
+    end
+  end
+
+  def create
+    @person = Person.find(params[:person_id])
+    @aspect = current_user.aspects.where(:id => params[:aspect_id]).first
+    @contact = current_user.contact_for(@person)
+
+    current_user.add_contact_to_aspect(@contact, @aspect)
+
+    flash.now[:notice] =  I18n.t 'aspects.add_to_aspect.success'
+
+    respond_to do |format|
+      format.js { render :json => {
+        :button_html => render_to_string(:partial => 'aspect_memberships/add_to_aspect',
+                         :locals => {:aspect_id => @aspect.id,
+                                     :person_id => @person.id}),
+        :badge_html =>  render_to_string(:partial => 'aspects/aspect_badge',
+                            :locals => {:aspect => @aspect})
+        }}
+      format.html{ redirect_to aspect_path(@aspect.id)}
+    end
+  end
+
+end

app/controllers/aspects_controller.rb

@@ -6,28 +6,67 @@ class AspectsController < ApplicationController
   before_filter :authenticate_user!
 
   respond_to :html
-  respond_to :json, :only => :show
+  respond_to :json, :only => [:show, :create]
+  respond_to :js
 
   def index
-    @posts  = current_user.visible_posts(:_type => "StatusMessage").paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
-    @post_hashes = hashes_for_posts @posts
-    @aspect_hashes = hashes_for_aspects @aspects.all, @contacts
-    @aspect = :all
+    if params[:a_ids]
+      @aspects = current_user.aspects.where(:id => params[:a_ids]).includes(:contacts => {:person => :profile})
+    else
+      @aspects = current_user.aspects.includes(:contacts => {:person => :profile})
+    end
+    @selected_contacts = @aspects.inject([]){|arr, aspect| arr.concat(aspect.contacts)}
+    @selected_contacts.uniq!
 
-    
-    if current_user.getting_started == true
+    # redirect to signup
+    if (current_user.getting_started == true || @aspects.blank?) && !request.format.mobile?
       redirect_to getting_started_path
+    else
+      if params[:sort_order].blank? and session[:sort_order].blank?
+         session[:sort_order] = 'updated_at'
+      elsif not params[:sort_order].blank? and not session[:sort_order] == params[:sort_order]
+        session[:sort_order] = params[:sort_order] == 'created_at' ? 'created_at' : 'updated_at'
+      end
+      sort_order = session[:sort_order] == 'created_at' ? 'created_at' : 'updated_at'
+      @aspect_ids = @aspects.map{|a| a.id}
+
+      @posts = StatusMessage.joins(:aspects).where(:pending => false,
+               :aspects => {:id => @aspect_ids}).includes(:comments, :photos).select('DISTINCT `posts`.*').paginate(
+               :page => params[:page], :per_page => 15, :order => sort_order + ' DESC')
+      @fakes = PostsFake.new(@posts)
+
+      @contact_count = current_user.contacts.count
+
+      @aspect = :all unless params[:a_ids]
+      @aspect ||= @aspects.first #used in mobile
+
     end
   end
-
   def create
     @aspect = current_user.aspects.create(params[:aspect])
+    #hack, we don't know why mass assignment is not working
+    @aspect.contacts_visible = params[:aspect][:contacts_visible]
+    @aspect.save
+
     if @aspect.valid?
       flash[:notice] = I18n.t('aspects.create.success', :name => @aspect.name)
       if current_user.getting_started
         redirect_to :back
       elsif request.env['HTTP_REFERER'].include?("aspects/manage")
         redirect_to :back
+      elsif params[:aspect][:share_with]
+        @contact = Contact.where(:id => params[:aspect][:contact_id]).first
+        @person = Person.where(:id => params[:aspect][:person_id]).first
+        @contact = current_user.contact_for(@person) || Contact.new
+
+        respond_to do |format|
+          format.js { render :json => {:html => render_to_string(
+              :partial => 'aspects/aspect_list_item',
+              :locals => {:aspect => @aspect,
+                            :person => @person,
+                            :contact => @contact}
+                                      ), :aspect_id => @aspect.id},:status => 201 }
+              end
       else
         respond_with @aspect
       end
@@ -42,127 +81,90 @@ class AspectsController < ApplicationController
   end
 
   def destroy
-    @aspect = current_user.aspect_by_id params[:id]
+    @aspect = current_user.aspects.where(:id => params[:id]).first
 
     begin
       current_user.drop_aspect @aspect
       flash[:notice] = I18n.t 'aspects.destroy.success',:name => @aspect.name
-    rescue RuntimeError => e 
-      flash[:error] = e.message
+      redirect_to aspects_path
+    rescue ActiveRecord::StatementInvalid => e
+      flash[:error] = I18n.t 'aspects.destroy.failure',:name => @aspect.name
+      redirect_to aspects_path
     end
-
-    respond_with :location => aspects_manage_path
   end
 
   def show
-    @aspect = current_user.aspect_by_id params[:id]
+    @aspect = current_user.aspects.where(:id => params[:id]).first
+    if @aspect
+      redirect_to aspects_path('a_ids[]' => @aspect.id)
+    else
+      redirect_to aspects_path
+    end
+  end
+
+  def edit
+    @aspect = current_user.aspects.where(:id => params[:id]).includes(:contacts => {:person => :profile}).first
+    @contacts = current_user.contacts.includes(:person => :profile)
     unless @aspect
       render :file => "#{Rails.root}/public/404.html", :layout => false, :status => 404
     else
-      @aspect_contacts = @aspect.contacts
-      @aspect_contacts_count = @aspect_contacts.count
-
-      @posts = @aspect.posts.find_all_by__type("StatusMessage", :order => 'created_at desc').paginate :page => params[:page], :per_page => 15
-      @post_hashes = hashes_for_posts @posts
-      @post_count = @posts.count
-
-      respond_with @aspect
+      @aspect_ids = [@aspect.id]
+      @aspect_contacts_count = @aspect.contacts.length
+      render :layout => false
     end
   end
 
   def manage
     @aspect = :manage
-    @remote_requests = current_user.requests_for_me
+    @contacts = current_user.contacts.includes(:person => :profile)
+    @remote_requests = Request.where(:recipient_id => current_user.person.id).includes(:sender => :profile)
+    @aspects = @all_aspects.includes(:contacts => {:person => :profile})
   end
 
   def update
-    @aspect = current_user.aspect_by_id(params[:id])
+    @aspect = current_user.aspects.where(:id => params[:id]).first
+
+    if @aspect.update_attributes!( params[:aspect] )
+      #hack, we don't know why mass assignment is not working
+      @aspect.contacts_visible = params[:aspect][:contacts_visible]
+      @aspect.save
+      flash[:notice] = I18n.t 'aspects.update.success',:name => @aspect.name
+    else
+      flash[:error] = I18n.t 'aspects.update.failure',:name => @aspect.name
+    end
 
-    @aspect.update_attributes( params[:aspect] )
-    flash[:notice] = I18n.t 'aspects.update.success',:name => @aspect.name
     respond_with @aspect
   end
 
+  def toggle_contact_visibility
+    @aspect = current_user.aspects.where(:id => params[:aspect_id]).first
+
+    if @aspect.contacts_visible?
+      @aspect.contacts_visible = false
+    else
+      @aspect.contacts_visible = true
+    end
+    @aspect.save
+  end
+
   def move_contact
-    unless current_user.move_contact( :person_id => params[:person_id], :from => params[:from], :to => params[:to][:to])
+    @person = Person.find(params[:person_id])
+    @from_aspect = current_user.aspects.where(:id => params[:from]).first
+    @to_aspect = current_user.aspects.where(:id => params[:to][:to]).first
+
+    response_hash = { }
+
+    unless current_user.move_contact( @person, @to_aspect, @from_aspect)
       flash[:error] = I18n.t 'aspects.move_contact.error',:inspect => params.inspect
     end
-    if aspect = current_user.aspect_by_id(params[:to][:to])
-      flash[:notice] = I18n.t 'aspects.move_contact.success'
-      render :nothing => true
+    if aspect = current_user.aspects.where(:id => params[:to][:to]).first
+      response_hash[:notice] = I18n.t 'aspects.move_contact.success'
+      response_hash[:success] = true
     else
-      flash[:notice] = I18n.t 'aspects.move_contact.failure'
-      render aspects_manage_path
+      response_hash[:notice] = I18n.t 'aspects.move_contact.failure'
+      response_hash[:success] = false
     end
-  end
 
-  def add_to_aspect
-    begin current_user.add_person_to_aspect( params[:person_id], params[:aspect_id])
-      @person_id = params[:person_id]
-      @aspect_id = params[:aspect_id]
-      flash.now[:notice] =  I18n.t 'aspects.add_to_aspect.success'
-
-      respond_to do |format|
-        format.js { render :status => 200 }
-        format.html{ redirect_to aspect_path(@aspect_id)}
-      end
-    rescue Exception => e
-      flash.now[:error] =  I18n.t 'aspects.add_to_aspect.failure'
-      respond_to do |format|
-        format.js  { render :text => e, :status => 403 }
-        format.html{ redirect_to aspect_path(@aspect_id)}
-      end
-    end
-  end
-
-  def remove_from_aspect
-    begin current_user.delete_person_from_aspect(params[:person_id], params[:aspect_id])
-      @person_id = params[:person_id]
-      @aspect_id = params[:aspect_id]
-      flash.now[:notice] = I18n.t 'aspects.remove_from_aspect.success'
-
-      respond_to do |format|
-        format.js { render :status => 200 }
-        format.html{ redirect_to aspect_path(@aspect_id)}
-      end
-    rescue Exception => e
-      flash.now[:error] = I18n.t 'aspects.remove_from_aspect.failure'
-
-      respond_to do |format|
-        format.js  { render :text => e, :status => 403 }
-        format.html{ redirect_to aspect_path(@aspect_id)}
-      end
-    end
-  end
-  
-  private
-  def hashes_for_aspects aspects, contacts
-    aspects.map do |a|
-      hash = {:aspect => a}
-      aspect_contacts = contacts.select{|c| 
-          c.aspect_ids.include?(a.id)}
-      hash[:contact_count] = aspect_contacts.count
-      person_ids = aspect_contacts.map{|c| c.person_id}
-      hash[:people] = Person.all(:id.in => person_ids, :limit => 8)
-      hash
-    end
-  end
-  def hashes_for_posts posts
-    post_ids = posts.map{|p| p.id}
-    comment_hash = Comment.hash_from_post_ids post_ids
-    person_hash = Person.from_post_comment_hash comment_hash
-    photo_hash = Photo.hash_from_post_ids post_ids
-
-    posts.map do |post|
-      {:post => post,
-        :photos => photo_hash[post.id],
-        :person => post.person,
-        :comments => comment_hash[post.id].map do |comment|
-          {:comment => comment,
-            :person => person_hash[comment.person_id],
-          }
-        end,
-      }
-    end
+    render :text => response_hash.to_json
   end
 end

app/controllers/comments_controller.rb

@@ -6,35 +6,38 @@ class CommentsController < ApplicationController
   include ApplicationHelper
   before_filter :authenticate_user!
 
-  respond_to :html
+  respond_to :html, :mobile
   respond_to :json, :only => :show
 
   def create
     target = current_user.find_visible_post_by_id params[:post_id]
     text = params[:text]
 
-    @comment = current_user.build_comment(text, :on => target)
+    if target
+      @comment = current_user.build_comment(text, :on => target)
 
-    if @comment.save(:safe => true)
-      raise 'MongoMapper failed to catch a failed save' unless @comment.id
-      Rails.logger.info("event=comment_create user=#{current_user.diaspora_handle} status=success comment=#{@comment.id}")
-      current_user.dispatch_comment(@comment)
+      if @comment.save
+        Rails.logger.info("event=create type=comment user=#{current_user.diaspora_handle} status=success comment=#{@comment.id} chars=#{params[:text].length}")
+        Postzord::Dispatch.new(current_user, @comment).post
 
-      respond_to do |format|
-        format.js{ 
-          json = { :post_id => @comment.post_id,
-                                     :comment_id => @comment.id,
-                                     :html => render_to_string(
-                                       :partial => 'comments/comment',
-                                       :locals => { :hash => {
-                                         :comment => @comment,
-                                         :person => current_user,
-                                        }}
-                                      )
-                                    }
-          render(:json => json, :status => 201)
-        }
-        format.html{ render :nothing => true, :status => 201 }
+        respond_to do |format|
+          format.js{
+            json = { :post_id => @comment.post_id,
+                                       :comment_id => @comment.id,
+                                       :html => render_to_string(
+                                         :partial => 'comments/comment',
+                                         :locals => { :comment => @comment,
+                                           :person => current_user.person,
+                                          }
+                                        )
+                                      }
+            render(:json => json, :status => 201)
+          }
+          format.html{ render :nothing => true, :status => 201 }
+          format.mobile{ redirect_to status_message_path(@comment.post_id) }
+        end
+      else
+        render :nothing => true, :status => 406
       end
     else
       render :nothing => true, :status => 406

app/controllers/contacts_controller.rb

@@ -0,0 +1,79 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class ContactsController < ApplicationController
+  before_filter :authenticate_user!
+
+  def new
+    @person = Person.find(params[:person_id])
+    @aspects_with_person = []
+    @aspects_without_person = current_user.aspects
+    @contact = Contact.new
+    render :layout => false
+  end
+
+  def create
+    @person = Person.find(params[:person_id])
+    @aspect = current_user.aspects.where(:id => params[:aspect_id]).first
+
+    @contact = request_to_aspect(@aspect, @person)
+
+    if @contact && @contact.persisted?
+      flash.now[:notice] =  I18n.t 'aspects.add_to_aspect.success'
+
+      respond_to do |format|
+        format.js { render :json => {
+          :button_html => render_to_string(:partial => 'aspect_memberships/add_to_aspect',
+                           :locals => {:aspect_id => @aspect.id,
+                                       :person_id => @person.id}),
+          :badge_html =>  render_to_string(:partial => 'aspects/aspect_badge',
+                              :locals => {:aspect => @aspect}),
+          :contact_id => @contact.id
+          }}
+        format.html{ redirect_to aspect_path(@aspect.id)}
+      end
+    else
+      flash[:error] = I18n.t 'contacts.create.failure'
+      redirect_to :back
+    end
+  end
+
+  def edit
+    @all_aspects ||= current_user.aspects
+    @contact = Contact.unscoped.where(:id => params[:id], :user_id => current_user.id).first
+
+    @person = @contact.person
+    @aspects_with_person = []
+
+    if @contact
+      @aspects_with_person = @contact.aspects
+    end
+
+    @aspects_without_person = @all_aspects - @aspects_with_person
+
+    render :layout => false
+  end
+
+  def destroy
+    contact = Contact.unscoped.where(:id => params[:id], :user_id => current_user.id).first
+    if current_user.disconnect(contact)
+      flash[:notice] = I18n.t('contacts.destroy.success', :name => contact.person.name)
+    else
+      flash[:error] = I18n.t('contacts.destroy.failure', :name => contact.person.name)
+    end
+    redirect_to contact.person
+  end
+
+  private
+
+  def request_to_aspect(aspect, person)
+    current_user.send_contact_request_to(person, aspect)
+    contact = current_user.contact_for(person)
+    if request = Request.where(:sender_id => person.id, :recipient_id => current_user.person.id).first
+      request.destroy
+      contact.update_attributes(:pending => false)
+    end
+    contact
+  end
+end

app/controllers/conversation_visibilities_controller.rb

@@ -0,0 +1,19 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+
+class ConversationVisibilitiesController < ApplicationController
+  before_filter :authenticate_user!
+
+  def destroy
+    @vis = ConversationVisibility.where(:person_id => current_user.person.id,
+                                        :conversation_id => params[:conversation_id]).first
+    if @vis
+      if @vis.destroy
+        flash[:notice] = "Conversation successfully removed"
+      end
+    end
+    redirect_to conversations_path
+  end
+end

app/controllers/conversations_controller.rb

@@ -0,0 +1,66 @@
+class ConversationsController < ApplicationController
+  before_filter :authenticate_user!
+
+  respond_to :html, :json
+
+  def index
+    @conversations = Conversation.joins(:conversation_visibilities).where(
+                              :conversation_visibilities => {:person_id => current_user.person.id}).paginate(
+                                                             :page => params[:page], :per_page => 15, :order => 'updated_at DESC')
+
+    @visibilities = ConversationVisibility.where( :person_id => current_user.person.id ).paginate(
+                                                             :page => params[:page], :per_page => 15, :order => 'updated_at DESC')
+
+    @unread_counts = {}
+    @visibilities.each{|v| @unread_counts[v.conversation_id] = v.unread}
+
+    @authors = {}
+    @conversations.each{|c| @authors[c.id] = c.last_author}
+    
+    @conversation = Conversation.joins(:conversation_visibilities).where(
+                              :conversation_visibilities => {:person_id => current_user.person.id, :conversation_id => params[:conversation_id]}).first
+  end
+
+  def create
+    person_ids = Contact.where(:id => params[:contact_ids].split(',')).map! do |contact|
+      contact.person_id
+    end
+
+    params[:conversation][:participant_ids] = person_ids | [current_user.person.id]
+    params[:conversation][:author] = current_user.person
+
+    if @conversation = Conversation.create(params[:conversation])
+      Postzord::Dispatch.new(current_user, @conversation).post
+
+      flash[:notice] = "Message sent"
+      if params[:profile]
+        redirect_to person_path(params[:profile])
+      else
+        redirect_to conversations_path(:conversation_id => @conversation.id)
+      end
+    end
+  end
+
+  def show
+    @conversation = Conversation.joins(:conversation_visibilities).where(:id => params[:id],
+                              :conversation_visibilities => {:person_id => current_user.person.id}).first
+
+    if @visibility = ConversationVisibility.where(:conversation_id => params[:id], :person_id => current_user.person.id).first
+      @visibility.unread = 0
+      @visibility.save
+    end
+
+    if @conversation
+      render :layout => false
+    else
+      redirect_to conversations_path
+    end
+  end
+
+  def new
+    @all_contacts_and_ids = current_user.contacts.map{|c| {:value => c.id, :name => c.person.name}}
+    @contact = current_user.contacts.find(params[:contact_id]) if params[:contact_id]
+    render :layout => false
+  end
+
+end

app/controllers/home_controller.rb

@@ -6,11 +6,25 @@ class HomeController < ApplicationController
 
   def show
     if current_user
-      redirect_to aspects_path
+      if params[:home]
+        redirect_to :controller => 'aspects', :action => 'index'
+      else
+        redirect_to :controller => 'aspects', :action => 'index', :a_ids => current_user.aspects.where(:open => true).select(:id).all
+      end
+    elsif is_mobile_device?
+      redirect_to user_session_path
     else
       @landing_page = true
       render :show
     end
   end
 
+  def toggle_mobile
+   if session[:mobile_view]
+     session[:mobile_view] = false
+   else
+     session[:mobile_view] = true
+   end
+    redirect_to :back
+  end
 end

app/controllers/invitations_controller.rb

@@ -4,8 +4,12 @@
 
 class InvitationsController < Devise::InvitationsController
 
-  before_filter :check_token, :only => [:edit] 
+  before_filter :check_token, :only => [:edit]
 
+  def new
+    @sent_invitations = current_user.invitations_from_me.includes(:recipient)
+    render :layout => false
+  end
 
   def create
       if current_user.invites == 0
@@ -13,42 +17,40 @@ class InvitationsController < Devise::InvitationsController
         redirect_to :back
         return
       end
-    begin
-      params[:user][:aspect_id] = params[:user].delete(:aspects)
+      aspect = params[:user].delete(:aspects)
       message = params[:user].delete(:invite_messages)
-      params[:user][:invite_message] = message unless message == ""
+      emails = params[:user][:email].to_s.gsub(/\s/, '').split(/, */)
 
-      emails = params[:user][:email].split(/, */)
-      invited_users = emails.map { |e| current_user.invite_user(params[:user].merge({:email => e}))}
-      good_users, rejected_users = invited_users.partition {|u| u.persisted? }
+      good_emails, bad_emails = emails.partition{|e| e.try(:match, Devise.email_regexp)}
 
-      flash[:notice] = I18n.t('invitations.create.sent') + good_users.map{|x| x.email}.join(', ')
-      if rejected_users.any?
-        flash[:error] = I18n.t('invitations.create.rejected') + rejected_users.map{|x| x.email}.join(', ')
-      end
-    rescue RuntimeError => e
-      if  e.message == "You have no invites"
-        flash[:error] = I18n.t 'invitations.create.no_more'
-      elsif e.message == "You already invited this person"
-        flash[:error] = I18n.t 'invitations.create.already_sent'
-      elsif e.message == "You are already connected to this person"
-        flash[:error] = I18n.t 'invitations.create.already_contacts'
+      good_emails.each{|e| Resque.enqueue(Job::InviteUserByEmail, current_user.id, e, aspect, message)}
+
+      if bad_emails.any?
+        flash[:error] = I18n.t('invitations.create.sent') + good_emails.join(', ') + " "+ I18n.t('invitations.create.rejected') + bad_emails.join(', ')
       else
-        raise e
+        flash[:notice] = I18n.t('invitations.create.sent') + good_emails.join(', ')
       end
-    end
-    redirect_to :back 
+
+    redirect_to :back
   end
 
   def update
     begin
+      invitation_token = params[:user][:invitation_token]
+      if invitation_token.nil? || invitation_token.blank?
+        raise I18n.t('invitations.check_token.not_found')
+      end
       user = User.find_by_invitation_token(params[:user][:invitation_token])
-      user.seed_aspects
       user.accept_invitation!(params[:user])
-    rescue MongoMapper::DocumentNotValid => e
+      user.seed_aspects
+    rescue Exception => e
       user = nil
-      flash[:error] = e.message
+      record = e.record
+      record.errors.delete(:person)
+
+      flash[:error] = record.errors.full_messages.join(", ")
     end
+
     if user
       flash[:notice] = I18n.t 'registrations.create.success'
       sign_in_and_redirect(:user, user)
@@ -58,6 +60,15 @@ class InvitationsController < Devise::InvitationsController
     end
   end
 
+  def resend
+    invitation = current_user.invitations_from_me.where(:id => params[:id]).first
+    if invitation
+      Resque.enqueue(Job::ResendInvitation, invitation.id)
+      flash[:notice] = I18n.t('invitations.create.sent') + invitation.recipient.email 
+    end
+    redirect_to :back
+  end
+
   protected
 
   def check_token

app/controllers/messages_controller.rb

@@ -0,0 +1,32 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class MessagesController < ApplicationController
+  include ApplicationHelper
+  before_filter :authenticate_user!
+
+  respond_to :html, :mobile
+  respond_to :json, :only => :show
+
+  def create
+    cnv = Conversation.joins(:conversation_visibilities).where(:id => params[:conversation_id],
+                              :conversation_visibilities => {:person_id => current_user.person.id}).first
+
+    if cnv
+      message = Message.new(:conversation_id => cnv.id, :text => params[:message][:text], :author => current_user.person)
+      
+      if message.save
+        Rails.logger.info("event=create type=comment user=#{current_user.diaspora_handle} status=success message=#{message.id} chars=#{params[:message][:text].length}")
+        Postzord::Dispatch.new(current_user, message).post
+
+        redirect_to conversations_path(:conversation_id => cnv.id)
+      else
+        render :nothing => true, :status => 406
+      end
+    else
+      render :nothing => true, :status => 406
+    end
+  end
+
+end

app/controllers/notifications_controller.rb

@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class NotificationsController < ApplicationController
+  before_filter :authenticate_user!
+  respond_to :html, :json
+
+
+  def update
+    note = Notification.where(:recipient_id => current_user.id, :id => params[:id]).first
+    if note
+      note.update_attributes(:unread => false)
+      render :nothing => true
+    else
+      render :nothing => true, :code => 404
+    end
+  end
+
+  def index
+    @notifications = Notification.find(:all, :conditions => {:recipient_id => current_user.id},
+                                       :order => 'created_at desc', :include => [:target, {:actors => :profile}]).paginate :page => params[:page], :per_page => 25
+    @group_days = @notifications.group_by{|note| I18n.l(note.updated_at, :format => I18n.t('date.formats.fullmonth_day')) }
+    respond_with @notifications
+  end
+
+  def read_all
+    Notification.where(:recipient_id => current_user.id).update_all(:unread => false)
+    redirect_to aspects_path
+  end
+end

app/controllers/people_controller.rb

@@ -3,44 +3,78 @@
 #   the COPYRIGHT file.
 
 class PeopleController < ApplicationController
-  before_filter :authenticate_user!
+  before_filter :authenticate_user!, :except => [:show]
 
   respond_to :html
   respond_to :json, :only => [:index, :show]
 
   def index
     @aspect = :search
+    params[:q] ||= params[:term]
+    limit = params[:limit] || 15
+
+    @people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit
+    @hashes = hashes_for_people(@people, @aspects) unless request.format == :json
 
-    @people = Person.search(params[:q]).paginate :page => params[:page], :per_page => 25, :order => 'created_at DESC'
-    @requests = Request.all(:to_id.in => @people.map{|p| p.id})
-    
     #only do it if it is an email address
     if params[:q].try(:match, Devise.email_regexp)
       webfinger(params[:q])
     end
-    
-    if @people.count == 1
-      redirect_to @people.first
-    else
-      respond_with @people
+    respond_with @people
+  end
+
+  def hashes_for_people people, aspects
+    ids = people.map{|p| p.id}
+    requests = {}
+    Request.where(:sender_id => ids, :recipient_id => current_user.person.id).each do |r|
+      requests[r.id] = r
     end
+    contacts = {}
+    Contact.unscoped.where(:user_id => current_user.id, :person_id => ids).each do |contact|
+      contacts[contact.person_id] = contact
+    end
+
+    people.map{|p|
+      {:person => p,
+        :contact => contacts[p.id],
+        :request => requests[p.id],
+        :aspects => aspects}
+    }
   end
 
   def show
-    @person = Person.find(params[:id].to_id)
+    @person = Person.where(:id => params[:id]).first
     @post_type = :all
-    @aspect = :none 
-    if @person
-      @profile = @person.profile
-      @contact = current_user.contact_for(@person)
-      @is_contact = @person != current_user.person && @contact
+    @share_with = (params[:share_with] == 'true')
 
-      if @contact
-        @aspects_with_person = @contact.aspects
+    if @person
+
+      @profile = @person.profile
+
+      if current_user
+        @incoming_request = current_user.request_from(@person)
+        @contact = current_user.contact_for(@person)
+        @aspects_with_person = []
+        if @contact
+          @aspects_with_person = @contact.aspects
+          @contacts_of_contact = @contact.contacts
+        else
+          @contact ||= Contact.new
+          @contacts_of_contact = []
+        end
+
+        if (@person != current_user.person) && (!@contact || @contact.pending)
+          @commenting_disabled = true
+        else
+          @commenting_disabled = false
+        end
+        @posts = current_user.posts_from(@person).where(:type => "StatusMessage").paginate(:per_page => 15, :page => params[:page])
+      else
+        @commenting_disabled = true
+        @posts = @person.posts.where(:type => "StatusMessage", :public => true).paginate(:per_page => 15, :page => params[:page], :order => 'created_at DESC')
       end
 
-      @posts = current_user.visible_posts(:person_id => @person.id, :_type => "StatusMessage").paginate :page => params[:page], :order => 'created_at DESC'
-      @post_hashes = hashes_for_posts @posts
+      @fakes = PostsFake.new(@posts)
       respond_with @person, :locals => {:post_type => :all}
 
     else
@@ -49,44 +83,6 @@ class PeopleController < ApplicationController
     end
   end
 
-  def destroy
-    current_user.disconnect(current_user.visible_person_by_id(params[:id]))
-    respond_with :location => root_url
-  end
-
-  def edit
-    @aspect  = :person_edit
-    @person  = current_user.person
-    @profile = @person.profile
-  end
-
-  def update
-
-    # upload and set new profile photo
-    params[:person][:profile] ||= {}
-    if params[:person][:profile][:image].present?
-      raw_image = params[:person][:profile].delete(:image)
-      params[:profile_image_hash] = { :user_file => raw_image, :to => "all" }
-
-      photo = current_user.post(:photo, params[:profile_image_hash])
-      params[:person][:profile][:image_url] = photo.url(:thumb_large)
-      params[:person][:profile][:image_url_medium] = photo.url(:thumb_medium)
-      params[:person][:profile][:image_url_small] = photo.url(:thumb_small)
-    end
-
-    if current_user.update_profile params[:person][:profile]
-      flash[:notice] = I18n.t 'people.update.updated'
-    else
-      flash[:error] = I18n.t 'people.update.failed'
-    end
-
-    if params[:getting_started]
-      redirect_to getting_started_path(:step => params[:getting_started].to_i+1)
-    else
-      redirect_to edit_person_path
-    end
-  end
-
   def retrieve_remote
     if params[:diaspora_handle]
       webfinger(params[:diaspora_handle], :single_aspect_form => true)
@@ -97,33 +93,7 @@ class PeopleController < ApplicationController
   end
 
   private
-  def hashes_for_posts posts
-    post_ids = posts.map{|p| p.id}
-    comment_hash = Comment.hash_from_post_ids post_ids
-    person_hash = Person.from_post_comment_hash comment_hash
-    photo_hash = Photo.hash_from_post_ids post_ids
-
-    posts.map do |post|
-      {:post => post,
-        :person => @person,
-        :photos => photo_hash[post.id],
-        :comments => comment_hash[post.id].map do |comment|
-          {:comment => comment,
-            :person => person_hash[comment.person_id],
-          }
-        end,
-      }
-    end
-  end
   def webfinger(account, opts = {})
-    finger = EMWebfinger.new(account)
-    finger.on_person do |response|
-      if response.class == Person
-        response.socket_to_uid(current_user.id, opts)
-      else
-        require File.join(Rails.root,'lib/diaspora/websocket')
-        Diaspora::WebSocket.queue_to_user(current_user.id, {:class => 'people', :status => 'fail', :query => account, :response => response}.to_json)
-      end
-    end
+    Resque.enqueue(Job::SocketWebfinger, current_user.id, account, opts)
   end
 end

app/controllers/photos_controller.rb

@@ -13,15 +13,25 @@ class PhotosController < ApplicationController
     @person = Person.find_by_id(params[:person_id])
 
     if @person
+      @incoming_request = Request.where(:recipient_id => current_user.person.id, :sender_id => @person.id).first
+      @outgoing_request = Request.where(:sender_id => current_user.person.id, :recipient_id => @person.id).first
+
       @profile = @person.profile
       @contact = current_user.contact_for(@person)
       @is_contact = @person != current_user.person && @contact
+      @aspects_with_person = []
 
       if @contact
         @aspects_with_person = @contact.aspects
+        @contacts_of_contact = @contact.contacts
+      else
+        @contact = Contact.new
+        @contacts_of_contact = []
       end
 
-      @posts = current_user.raw_visible_posts.all(:_type => 'Photo', :person_id => @person.id, :order => 'created_at DESC').paginate :page => params[:page], :order => 'created_at DESC'
+      @posts = current_user.visible_photos.where(
+        :author_id => @person.id
+      ).paginate(:page => params[:page])
 
       render 'people/show'
 
@@ -33,9 +43,12 @@ class PhotosController < ApplicationController
 
   def create
     begin
+      raise unless params[:photo][:aspect_ids]
 
       if params[:photo][:aspect_ids] == "all"
         params[:photo][:aspect_ids] = current_user.aspects.collect{|x| x.id}
+      elsif params[:photo][:aspect_ids].is_a?(Hash)
+        params[:photo][:aspect_ids] = params[:photo][:aspect_ids].values
       end
 
       params[:photo][:user_file] = file_handler(params)
@@ -43,35 +56,46 @@ class PhotosController < ApplicationController
       @photo = current_user.build_post(:photo, params[:photo])
 
       if @photo.save
-        raise 'MongoMapper failed to catch a failed save' unless @photo.id
 
-        current_user.add_to_streams(@photo, params[:photo][:aspect_ids])
-        current_user.dispatch_post(@photo, :to => params[:photo][:aspect_ids]) unless @photo.pending
+        aspects = current_user.aspects_from_ids(params[:photo][:aspect_ids])
+
+        unless @photo.pending
+          current_user.add_to_streams(@photo, aspects)
+          current_user.dispatch_post(@photo, :to => params[:photo][:aspect_ids])
+        end
+
+        if params[:photo][:set_profile_photo]
+          profile_params = {:image_url => @photo.url(:thumb_large),
+                           :image_url_medium => @photo.url(:thumb_medium),
+                           :image_url_small => @photo.url(:thumb_small)}
+          current_user.update_profile(profile_params)
+        end
+
         respond_to do |format|
           format.json{ render(:layout => false , :json => {"success" => true, "data" => @photo}.to_json )}
         end
       else
-        respond_with :location => photos_path, :error => message
+        respond_with @photo, :location => photos_path, :error => message
       end
 
     rescue TypeError
       message = I18n.t 'photos.create.type_error'
-      respond_with :location => photos_path, :error => message
+      respond_with @photo, :location => photos_path, :error => message
 
     rescue CarrierWave::IntegrityError
       message = I18n.t 'photos.create.integrity_error'
-      respond_with :location => photos_path, :error => message
+      respond_with @photo, :location => photos_path, :error => message
 
     rescue RuntimeError => e
       message = I18n.t 'photos.create.runtime_error'
-      respond_with :location => photos_path, :error => message
+      respond_with @photo, :location => photos_path, :error => message
       raise e
     end
   end
 
   def make_profile_photo
-    person_id = current_user.person.id
-    @photo = Photo.find_by_id_and_person_id(params[:photo_id], person_id)
+    author_id = current_user.person.id
+    @photo = Photo.where(:id => params[:photo_id], :author_id => author_id).first
 
     if @photo
       profile_hash = {:image_url        => @photo.url(:thumb_large),
@@ -84,7 +108,7 @@ class PhotosController < ApplicationController
                                        :image_url => @photo.url(:thumb_large),
                                        :image_url_medium => @photo.url(:thumb_medium),
                                        :image_url_small  => @photo.url(:thumb_small),
-                                       :person_id => person_id},
+                                       :author_id => author_id},
                             :status => 201}
         end
       else
@@ -96,46 +120,62 @@ class PhotosController < ApplicationController
   end
 
   def destroy
-    photo = current_user.my_posts.where(:_id => params[:id]).first
+    photo = current_user.posts.where(:id => params[:id]).first
 
     if photo
       photo.destroy
       flash[:notice] = I18n.t 'photos.destroy.notice'
 
+
       if photo.status_message_id
-        respond_with :location => photo.status_message
+        respond_with photo, :location => photo.status_message
       else
-        respond_with :location => photos_path
+        respond_with photo, :location => person_photos_path(current_user.person)
       end
     else
-      respond_with :location => photos_path
+      respond_with photo, :location => person_photos_path(current_user.person)
     end
-   
+
   end
 
   def show
-    @photo = current_user.find_visible_post_by_id params[:id]
-    @parent = @photo.status_message
+    @photo = current_user.visible_photos.where(:id => params[:id]).includes(:author, :status_message => :photos).first
+    @photo ||= Photo.where(:public => true, :id => params[:id]).includes(:author, :status_message => :photos).first
+    if @photo
+      @parent = @photo.status_message
 
-    #if photo is not an attachment, fetch comments for self
-    unless @parent
-      @parent = @photo
+      #if photo is not an attachment, fetch comments for self
+      if @parent
+        @additional_photos = @photo.status_message.photos
+        if @additional_photos
+          @next_photo = @additional_photos[@additional_photos.index(@photo)+1]
+          @prev_photo = @additional_photos[@additional_photos.index(@photo)-1]
+          @next_photo ||= @additional_photos.first
+        end
+      else
+        @parent = @photo
+      end
+
+      @object_aspect_ids = []
+      if @parent_aspects = @parent.aspects.where(:user_id => current_user.id)
+        @object_aspect_ids = @parent_aspects.map{|a| a.id}
+      end
+
+      @ownership = current_user.owns? @photo
+
+      respond_with @photo
+    else
+      begin
+        redirect_to :back
+      rescue
+        redirect_to aspects_path
+      end
     end
 
-    comments_hash = Comment.hash_from_post_ids [@parent.id]
-    person_hash = Person.from_post_comment_hash comments_hash
-    @comment_hashes = comments_hash[@parent.id].map do |comment|
-      {:comment => comment,
-        :person => person_hash[comment.person_id]
-      }
-    end
-    @ownership = current_user.owns? @photo
-
-    respond_with @photo
   end
 
   def edit
-    if @photo = current_user.my_posts.where(:_id => params[:id]).first
+    if @photo = current_user.posts.where(:id => params[:id]).first
       respond_with @photo
     else
       redirect_to person_photos_path(current_user.person)
@@ -143,7 +183,7 @@ class PhotosController < ApplicationController
   end
 
   def update
-    photo = current_user.my_posts.where(:_id => params[:id]).first
+    photo = current_user.posts.where(:id => params[:id]).first
     if photo
       if current_user.update_post( photo, params[:photo] )
         flash.now[:notice] = I18n.t 'photos.update.notice'
@@ -163,7 +203,7 @@ class PhotosController < ApplicationController
   end
 
 
-  private 
+  private
 
   def file_handler(params)
       ######################## dealing with local files #############

app/controllers/posts_controller.rb

@@ -0,0 +1,48 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class PostsController < ApplicationController
+  skip_before_filter :count_requests
+  skip_before_filter :set_invites
+  skip_before_filter :which_action_and_user
+  skip_before_filter :set_grammatical_gender
+
+  def index
+    if current_user
+      @posts = StatusMessage.joins(:aspects).where(:pending => false
+               ).where(Aspect.arel_table[:user_id].eq(current_user.id).or(StatusMessage.arel_table[:public].eq(true))
+               ).select('DISTINCT `posts`.*')
+    else
+      @posts = StatusMessage.where(:public => true, :pending => false)
+    end
+
+    params[:tag] ||= 'partytimeexcellent'
+
+    @posts = @posts.tagged_with(params[:tag])
+    @posts = @posts.includes(:comments, :photos).paginate(:page => params[:page], :per_page => 15, :order => 'created_at DESC')
+
+    @fakes = PostsFake.new(@posts)
+    @commenting_disabled = true
+    @pod_url = AppConfig[:pod_uri].host
+  end
+
+  def show
+    @post = Post.where(:id => params[:id], :public => true).includes(:author, :comments => :author).first
+
+    if @post
+      @landing_page = true
+      @person = @post.author
+      if @person.owner_id
+        I18n.locale = @person.owner.language
+        render "posts/#{@post.class.to_s.underscore}", :layout => true
+      else
+        flash[:error] = "that post does not exsist!"
+        redirect_to root_url
+      end
+    else
+      flash[:error] = "that post does not exsist!"
+      redirect_to root_url
+    end
+  end
+end

app/controllers/profiles_controller.rb

@@ -0,0 +1,33 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class ProfilesController < ApplicationController
+  before_filter :authenticate_user!
+  def edit
+    @person = current_user.person
+    @aspect  = :person_edit
+    @profile = @person.profile
+  end
+
+  def update
+     # upload and set new profile photo
+    params[:profile] ||= {}
+    params[:profile][:searchable] ||= false
+    params[:profile][:photo] = Photo.where(:author_id => current_user.person.id,
+                                           :id => params[:photo_id]).first if params[:photo_id]
+
+    if current_user.update_profile params[:profile]
+      flash[:notice] = I18n.t 'profiles.update.updated'
+    else
+      flash[:error] = I18n.t 'profiles.update.failed'
+    end
+
+    if params[:getting_started]
+      redirect_to getting_started_path(:step => params[:getting_started].to_i+1)
+    else
+      redirect_to edit_profile_path
+    end
+ 
+  end
+end

app/controllers/publics_controller.rb

@@ -6,15 +6,17 @@ class PublicsController < ApplicationController
   require File.join(Rails.root, '/lib/diaspora/parser')
   include Diaspora::Parser
 
-  skip_before_filter :set_contacts_and_status, :except => [:create, :update]
+  skip_before_filter :set_header_data
   skip_before_filter :count_requests
   skip_before_filter :set_invites
-  skip_before_filter :set_locale
+  skip_before_filter :which_action_and_user
+  skip_before_filter :set_grammatical_gender
 
   layout false
+  caches_page :host_meta
 
   def hcard
-    @person = Person.find_by_id params[:id]
+    @person = Person.where(:guid => params[:guid]).first
     unless @person.nil? || @person.owner.nil?
       render 'publics/hcard'
     else
@@ -28,7 +30,7 @@ class PublicsController < ApplicationController
 
   def webfinger
     @person = Person.local_by_account_identifier(params[:q]) if params[:q]
-    unless @person.nil? 
+    unless @person.nil?
       render 'webfinger', :content_type => 'application/xrd+xml'
     else
       render :nothing => true, :status => 404
@@ -36,9 +38,7 @@ class PublicsController < ApplicationController
   end
 
   def hub
-    if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe'
-      render :text => params['hub.challenge'], :status => 202, :layout => false
-      end
+    render :text => params['hub.challenge'], :status => 202, :layout => false
   end
 
   def receive
@@ -47,21 +47,16 @@ class PublicsController < ApplicationController
       return
     end
 
-    person = Person.first(:id => params[:id])
+    person = Person.where(:guid => params[:guid]).first
 
     if person.owner_id.nil?
-      Rails.logger.error("Received post for nonexistent person #{params[:id]}")
+      Rails.logger.error("Received post for nonexistent person #{params[:guid]}")
       render :nothing => true, :status => 404
       return
     end
 
     @user = person.owner
-     
-    begin
-      @user.receive_salmon(params[:xml])
-    rescue Exception => e
-      Rails.logger.info("bad salmon: #{e.message}")
-    end
+    Resque.enqueue(Job::ReceiveSalmon, @user.id, CGI::unescape(params[:xml]))
 
     render :nothing => true, :status => 200
   end

app/controllers/registrations_controller.rb

@@ -13,7 +13,9 @@ class RegistrationsController < Devise::RegistrationsController
       sign_in_and_redirect(:user, @user)
       Rails.logger.info("event=registration status=successful user=#{@user.diaspora_handle}")
     else
-      flash[:error] = @user.errors.full_messages.join(', ')
+      @user.errors.delete(:person)
+
+      flash[:error] = @user.errors.full_messages.join(";")
       Rails.logger.info("event=registration status=failure errors='#{@user.errors.full_messages.join(', ')}'")
       render :new
     end
@@ -25,7 +27,7 @@ class RegistrationsController < Devise::RegistrationsController
 
   private
   def check_registrations_open!
-    if APP_CONFIG[:registrations_closed]
+    if AppConfig[:registrations_closed]
       flash[:error] = t('registrations.closed')
       redirect_to new_user_session_path
     end

app/controllers/requests_controller.rb

@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require File.join(Rails.root, 'lib/em-webfinger')
+require File.join(Rails.root, 'lib/webfinger')
 
 class RequestsController < ApplicationController
   before_filter :authenticate_user!
@@ -11,14 +11,18 @@ class RequestsController < ApplicationController
   respond_to :html
 
   def destroy
+    if notification = Notification.where(:recipient_id => current_user.id, :target_id=> params[:id]).first
+      notification.update_attributes(:unread=>false)
+    end
+
     if params[:accept]
       if params[:aspect_id]
         @contact = current_user.accept_and_respond( params[:id], params[:aspect_id])
         flash[:notice] = I18n.t 'requests.destroy.success'
-        respond_with :location => current_user.aspect_by_id(params[:aspect_id])
+        respond_with @contact, :location => requests_url
       else
         flash[:error] = I18n.t 'requests.destroy.error'
-        respond_with :location => requests_url
+        respond_with @contact, :location => requests_url
       end
     else
       current_user.ignore_contact_request params[:id]
@@ -28,23 +32,26 @@ class RequestsController < ApplicationController
   end
 
  def create
-   aspect = current_user.aspect_by_id(params[:request][:into])
-   account = params[:request][:to].strip  
+   aspect = current_user.aspects.where(:id => params[:request][:into]).first
+   account = params[:request][:to].strip
    person = Person.by_account_identifier(account)
-   existing_request = Request.from(person).to(current_user.person).where(:sent => false).first if person
+   existing_request = Request.where(:sender_id => person.id, :recipient_id => current_user.person.id).first if person
    if existing_request
      current_user.accept_and_respond(existing_request.id, aspect.id)
      redirect_to :back
    else
-     @request = Request.instantiate(:to => person,
-                                    :from => current_user.person,
-                                    :into => aspect)
-     if @request.save
-       current_user.dispatch_request(@request)
+
+     @contact = Contact.new(:user => current_user,
+                            :person => person,
+                            :aspect_ids => [aspect.id],
+                            :pending => true)
+
+     if @contact.save
+       @contact.dispatch_request
        flash.now[:notice] = I18n.t('requests.create.sent')
        redirect_to :back
      else
-       flash.now[:error] = @request.errors.full_messages.join(', ')
+       flash.now[:error] = @contact.errors.full_messages.join(', ')
        redirect_to :back
      end
    end

app/controllers/services_controller.rb

@@ -1,7 +1,5 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
+#   licensed under the Affero General Public License version 3 or later.  See #   the COPYRIGHT file.
 
 class ServicesController < ApplicationController
   before_filter :authenticate_user!
@@ -13,36 +11,67 @@ class ServicesController < ApplicationController
   def create
     auth = request.env['omniauth.auth']
 
+    toke = auth['credentials']['token']
+    secret = auth['credentials']['secret']
+
     provider = auth['provider']
     user     = auth['user_info']
 
-    if provider == 'twitter'
-      access_token = auth['extra']['access_token']
-      current_user.services.create(:nickname => user['nickname'],
-                                   :access_token => access_token.token, 
-                                   :access_secret => access_token.secret,
-                                   :provider => provider, 
-                                   :uid => auth['uid'])
-                                   
-    elsif provider == 'facebook'
-      current_user.services.create(:nickname => user['nickname'],
-                                   :access_token => auth['credentials']['token'],
-                                   :provider => provider, 
-                                   :uid => auth['uid'])
-    end
+    service = "Services::#{provider.camelize}".constantize.new(:nickname => user['nickname'],
+                                                               :access_token => toke,
+                                                               :access_secret => secret,
+                                                               :uid => auth['uid'])
+    current_user.services << service
 
     flash[:notice] = I18n.t 'services.create.success'
     if current_user.getting_started
       redirect_to  getting_started_path(:step => 3)
     else
-      redirect_to services_url 
+      redirect_to services_url
     end
   end
 
+  def failure
+    Rails.logger.info  "error in oauth #{params.inspect}"
+    flash[:error] = t('services.failure.error')
+    redirect_to services_url
+  end
+
   def destroy
     @service = current_user.services.find(params[:id])
     @service.destroy
     flash[:notice] = I18n.t 'services.destroy.success'
     redirect_to services_url
   end
+
+  def finder
+    service = current_user.services.where(:type => "Services::#{params[:provider].titleize}").first
+    @friends = service ? service.finder(:remote => params[:remote]) : {}
+    render :layout => false
+  end
+
+  def inviter
+    if current_user.invites == 0
+      flash[:error] = I18n.t 'invitations.create.no_more'
+      redirect_to :back
+      return
+    end
+
+    @uid = params[:uid]
+
+    if i_id = params[:invitation_id]
+      invited_user = Invitation.find(i_id).recipient
+    else
+      invited_user = current_user.invite_user(params[:aspect_id], params[:provider], @uid)
+    end
+
+    @subject = t('services.inviter.join_me_on_diaspora')
+    @message = <<MSG
+#{t('services.inviter.click_link_to_accept_invitation')}:
+\n
+\n
+#{accept_invitation_url(invited_user, :invitation_token => invited_user.invitation_token)}
+MSG
+    redirect_to "https://www.facebook.com/?compose=1&id=#{@uid}&subject=#{@subject}&message=#{@message}&sk=messages"
+  end
 end

app/controllers/sockets_controller.rb

@@ -11,9 +11,8 @@ class SocketsController < ApplicationController
     Rails.logger.info("Socket received connection to: #{msg}")
   end
 
-  def outgoing(uid,object,opts={})
+  def outgoing(user, object, opts={})
     @_request = ActionDispatch::Request.new({})
-    Diaspora::WebSocket.queue_to_user(uid, action_hash(uid, object, opts))
+    Diaspora::WebSocket.queue_to_user(user.id, action_hash(user, object, opts))
   end
-
 end

app/controllers/status_messages_controller.rb

@@ -6,79 +6,84 @@ class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
   respond_to :html
+  respond_to :mobile
   respond_to :json, :only => :show
 
   def create
+    params[:status_message][:aspect_ids] = params[:aspect_ids]
 
-    if params[:status_message][:aspect_ids] == "all"
-      params[:status_message][:aspect_ids] = current_user.aspects.collect{|x| x.id}
-    end
-
-    photos = Photo.all(:id.in => [*params[:photos]], :diaspora_handle => current_user.person.diaspora_handle)
+    photos = Photo.where(:id => [*params[:photos]], :diaspora_handle => current_user.person.diaspora_handle)
 
     public_flag = params[:status_message][:public]
-    public_flag.to_s.match(/(true)/) ? public_flag = true : public_flag = false
-    params[:status_message][:public] = public_flag 
+    public_flag.to_s.match(/(true)|(on)/) ? public_flag = true : public_flag = false
+    params[:status_message][:public] = public_flag
+
     @status_message = current_user.build_post(:status_message, params[:status_message])
+    aspects = current_user.aspects_from_ids(params[:aspect_ids])
 
+    if !photos.empty?
+      @status_message.photos << photos
+    end
+    if @status_message.save
+      Rails.logger.info("event=create type=status_message chars=#{params[:status_message][:message].length}")
 
-    if @status_message.save(:safe => true)
-      raise 'MongoMapper failed to catch a failed save' unless @status_message.id
-
-      @status_message.photos += photos unless photos.nil?
-      current_user.add_to_streams(@status_message, params[:status_message][:aspect_ids])
-      current_user.dispatch_post(@status_message, :to => params[:status_message][:aspect_ids])
-
-      for photo in photos
-        current_user.add_to_streams(photo, params[:status_message][:aspect_ids])
-        current_user.dispatch_post(photo, :to => params[:status_message][:aspect_ids])
+      current_user.add_to_streams(@status_message, aspects)
+      receiving_services = params[:services].map{|s| current_user.services.where(
+                                  :type => "Services::"+s.titleize).first} if params[:services]
+      current_user.dispatch_post(@status_message, :url => post_url(@status_message), :services => receiving_services)
+      if !photos.empty?
+        for photo in photos
+          was_pending = photo.pending
+          if was_pending
+            current_user.add_to_streams(photo, aspects)
+            current_user.dispatch_post(photo)
+          end
+        end
+        photos.update_all(:pending => false, :public => public_flag)
       end
 
       respond_to do |format|
-        format.js{ render :json => { :post_id => @status_message.id,
-                                     :html => render_to_string(
-                                       :partial => 'shared/stream_element', 
-                                       :locals => {
-                                         :post => @status_message, 
-                                         :person => @status_message.person,
-                                         :photos => @status_message.photos,
-                                         :comments => [],
-                                         :aspects => current_user.aspects, 
-                                         :current_user => current_user
-                                        }
-                                     )
-                                    },
-                                     :status => 201 }
-        format.html{ respond_with @status_message }
+        format.js { render :create, :status => 201}
+        format.html { redirect_to :back}
+        format.mobile{ redirect_to :back}
       end
     else
+      if !photos.empty?
+        photos.update_all(:status_message_id => nil)
+      end
       respond_to do |format|
-        format.js{ render :status => 406 }
+        format.js { render :json =>{:errors => @status_message.errors.full_messages}, :status => 406 }
+        format.html {redirect_to :back}
       end
     end
   end
 
   def destroy
-    @status_message = current_user.my_posts.where(:_id =>  params[:id]).first
+    @status_message = current_user.posts.where(:id => params[:id]).first
     if @status_message
       @status_message.destroy
-
+      render :nothing => true, :status => 200
     else
       Rails.logger.info "event=post_destroy status=failure user=#{current_user.diaspora_handle} reason='User does not own post'"
+      render :nothing => true, :status => 404
     end
-
-    respond_with :location => root_url
   end
 
   def show
     @status_message = current_user.find_visible_post_by_id params[:id]
-    comments_hash = Comment.hash_from_post_ids [@status_message.id]
-    person_hash = Person.from_post_comment_hash comments_hash
-    @comment_hashes = comments_hash[@status_message.id].map do |comment|
-      {:comment => comment,
-        :person => person_hash[comment.person_id]
-      }
+    if @status_message
+      @object_aspect_ids = @status_message.aspects.map{|a| a.id}
+
+      # mark corresponding notification as read
+      if notification = Notification.where(:recipient_id => current_user.id, :target_id => @status_message.id).first
+        notification.unread = false
+        notification.save
+      end
+
+      respond_with @status_message
+    else
+      redirect_to :back
     end
-    respond_with @status_message
   end
+
 end

app/controllers/users_controller.rb

@@ -1,7 +1,6 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-
 class UsersController < ApplicationController
   require File.join(Rails.root, 'lib/diaspora/ostatus_builder')
   require File.join(Rails.root, 'lib/diaspora/exporter')
@@ -14,45 +13,53 @@ class UsersController < ApplicationController
   def edit
     @aspect = :user_edit
     @user   = current_user
+    @email_prefs = Hash.new(true) 
+    @user.user_preferences.each do |pref|
+      @email_prefs[pref.email_type] = false
+    end
   end
 
   def update
+    
+    u = params[:user]
     @user = current_user
 
-    if params[:user][:getting_started]
-      boolean = params[:user][:getting_started] == "true"
-      @user.update_attributes( :getting_started => boolean )
-      redirect_to root_path
+    u.delete(:password) if u[:password].blank?
+    u.delete(:password_confirmation) if u[:password].blank? and u[:password_confirmation].blank?
+    u.delete(:language) if u[:language].blank?
 
-    else
-      params[:user].delete(:password) if params[:user][:password].blank?
-      params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
-      params[:user].delete(:language) if params[:user][:language].blank?
-      params[:user].delete(:grammatical_gender) if params[:user][:grammatical_gender].blank?
-
-      if params[:user][:password] && params[:user][:password_confirmation]
-        if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
-          flash[:notice] = I18n.t 'users.update.password_changed'
-        else
-          flash[:error] = I18n.t 'users.update.password_not_changed'
-        end
-      elsif params[:user][:language]
-        if @user.update_attributes(:language => params[:user][:language])
-          if params[:user][:grammatical_gender]
-            if @user.update_attributes(:grammatical_gender => params[:user][:grammatical_gender])
-              flash[:notice] = I18n.t 'users.update.language_changed'
-            else
-              flash[:error] = I18n.t 'users.update.language_not_changed'
-            end
-          else
-            flash[:notice] = I18n.t 'users.update.language_changed'
-          end
-        else
-          flash[:error] = I18n.t 'users.update.language_not_changed'
-        end
+    # change email notifications
+    if u[:email_preferences]
+      @user.update_user_preferences(u[:email_preferences])
+      flash[:notice] = I18n.t 'users.update.email_notifications_changed'
+    # change passowrd
+    elsif u[:current_password] && u[:password] && u[:password_confirmation]
+      if @user.update_with_password(u)
+        flash[:notice] = I18n.t 'users.update.password_changed'
+      else
+        flash[:error] = I18n.t 'users.update.password_not_changed'
       end
+    elsif u[:language]
+      if @user.update_attributes(:language => u[:language])
+        I18n.locale = @user.language
+        flash[:notice] = I18n.t 'users.update.language_changed'
+      else
+        flash[:error] = I18n.t 'users.update.language_not_changed'
+      end
+    elsif u[:a_ids]
+      @user.aspects.update_all(:open => false)
+      unless u[:a_ids] == ["home"]
+        @user.aspects.where(:id => u[:a_ids]).update_all(:open => true)
+      end
+    end
 
-      redirect_to edit_user_path(@user)
+    respond_to do |format|
+      format.js{
+        render :nothing => true, :status => 204
+      }
+      format.all{
+        redirect_to edit_user_path(@user)
+      }
     end
   end
 
@@ -67,13 +74,13 @@ class UsersController < ApplicationController
     user = User.find_by_username(params[:username])
 
     if user
+      posts = StatusMessage.where(:author_id => user.person.id, :public => true).order('created_at DESC')
       director = Diaspora::Director.new
-      ostatus_builder = Diaspora::OstatusBuilder.new(user)
+      ostatus_builder = Diaspora::OstatusBuilder.new(user, posts)
 
       render :xml => director.build(ostatus_builder), :content_type => 'application/atom+xml'
     else
-      flash[:error] = I18n.t 'users.public.does_not_exist', :username => params[:username]
-      redirect_to root_url
+      redirect_to root_url, :error => I18n.t('users.public.does_not_exist', :username => params[:username])
     end
   end
 
@@ -83,17 +90,34 @@ class UsersController < ApplicationController
     @person   = @user.person
     @profile  = @user.profile
     @services = @user.services
-    @requests = @user.pending_requests
+    service = current_user.services.where(:type => "Services::Facebook").first
 
-    @step = ((params[:step].to_i>0)&&(params[:step].to_i<5)) ? params[:step].to_i : 1
+    @step = ((params[:step].to_i>0)&&(params[:step].to_i<4)) ? params[:step].to_i : 1
     @step ||= 1
 
-    if @step == 4
-      @user.grammatical_gender = I18n::Backend::Genderize.guess(@profile.gender)
-      @user.getting_started = false
-      @user.save
+    if @step == 2 && SERVICES['facebook']['app_id'] == ""
+      @step = 3
     end
-    render "users/getting_started"
+
+    if @step == 3
+      @requests = Request.where(:recipient_id => @person.id).includes(:sender => :profile).all
+      @friends = service ? service.finder(:local => true) : {}
+      @friends.delete_if{|key, value| @requests.any?{ |r| r.sender_id == value[:person].id} }
+    end
+
+
+    if @step == 3 && @requests.length == 0 && @friends.length == 0
+      @user.update_attributes(:getting_started => false)
+      redirect_to root_path
+    else
+      render "users/getting_started"
+    end
+  end
+
+  def getting_started_completed
+    user = current_user
+    user.update_attributes(:getting_started => false)
+    redirect_to root_path
   end
 
   def export

app/helpers/application_helper.rb

@@ -5,32 +5,61 @@
 module ApplicationHelper
   @@youtube_title_cache = Hash.new("no-title")
 
-  def modern_browser?
-    false
+  def timeago(time, options = {})
+    options[:class] ||= "timeago"
+    content_tag(:abbr, time.to_s, options.merge(:title => time.iso8601)) if time
+  end
+
+  def page_title text=nil
+    title = ""
+    if text.blank?
+      title = "#{current_user.name}" if current_user
+    else
+      title = "#{text}"
+    end
   end
 
   def aspects_with_post aspects, post
-    aspects.select do |a|
-      post.aspect_ids.include?(a.id)
+    aspects.select do |aspect|
+      PostVisibility.exists?(:aspect_id => aspect.id, :post_id => post.id)
     end
   end
+
   def aspects_without_post aspects, post
-    aspects.reject do |a|
-      post.aspect_ids.include?(a.id)
+    aspects.reject do |aspect|
+      PostVisibility.exists?(:aspect_id => aspect.id, :post_id => post.id)
     end
   end
-  def aspect_links aspects, opts={}
-    str = ""
-    aspects.each do |a|
-      str << aspect_li(a, opts)
+
+  def aspect_badges aspects
+    str = ''
+    aspects.each do |aspect|
+      str << aspect_badge(aspect)
     end
     str.html_safe
   end
+
+  def aspect_badge aspect
+    str = "<span class='aspect_badge single'>"
+    str << link_for_aspect(aspect, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+    str << "</span>"
+  end
+
+  def aspect_links aspects, opts={}
+    str = ""
+    aspects.each do |aspect|
+      str << '<li>'
+      str << link_for_aspect(aspect, :params => opts, 'data-guid' => aspect.id, :class => 'hard_aspect_link').html_safe
+      str << '</li>'
+    end
+    str.html_safe
+  end
+
   def aspect_li aspect, opts= {}
     param_string = ""
     if opts.size > 0
       param_string << '?'
-      opts.each_pair do |k,v|
+      opts.each_pair do |k, v|
         param_string << "#{k}=#{v}"
       end
     end
@@ -52,7 +81,7 @@ module ApplicationHelper
       aspects_path
     end
   end
-  
+
   def object_path(object, opts = {})
     return "" if object.nil?
     object = object.person if object.is_a? User
@@ -73,17 +102,17 @@ module ApplicationHelper
   end
 
   def how_long_ago(obj)
-    "#{time_ago_in_words(obj.created_at)} #{t('ago')}"
+    timeago(obj.created_at)
   end
 
   def person_url(person)
     case person.class.to_s
-    when "User"
-      user_path(person)
-    when "Person"
-      person_path(person)
-    else
-      I18n.t('application.helper.unknown_person')
+      when "User"
+        user_path(person)
+      when "Person"
+        person_path(person)
+      else
+        I18n.t('application.helper.unknown_person')
     end
   end
 
@@ -100,32 +129,25 @@ module ApplicationHelper
   end
 
   def person_image_tag(person, size=:thumb_small)
-    "<img alt='#{person.name}' class='avatar' data-person_id='#{person.id}' src='#{image_or_default(person, size)}' title='#{person.name}'>".html_safe
+    "<img alt=\"#{h(person.name)}\" class=\"avatar\" data-person_id=\"#{person.id}\" src=\"#{person.profile.image_url(size)}\" title=\"#{h(person.name)}\">".html_safe
   end
 
-  def person_link(person)
-"<a href='/people/#{person.id}'>
-  #{person.name}
+  def person_link(person, opts={})
+    "<a href='/people/#{person.id}' class='#{opts[:class]}'>
+  #{h(person.name)}
 </a>".html_safe
   end
 
-  def image_or_default(person, size=:thumb_large)
-    image_location = person.profile.image_url(size) if person.profile
-    image_location ||= person.profile.image_url(:thumb_large) if person.profile  #backwards compatability for old profile pictures
-    image_location ||= "/images/user/default.png"
-    image_location
-  end
-  
   def hard_link(string, path)
-    link_to string, path, :rel => 'external' 
+    link_to string, path, :rel => 'external'
   end
 
   def person_image_link(person, opts = {})
-    return "" if person.nil?
+    return "" if person.nil? || person.profile.nil?
     if opts[:to] == :photos
-      link_to person_image_tag(person,opts[:size]), person_photos_path(person)
+      link_to person_image_tag(person, opts[:size]), person_photos_path(person)
     else
-"<a href='/people/#{person.id}'>
+      "<a href='/people/#{person.id}'>
   #{person_image_tag(person)}
 </a>".html_safe
     end
@@ -135,86 +157,129 @@ module ApplicationHelper
     (':' + post.id.to_s).to_sym
   end
 
-  def person_photos_path person
-    person_id = person.id if person.respond_to?(:id)
-    person_id ||= person
-      
-    "#{photos_path}?person_id=#{person_id}"
-  end
-
   def markdownify(message, options = {})
     message = h(message).html_safe
 
-    [:autolinks, :youtube, :emphasis, :links].each do |k|
-      if !options.has_key?(k)
-        options[k] = true
-      end
+    if !options.has_key?(:newlines)
+      options[:newlines] = true
     end
 
-    if options[:links]
-      message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m|
-        escape = (options[:emphasis]) ? "\\" : ""
-        res = "<a target=\"#{escape}_blank\" href=\"#{$2}\" title=\"#{$3}\">#{$1}</a>"
-        res
-      end
-      message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m|
-        escape = (options[:emphasis]) ? "\\" : ""
-        res = "<a target=\"#{escape}_blank\" href=\"#{$2}\">#{$1}</a>"
-        res
-      end
-    end
+    message = process_links(message)
+    message = process_autolinks(message)
+    message = process_emphasis(message)
+    message = process_youtube(message, options[:youtube_maps])
+    message = process_vimeo(message, options[:vimeo_maps])
+    
+    message.gsub!(/&lt;3/, "&hearts;")
 
-    if options[:youtube]
-      message.gsub!(/( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_]+)(&[^ ]*|)/) do |m|
-        res = "#{$1}youtube.com::#{$3}"
-        res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis]
-        res
-      end
-    end
-
-    if options[:autolinks]
-      message.gsub!(/( |^)(www\.[^ ]+\.[^ ])/, '\1http://\2')
-      message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^ ]+)/) do |m|
-        if !$1.nil?
-          m
-        else
-          res = %{<a target="_blank" href="#{$2}://#{$3}">#{$3}</a>}
-          res.gsub!(/(\*|_)/) { |m| "\\#{$1}" } if options[:emphasis]
-          res
-        end
-      end
-    end
-
-    if options[:emphasis]
-      message.gsub!("\\**", "-^doublestar^-")
-      message.gsub!("\\__", "-^doublescore^-")
-      message.gsub!("\\*", "-^star^-")
-      message.gsub!("\\_", "-^score^-")
-      message.gsub!(/(\*\*\*|___)(.+?)\1/m, '<em><strong>\2</strong></em>')
-      message.gsub!(/(\*\*|__)(.+?)\1/m, '<strong>\2</strong>')
-      message.gsub!(/(\*|_)(.+?)\1/m, '<em>\2</em>')
-      message.gsub!("-^doublestar^-", "**")
-      message.gsub!("-^doublescore^-", "__")
-      message.gsub!("-^star^-", "*")
-      message.gsub!("-^score^-", "_")
-    end
-
-    if options[:youtube]
-      while youtube = message.match(/youtube\.com::([A-Za-z0-9_\\\-]+)/)
-        video_id = youtube[1]
-        if options[:youtube_maps] && options[:youtube_maps][video_id]
-          title = options[:youtube_maps][video_id]
-        else
-          title = I18n.t 'application.helper.youtube_title.unknown'
-        end
-        message.gsub!('youtube.com::'+video_id, '<a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="#video">Youtube: ' + title + '</a>')
-      end
+    if options[:newlines]
+      message.gsub!(/\n+/, '<br />')
     end
 
     return message
   end
 
+
+  def process_links(message)
+    message.gsub!(/\[([^\[]+)\]\(([^ ]+) \&quot;(([^&]|(&[^q])|(&q[^u])|(&qu[^o])|(&quo[^t])|(&quot[^;]))+)\&quot;\)/) do |m|
+      escape = "\\"
+      link = $1
+      url = $2
+      title = $3
+      url.gsub!("_", "\\_")
+      url.gsub!("*", "\\*")
+      protocol = (url =~ /^\w+:\/\//) ? '' :'http://'
+      res    = "<a target=\"#{escape}_blank\" href=\"#{protocol}#{url}\" title=\"#{title}\">#{link}</a>"
+      res
+    end
+    message.gsub!(/\[([^\[]+)\]\(([^ ]+)\)/) do |m|
+      escape = "\\"
+      link = $1
+      url = $2
+      url.gsub!("_", "\\_")
+      url.gsub!("*", "\\*")
+      protocol = (url =~ /^\w+:\/\//) ? '' :'http://'
+      res    = "<a target=\"#{escape}_blank\" href=\"#{protocol}#{url}\">#{link}</a>"
+      res
+    end
+
+    return message
+  end
+
+  def process_youtube(message, youtube_maps)
+    regex = /( |^)(http:\/\/)?www\.youtube\.com\/watch[^ ]*v=([A-Za-z0-9_\-]+)(&[^ ]*|)/
+    processed_message = message.gsub(regex) do |matched_string|
+      match_data = matched_string.match(regex)
+      video_id = match_data[3]
+      if youtube_maps && youtube_maps[video_id]
+        title = h(CGI::unescape(youtube_maps[video_id]))
+      else
+        title = I18n.t 'application.helper.video_title.unknown'
+      end
+      ' <a class="video-link" data-host="youtube.com" data-video-id="' + video_id + '" href="'+ match_data[0].strip + '" target="_blank">Youtube: ' + title + '</a>'
+    end
+    return processed_message
+  end
+
+  def process_autolinks(message)
+    message.gsub!(/( |^)(www\.[^\s]+\.[^\s])/, '\1http://\2')
+    message.gsub!(/(<a target="\\?_blank" href=")?(https|http|ftp):\/\/([^\s]+)/) do |m|
+      captures = [$1,$2,$3]
+      if !captures[0].nil?
+        m
+      elsif m.match(/(youtube|vimeo)/)
+        m.gsub(/(\*|_)/) { |m| "\\#{$1}" } #remove markers on markdown chars to not markdown inside links
+      else
+        res = %{<a target="_blank" href="#{captures[1]}://#{captures[2]}">#{captures[2]}</a>}
+        res.gsub!(/(\*|_)/) { |m| "\\#{$1}" }
+        res
+      end
+    end
+    return message
+  end
+
+  def process_emphasis(message)
+    message.gsub!("\\**", "-^doublestar^-")
+    message.gsub!("\\__", "-^doublescore^-")
+    message.gsub!("\\*", "-^star^-")
+    message.gsub!("\\_", "-^score^-")
+    message.gsub!(/(\*\*\*|___)(.+?)\1/m, '<em><strong>\2</strong></em>')
+    message.gsub!(/(\*\*|__)(.+?)\1/m, '<strong>\2</strong>')
+    message.gsub!(/(\*|_)(.+?)\1/m, '<em>\2</em>')
+    message.gsub!("-^doublestar^-", "**")
+    message.gsub!("-^doublescore^-", "__")
+    message.gsub!("-^star^-", "*")
+    message.gsub!("-^score^-", "_")
+    return message
+  end
+
+  def process_vimeo(message, vimeo_maps)
+    regex = /https?:\/\/(?:w{3}\.)?vimeo.com\/(\d{6,})/
+    processed_message = message.gsub(regex) do |matched_string|
+      match_data = message.match(regex)
+      video_id = match_data[1]
+      if vimeo_maps && vimeo_maps[video_id]
+        title = h(CGI::unescape(vimeo_maps[video_id]))
+      else
+        title = I18n.t 'application.helper.video_title.unknown'
+      end
+      ' <a class="video-link" data-host="vimeo.com" data-video-id="' + video_id + '" href="' + match_data[0] + '" target="_blank">Vimeo: ' + title + '</a>'
+    end
+    return processed_message
+  end
+
   def info_text(text)
     image_tag 'icons/monotone_question.png', :class => 'what_is_this', :title => text
   end
+
+  def get_javascript_strings_for(language)
+    defaults = I18n.t('javascripts', :locale => DEFAULT_LANGUAGE)
+
+    if language != DEFAULT_LANGUAGE
+      translations = I18n.t('javascripts', :locale => language)
+      defaults.update(translations)
+    end
+
+    defaults
+  end
 end

app/helpers/aspects_helper.rb

@@ -1,13 +1,17 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
+#/   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
 module AspectsHelper
-  def link_for_aspect( aspect )
-    link_to aspect.name, aspect
+  def link_for_aspect(aspect, opts={})
+    opts[:params] ||= {}
+    params ||= {}
+    opts[:params] = opts[:params].merge("a_ids[]" => aspect.id, :created_at => params[:created_at])
+
+    link_to aspect.name, aspects_path( opts[:params] ), opts
   end
 
-  def remove_link( aspect )
+  def remove_link(aspect)
     if aspect.contacts.size == 0
       link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => I18n.t('aspects.helper.are_you_sure')
     else
@@ -15,20 +19,38 @@ module AspectsHelper
     end
   end
 
-  def add_to_aspect_button(aspect_id, person_id)
-    link_to image_tag('icons/monotone_plus_add_round.png'), {:controller => "aspects", :action => 'add_to_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'add button'
+  def add_to_aspect_button(aspect_id, person_id, kontroller)
+    link_to image_tag('icons/monotone_plus_add_round.png'),
+      {:controller => kontroller,
+        :action => 'create',
+        :aspect_id => aspect_id,
+        :person_id => person_id},
+      :remote => true,
+      :method => 'post',
+      :class => 'add button'
   end
 
   def remove_from_aspect_button(aspect_id, person_id)
-    link_to image_tag('icons/monotone_check_yes.png'), {:controller => "aspects", :action => 'remove_from_aspect', :aspect_id => aspect_id, :person_id => person_id}, :remote => true, :class => 'added button'
+    link_to image_tag('icons/monotone_check_yes.png'),
+      {:controller => "aspect_memberships",
+        :action => 'destroy',
+        :id => 42,
+        :aspect_id => aspect_id,
+        :person_id => person_id},
+      :remote => true,
+      :method => 'delete',
+      :class => 'added button'
   end
 
-  def aspect_membership_button(aspect_id, contact)
-    unless contact.aspect_ids.include?(aspect_id)
-      add_to_aspect_button(aspect_id, contact.person.id)
+  def contact_or_membership(contact)
+    (contact.persisted?) ? 'aspect_memberships' : 'contacts'
+  end
+
+  def aspect_membership_button(aspect, contact, person)
+    if contact.nil? || !aspect.contacts.include?(contact)
+      add_to_aspect_button(aspect.id, person.id, contact_or_membership(contact))
     else
-      remove_from_aspect_button(aspect_id, contact.person.id)
+      remove_from_aspect_button(aspect.id, person.id)
     end
   end
 end
-

app/helpers/conversations_helper.rb

@@ -0,0 +1,5 @@
+module ConversationsHelper
+  def new_message_text(count)
+    t('conversations.helper.new_messages', :count => count)
+  end
+end

app/helpers/language_helper.rb

@@ -6,30 +6,4 @@ module LanguageHelper
     end
     options.sort_by { |o| o[0] }
   end
-
-  def options_for_gender_select(user)
-    grammatical_gender = user.grammatical_gender
-    genders_list = I18n::Backend::Genderize.known_genders.map do |gender|
-      [t("#{gender}"), gender]
-    end
-    if grammatical_gender.blank?
-      grammatical_gender = I18n::Backend::Genderize.guess(user.profile.gender)
-    end
-    options_for_select(genders_list, grammatical_gender.to_s)
-  end
-
-  def gender_select_disabled(user)
-    not I18n::Backend::Genderize.supports?(user.language)
-  end
-
-  def grammatical_gender_languages
-    @glang_cache ||= array_or_string_for_javascript(I18n::Backend::Genderize::SupportedLanguages)
-  end
-
-  def options_for_grammatical_gender_block(user)
-    enabled = I18n::Backend::Genderize.supports? user.language
-    {:style => 'display: ' + (enabled ? 'inline' : 'none') + ';' +
-              ' margin-left: 1em; margin-right: 0.5em;'
-    }
-  end
-end
+end

app/helpers/notifications_helper.rb

@@ -0,0 +1,53 @@
+module NotificationsHelper
+  def object_link(note)
+    target_type = note.translation_key
+    if note.instance_of?(Notifications::Mentioned)
+      post = Mention.find(note.target_id).post
+      if post
+        "#{translation(target_type)} #{link_to t('notifications.post'), object_path(post)}".html_safe
+      else
+        "#{translation(target_type)} #{t('notifications.deleted')} #{t('notifications.post')}"
+      end
+    elsif note.instance_of?(Notifications::RequestAccepted)
+      translation(target_type)
+    elsif note.instance_of?(Notifications::NewRequest)
+      translation(target_type)
+    elsif note.instance_of?(Notifications::CommentOnPost)
+      post = Post.where(:id => note.target_id).first
+      if post
+        "#{translation(target_type)} #{link_to t('notifications.post'), object_path(post)}".html_safe
+      else
+        "#{translation(target_type)} #{t('notifications.deleted')} #{t('notifications.post')}"
+      end
+    elsif note.instance_of?(Notifications::AlsoCommented)
+      post = Post.where(:id => note.target_id).first
+      if post
+        "#{translation(target_type, post.author.name)} #{link_to t('notifications.post'), object_path(post)}".html_safe
+      else
+        t('notifications.also_commented_deleted')
+      end
+    end
+  end
+
+  def translation(target_type, post_author = nil)
+    t("notifications.#{target_type}", :post_author => post_author)
+  end
+
+  def new_notification_text(count)
+      t('notifications.helper.new_notifications', :count => count)
+  end
+
+  def new_notification_link(count)
+    if count > 0
+        link_to new_notification_text(count), notifications_path
+    end
+  end
+
+  def notification_people_link(note)
+    note.actors.collect{ |person| link_to("#{h(person.name.titlecase)}", person_path(person))}.join(", ").html_safe
+  end
+
+  def peoples_names(note)
+    note.actors.map{|p| p.name}.join(",")
+  end
+end

app/helpers/people_helper.rb

@@ -20,16 +20,11 @@ module PeopleHelper
     end
   end
 
-  def action_link(person, is_contact)
-    if is_contact
-      link_to t('people.profile_sidebar.remove_contact'), person, :confirm => t('are_you_sure'), :method => :delete
-    elsif person == current_user.person
-      link_to t('people.profile_sidebar.edit_my_profile'), edit_person_path(person)
+  def birthday_format(bday)
+    if bday.year == 1000
+      I18n.l bday, :format => I18n.t('date.formats.birthday')
+    else
+      I18n.l bday, :format => I18n.t('date.formats.birthday_with_year')
     end
   end
-
-  def pending_request_for(person)
-    current_user.request_for(person)
-  end
-
 end

app/helpers/private_messages_helper.rb

@@ -0,0 +1,2 @@
+module PrivateMessagesHelper
+end

app/helpers/requests_helper.rb

@@ -10,7 +10,7 @@ module RequestsHelper
 
   def new_request_link(request_count)
     if request_count > 0
-        link_to t('new_requests', :count => @request_count), aspects_manage_path
+        link_to t('requests.helper.new_requests', :count => @request_count), aspects_manage_path
     end
   end
 end

app/helpers/sockets_helper.rb

@@ -4,44 +4,61 @@
 
 module SocketsHelper
   include ApplicationHelper
+  include NotificationsHelper
 
   def obj_id(object)
-    object.respond_to?(:post_id) ? object.post_id : object.id
+    if object.respond_to?(:post_id)
+      object.post_id
+    elsif object.respond_to?(:post_guid)
+      object.post_guid
+    else
+      object.id
+    end
   end
 
-  def action_hash(uid, object, opts={})
+  def action_hash(user, object, opts={})
+    uid = user.id
     begin
-      user = User.find_by_id uid
+      unless user.nil?
+        old_locale = I18n.locale
+        I18n.locale = user.language.to_s
+      end
+
       if object.is_a? StatusMessage
         post_hash = {:post => object,
-          :person => object.person,
+          :author => object.author,
           :photos => object.photos,
           :comments => object.comments.map{|c|
             {:comment => c,
-             :person => c.person
+             :author => c.author
             }
         },
           :current_user => user,
-          :aspects => user.aspects,
+          :all_aspects => user.aspects,
         }
         v = render_to_string(:partial => 'shared/stream_element', :locals => post_hash)
       elsif object.is_a? Person
         person_hash = {
-          :single_aspect_form => opts[:single_aspect_form], 
+          :single_aspect_form => opts["single_aspect_form"],
           :person => object,
-          :aspects => user.aspects,
+          :all_aspects => user.aspects,
           :contact => user.contact_for(object),
-          :request => user.request_for(object), 
+          :request => user.request_from(object),
           :current_user => user}
         v = render_to_string(:partial => 'people/person', :locals => person_hash)
+
       elsif object.is_a? Comment
-        v = render_to_string(:partial => 'comments/comment', :locals => {:hash => {:comment => object, :person => object.person}})
+        v = render_to_string(:partial => 'comments/comment', :locals => {:comment => object, :person => object.author})
+
+      elsif object.is_a? Notification
+        v = render_to_string(:partial => 'notifications/popup', :locals => {:note => object, :person => opts[:actor]})
+
       else
-        v = render_to_string(:partial => type_partial(object), :locals => {:post => object, :current_user => user}) unless object.is_a? Retraction
+        raise "#{object.inspect} with class #{object.class} is not actionhashable." unless object.is_a? Retraction
       end
     rescue Exception => e
       Rails.logger.error("event=socket_render status=fail user=#{user.diaspora_handle} object=#{object.id.to_s}")
-      raise e.original_exception
+      raise e
     end
     action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
     action_hash.merge! opts
@@ -50,21 +67,17 @@ module SocketsHelper
     end
 
     if object.is_a? Comment
+      post = object.post
       action_hash[:comment_id] = object.id
-      action_hash[:my_post?] = (object.post.person.owner.id == uid)
-      action_hash[:notification] = notification(object)
+      action_hash[:my_post?] = (post.author.owner_id == uid)
+      action_hash[:post_guid] = post.guid
+
     end
 
-    action_hash[:mine?] = object.person && (object.person.owner.id == uid) if object.respond_to?(:person)
+    action_hash[:mine?] = object.author && (object.author.owner_id == uid) if object.respond_to?(:author)
+
+    I18n.locale = old_locale unless user.nil?
 
     action_hash.to_json
   end
-
-  def notification(object)
-    begin
-      render_to_string(:partial => 'shared/notification', :locals => {:object => object})
-    rescue Exception => e
-      Rails.logger.error("event=socket_render status=fail user=#{user.diaspora_handle} object=#{object.id.to_s}")
-    end
-  end
 end

app/helpers/stream_helper.rb

@@ -3,13 +3,18 @@
 #   the COPYRIGHT file.
 
 module StreamHelper
-
-  def comment_toggle(count)
-    if count < 3
+  GSUB_THIS = "FIUSDHVIUSHDVIUBAIUHAPOIUXJM"
+  def comment_toggle(count, commenting_disabled=false)
+    if count <= 3
       link_to "#{t('stream_helper.hide_comments')} (#{count})", '#', :class => "show_post_comments"
     else
       link_to "#{t('stream_helper.show_comments')} (#{count})", '#', :class => "show_post_comments"
     end
   end
 
+  def new_comment_form(post_id, current_user)
+    @form ||= controller.render_to_string(
+      :partial => 'comments/new_comment', :locals => {:post_id => GSUB_THIS, :current_user => current_user})
+    @form.gsub(GSUB_THIS, post_id.to_s)
+  end
 end

app/mailers/notifier.rb

@@ -1,24 +1,25 @@
 class Notifier < ActionMailer::Base
-  
-  default :from => "no-reply@joindiaspora.com"
-  
-  ATTACHMENT = File.read("#{Rails.root}/public/images/diaspora_white_on_grey.png")
+  helper :application
+
+  default :from => AppConfig[:smtp_sender_address]
+
+  ATTACHMENT = File.read("#{Rails.root}/public/images/logo_caps.png")
 
   def self.admin(string, recipients, opts = {})
     mails = []
     recipients.each do |rec|
       mail = single_admin(string, rec)
       mails << mail
-      mail.deliver
     end
     mails
   end
+
   def single_admin(string, recipient)
     @recipient = recipient
     @string = string.html_safe
-    attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
+    attachments.inline['logo_caps.png'] = ATTACHMENT
     mail(:to => @recipient.email,
-         :subject => I18n.t('notifier.single_admin.subject'), :host => APP_CONFIG[:terse_pod_url])
+         :subject => I18n.t('notifier.single_admin.subject'), :host => AppConfig[:pod_uri].host)
   end
 
   def new_request(recipient_id, sender_id)
@@ -27,28 +28,96 @@ class Notifier < ActionMailer::Base
 
     log_mail(recipient_id, sender_id, 'new_request')
 
-    attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT
+    attachments.inline['logo_caps.png'] = ATTACHMENT
 
-    mail(:to => "#{@receiver.name} <#{@receiver.email}>",
-         :subject => I18n.t('notifier.new_request.subject', :from => @sender.name), :host => APP_CONFIG[:terse_pod_url])
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.new_request.subject', :from => @sender.name), :host => AppConfig[:pod_uri].host)
+    end
   end
 
-  def request_accepted(recipient_id, sender_id, aspect_id)
+  def request_accepted(recipient_id, sender_id)
     @receiver = User.find_by_id(recipient_id)
     @sender = Person.find_by_id(sender_id)
-    @aspect = Aspect.find_by_id(aspect_id)
 
     log_mail(recipient_id, sender_id, 'request_accepted')
 
-    attachments.inline['diaspora_white_on_grey.png'] = ATTACHMENT 
+    attachments.inline['logo_caps.png'] = ATTACHMENT
 
-    mail(:to => "#{@receiver.name} <#{@receiver.email}>",
-          :subject => I18n.t('notifier.request_accepted.subject', :name => @sender.name), :host => APP_CONFIG[:terse_pod_url])
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.request_accepted.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
+    end
+  end
+
+  def mentioned(recipient_id, sender_id, target_id)
+    @receiver = User.find_by_id(recipient_id)
+    @sender   = Person.find_by_id(sender_id)
+    @post  = Mention.find_by_id(target_id).post
+
+    log_mail(recipient_id, sender_id, 'mentioned')
+
+    attachments.inline['logo_caps.png'] = ATTACHMENT
+
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.mentioned.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
+    end
+  end
+
+  def comment_on_post(recipient_id, sender_id, comment_id)
+    @receiver = User.find_by_id(recipient_id)
+    @sender   = Person.find_by_id(sender_id)
+    @comment  = Comment.find_by_id(comment_id)
+
+    log_mail(recipient_id, sender_id, 'comment_on_post')
+
+    attachments.inline['logo_caps.png'] = ATTACHMENT
+
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.comment_on_post.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
+    end
+  end
+
+  def also_commented(recipient_id, sender_id, comment_id)
+    @receiver = User.find_by_id(recipient_id)
+    @sender   = Person.find_by_id(sender_id)
+    @comment  = Comment.find_by_id(comment_id)
+    @post_author_name = @comment.post.author.name
+
+
+    log_mail(recipient_id, sender_id, 'comment_on_post')
+
+    attachments.inline['logo_caps.png'] = ATTACHMENT
+
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.also_commented.subject', :name => @sender.name, :post_author => @post_author_name ), :host => AppConfig[:pod_uri].host)
+    end
+  end
+
+  def private_message(recipient_id, sender_id, message_id)
+    @receiver = User.find_by_id(recipient_id)
+    @sender   = Person.find_by_id(sender_id)
+    @message  = Message.find_by_id(message_id)
+    @conversation = @message.conversation
+    @participants = @conversation.participants
+
+
+    log_mail(recipient_id, sender_id, 'private_message')
+
+    attachments.inline['logo_caps.png'] = ATTACHMENT
+
+    I18n.with_locale(@receiver.language) do
+      mail(:to => "\"#{@receiver.name}\" <#{@receiver.email}>",
+           :subject => I18n.t('notifier.private_message.subject', :name => @sender.name), :host => AppConfig[:pod_uri].host)
+    end
   end
 
   private
   def log_mail recipient_id, sender_id, type
-    log_string = "event=mail mail_type=#{type} db_name=#{MongoMapper.database.name} recipient_id=#{recipient_id} sender_id=#{sender_id}"
+    log_string = "event=mail mail_type=#{type} recipient_id=#{recipient_id} sender_id=#{sender_id}"
     if @receiver && @sender
       log_string << "models_found=true sender_handle=#{@sender.diaspora_handle} recipient_handle=#{@receiver.diaspora_handle}"
     else

app/models/aspect.rb

@@ -2,48 +2,27 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Aspect
-  include MongoMapper::Document
+class Aspect < ActiveRecord::Base
+  belongs_to :user
 
-  key :name,        String
-  key :request_ids, Array
-  key :post_ids,    Array
+  has_many :aspect_memberships
+  has_many :contacts, :through => :aspect_memberships
 
-  many :contacts, :foreign_key => 'aspect_ids', :class_name => 'Contact'
-  many :requests, :in => :request_ids, :class_name => 'Request'
-  many :posts,    :in => :post_ids,    :class_name => 'Post'
-
-  belongs_to :user, :class_name => 'User'
+  has_many :post_visibilities
+  has_many :posts, :through => :post_visibilities
 
   validates_presence_of :name
   validates_length_of :name, :maximum => 20
-  validates_uniqueness_of :name, :scope => :user_id
+  validates_uniqueness_of :name, :scope => :user_id, :case_sensitive => false
+
   attr_accessible :name
-  
+
   before_validation do
     name.strip!
   end
-  
-  timestamps!
 
   def to_s
     name
   end
-  
-  def person_objects
-    person_ids = people.map{|x| x.person_id}
-    Person.all(:id.in => person_ids)
-  end
-
-  def as_json(opts = {})
-    {
-      :aspect => {
-        :name   => self.name,
-        :people => self.people.each{|person| person.as_json},
-        :posts  => self.posts.each {|post|   post.as_json  },
-      }
-    }
-  end
-
 end
 

app/models/aspect_membership.rb

@@ -0,0 +1,23 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class AspectMembership < ActiveRecord::Base
+
+  belongs_to :aspect
+  belongs_to :contact
+  has_one :user, :through => :contact
+  has_one :person, :through => :contact
+
+  before_destroy :ensure_membership
+  
+  
+  def ensure_membership
+    if self.contact.aspect_memberships.count == 1
+      errors[:base] << I18n.t('shared.contact_list.cannot_remove')
+      false
+    else
+      true
+    end
+  end
+end

app/models/comment.rb

@@ -2,88 +2,58 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class HandleValidator < ActiveModel::Validator
-  def validate(document)
-    unless document.diaspora_handle == document.person.diaspora_handle
-      document.errors[:base] << "Diaspora handle and person handle must match"
-    end
-  end
-end
-
-class Comment
-  require File.join(Rails.root, 'lib/diaspora/websocket')
+class Comment < ActiveRecord::Base
+  require File.join(Rails.root, 'lib/diaspora/web_socket')
   require File.join(Rails.root, 'lib/youtube_titles')
   include YoutubeTitles
-  include MongoMapper::Document
   include ROXML
+
   include Diaspora::Webhooks
-  include Encryptable
+  include Diaspora::Relayable
+  include Diaspora::Guid
+
   include Diaspora::Socketable
 
-  xml_reader :text
-  xml_reader :diaspora_handle
-  xml_reader :post_id
-  xml_reader :_id
+  xml_attr :text
+  xml_attr :diaspora_handle
 
-  key :text,      String
-  key :post_id,   ObjectId
-  key :person_id, ObjectId
-  key :diaspora_handle, String
+  belongs_to :post, :touch => true
+  belongs_to :author, :class_name => 'Person'
 
-  belongs_to :post,   :class_name => "Post"
-  belongs_to :person, :class_name => "Person"
-
-  validates_presence_of :text, :diaspora_handle, :post
-  validates_with HandleValidator
+  validates_presence_of :text, :post
+  validates_length_of :text, :maximum => 2500
 
+  serialize :youtube_titles, Hash
   before_save do
     get_youtube_title text
+    self.text.strip! unless self.text.nil?
+  end
+  def diaspora_handle
+    self.author.diaspora_handle
+  end
+  def diaspora_handle= nh
+    self.author = Webfinger.new(nh).fetch
   end
 
-  timestamps!
-
-  #ENCRYPTION
-
-  xml_reader :creator_signature
-  xml_reader :post_creator_signature
-
-  key :creator_signature, String
-  key :post_creator_signature, String
-
-  def signable_accessors
-    accessors = self.class.roxml_attrs.collect{|definition|
-      definition.accessor}
-    accessors.delete 'person'
-    accessors.delete 'creator_signature'
-    accessors.delete 'post_creator_signature'
-    accessors
-  end
-
-  def signable_string
-    signable_accessors.collect{|accessor|
-      (self.send accessor.to_sym).to_s}.join ';'
-  end
-
-  def verify_post_creator_signature
-    verify_signature(post_creator_signature, post.person)
-  end
-
-  def signature_valid?
-    verify_signature(creator_signature, person)
-  end
-  def self.hash_from_post_ids post_ids
-    hash = {}
-    comments = self.on_posts(post_ids)
-    post_ids.each do |id|
-      hash[id] = []
+  def notification_type(user, person)
+    if self.post.author == user.person
+      return Notifications::CommentOnPost
+    elsif self.post.comments.where(:author_id => user.person.id) != [] && self.author_id != user.person.id
+      return Notifications::AlsoCommented
+    else
+      return false
     end
-    comments.each do |comment|
-      hash[comment.post_id] << comment
-    end
-    hash.each_value {|comments| comments.sort!{|c1, c2| c1.created_at <=> c2.created_at }}
-    hash
   end
-  scope :on_posts, lambda { |post_ids| 
-    where(:post_id.in => post_ids)
-  }
+
+  def parent_class
+    Post
+  end
+
+  def parent
+    self.post
+  end
+
+  def parent= parent
+    self.post = parent
+  end
 end

app/models/contact.rb

@@ -2,8 +2,8 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Contact
-  include MongoMapper::Document
+class Contact < ActiveRecord::Base
+  default_scope where(:pending => false)
 
   belongs_to :user
   validates_presence_of :user
@@ -11,7 +11,38 @@ class Contact
   belongs_to :person
   validates_presence_of :person
 
-  key :aspect_ids, Array, :typecast => 'ObjectId'  
-  many :aspects, :in => :aspect_ids, :class_name => 'Aspect'
- 
+  has_many :aspect_memberships
+  has_many :aspects, :through => :aspect_memberships
+  validate :not_contact_for_self
+  validates_uniqueness_of :person_id, :scope => :user_id
+
+  def dispatch_request
+    request = self.generate_request
+    Postzord::Dispatch.new(self.user, request).post
+    request
+  end
+
+  def generate_request
+    Request.new(:sender => self.user.person,
+                :recipient => self.person,
+                :aspect => aspects.first)
+  end
+
+  def contacts
+    people = Person.arel_table
+    incoming_aspects = Aspect.joins(:contacts).where(
+      :user_id => self.person.owner_id,
+      :contacts_visible => true,
+      :contacts => {:person_id => self.user.person.id}).select('`aspects`.id')
+    incoming_aspect_ids = incoming_aspects.map{|a| a.id}
+    similar_contacts = Person.joins(:contacts => :aspect_memberships).where(
+      :aspect_memberships => {:aspect_id => incoming_aspect_ids}).where(people[:id].not_eq(self.user.person.id)).select('DISTINCT `people`.*')
+  end
+  private
+  def not_contact_for_self
+    if person_id && person.owner == user
+      errors[:base] << 'Cannot create self-contact'
+    end
+  end
 end
+

app/models/conversation.rb

@@ -0,0 +1,72 @@
+class Conversation < ActiveRecord::Base
+  include ROXML
+  include Diaspora::Guid
+  include Diaspora::Webhooks
+
+  xml_attr :subject
+  xml_attr :created_at
+  xml_attr :messages, :as => [Message]
+  xml_reader :diaspora_handle
+  xml_reader :participant_handles
+
+  has_many :conversation_visibilities, :dependent => :destroy
+  has_many :participants, :class_name => 'Person', :through => :conversation_visibilities, :source => :person
+  has_many :messages, :order => 'created_at ASC'
+
+  belongs_to :author, :class_name => 'Person'
+
+  def self.create(opts={})
+    opts = opts.dup
+    msg_opts = {:author => opts[:author], :text => opts.delete(:text)}
+
+    cnv = super(opts)
+    message = Message.new(msg_opts.merge({:conversation_id => cnv.id}))
+    message.save
+    cnv
+  end
+
+  def recipients
+    self.participants - [self.author]
+  end
+
+  def diaspora_handle
+    self.author.diaspora_handle
+  end
+  def diaspora_handle= nh
+    self.author = Webfinger.new(nh).fetch
+  end
+
+  def participant_handles
+    self.participants.map{|p| p.diaspora_handle}.join(";")
+  end
+  def participant_handles= handles
+    handles.split(';').each do |handle|
+      self.participants << Webfinger.new(handle).fetch
+    end
+  end
+
+  def last_author
+    self.messages.last.author if self.messages.size > 0
+  end
+
+  def subject
+    self[:subject].blank? ? "no subject" : self[:subject]
+  end
+
+  def subscribers(user)
+    self.recipients
+  end
+
+  def receive(user, person)
+    cnv = Conversation.find_or_create_by_guid(self.attributes)
+
+    self.participants.each do |participant|
+      ConversationVisibility.find_or_create_by_conversation_id_and_person_id(cnv.id, participant.id)
+    end
+    self.messages.each do |msg|
+      msg.conversation_id = cnv.id
+      received_msg = msg.receive(user, person)
+      Notification.notify(user, received_msg, person) if msg.respond_to?(:notification_type)
+    end
+  end
+end

app/models/conversation_visibility.rb

@@ -0,0 +1,6 @@
+class ConversationVisibility < ActiveRecord::Base
+
+  belongs_to :conversation
+  belongs_to :person
+
+end

app/models/invitation.rb

@@ -2,63 +2,91 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Invitation
-  include MongoMapper::Document
+class Invitation < ActiveRecord::Base
 
-  belongs_to :from, :class => User
-  belongs_to :to, :class => User
-  belongs_to :into, :class => Aspect
-  key :message, String
+  belongs_to :sender, :class_name => 'User'
+  belongs_to :recipient, :class_name => 'User'
+  belongs_to :aspect
 
-  validates_presence_of :from, :to, :into
+  validates_presence_of :sender, :recipient, :aspect
 
   def self.invite(opts = {})
-    existing_user = User.find_by_email(opts[:email])
+    return false if opts[:identifier] == opts[:from].email
+
+    existing_user = self.find_existing_user(opts[:service], opts[:identifier])
+
     if existing_user
       if opts[:from].contact_for(opts[:from].person)
         raise "You are already connceted to this person"
       elsif not existing_user.invited?
         opts[:from].send_contact_request_to(existing_user.person, opts[:into])
         return
-      elsif Invitation.first(:from_id => opts[:from].id, :to_id => existing_user.id)
+      elsif Invitation.where(:sender_id => opts[:from].id, :recipient_id => existing_user.id).first
         raise "You already invited this person"
       end
     end
+
+    opts[:existing_user] = existing_user
     create_invitee(opts)
   end
 
-  def self.create_invitee(opts = {})
-    invitee = User.find_or_initialize_with_error_by(:email, opts[:email])
-    invitee.invites = opts[:invites]
-    if invitee.new_record?
-      invitee.errors.clear if invitee.email.try(:match, Devise.email_regexp)
+  def self.find_existing_user(service, identifier)
+    existing_user = User.where(:invitation_service => service,
+                               :invitation_identifier => identifier).first
+    if service == 'email'
+      existing_user ||= User.where(:email => identifier).first
     else
-      invitee.errors.add(:email, :taken) unless invitee.invited?
+      existing_user ||= User.joins(:services).where(:services => {:type => "Services::#{service.titleize}", :uid => identifier}).first
     end
 
-    if invitee.errors.empty?
+    existing_user
+  end
 
-      if opts[:from]
-        invitee.save(:validate => false)
-        Invitation.create!(:from => opts[:from],
-                           :to => invitee,
-                           :into => opts[:into],
-                           :message => opts[:message])
-
-        opts[:from].invites -= 1 unless opts[:from].invites == 0
-        opts[:from].save!
-        invitee.reload
-      end
+  def self.new_user_by_service_and_identifier(service, identifier)
+    result = User.new()
+    result.invitation_service = service
+    result.invitation_identifier = identifier
+    result.email = identifier if service == 'email'
+    result.valid?
+    result
+  end
 
+  def self.create_invitee(opts = {})
+    invitee = opts[:existing_user] || new_user_by_service_and_identifier(opts[:service], opts[:identifier])
+    return invitee if opts[:service] == 'email' && !opts[:identifier].match(Devise.email_regexp)
+    invitee.invites = opts[:invites] || 5
+    if invitee.new_record?
+      invitee.errors.clear
+      invitee.serialized_private_key = User.generate_key if invitee.serialized_private_key.blank?
       invitee.send(:generate_invitation_token)
-      invitee.invite! 
-      Rails.logger.info("event=invitation_sent to=#{opts[:email]} #{"inviter=#{opts[:from].diaspora_handle}" if opts[:from]}")
+    elsif invitee.invitation_token.nil?
+      return invitee
     end
+
+    if opts[:from]
+      invitee.save(:validate => false)
+      Invitation.create!(:sender => opts[:from],
+                         :recipient => invitee,
+                         :aspect => opts[:into],
+                         :message => opts[:message])
+
+      opts[:from].invites -= 1 unless opts[:from].invites == 0
+      opts[:from].save!
+      invitee.reload
+    end
+    invitee.invite!(:email => (opts[:service] == 'email'))
+    log_string = "event=invitation_sent to=#{opts[:identifier]} service=#{opts[:service]} "
+    log_string << "inviter=#{opts[:from].diaspora_handle} inviter_uid=#{opts[:from].id} inviter_created_at_unix=#{opts[:from].created_at.to_i}" if opts[:from]
+    Rails.logger.info(log_string)
     invitee
   end
 
+  def resend
+    recipient.invite!
+  end
+
   def to_request!
-    request = from.send_contact_request_to(to.person, into)
+    request = sender.send_contact_request_to(recipient.person, aspect)
     destroy if request
     request
   end

app/models/jobs/base.rb

@@ -0,0 +1,13 @@
+module Job
+  class Base
+    extend ResqueJobLogging
+
+    def self.perform(*args)  
+      ActiveRecord::Base.verify_active_connections!  
+      self.perform_delegate(*args)  
+    end
+
+    def self.perform_delegate(*args) # override this  
+    end
+  end
+end

app/models/jobs/http_multi.rb

@@ -0,0 +1,60 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+require 'uri'
+
+module Job
+  class HttpMulti < Base
+    @queue = :http
+
+    MAX_RETRIES = 3
+    OPTS = {:max_redirects => 3, :timeout => 5000, :method => :post}
+
+    def self.perform_delegate(user_id, enc_object_xml, person_ids, retry_count=0)
+      user = User.find(user_id)
+      people = Person.where(:id => person_ids)
+
+      salmon = Salmon::SalmonSlap.create(user, Base64.decode64(enc_object_xml))
+
+      failed_request_people = []
+
+      hydra = Typhoeus::Hydra.new
+      people.each do |person|
+
+        url = person.receive_url
+        xml = salmon.xml_for(person)
+
+        request = Typhoeus::Request.new(url, OPTS.merge(:params => {:xml => CGI::escape(xml)}))
+
+        request.on_complete do |response|
+          if response.code >= 300 && response.code < 400
+            if response.headers_hash['Location'] == response.request.url.sub('http://', 'https://')
+              location = URI.parse(response.headers_hash['Location'])
+              newuri = "#{location.scheme}://#{location.host}"
+              newuri += ":#{location.port}" unless ["80", "443"].include?(location.port.to_s)
+              newuri += "/"
+              person.url = newuri
+              person.save
+            end
+          end
+          unless response.success?
+            Rails.logger.info("event=http_multi_fail sender_id=#{user_id} recipient_id=#{person.id} url=#{response.effective_url} response_code='#{response.code}' xml='#{Base64.decode64(enc_object_xml)}'")
+            failed_request_people << person.id
+          end
+        end
+
+        hydra.queue request
+      end
+      hydra.run
+
+      unless failed_request_people.empty?
+        if retry_count < MAX_RETRIES
+          Resque.enqueue(Job::HttpMulti, user_id, enc_object_xml, failed_request_people, retry_count + 1 )
+        else
+          Rails.logger.info("event=http_multi_abandon sender_id=#{user_id} failed_recipient_ids='[#{person_ids.join(', ')}] xml='#{Base64.decode64(enc_object_xml)}'")
+        end
+      end
+    end
+  end
+end

app/models/jobs/http_post.rb

@@ -0,0 +1,30 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class HttpPost < Base 
+    @queue = :http
+    NUM_TRIES = 3
+
+    def self.perform_delegate(url, body, tries_remaining = NUM_TRIES)
+      begin
+        body = CGI::escape(body)
+        RestClient.post(url, :xml => body){ |response, request, result, &block|
+          if [301, 302, 307].include? response.code
+            response.follow_redirection(request, result, &block)
+          else
+            response.return!(request, result, &block)
+          end
+        }
+      rescue Exception => e
+        unless tries_remaining <= 1
+          Resque.enqueue(self, url, body, tries_remaining -1)
+        else
+          raise e
+        end
+      end
+    end
+  end
+end

app/models/jobs/invite_user_by_email.rb

@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class InviteUserByEmail < Base
+    @queue = :mail
+    def self.perform_delegate(sender_id, email, aspect_id, invite_message)
+      user = User.find(sender_id)
+      user.invite_user(aspect_id, 'email', email, invite_message)
+    end
+  end
+end

app/models/jobs/mail_also_commented.rb

@@ -0,0 +1,9 @@
+module Job
+  class MailAlsoCommented < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, sender_id, comment_id)
+      Notifier.also_commented(recipient_id, sender_id, comment_id).deliver
+    end
+  end
+end
+

app/models/jobs/mail_comment_on_post.rb

@@ -0,0 +1,9 @@
+module Job
+  class MailCommentOnPost < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, sender_id, comment_id)
+      Notifier.comment_on_post(recipient_id, sender_id, comment_id).deliver
+    end
+  end
+end
+

app/models/jobs/mail_mentioned.rb

@@ -0,0 +1,15 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class MailMentioned < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, actor_id, target_id)
+      
+      Notifier.mentioned( recipient_id, actor_id, target_id).deliver
+
+    end
+  end
+end

app/models/jobs/mail_private_message.rb

@@ -0,0 +1,13 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class MailPrivateMessage < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, actor_id, target_id)
+      Notifier.private_message( recipient_id, actor_id, target_id).deliver
+    end
+  end
+end

app/models/jobs/mail_request_acceptance.rb

@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class MailRequestAcceptance < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, sender_id, target_id)
+      Notifier.request_accepted(recipient_id, sender_id).deliver
+    end
+  end
+end
+

app/models/jobs/mail_request_received.rb

@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class MailRequestReceived < Base
+    @queue = :mail
+    def self.perform_delegate(recipient_id, sender_id, target_id)
+      Notifier.new_request(recipient_id, sender_id).deliver
+    end
+  end
+end
+

app/models/jobs/notify_local_users.rb

@@ -0,0 +1,19 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module Job
+  class NotifyLocalUsers < Base
+    @queue = :receive_local
+
+    require File.join(Rails.root, 'app/models/notification')
+
+    def self.perform_delegate(user_id, object_klass, object_id, person_id)
+      user  = User.find_by_id(user_id)
+      object = object_klass.constantize.find_by_id(object_id)
+      person = Person.find_by_id(person_id)
+
+      Notification.notify(user, object, person)
+    end
+  end
+end

app/models/jobs/post_to_service.rb

@@ -0,0 +1,15 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+module Job
+  class PostToService < Base
+    @queue = :http_service
+
+    def self.perform_delegate(service_id, post_id, url)
+      service = Service.find_by_id(service_id)
+      post = Post.find_by_id(post_id)
+      service.post(post, url)
+    end
+  end
+end

app/models/jobs/publish_to_hub.rb

@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module Job
+  class PublishToHub < Base
+    @queue = :http_service
+
+    def self.perform_delegate(sender_public_url)
+      require File.join(Rails.root, 'lib/pubsubhubbub')
+      Pubsubhubbub.new(AppConfig[:pubsub_server]).publish(sender_public_url)
+    end
+  end
+end

app/models/jobs/receive.rb

@@ -0,0 +1,17 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class Receive < Base
+
+    @queue = :receive
+    def self.perform(user_id, xml, salmon_author_id)
+      user = User.find(user_id)
+      salmon_author = Person.find(salmon_author_id)
+      zord = Postzord::Receiver.new(user, :person => salmon_author)
+      zord.parse_and_receive(xml)
+    end
+  end
+end

app/models/jobs/receive_local.rb

@@ -0,0 +1,20 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class ReceiveLocal < Base
+    require File.join(Rails.root, 'lib/postzord/receiver')
+
+    @queue = :receive_local
+    def self.perform_delegate(user_id, person_id, object_type, object_id)
+      user = User.find(user_id)
+      person = Person.find(person_id)
+      object = object_type.constantize.where(:id => object_id).first
+
+      z = Postzord::Receiver.new(user, :person => person, :object => object)
+      z.receive_object
+    end
+  end
+end

app/models/jobs/receive_salmon.rb

@@ -0,0 +1,17 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+require File.join(Rails.root, 'lib/postzord/receiver')
+module Job
+  class ReceiveSalmon < Base
+    @queue = :receive_salmon
+
+    def self.perform_delegate(user_id, xml)
+      user = User.find(user_id)
+      zord = Postzord::Receiver.new(user, :salmon_xml => xml)
+      zord.perform
+    end
+  end
+end

app/models/jobs/resend_invitation.rb

@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class ResendInvitation < Base
+    @queue = :mail
+    def self.perform_delegate(invitation_id)
+      inv = Invitation.where(:id => invitation_id).first
+      inv.resend
+    end
+  end
+end

app/models/jobs/socket_webfinger.rb

@@ -0,0 +1,27 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+module Job
+  class SocketWebfinger < Base
+
+    @queue = :socket_webfinger
+
+    def self.perform_delegate(user_id, account, opts={})
+      finger = Webfinger.new(account)
+      begin
+        user = User.find_by_id(user_id)
+        result = finger.fetch
+        result.socket_to_user(user, opts)
+      rescue
+        Diaspora::WebSocket.queue_to_user(user_id,
+          {:class => 'people',
+           :status => 'fail',
+           :query => account,
+           :response => I18n.t('people.webfinger.fail', :handle => account)}.to_json)
+      end
+    end
+  end
+end
+

app/models/mention.rb

@@ -0,0 +1,25 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class Mention < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :person
+  validates_presence_of :post
+  validates_presence_of :person
+
+  after_destroy :delete_notification
+
+  def notify_recipient
+    Rails.logger.info "event=mention_sent id=#{self.id} to=#{person.diaspora_handle} from=#{post.author.diaspora_handle}"
+    Notification.notify(person.owner, self, post.author) unless person.remote?
+  end
+
+  def notification_type(*args)
+    Notifications::Mentioned
+  end
+
+  def delete_notification
+    Notification.where(:target_type => self.class.name, :target_id => self.id).delete_all
+  end
+end

app/models/message.rb

@@ -0,0 +1,82 @@
+class Message < ActiveRecord::Base
+  include ROXML
+
+  include Diaspora::Guid
+  include Diaspora::Webhooks
+  include Diaspora::Relayable
+
+  xml_attr :text
+  xml_attr :created_at
+  xml_reader :diaspora_handle
+  xml_reader :conversation_guid
+
+  belongs_to :author, :class_name => 'Person'
+  belongs_to :conversation, :touch => true
+
+  after_create do
+    #sign comment as commenter
+    self.author_signature = self.sign_with_key(self.author.owner.encryption_key) if self.author.owner
+
+    if !self.parent.blank? &&  self.author.owns?(self.parent)
+      #sign comment as post owner
+      self.parent_author_signature = self.sign_with_key( self.parent.author.owner.encryption_key) if self.parent.author.owner
+    end
+    self.save!
+    self
+  end
+
+  validate :participant_of_parent_conversation
+
+  def diaspora_handle
+    self.author.diaspora_handle
+  end
+
+  def diaspora_handle= nh
+    self.author = Webfinger.new(nh).fetch
+  end
+
+  def conversation_guid
+    self.conversation.guid
+  end
+
+  def conversation_guid= guid
+    if cnv = Conversation.find_by_guid(guid)
+      self.conversation_id = cnv.id
+    end
+  end
+
+  def parent_class
+    Conversation
+  end
+
+  def parent
+    self.conversation
+  end
+
+  def parent= parent
+    self.conversation = parent
+  end
+
+  def after_receive(user, person)
+    if vis = ConversationVisibility.where(:conversation_id => self.conversation_id, :person_id => user.person.id).first
+      vis.unread += 1
+      vis.save
+      self
+    else
+      raise NotVisibileException("Attempting to access a ConversationVisibility that does not exist!")
+    end
+  end
+
+  def notification_type(user, person)
+    Notifications::PrivateMessage unless user.person == person
+  end
+
+  private
+  def participant_of_parent_conversation
+    if self.parent && !self.parent.participants.include?(self.author)
+      errors[:base] << "Author is not participating in the conversation"
+    else
+      true
+    end
+  end
+end

app/models/mongo.rb

@@ -0,0 +1,21 @@
+module Mongo
+  def self.table_name_prefix
+    "mongo_"
+  end
+
+  class Aspect < ActiveRecord::Base; end
+  class AspectMembership < ActiveRecord::Base; end
+  class Comment < ActiveRecord::Base; end
+  class Contact < ActiveRecord::Base; end
+  class Invitation < ActiveRecord::Base; end
+  class Notification < ActiveRecord::Base; end
+  class Person < ActiveRecord::Base; end
+  #Photo?
+  class Post < ActiveRecord::Base; end
+  class PostVisibility < ActiveRecord::Base; end
+  class Profile < ActiveRecord::Base; end
+  class Request < ActiveRecord::Base; end
+  class Service < ActiveRecord::Base; end
+  #StatusMessage?
+  class User < ActiveRecord::Base; end
+end

app/models/notification.rb

@@ -0,0 +1,65 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+class Notification < ActiveRecord::Base
+  require File.join(Rails.root, 'lib/diaspora/web_socket')
+  include Diaspora::Socketable
+
+  belongs_to :recipient, :class_name => 'User'
+  has_many :notification_actors
+  has_many :actors, :class_name => 'Person', :through => :notification_actors, :source => :person
+  belongs_to :target, :polymorphic => true
+
+  def self.for(recipient, opts={})
+    self.where(opts.merge!(:recipient_id => recipient.id)).order('updated_at desc')
+  end
+
+  def self.notify(recipient, target, actor)
+    if target.respond_to? :notification_type
+      if note_type = target.notification_type(recipient, actor)
+        if target.is_a? Comment
+          n = note_type.concatenate_or_create(recipient, target.post, actor, note_type)
+        else
+          n = note_type.make_notification(recipient, target, actor, note_type)
+        end
+        n.email_the_user(target, actor) if n
+        n.socket_to_user(recipient, :actor => actor) if n
+        n
+       end
+    end
+  end
+
+  def email_the_user(target, actor)
+    self.recipient.mail(self.mail_job, self.recipient_id, actor.id, target.id)
+  end
+  def mail_job
+    raise NotImplementedError.new('Subclass this.')
+  end
+
+private
+  def self.concatenate_or_create(recipient, target, actor, notification_type)
+    if n = notification_type.where(:target_id => target.id,
+                              :target_type => target.class.base_class,
+                               :recipient_id => recipient.id).first
+      unless n.actors.include?(actor)
+        n.actors << actor
+      end
+
+      n.unread = true
+      n.save!
+      n
+    else
+      make_notification(recipient, target, actor, notification_type)
+    end
+  end
+
+  def self.make_notification(recipient, target, actor, notification_type)
+    n = notification_type.new(:target => target,
+                               :recipient_id => recipient.id)
+    n.actors << actor
+    n.unread = false if target.is_a? Request
+    n.save!
+    n
+  end
+end

app/models/notification_actor.rb

@@ -1,8 +1,10 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-#
-require 'spec_helper'
 
-describe SocketsHelper do
+class NotificationActor < ActiveRecord::Base
+
+  belongs_to :notification
+  belongs_to :person
+
 end

app/models/notifications/also_commented.rb

@@ -0,0 +1,8 @@
+class Notifications::AlsoCommented < Notification
+  def mail_job
+    Job::MailAlsoCommented
+  end
+  def translation_key
+    'also_commented'
+  end
+end

app/models/notifications/comment_on_post.rb

@@ -0,0 +1,8 @@
+class Notifications::CommentOnPost < Notification
+  def mail_job
+    Job::MailCommentOnPost
+  end
+  def translation_key
+    'comment_on_post'
+  end
+end

app/models/notifications/mentioned.rb

@@ -0,0 +1,8 @@
+class Notifications::Mentioned < Notification
+  def mail_job
+    Job::MailMentioned
+  end
+  def translation_key
+    'mentioned'
+  end
+end

app/models/notifications/new_request.rb

@@ -0,0 +1,8 @@
+class Notifications::NewRequest < Notification
+  def mail_job
+    Job::MailRequestReceived
+  end
+  def translation_key
+    'new_request'
+  end
+end

app/models/notifications/private_message.rb

@@ -0,0 +1,15 @@
+class Notifications::PrivateMessage < Notification
+  def mail_job
+    Job::MailPrivateMessage
+  end
+  def translation_key
+    'private_message'
+  end
+  def self.make_notification(recipient, target, actor, notification_type)
+    n = notification_type.new(:target => target,
+                               :recipient_id => recipient.id)
+
+    n.actors << actor
+    n
+  end
+end

app/models/notifications/request_accepted.rb

@@ -0,0 +1,8 @@
+class Notifications::RequestAccepted < Notification
+  def mail_job
+    Job::MailRequestAcceptance
+  end
+  def translation_key
+    'request_accepted'
+  end
+end

app/models/person.rb

@@ -2,92 +2,126 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require 'uri'
 require File.join(Rails.root, 'lib/hcard')
 
-class Person
-  include MongoMapper::Document
+class Person < ActiveRecord::Base
   include ROXML
   include Encryptor::Public
-  require File.join(Rails.root, 'lib/diaspora/websocket')
+  require File.join(Rails.root, 'lib/diaspora/web_socket')
   include Diaspora::Socketable
+  include Diaspora::Guid
 
-  xml_accessor :_id
-  xml_accessor :diaspora_handle
-  xml_accessor :url
-  xml_accessor :profile, :as => Profile
-  xml_reader :exported_key
+  xml_attr :diaspora_handle
+  xml_attr :url
+  xml_attr :profile, :as => Profile
+  xml_attr :exported_key
 
-  key :url, String
-  key :diaspora_handle, String, :unique => true
-  key :serialized_public_key, String
+  has_one :profile
+  delegate :last_name, :to => :profile
 
-  key :owner_id, ObjectId
-
-  one :profile, :class_name => 'Profile'
-  validates_associated :profile
-  delegate :first_name, :last_name, :to => :profile
-  before_save :downcase_diaspora_handle 
-  
+  before_save :downcase_diaspora_handle
   def downcase_diaspora_handle
     diaspora_handle.downcase!
   end
 
+  has_many :contacts #Other people's contacts for this person
+  has_many :posts, :foreign_key => :author_id #his own posts
+
   belongs_to :owner, :class_name => 'User'
 
-  timestamps!
-  
+  has_many :notification_actors
+  has_many :notifications, :through => :notification_actors
+
+  has_many :mentions, :dependent => :destroy
+
   before_destroy :remove_all_traces
   before_validation :clean_url
+
   validates_presence_of :url, :profile, :serialized_public_key
   validates_uniqueness_of :diaspora_handle, :case_sensitive => false
-  #validates_format_of :url, :with =>
-  #  /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
-  ensure_index :diaspora_handle
+  scope :searchable, joins(:profile).where(:profiles => {:searchable => true})
 
-  scope :searchable, where('profile.searchable' => true)
+  def self.search(query, user)
+    return [] if query.to_s.blank? || query.to_s.length < 3
 
-  attr_accessible :profile
+    where_clause = <<-SQL
+      profiles.first_name LIKE ? OR
+      profiles.last_name LIKE ? OR
+      people.diaspora_handle LIKE ? OR
+      profiles.first_name LIKE ? OR
+      profiles.last_name LIKE ?
+    SQL
+    sql = ""
+    tokens = []
 
-  def self.search(query)
-    return [] if query.to_s.empty?
     query_tokens = query.to_s.strip.split(" ")
-    full_query_text = Regexp.escape(query.to_s.strip)
-
-    p = []
-
-    query_tokens.each do |token|
-      q = Regexp.escape(token.to_s.strip)
-      p = Person.searchable.all('profile.first_name' => /^#{q}/i, 'limit' => 30) \
- | Person.searchable.all('profile.last_name' => /^#{q}/i, 'limit' => 30) \
- | Person.searchable.all('diaspora_handle' => /^#{q}/i, 'limit' => 30) \
- | p
+    query_tokens.each_with_index do |raw_token, i|
+      token = "#{raw_token}%"
+      up_token = "#{raw_token.titleize}%"
+      sql << " OR " unless i == 0
+      sql << where_clause
+      tokens.concat([token, token, token])
+      tokens.concat([up_token, up_token])
     end
-  
-    return p
+#SELECT `people`.* FROM people
+#  INNER JOIN `profiles` ON `profiles`.person_id = `people`.id
+#  LEFT OUTER JOIN `contacts` ON (`contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id)
+#  WHERE `profiles`.searchable = true AND
+#  `profiles`.first_name LIKE '%Max%'
+#  ORDER BY `contacts`.user_id DESC
+    Person.searchable.where(sql, *tokens).joins(
+      "LEFT OUTER JOIN `contacts` ON `contacts`.user_id = #{user.id} AND `contacts`.person_id = `people`.id"
+    ).joins("LEFT OUTER JOIN `requests` ON `requests`.recipient_id = #{user.person.id} AND `requests`.sender_id = `people`.id"
+    ).order("contacts.user_id DESC", "requests.recipient_id DESC", "profiles.last_name ASC", "profiles.first_name ASC")
   end
 
-  def name
-    @name ||= if profile.first_name.nil? || profile.first_name.empty?
+  def name(opts = {})
+    @name ||= if profile.nil? || profile.first_name.nil? || profile.first_name.blank?
                 self.diaspora_handle
               else
                 "#{profile.first_name.to_s} #{profile.last_name.to_s}"
               end
   end
 
-  def owns?(post)
-    self.id == post.person.id
+  def first_name
+    @first_name ||= if profile.nil? || profile.first_name.nil? || profile.first_name.blank?
+                self.diaspora_handle.split('@').first
+              else
+                profile.first_name.to_s
+              end
+  end
+
+  def owns?(obj)
+    self == obj.author
+  end
+
+  def url
+    begin
+      uri = URI.parse(@attributes['url'])
+      url = "#{uri.scheme}://#{uri.host}"
+      url += ":#{uri.port}" unless ["80", "443"].include?(uri.port.to_s)
+      url += "/"
+    rescue Exception => e
+      url = @attributes['url']
+    end
+    url
   end
 
   def receive_url
-    "#{self.url}receive/users/#{self.id}/"
+    "#{url}receive/users/#{self.guid}/"
   end
 
   def public_url
-    "#{self.url}public/#{self.owner.username}"
+    if self.owner
+      username = self.owner.username
+    else
+      username = self.diaspora_handle.split("@")[0]
+    end
+    "#{url}public/#{username}"
   end
 
-
   def public_key_hash
     Base64.encode64 OpenSSL::Digest::SHA256.new(self.exported_key).to_s
   end
@@ -102,13 +136,13 @@ class Person
 
   def exported_key= new_key
     raise "Don't change a key" if serialized_public_key
-    @serialized_public_key = new_key
+    serialized_public_key = new_key
   end
 
   #database calls
   def self.by_account_identifier(identifier)
     identifier = identifier.strip.downcase.gsub('acct:', '')
-    self.first(:diaspora_handle => identifier)
+    self.where(:diaspora_handle => identifier).first
   end
 
   def self.local_by_account_identifier(identifier)
@@ -116,49 +150,37 @@ class Person
    (person.nil? || person.remote?) ? nil : person
   end
 
-  def self.build_from_webfinger(profile, hcard)
+  def self.create_from_webfinger(profile, hcard)
     return nil if profile.nil? || !profile.valid_diaspora_profile?
     new_person = Person.new
-    new_person.exported_key = profile.public_key
-    new_person.id = profile.guid
+    new_person.serialized_public_key = profile.public_key
+    new_person.guid = profile.guid
     new_person.diaspora_handle = profile.account
     new_person.url = profile.seed_location
 
     #hcard_profile = HCard.find profile.hcard.first[:href]
     Rails.logger.info("event=webfinger_marshal valid=#{new_person.valid?} target=#{new_person.diaspora_handle}")
     new_person.url = hcard[:url]
-    new_person.profile = Profile.new( :first_name => hcard[:given_name],
-                                      :last_name  => hcard[:family_name],
-                                      :image_url  => hcard[:photo],
-                                      :image_url_medium  => hcard[:photo_medium],
-                                      :image_url_small  => hcard[:photo_small],
-                                      :searchable => hcard[:searchable])
-
-    new_person.save! ? new_person : nil
+    new_person.profile = Profile.new(:first_name => hcard[:given_name],
+                              :last_name  => hcard[:family_name],
+                              :image_url  => hcard[:photo],
+                              :image_url_medium  => hcard[:photo_medium],
+                              :image_url_small  => hcard[:photo_small],
+                              :searchable => hcard[:searchable])
+    new_person.save!
+    new_person.profile.save!
+    new_person
   end
 
   def remote?
     owner_id.nil?
   end
-
-  def as_json(opts={})
-    {
-      :person => {
-        :id           => self.id,
-        :name         => self.name,
-        :url          => self.url,
-        :exported_key => exported_key,
-        :diaspora_handle => self.diaspora_handle
-      }
-    }
+  def local?
+    !remote?
   end
 
-  def self.from_post_comment_hash(hash)
-    person_ids = hash.values.flatten.map{|c| c.person_id}.uniq
-    people = where(:id.in => person_ids)
-    people_hash = {}
-    people.each{|p| people_hash[p.id] = p}
-    people_hash
+  def as_json(opts={})
+   {:id => self.guid, :name => self.name, :avatar => self.profile.image_url(:thumb_small), :handle => self.diaspora_handle, :url => "/people/#{self.id}"}
   end
 
   protected
@@ -173,6 +195,6 @@ class Person
 
   private
   def remove_all_traces
-    Post.all(:person_id => id).each { |p| p.delete }
+    Notification.joins(:notification_actors).where(:notification_actors => {:person_id => self.id}).all.each{ |n| n.destroy}
   end
 end

app/models/photo.rb

@@ -3,71 +3,79 @@
 #   the COPYRIGHT file.
 
 class Photo < Post
-  require 'carrierwave/orm/mongomapper'
-  include MongoMapper::Document
+  require 'carrierwave/orm/activerecord'
   mount_uploader :image, ImageUploader
 
-  xml_accessor :remote_photo
-  xml_accessor :caption
-  xml_reader :status_message_id
+  xml_attr :remote_photo_path
+  xml_attr :remote_photo_name
 
-  key :caption,  String
-  key :remote_photo_path
-  key :remote_photo_name
-  key :random_string
-
-  key :status_message_id, ObjectId
-  
-  timestamps!
+  xml_attr :caption
+  xml_attr :status_message_guid
 
   belongs_to :status_message
 
-  attr_accessible :caption
+  attr_accessible :caption, :pending
   validate :ownership_of_status_message
 
   before_destroy :ensure_user_picture
 
   def ownership_of_status_message
     message = StatusMessage.find_by_id(self.status_message_id)
-    if status_message_id && message 
-      self.diaspora_handle == message.diaspora_handle 
+    if status_message_id && message
+      self.diaspora_handle == message.diaspora_handle
     else
       true
     end
   end
 
-  def self.instantiate(params = {})
+  def self.diaspora_initialize(params = {})
     photo = super(params)
     image_file = params.delete(:user_file)
     photo.random_string = gen_random_string(10)
 
     photo.image.store! image_file
+
+    unless photo.image.url.match(/^https?:\/\//)
+      pod_url = AppConfig[:pod_url].dup
+      pod_url.chop! if AppConfig[:pod_url][-1,1] == '/'
+      remote_path = "#{pod_url}#{photo.image.url}"
+    else
+      remote_path = photo.image.url
+    end
+
+    name_start = remote_path.rindex '/'
+    photo.remote_photo_path = "#{remote_path.slice(0, name_start)}/"
+    photo.remote_photo_name = remote_path.slice(name_start + 1, remote_path.length)
+
     photo
   end
 
-  def remote_photo
-    image.url.nil? ? (remote_photo_path + '/' + remote_photo_name) : image.url
+  def status_message_guid
+    if self.status_message
+      self.status_message.guid
+    else
+      nil
+    end
   end
 
-  def remote_photo= remote_path
-    name_start = remote_path.rindex '/'
-    self.remote_photo_path = remote_path.slice(0, name_start )
-    self.remote_photo_name = remote_path.slice(name_start + 1, remote_path.length)
+  def status_message_guid= new_sm_guid
+    self.status_message= StatusMessage.where(:guid => new_sm_guid).first
   end
 
   def url(name = nil)
     if remote_photo_path
-      name = name.to_s + "_" if name
-      person.url.chop + remote_photo_path + "/" + name.to_s + remote_photo_name
+      name = name.to_s + '_' if name
+      remote_photo_path + name.to_s + remote_photo_name
     else
-      image.url name
+      image.url(name)
     end
   end
 
   def ensure_user_picture
-    people = Person.all('profile.image_url' => absolute_url(:thumb_large) )
-    people.each{ |person|
-      person.profile.update_attributes(:image_url => nil)
+    profiles = Profile.where(:image_url => url(:thumb_large))
+    profiles.each { |profile|
+      profile.image_url = nil
+      profile.save
     }
   end
 
@@ -79,12 +87,6 @@ class Photo < Post
     true
   end
 
-  def absolute_url *args
-    pod_url = APP_CONFIG[:pod_url].dup
-    pod_url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
-    "#{pod_url}#{url(*args)}"
-  end
-  
   def self.gen_random_string(len)
     chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
     string = ""
@@ -92,30 +94,19 @@ class Photo < Post
     return string
   end
 
+
   def as_json(opts={})
     {
-      :photo => {
-        :id => self.id,
+    :photo => {
+      :id => self.id,
         :url => self.url(:thumb_medium),
+        :thumb_small => self.url(:thumb_small),
         :caption => self.caption
       }
     }
   end
-  
-  def self.hash_from_post_ids post_ids
-    hash = {}
-    photos = self.on_statuses(post_ids)
-    post_ids.each do |id|
-      hash[id] = []
-    end
-    photos.each do |photo|
-      hash[photo.status_message_id] << photo
-    end
-    hash.each_value {|photos| photos.sort!{|p1, p2| p1.created_at <=> p2.created_at }}
-    hash
-  end
-  scope :on_statuses, lambda { |post_ids| 
-    where(:status_message_id.in => post_ids)
+
+  scope :on_statuses, lambda { |post_ids|
+    where(:status_message_id => post_ids)
   }
 end
-

app/models/post.rb

@@ -2,57 +2,52 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Post
-  require File.join(Rails.root, 'lib/encryptable')
-  require File.join(Rails.root, 'lib/diaspora/websocket')
-  include MongoMapper::Document
+class Post < ActiveRecord::Base
+  require File.join(Rails.root, 'lib/diaspora/web_socket')
   include ApplicationHelper
   include ROXML
   include Diaspora::Webhooks
+  include Diaspora::Guid
 
-  xml_reader :_id
-  xml_reader :diaspora_handle
-  xml_reader :public
-  xml_reader :created_at
+  xml_attr :diaspora_handle
+  xml_attr :public
+  xml_attr :created_at
 
-
-  key :public, Boolean, :default => false
-
-  key :diaspora_handle, String
-  key :user_refs, Integer, :default => 0
-  key :pending, Boolean, :default => false
-  key :aspect_ids, Array, :typecast => 'ObjectId'
-
-  many :comments, :class_name => 'Comment', :foreign_key => :post_id, :order => 'created_at ASC'
-  many :aspects, :in => :aspect_ids, :class_name => 'Aspect'
-  belongs_to :person, :class_name => 'Person'
-
-  timestamps!
+  has_many :comments, :order => 'created_at ASC'
+  has_many :post_visibilities
+  has_many :aspects, :through => :post_visibilities
+  has_many :mentions, :dependent => :destroy
+  belongs_to :author, :class_name => 'Person'
 
   cattr_reader :per_page
   @@per_page = 10
 
-  before_destroy :propogate_retraction
-  after_destroy :destroy_comments
+  after_destroy :propogate_retraction
 
-  attr_accessible :user_refs
-  
-  def self.instantiate params
+  def user_refs
+    self.post_visibilities.count
+  end
+
+  def diaspora_handle= nd
+    self.author = Person.where(:diaspora_handle => nd).first
+    write_attribute(:diaspora_handle, nd)
+  end
+
+  def self.diaspora_initialize params
     new_post = self.new params.to_hash
-    new_post.person = params[:person]
-    new_post.aspect_ids = params[:aspect_ids]
-    new_post.public = params[:public]
-    new_post.pending = params[:pending]
-    new_post.diaspora_handle = new_post.person.diaspora_handle
+    new_post.author = params[:author]
+    new_post.public = params[:public] if params[:public]
+    new_post.pending = params[:pending] if params[:pending]
+    new_post.diaspora_handle = new_post.author.diaspora_handle
     new_post
   end
 
   def as_json(opts={})
     {
-      :post => {
-        :id     => self.id,
-        :person => self.person.as_json,
-      }
+        :post => {
+            :id     => self.id,
+            :author => self.author.as_json,
+        }
     }
   end
 
@@ -60,13 +55,46 @@ class Post
     false
   end
 
-  protected
-  def destroy_comments
-    comments.each{|c| c.destroy}
+  def subscribers(user)
+    user.people_in_aspects(user.aspects_with_post(self.id))
   end
 
+  def receive(user, person)
+    #exists locally, but you dont know about it
+    #does not exsist locally, and you dont know about it
+    #exists_locally?
+    #you know about it, and it is mutable
+    #you know about it, and it is not mutable
+
+    local_post = Post.where(:guid => self.guid).first
+    if local_post && local_post.author_id == self.author_id
+      known_post = user.visible_posts(:guid => self.guid).first
+      if known_post
+        if known_post.mutable?
+          known_post.update_attributes(self.attributes)
+        else
+          Rails.logger.info("event=receive payload_type=#{self.class} update=true status=abort sender=#{self.diaspora_handle} reason=immutable existing_post=#{known_post.id}")
+        end
+      else
+        user.add_post_to_aspects(local_post)
+        user.notify_if_mentioned(local_post)
+        Rails.logger.info("event=receive payload_type=#{self.class} update=true status=complete sender=#{self.diaspora_handle} existing_post=#{local_post.id}")
+        return local_post
+      end
+    elsif !local_post
+      self.save
+      user.add_post_to_aspects(self)
+      user.notify_if_mentioned(self)
+      Rails.logger.info("event=receive payload_type=#{self.class} update=false status=complete sender=#{self.diaspora_handle}")
+      return self
+    else
+      Rails.logger.info("event=receive payload_type=#{self.class} update=true status=abort sender=#{self.diaspora_handle} reason='update not from post owner' existing_post=#{self.id}")
+    end
+  end
+
+  protected
   def propogate_retraction
-    self.person.owner.retract(self)
+    self.author.owner.retract(self) if self.author.owner
   end
 end
 

app/models/post_visibility.rb

@@ -0,0 +1,15 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class PostVisibility < ActiveRecord::Base
+
+  belongs_to :aspect
+  validates_presence_of :aspect
+
+  belongs_to :post
+  validates_presence_of :post
+  has_one :user, :through => :aspect
+  has_one :person, :through => :post, :foreign_key => :author_id
+
+end

app/models/profile.rb

@@ -2,64 +2,62 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Profile
-  include MongoMapper::EmbeddedDocument
+class Profile < ActiveRecord::Base
   require File.join(Rails.root, 'lib/diaspora/webhooks')
   include Diaspora::Webhooks
   include ROXML
 
-  xml_reader :diaspora_handle
-  xml_reader :first_name
-  xml_reader :last_name
-  xml_reader :image_url
-  xml_reader :image_url_small
-  xml_reader :image_url_medium
-  xml_reader :birthday
-  xml_reader :gender
-  xml_reader :bio
-  xml_reader :searchable
-
-  key :diaspora_handle, String
-  key :first_name, String
-  key :last_name,  String
-  key :image_url,  String
-  key :image_url_small,  String
-  key :image_url_medium,  String
-  key :birthday,   Date
-  key :gender,     String
-  key :bio,        String
-  key :searchable, Boolean, :default => true
-
-  after_validation :strip_names
-  validates_length_of :first_name, :maximum => 32
-  validates_length_of :last_name,  :maximum => 32
+  xml_attr :diaspora_handle
+  xml_attr :first_name
+  xml_attr :last_name
+  xml_attr :image_url
+  xml_attr :image_url_small
+  xml_attr :image_url_medium
+  xml_attr :birthday
+  xml_attr :gender
+  xml_attr :bio
+  xml_attr :searchable
 
   before_save :strip_names
+  after_validation :strip_names
+
+  validates_length_of :first_name, :maximum => 32
+  validates_length_of :last_name,  :maximum => 32
+  validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true
+  validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true
 
   attr_accessible :first_name, :last_name, :image_url, :image_url_medium,
     :image_url_small, :birthday, :gender, :bio, :searchable, :date
 
+  belongs_to :person
 
-  def person
-    self._parent_document
+  def subscribers(user)
+    Person.joins(:contacts).where(:contacts => {:user_id => user.id})
+  end
+
+  def receive(user, person)
+    Rails.logger.info("event=receive payload_type=profile sender=#{person} to=#{user}")
+    person.profile.update_attributes self.attributes
+
+    person.profile
   end
 
   def diaspora_handle
     #get the parent diaspora handle, unless we want to access a profile without a person
-    (self._parent_document) ? self.person.diaspora_handle : self[:diaspora_handle]
+    (self.person) ? self.person.diaspora_handle : self[:diaspora_handle]
   end
 
   def image_url(size = :thumb_large)
-    if size == :thumb_medium
-      self[:image_url_medium]
-    elsif size == :thumb_small
-      self[:image_url_small]
-    else
-      self[:image_url]
-    end
+    result = if size == :thumb_medium && self[:image_url_medium]
+               self[:image_url_medium]
+             elsif size == :thumb_small && self[:image_url_small]
+               self[:image_url_small]
+             else
+               self[:image_url]
+             end
+    result || '/images/user/default.png'
   end
 
-
   def image_url= url
     return image_url if url == ''
     if url.nil? || url.match(/^https?:\/\//)
@@ -88,10 +86,11 @@ class Profile
   end
 
   def date= params
-    if ['year', 'month', 'day'].all? { |key| params[key].present? }
+    if ['month', 'day'].all? { |key| params[key].present?  }
+      params['year'] = '1000' if params['year'].blank?
       date = Date.new(params['year'].to_i, params['month'].to_i, params['day'].to_i)
       self.birthday = date
-    elsif ['year', 'month', 'day'].all? { |key| params[key] == '' }
+    elsif [ 'year', 'month', 'day'].all? { |key| params[key].blank? }
       self.birthday = nil
     end
   end
@@ -105,8 +104,8 @@ class Profile
 
   private
   def absolutify_local_url url
-    pod_url = APP_CONFIG[:pod_url].dup
-    pod_url.chop! if APP_CONFIG[:pod_url][-1,1] == '/'
+    pod_url = AppConfig[:pod_url].dup
+    pod_url.chop! if AppConfig[:pod_url][-1,1] == '/'
     "#{pod_url}#{url}"
   end
 end

app/models/request.rb

@@ -2,115 +2,87 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Request  
+class Request < ActiveRecord::Base
   require File.join(Rails.root, 'lib/diaspora/webhooks')
-  
-  include MongoMapper::Document
-  include Magent::Async
+
+  require File.join(Rails.root, 'lib/postzord/dispatch')
   include Diaspora::Webhooks
   include ROXML
 
-  xml_reader :sender_handle
-  xml_reader :recipient_handle
+  xml_accessor :sender_handle
+  xml_accessor :recipient_handle
 
-  belongs_to :into, :class => Aspect
-  belongs_to :from, :class => Person
-  belongs_to :to,   :class => Person
-  key :sent,                  Boolean, :default => false
+  belongs_to :sender,   :class_name => 'Person'
+  belongs_to :recipient, :class_name => 'Person'
+  belongs_to :aspect
 
-  validates_presence_of :from, :to
-  validate :not_already_connected_if_sent
-  validate :not_already_connected_if_not_sent
-  validate :no_pending_request, :if => :sent
+  validates_uniqueness_of :sender_id, :scope => :recipient_id
+  validates_presence_of :sender, :recipient
+  validate :not_already_connected
   validate :not_friending_yourself
-  
-  #before_validation :clean_link
-  
-  scope :from, lambda { |person| 
-    target = (person.is_a?(User) ? person.person : person)
-    where(:from_id => target.id)
-  }
-  
-  scope :to, lambda { |person| 
-    target = (person.is_a?(User) ? person.person : person)
-    where(:to_id => target.id)
-  }
 
-
-  def self.instantiate(opts = {})
-    self.new(:from => opts[:from],
-             :to   => opts[:to],
-             :into => opts[:into],
-             :sent => true)
+  def self.diaspora_initialize(opts = {})
+    self.new(:sender => opts[:from],
+             :recipient   => opts[:to],
+             :aspect => opts[:into])
   end
 
   def reverse_for accepting_user
     Request.new(
-      :from => accepting_user.person,
-      :to => self.from
+      :sender => accepting_user.person,
+      :recipient => self.sender
     )
   end
 
-  
-  def self.send_request_accepted(user, person, aspect)
-    self.async.send_request_accepted!(user.id, person.id, aspect.id).commit!
-  end
-
-  def self.send_request_accepted!(user_id, person_id, aspect_id)
-    Notifier.request_accepted(user_id, person_id, aspect_id).deliver
-  end
-
-  def self.send_new_request(user, person)
-    self.async.send_new_request!(user.id, person.id).commit!
-  end
-
-  def self.send_new_request!(user_id, person_id)
-    Notifier.new_request(user_id, person_id).deliver
-  end
-
   def sender_handle
-    from.diaspora_handle
+    sender.diaspora_handle
   end
+
   def sender_handle= sender_handle
-    self.from = Person.first(:diaspora_handle => sender_handle)
+    self.sender = Person.where(:diaspora_handle => sender_handle).first
   end
 
   def recipient_handle
-    to.diaspora_handle
+    recipient.diaspora_handle
   end
+
   def recipient_handle= recipient_handle
-    self.to = Person.first(:diaspora_handle => recipient_handle)
+    self.recipient = Person.where(:diaspora_handle => recipient_handle).first
   end
 
   def diaspora_handle
-    self.from.diaspora_handle
+    sender_handle
+  end
+
+  def notification_type(user, person)
+    if Contact.where(:user_id => user.id, :person_id => person.id).first
+      Notifications::RequestAccepted
+    else
+      Notifications::NewRequest
+    end
+  end
+
+  def subscribers(user)
+    [self.recipient]
+  end
+
+  def receive(user, person)
+    Rails.logger.info("event=receive payload_type=request sender=#{self.sender} to=#{self.recipient}")
+    user.receive_contact_request(self)
+    self.save
+    self
   end
 
   private
-  def no_pending_request
-    if Request.first(:from_id => from_id, :to_id => to_id)
-      errors[:base] << 'You have already sent a request to that person'
-    end
-  end
 
-  def not_already_connected_if_sent
-    if self.sent
-      if Contact.first(:user_id => self.from.owner_id, :person_id => self.to.id)
-        errors[:base] << 'You have already connected to this person'
-      end
-    end
-  end
-
-  def not_already_connected_if_not_sent
-    unless self.sent
-      if Contact.first(:user_id => self.to.owner_id, :person_id => self.from.id)
-        errors[:base] << 'You have already connected to this person'
-      end
+  def not_already_connected
+    if sender && recipient && Contact.where(:user_id => self.recipient.owner_id, :person_id => self.sender.id).count > 0
+      errors[:base] << 'You have already connected to this person'
     end
   end
 
   def not_friending_yourself
-    if self.to == self.from 
+    if self.recipient == self.sender
       errors[:base] << 'You can not friend yourself'
     end
   end

app/models/retraction.rb

@@ -6,41 +6,59 @@ class Retraction
   include ROXML
   include Diaspora::Webhooks
 
-  xml_accessor :post_id
+  xml_accessor :post_guid
   xml_accessor :diaspora_handle
   xml_accessor :type
 
-  attr_accessor :person
+  attr_accessor :person, :object, :subscribers
+
+  def subscribers(user)
+    unless self.type == 'Person'
+      @subscribers ||= self.object.subscribers(user)
+    else
+      raise 'HAX: you must set the subscribers manaully before unfriending' if @subscribers.nil?
+      @subscribers
+    end
+  end
 
   def self.for(object)
     retraction = self.new
     if object.is_a? User
-      retraction.post_id = object.person.id
+      retraction.post_guid = object.person.guid
       retraction.type = object.person.class.to_s
     else
-      retraction.post_id = object.id
+      retraction.post_guid = object.guid
       retraction.type = object.class.to_s
+      retraction.object = object
     end
-    retraction.diaspora_handle = object.diaspora_handle 
+    retraction.diaspora_handle = object.diaspora_handle
     retraction
   end
 
-  def perform receiving_user_id
-    Rails.logger.debug "Performing retraction for #{post_id}"
-    if self.type.constantize.find_by_id(post_id) 
-      unless Post.first(:diaspora_handle => person.diaspora_handle, :id => post_id) 
-        Rails.logger.info("event=retraction status=abort reason='no post found authored by retractor' sender=#{person.diaspora_handle} post_id=#{post_id}")
-        raise "#{person.inspect} is trying to retract a post that either doesn't exist or is not by them"
-      end
+  def target
+    @target ||= self.type.constantize.where(:guid => post_guid).first
+  end
 
-      begin
-        Rails.logger.debug("Retracting #{self.type} id: #{self.post_id}")
-        target = self.type.constantize.first(:id => self.post_id)
-        target.unsocket_from_uid receiving_user_id if target.respond_to? :unsocket_from_uid
-        target.delete
-      rescue NameError
-        Rails.logger.info("event=retraction status=abort reason='unknown type'")
+  def perform receiving_user
+    Rails.logger.debug "Performing retraction for #{post_guid}"
+    self.target.unsocket_from_user receiving_user if target.respond_to? :unsocket_from_user
+    self.target.destroy
+    target.post_visibilities.delete_all
+    Rails.logger.info("event=retraction status=complete type=#{self.type} guid=#{self.post_guid}")
+  end
+
+  def receive(user, person)
+    if self.type == 'Person'
+      unless self.person.guid.to_s == self.post_guid.to_s
+        Rails.logger.info("event=receive status=abort reason='sender is not the person he is trying to retract' recipient=#{self.diaspora_handle} sender=#{self.person.diaspora_handle} payload_type=#{self.class} retraction_type=person")
+        return
       end
+      user.disconnected_by(self.target)
+    elsif self.target.nil? || self.target.author != self.person
+      Rails.logger.info("event=retraction status=abort reason='no post found authored by retractor' sender=#{person.diaspora_handle} post_guid=#{post_guid}")
+    else
+      self.perform(user)
     end
+    self
   end
 end

app/models/service.rb

@@ -2,14 +2,18 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-class Service
-  include MongoMapper::Document
+class Service < ActiveRecord::Base
+  include ActionView::Helpers::TextHelper
 
   belongs_to :user
 
-  key :provider, String
-  key :uid, String
-  key :access_token, String
-  key :access_secret, String
-  key :nickname, String
+  def public_message(post, length, url = "")
+    url = "" if post.respond_to?(:photos) && post.photos.count == 0
+    space_for_url = url.blank? ? 0 : (url.length + 1)
+    truncated = truncate(post.message(:plain_text => true), :length => (length - space_for_url))
+    truncated = "#{truncated} #{url}" unless url.blank?
+    return truncated
+  end
 end
+require File.join(Rails.root, 'app/models/services/facebook')
+require File.join(Rails.root, 'app/models/services/twitter')

app/models/services/facebook.rb

@@ -0,0 +1,65 @@
+class Services::Facebook < Service
+  MAX_CHARACTERS = 420
+
+  def provider
+    "facebook"
+  end
+
+  def post(post, url='')
+    Rails.logger.debug("event=post_to_service type=facebook sender_id=#{self.user_id}")
+    message = public_message(post, url)
+    begin
+      RestClient.post("https://graph.facebook.com/me/feed", :message => message, :access_token => self.access_token)
+    rescue Exception => e
+      Rails.logger.info("#{e.message} failed to post to facebook")
+    end
+  end
+
+  def public_message(post, url)
+    super(post, MAX_CHARACTERS,  url)
+  end
+
+  def finder(opts = {})
+    Rails.logger.debug("event=friend_finder type=facebook sender_id=#{self.user_id}")
+    response = RestClient.get("https://graph.facebook.com/me/friends", {:params => {:access_token => self.access_token}})
+    data = JSON.parse(response.body)['data']
+
+    data_h = {}
+    data.each do |d|
+      data_h[d['id']] = {:name => d['name']}
+    end
+
+    invitation_objects = Invitation.joins(:recipient).where(:sender_id => self.user_id,
+                                                            :users => {:invitation_service => 'facebook',
+                                                                       :invitation_identifier => data_h.keys})
+
+    invitation_objects.each do |inv|
+      data_h[inv.recipient.invitation_identifier][:invitation_id] = inv.id
+    end
+
+    service_objects = Services::Facebook.where(:uid => data_h.keys).includes(:user => {:person => :profile})
+    person_ids_and_uids = {}
+
+    service_objects.each do |s|
+      data_h[s.uid][:person] = s.user.person if s.user.person.profile.searchable
+      person_ids_and_uids[s.user.person.id] = s.uid
+    end
+
+    requests = Request.where(:recipient_id => self.user.person.id, :sender_id => person_ids_and_uids.keys).all
+    requests.each{|r| data_h[person_ids_and_uids[r.sender_id]][:request] = r}
+
+
+    contact_objects = Contact.unscoped.where(:user_id => self.user.id, :person_id => person_ids_and_uids.keys)
+    contact_objects.each{|c| data_h[person_ids_and_uids[c.person_id]][:contact] = c}
+
+    if opts[:local]
+      data_h.delete_if {|key, value| value[:person].nil? }
+    end
+
+   if opts[:remote]
+      data_h.delete_if {|key, value| !value[:person].nil? }
+    end
+
+    data_h
+  end
+end

app/models/services/twitter.rb

@@ -0,0 +1,36 @@
+class Services::Twitter < Service
+  MAX_CHARACTERS = 140
+
+  def provider
+    "twitter"
+  end
+
+  def post(post, url='')
+    Rails.logger.debug("event=post_to_service type=twitter sender_id=#{self.user_id}")
+    message = public_message(post, url)
+
+    twitter_key = SERVICES['twitter']['consumer_key']
+    twitter_consumer_secret = SERVICES['twitter']['consumer_secret']
+
+    if twitter_consumer_secret.blank? || twitter_consumer_secret.blank?
+      Rails.logger.info "you have a blank twitter key or secret.... you should look into that"
+    end
+
+    Twitter.configure do |config|
+      config.consumer_key = twitter_key
+      config.consumer_secret = twitter_consumer_secret
+      config.oauth_token = self.access_token
+      config.oauth_token_secret = self.access_secret
+    end
+
+    begin
+      Twitter.update(message)
+    rescue Exception => e
+      Rails.logger.info e.message
+    end
+  end
+
+  def public_message(post, url)
+    super(post, MAX_CHARACTERS,  url)
+  end
+end

app/models/status_message.rb

@@ -6,41 +6,139 @@ class StatusMessage < Post
   include Diaspora::Socketable
   include YoutubeTitles
   require File.join(Rails.root, 'lib/youtube_titles')
-  
+  include ActionView::Helpers::TextHelper
+
+  acts_as_taggable_on :tags
+
   validates_length_of :message, :maximum => 1000, :message => "please make your status messages less than 1000 characters"
   xml_name :status_message
-  xml_reader :message
+  xml_attr :raw_message
 
-  key :message, String
-  many :photos, :class => Photo, :foreign_key => :status_message_id
+  has_many :photos, :dependent => :destroy
   validate :message_or_photos_present?
 
   attr_accessible :message
 
+  serialize :youtube_titles, Hash
   before_save do
     get_youtube_title message
   end
+
+  before_create :build_tags
+
+  def message(opts = {})
+    self.formatted_message(opts)
+  end
+
+  def raw_message
+    read_attribute(:message)
+  end
+  def raw_message=(text)
+    write_attribute(:message, text)
+  end
+
+  def formatted_message(opts={})
+    return self.raw_message unless self.raw_message
+
+    escaped_message = opts[:plain_text] ? self.raw_message: ERB::Util.h(self.raw_message)
+    mentioned_message = self.format_mentions(escaped_message, opts)
+    self.format_tags(mentioned_message, opts)
+  end
+
+  def format_tags(text, opts={})
+    return text if opts[:plain_text]
+    regex = /(^|\s)#(\w+)/
+    form_message = text.gsub(regex) do |matched_string|
+      "#{$~[1]}<a href=\"/p?tag=#{$~[2]}\" class=\"tag\">##{ERB::Util.h($~[2])}</a>"
+    end
+    form_message
+  end
+
+  def format_mentions(text, opts = {})
+    people = self.mentioned_people
+    regex = /@\{([^;]+); ([^\}]+)\}/
+    form_message = text.gsub(regex) do |matched_string|
+      person = people.detect{ |p|
+        p.diaspora_handle == $~[2] unless p.nil?
+      }
+
+      if opts[:plain_text]
+        person ? ERB::Util.h(person.name) : ERB::Util.h($~[1])
+      else
+        person ? "<a href=\"/people/#{person.id}\" class=\"mention\">@#{ERB::Util.h(person.name)}</a>" : ERB::Util.h($~[1])
+      end
+    end
+    form_message
+  end
+
+  def mentioned_people
+    if self.persisted?
+      create_mentions if self.mentions.empty?
+      self.mentions.includes(:person => :profile).map{ |mention| mention.person }
+    else
+      mentioned_people_from_string
+    end
+  end
+
+  def create_mentions
+    mentioned_people_from_string.each do |person|
+      self.mentions.create(:person => person)
+    end
+  end
+
+  def mentions?(person)
+    mentioned_people.include? person
+  end
+
+  def notify_person(person)
+    self.mentions.where(:person_id => person.id).first.try(:notify_recipient)
+  end
+
+  def mentioned_people_from_string
+    regex = /@\{([^;]+); ([^\}]+)\}/
+    identifiers = self.raw_message.scan(regex).map do |match|
+      match.last
+    end
+    identifiers.empty? ? [] : Person.where(:diaspora_handle => identifiers)
+  end
+
+  def build_tags
+    self.tag_list = tag_strings
+  end
+
+  def tag_strings
+    regex = /(?:^|\s)#(\w+)/
+    matches = self.raw_message.scan(regex).map do |match|
+      match.last
+    end
+    unique_matches = matches.inject(Hash.new) do |h,element|
+      h[element.downcase] = element unless h[element.downcase]
+      h
+    end
+    unique_matches.values
+  end
+
   def to_activity
-        <<-XML
+    <<-XML
   <entry>
-    <title>#{self.message}</title>
-    <link rel="alternate" type="text/html" href="#{person.url}status_messages/#{self.id}"/>
-    <id>#{person.url}status_messages/#{self.id}</id>
+    <title>#{x(self.formatted_message(:plain_text => true))}</title>
+    <content>#{x(self.formatted_message(:plain_text => true))}</content>
+    <link rel="alternate" type="text/html" href="#{self.author.url}p/#{self.id}"/>
+    <id>#{self.author.url}posts/#{self.id}</id>
     <published>#{self.created_at.xmlschema}</published>
     <updated>#{self.updated_at.xmlschema}</updated>
     <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
     <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
   </entry>
-        XML
+      XML
   end
 
   protected
 
   def message_or_photos_present?
-    unless !self.message.blank? || self.photos.count > 0
+    if self.message.blank? && self.photos == []
       errors[:base] << 'Status message requires a message or at least one photo'
     end
   end
-
 end
 

app/models/user.rb

@@ -4,66 +4,67 @@
 
 require File.join(Rails.root, 'lib/diaspora/user')
 require File.join(Rails.root, 'lib/salmon/salmon')
+require File.join(Rails.root, 'lib/postzord/dispatch')
+require 'rest-client'
 
-class User
-  include MongoMapper::Document
+class User < ActiveRecord::Base
   include Diaspora::UserModules
   include Encryptor::Private
 
-  plugin MongoMapper::Devise
-
-  QUEUE = MessageHandler.new
-
   devise :invitable, :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-  key :username
-  key :serialized_private_key, String
-  key :invites, Integer, :default => 5
-  key :invitation_token, String
-  key :invitation_sent_at, DateTime
-  key :pending_request_ids, Array, :typecast => 'ObjectId'
-  key :visible_post_ids, Array, :typecast => 'ObjectId'
-  key :visible_person_ids, Array, :typecast => 'ObjectId'
-
-  key :getting_started, Boolean, :default => true
-
-  key :language, String
-  key :grammatical_gender, String
+         :recoverable, :rememberable, :trackable, :validatable,
+         :timeoutable
 
   before_validation :strip_and_downcase_username, :on => :create
   before_validation :set_current_language, :on => :create
 
   validates_presence_of :username
   validates_uniqueness_of :username, :case_sensitive => false
-  validates_format_of :username, :with => /\A[A-Za-z0-9_.]+\z/
+  validates_format_of :username, :with => /\A[A-Za-z0-9_]+\z/
   validates_length_of :username, :maximum => 32
   validates_inclusion_of :language, :in => AVAILABLE_LANGUAGE_CODES
-  validates_inclusion_of :grammatical_gender, :in => I18n::Backend::Genderize::known_genders + [nil]
 
   validates_presence_of :person, :unless => proc {|user| user.invitation_token.present?}
   validates_associated :person
 
-  one :person, :class => Person, :foreign_key => :owner_id
+  has_one :person, :foreign_key => :owner_id
+  delegate :public_key, :posts, :owns?, :diaspora_handle, :name, :public_url, :profile, :first_name, :last_name, :to => :person
 
-  many :invitations_from_me, :class => Invitation, :foreign_key => :from_id
-  many :invitations_to_me, :class => Invitation, :foreign_key => :to_id
-  many :contacts, :class => Contact, :foreign_key => :user_id
-  many :visible_people, :in => :visible_person_ids, :class => Person # One of these needs to go
-  many :pending_requests, :in => :pending_request_ids, :class => Request
-  many :raw_visible_posts, :in => :visible_post_ids, :class => Post
-  many :aspects, :class => Aspect, :dependent => :destroy
+  has_many :invitations_from_me, :class_name => 'Invitation', :foreign_key => :sender_id
+  has_many :invitations_to_me, :class_name => 'Invitation', :foreign_key => :recipient_id
+  has_many :aspects
+  has_many :aspect_memberships, :through => :aspects
+  has_many :contacts
+  has_many :contact_people, :through => :contacts, :source => :person
+  has_many :services
+  has_many :user_preferences  
 
-  many :services, :class => Service
-
-  #after_create :seed_aspects
-
-  before_destroy :disconnect_everyone, :remove_person
+  before_destroy :disconnect_everyone, :remove_mentions, :remove_person
   before_save do
-    person.save if person
+    person.save if person && person.changed?
   end
 
-  attr_accessible :getting_started, :password, :password_confirmation, :language, :grammatical_gender
+  attr_accessible :getting_started, :password, :password_confirmation, :language, :disable_mail
+
+  def update_user_preferences(pref_hash)
+    if self.disable_mail
+      mails = ['mentioned', 'request_received', 'comment_on_post', 'request_acceptance', 'also_commented', 'private_message']
+      mails.each{|x| self.user_preferences.find_or_create_by_email_type(x)}
+      self.disable_mail = false
+      self.save
+    end
+    
+    pref_hash.keys.each do |key|
+      if pref_hash[key] == 'true'
+        self.user_preferences.find_or_create_by_email_type(key)
+      else
+        block = self.user_preferences.where(:email_type => key).first
+        if block
+          block.destroy
+        end
+      end
+    end
+  end
 
   def strip_and_downcase_username
     if username.present?
@@ -77,133 +78,73 @@ class User
   end
 
   def self.find_for_authentication(conditions={})
+    conditions[:username] = conditions[:username].downcase
     if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
       conditions[:email] = conditions.delete(:username)
     end
-    super
-  end
-
-  def has_incoming_request_from(person)
-    self.pending_requests.select do |req|
-      req.to_id == self.person.id
-    end.any? { |req| req.from_id == person.id }
-  end
-
-  ######## Making things work ########
-  key :email, String
-
-  def method_missing(method, *args)
-    self.person.send(method, *args) if self.person
+    super(conditions)
   end
 
   ######### Aspects ######################
   def drop_aspect(aspect)
-    if aspect.contacts.count == 0
       aspect.destroy
+  end
+
+  def move_contact(person, to_aspect, from_aspect)
+    return true if to_aspect == from_aspect
+    contact = contact_for(person)
+    if add_contact_to_aspect(contact, to_aspect)
+      membership = contact ? contact.aspect_memberships.where(:aspect_id => from_aspect.id).first : nil
+      return ( membership && membership.destroy )
     else
-      raise "Aspect not empty"
+      false
     end
   end
 
-  def move_contact(opts = {})
-    if opts[:to] == opts[:from]
-      true
-    elsif opts[:person_id] && opts[:to] && opts[:from]
-      from_aspect = self.aspects.find_by_id(opts[:from])
-
-      if add_person_to_aspect(opts[:person_id], opts[:to])
-        delete_person_from_aspect(opts[:person_id], opts[:from])
-      end
-    end
-  end
-
-  def add_person_to_aspect(person_id, aspect_id)
-    contact = contact_for(Person.find(person_id))
-    raise "Can not add person to an aspect you do not own" unless aspect = self.aspects.find_by_id(aspect_id)
-    raise "Can not add person you are not connected to" unless contact
-    raise 'Can not add person who is already in the aspect' if aspect.contacts.include?(contact)
-    contact.aspects << aspect
-    contact.save!
-    aspect.save!
-  end
-
-  def delete_person_from_aspect(person_id, aspect_id, opts = {})
-    aspect = Aspect.find(aspect_id)
-    raise "Can not delete a person from an aspect you do not own" unless aspect.user == self
-    contact = contact_for Person.find(person_id)
-
-    if opts[:force] || contact.aspect_ids.count > 1
-      contact.aspect_ids.delete aspect.id
-      contact.save!
-      aspect.save!
-    else
-      raise "Can not delete a person from last aspect"
-    end
+  def add_contact_to_aspect(contact, aspect)
+    return true if contact.aspect_memberships.where(:aspect_id => aspect.id).count > 0
+    contact.aspect_memberships.create!(:aspect => aspect)
   end
 
   ######## Posting ########
-  def post(class_name, opts = {})
-    post = build_post(class_name, opts)
-
-    if post.save
-      raise 'MongoMapper failed to catch a failed save' unless post.id
-      add_to_streams(post, opts[:to])
-      dispatch_post(post, :to => opts[:to])
-    end
-    post
-  end
-
   def build_post(class_name, opts = {})
-    opts[:person] = self.person
-    opts[:diaspora_handle] = opts[:person].diaspora_handle
+    opts[:author] = self.person
+    opts[:diaspora_handle] = opts[:author].diaspora_handle
 
     model_class = class_name.to_s.camelize.constantize
-    model_class.instantiate(opts)
+    model_class.diaspora_initialize(opts)
   end
 
   def dispatch_post(post, opts = {})
-    aspect_ids = opts.delete(:to)
-
-    #socket post
-    Rails.logger.info("event=dispatch user=#{diaspora_handle} post=#{post.id.to_s}")
-    push_to_aspects(post, aspects_from_ids(aspect_ids))
-
-    if post.public
-      self.services.each do |service|
-        self.send("post_to_#{service.provider}".to_sym, service, post.message)
-      end
-    end
-  end
-
-  def post_to_facebook(service, message)
-    Rails.logger.info("Sending a message: #{message} to Facebook")
-    EventMachine::HttpRequest.new("https://graph.facebook.com/me/feed?message=#{message}&access_token=#{service.access_token}").post
-  end
-
-  def post_to_twitter(service, message)
-    oauth = Twitter::OAuth.new(SERVICES['twitter']['consumer_token'], SERVICES['twitter']['consumer_secret'])
-    oauth.authorize_from_access(service.access_token, service.access_secret)
-    client = Twitter::Base.new(oauth)
-    client.update(message)
+    mailman = Postzord::Dispatch.new(self, post)
+    mailman.post(opts)
   end
 
   def update_post(post, post_hash = {})
     if self.owns? post
       post.update_attributes(post_hash)
-      aspects = aspects_with_post(post.id)
-      self.push_to_aspects(post, aspects)
+      Postzord::Dispatch.new(self, post).post
     end
   end
 
-  def add_to_streams(post, aspect_ids)
-    self.raw_visible_posts << post
-    self.save
+  def notify_if_mentioned(post)
+    return unless self.contact_for(post.author) && post.respond_to?(:mentions?)
 
-    post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to? :socket_to_uid
-    target_aspects = aspects_from_ids(aspect_ids)
-    target_aspects.each do |aspect|
+    post.notify_person(self.person) if post.mentions? self.person
+  end
+
+  def add_post_to_aspects(post)
+    return unless self.contact_for(post.author)
+
+    Rails.logger.debug("event=add_post_to_aspects user_id=#{self.id} post_id=#{post.id}")
+    add_to_streams(post, self.aspects_with_person(post.author))
+    post
+  end
+
+  def add_to_streams(post, aspects_to_insert)
+    post.socket_to_user(self, :aspect_ids => aspects_to_insert.map{|x| x.id}) if post.respond_to? :socket_to_user
+    aspects_to_insert.each do |aspect|
       aspect.posts << post
-      aspect.save
     end
   end
 
@@ -211,124 +152,61 @@ class User
     if aspect_ids == "all" || aspect_ids == :all
       self.aspects
     else
-      if aspect_ids.respond_to? :to_id
-        aspect_ids = [aspect_ids]
-      end
-      aspect_ids.map!{ |x| x.to_id }
-      aspects.all(:id.in => aspect_ids)
+      aspects.where(:id => aspect_ids)
     end
   end
 
-  def push_to_aspects(post, aspects)
-    #send to the aspects
-    target_contacts = aspects.inject([]) { |contacts,aspect|
-      contacts = contacts | aspect.contacts
-    }
-
-    push_to_hub(post) if post.respond_to?(:public) && post.public
-    push_to_people(post, self.person_objects(target_contacts))
-  end
-
-  def push_to_people(post, people)
-    salmon = salmon(post)
-    people.each do |person|
-      push_to_person(salmon, post, person)
-    end
-  end
-
-  def push_to_person(salmon, post, person)
-    person.reload # Sadly, we need this for Ruby 1.9.
-    # person.owner will always return a ProxyObject.
-    # calling nil? performs a necessary evaluation.
-    if person.owner_id
-      Rails.logger.info("event=push_to_person route=local sender=#{self.diaspora_handle} recipient=#{person.diaspora_handle} payload_type=#{post.class}")
-      person.owner.receive(post.to_diaspora_xml, self.person)
-    else
-      xml = salmon.xml_for person
-      Rails.logger.info("event=push_to_person route=remote sender=#{self.diaspora_handle} recipient=#{person.diaspora_handle} payload_type=#{post.class}")
-      QUEUE.add_post_request(person.receive_url, xml)
-      QUEUE.process
-    end
-  end
-
-  def push_to_hub(post)
-    Rails.logger.debug("event=push_to_hub target=#{APP_CONFIG[:pubsub_server]} sender_url=#{self.public_url}")
-    QUEUE.add_hub_notification(APP_CONFIG[:pubsub_server], self.public_url)
-  end
-
   def salmon(post)
-    created_salmon = Salmon::SalmonSlap.create(self, post.to_diaspora_xml)
-    created_salmon
+    Salmon::SalmonSlap.create(self, post.to_diaspora_xml)
   end
 
   ######## Commenting  ########
-  def comment(text, options = {})
-    comment = build_comment(text, options)
-
-    if comment.save
-      raise 'MongoMapper failed to catch a failed save' unless comment.id
-      dispatch_comment comment
-    end
-    comment
-  end
-
   def build_comment(text, options = {})
-    comment = Comment.new(:person_id => self.person.id,
-                          :diaspora_handle => self.person.diaspora_handle,
+    comment = Comment.new(:author_id => self.person.id,
                           :text => text,
                           :post => options[:on])
-
+    comment.set_guid
     #sign comment as commenter
-    comment.creator_signature = comment.sign_with_key(self.encryption_key)
+    comment.author_signature = comment.sign_with_key(self.encryption_key)
 
-    if !comment.post_id.blank? && owns?(comment.post)
+    if !comment.post_id.blank? && person.owns?(comment.parent)
       #sign comment as post owner
-      comment.post_creator_signature = comment.sign_with_key(self.encryption_key)
+      comment.parent_author_signature = comment.sign_with_key(self.encryption_key)
     end
 
     comment
   end
 
-  def dispatch_comment(comment)
-    if owns? comment.post
-      #push DOWNSTREAM (to original audience)
-      Rails.logger.info "event=dispatch_comment direction=downstream user=#{self.diaspora_handle} comment=#{comment.id}"
-      aspects = aspects_with_post(comment.post_id)
-    
-      #just socket to local users, as the comment has already
-      #been associated and saved by post owner
-      #  (we'll push to all of their aspects for now, the comment won't
-      #   show up via js where corresponding posts are not present)
-
-      people_in_aspects(aspects, :type => 'local').each do |person|
-        comment.socket_to_uid(person.owner_id, :aspect_ids => 'all')
-      end
-
-      #push to remote people
-      push_to_people(comment, people_in_aspects(aspects, :type => 'remote'))
-
-    elsif owns? comment
-      #push UPSTREAM (to poster)
-      Rails.logger.info "event=dispatch_comment direction=upstream user=#{self.diaspora_handle} comment=#{comment.id}"
-      push_to_people comment, [comment.post.person]
+  ######### Mailer #######################
+  def mail(job, *args)
+    pref = job.to_s.gsub('Job::Mail', '').underscore
+    unless self.disable_mail || self.user_preferences.exists?(:email_type => pref)
+      Resque.enqueue(job, *args)
     end
   end
 
   ######### Posts and Such ###############
   def retract(post)
-    aspect_ids = aspects_with_post(post.id)
-    aspect_ids.map! { |aspect| aspect.id.to_s }
+    aspects = post.aspects
 
-    post.unsocket_from_uid(self.id, :aspect_ids => aspect_ids) if post.respond_to? :unsocket_from_uid
     retraction = Retraction.for(post)
-    push_to_people retraction, people_in_aspects(aspects_with_post(post.id))
+    post.unsocket_from_user(self, :aspect_ids => aspects.map { |a| a.id.to_s }) if post.respond_to? :unsocket_from_user
+    mailman = Postzord::Dispatch.new(self, retraction)
+    mailman.post
+
     retraction
   end
 
   ########### Profile ######################
   def update_profile(params)
+    if photo = params.delete(:photo)
+      photo.update_attributes(:pending => false) if photo.pending
+      params[:image_url] = photo.url(:thumb_large)
+      params[:image_url_medium] = photo.url(:thumb_medium)
+      params[:image_url_small] = photo.url(:thumb_small)
+    end
     if self.person.profile.update_attributes(params)
-      push_to_aspects profile, aspects
+      Postzord::Dispatch.new(self, profile).post
       true
     else
       false
@@ -336,88 +214,80 @@ class User
   end
 
   ###Invitations############
-  def invite_user(opts = {})
-    aspect_id = opts.delete(:aspect_id)
-    if aspect_id == nil
-      raise "Must invite into aspect"
-    end
-    aspect_object = self.aspects.find_by_id(aspect_id)
-    if !(aspect_object)
-      raise "Must invite to your aspect"
-    else
-      Invitation.invite(:email => opts[:email],
+  def invite_user(aspect_id, service, identifier, invite_message = "")
+    aspect = aspects.find(aspect_id)
+    if aspect
+      Invitation.invite(:service => service,
+                        :identifier => identifier,
                         :from => self,
-                        :into => aspect_object,
-                        :message => opts[:invite_message])
-
+                        :into => aspect,
+                        :message => invite_message)
+    else
+      false
     end
   end
 
   def accept_invitation!(opts = {})
-    if self.invited?
-      log_string = "event=invitation_accepted username=#{opts[:username]} "
-      log_string << "inviter=#{invitations_to_me.first.from.diaspora_handle}" if invitations_to_me.first
+    log_string = "event=invitation_accepted username=#{opts[:username]} uid=#{self.id} "
+    log_string << "inviter=#{invitations_to_me.first.sender.diaspora_handle} " if invitations_to_me.first
+    begin
+      if self.invited?
+        self.setup(opts)
+        self.invitation_token = nil
+        self.password              = opts[:password]
+        self.password_confirmation = opts[:password_confirmation]
+        self.save!
+        invitations_to_me.each{|invitation| invitation.to_request!}
+        log_string << "success"
+        Rails.logger.info log_string
+
+        self.reload # Because to_request adds a request and saves elsewhere
+        self
+      end
+    rescue Exception => e
+      log_string << "failure"
       Rails.logger.info log_string
-      self.setup(opts)
-
-      self.invitation_token = nil
-      self.password              = opts[:password]
-      self.password_confirmation = opts[:password_confirmation]
-      self.person.save!
-      self.save!
-      invitations_to_me.each{|invitation| invitation.to_request!}
-
-      self.reload # Because to_request adds a request and saves elsewhere
-      self
+      raise e
     end
   end
 
   ###Helpers############
   def self.build(opts = {})
     u = User.new(opts)
-    u.email = opts[:email]
     u.setup(opts)
     u
   end
 
   def setup(opts)
     self.username = opts[:username]
+    self.email = opts[:email]
     self.valid?
     errors = self.errors
     errors.delete :person
     return if errors.size > 0
 
     opts[:person] ||= {}
-    opts[:person][:profile] ||= Profile.new
+    unless opts[:person][:profile].is_a?(Profile)
+      opts[:person][:profile] ||= Profile.new
+      opts[:person][:profile] = Profile.new(opts[:person][:profile])
+    end
 
     self.person = Person.new(opts[:person])
-    self.person.diaspora_handle = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
-    self.person.url = APP_CONFIG[:pod_url]
-    new_key = User.generate_key
-    self.serialized_private_key = new_key
-    self.person.serialized_public_key = new_key.public_key
+    self.person.diaspora_handle = "#{opts[:username]}@#{AppConfig[:pod_uri].host}"
+    self.person.url = AppConfig[:pod_url]
+
+
+    self.serialized_private_key = User.generate_key if self.serialized_private_key.blank?
+    self.person.serialized_public_key = OpenSSL::PKey::RSA.new(self.serialized_private_key).public_key
 
     self
   end
 
-
   def seed_aspects
     self.aspects.create(:name => I18n.t('aspects.seed.family'))
     self.aspects.create(:name => I18n.t('aspects.seed.work'))
   end
 
-  def as_json(opts={})
-    {
-      :user => {
-        :posts            => self.raw_visible_posts.each { |post| post.as_json },
-        :contacts         => self.contacts.each { |contact| contact.as_json },
-        :aspects          => self.aspects.each { |aspect| aspect.as_json },
-        :pending_requests => self.pending_requests.each { |request| request.as_json },
-      }
-    }
-  end
-
-
   def self.generate_key
     key_size = (Rails.env == 'test' ? 512 : 4096)
     OpenSSL::PKey::RSA::generate key_size
@@ -434,12 +304,21 @@ class User
   end
 
   def disconnect_everyone
-    contacts.each { |contact|
-      if contact.person.owner?
+    Contact.unscoped.where(:user_id => self.id).each { |contact|
+      if contact.person.owner_id
         contact.person.owner.disconnected_by self.person
+        remove_contact(contact)
       else
         self.disconnect contact
       end
     }
+    self.aspects.delete_all
   end
+
+  def remove_mentions
+    Mention.where( :person_id => self.person.id).each do |mentioned_person|
+      mentioned_person.delete
+    end
+  end
+
 end

app/models/user_preference.rb

@@ -0,0 +1,21 @@
+class UserPreference < ActiveRecord::Base
+  belongs_to :user
+
+  validate :must_be_valid_email_type
+  
+
+  def must_be_valid_email_type
+    unless valid_email_types.include?(self.email_type)
+      errors.add(:email_type, 'supplied mail type is not a valid or known email type')
+    end
+  end
+
+  def valid_email_types
+    ["mentioned",
+   "comment_on_post",
+   "private_message",
+   "request_acceptence",
+   "request_received",
+   "also_commented"]
+  end
+end

app/uploaders/image_uploader.rb

@@ -5,8 +5,6 @@
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
-
-
   def store_dir
     "uploads/images"
   end
@@ -19,8 +17,6 @@ class ImageUploader < CarrierWave::Uploader::Base
     model.random_string + model.id.to_s + File.extname(@filename) if @filename
   end
 
-
-
   version :thumb_small do
     process :resize_to_fill => [50,50]
   end

app/views/admins/user_search.html.haml

@@ -0,0 +1,41 @@
+
+%h3
+  = form_tag 'admin_inviter', :method => :get do
+    email to invite:
+    = text_field_tag 'identifier'
+    = submit_tag 'invite'
+
+
+
+%h3
+  user search
+= form_tag 'user_search', :method => :get do
+  username:
+  = text_field_tag 'user[username]', params[:user][:username]
+  
+  email:
+  = text_field_tag 'user[email]', params[:user][:email]
+
+  invitation identifier 
+  = text_field_tag 'user[invitation_identifier]', params[:user][:invitation_identifier]
+
+  invitation token:
+  = text_field_tag 'user[invitation_token]', params[:user][:invitation_token]
+  = submit_tag 'go'
+
+
+= "#{@users.count} users found"
+%br
+%br
+= for user in @users
+  = user.inspect
+  %br
+  - if user.person
+    = user.person.inspect
+    %br
+    - if user.person.profile
+      = user.person.profile.inspect
+    %br
+  = "invite token: #{accept_invitation_url(user, :invitation_token => user.invitation_token)}" if user.invitation_token 
+  %br
+  %br

app/views/aspect_memberships/_add_to_aspect.haml

@@ -2,4 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= link_to t('.new', :type => object.class.to_s, :from => object.person.name), object_path(object.post)
+
+= remove_from_aspect_button(aspect_id,person_id)
+

app/views/aspect_memberships/_remove_from_aspect.haml

@@ -0,0 +1,7 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+= aspect_membership_button(aspect, contact, person)
+

app/views/aspect_memberships/remove_from_aspect.js.haml

@@ -3,5 +3,5 @@
 -#   the COPYRIGHT file.
 
 
-= add_to_aspect_button(@aspect_id,@person_id)
+= aspect_membership_button(aspect, person, contact)
 

app/views/aspects/_aspect.haml

@@ -0,0 +1,12 @@
+%li{:data=>{:guid=>aspect.id}, :class => ("dull" if contacts.size == 0)}
+  .right
+    %b
+      = link_to t('contacts', :count => contacts.size), edit_aspect_path(aspect), :rel => 'facebox'
+  %b
+    = link_to aspect.name, edit_aspect_path(aspect), :rel => 'facebox', :class => 'name'
+  %br
+
+  - if contacts.length > 0
+    .contacts
+      - for contact in contacts[0..15]
+        = person_image_link(contact.person)

app/views/aspects/_aspect_badge.haml

@@ -0,0 +1,7 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+.aspect_badge.single{:guid=>aspect.id}
+  = link_to aspect.name, aspect

app/views/aspects/_aspect_contacts.haml

@@ -0,0 +1,30 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+- content_for :head do
+  =javascript_include_tag 'aspect-contacts'
+  :javascript
+    EditPane.setTranslations({
+      doneEditing: "#{t('.done_editing')}",
+      editAspect:"#{t('aspects.show.edit_aspect')}"
+    });
+
+  - if aspect.contacts.count == 0
+    :javascript
+      $(document).ready(function(){
+        EditPane.fadeIn();
+      });
+
+#left_pane
+  .section.contact_pictures
+    - for contact in contacts
+      = person_image_link(contact[:person])
+
+    %br
+    %br
+    %br
+    .section
+      %h3= t('shared.invitations.invites')
+      = render "shared/invitations", :invites => @invites
+