bump to 0.5.0.1

GET requests don't get any CSRF protection by Rails,
thus these sensitive actions should be better protected.

Thanks to @tomekr for the report.

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[{Gemfile,Rakefile,Guardfile,Procfile}]
+trim_trailing_whitespace = true
+
+[*.{js,hbs,rb,rake,ru,erb,haml,scss,sh,md}]
+trim_trailing_whitespace = true
+
+[*.yml]
+trim_trailing_whitespace = false

.foreman

@@ -1,2 +1,2 @@
 port: 3000
-formation: web=1,worker=0
+formation: xmpp=0,web=1,sidekiq=0

.gitignore

@@ -1,6 +1,11 @@
+# xmpp certificates, keys and user data
+config/vines/*.crt
+config/vines/*.key
+
 #trademark sillyness
 app/views/home/_show.*
-app/assets/images/custom/*
+app/views/terms/terms.*
+app/assets/images/custom/
 
 
 # Configuration files
@@ -9,9 +14,10 @@ config/heroku.yml
 config/initializers/secret_token.rb
 config/redis.conf
 config/deploy_config.yml
+config/schedule.rb
 .bundle
-vendor/bundle/*
-vendor/cache/*
+vendor/bundle/
+vendor/cache/
 config/database.yml
 .rvmrc_custom
 .rvmrc.local
@@ -21,29 +27,37 @@ config/email_offset
 config/mailing_list.csv
 
 # Generated files
-log/*
+log/
 public/stylesheets/*.css
 public/diaspora
 spec/fixtures/*.y*ml
 spec/fixtures/*.fixture.*
-coverage/*
-xml_locales/*
+coverage/
+xml_locales/
+public/404.html
+public/422.html
+public/500.html
+
+# Sprites
+app/assets/images/branding-*.png
+app/assets/images/icons-*.png
+app/assets/images/social_media_logos-*.png
 
 #Documentation
 .yardoc/
 doc/
 
 # Uploaded files and local files
-public/uploads/*
-public/assets/*
+public/uploads/
+public/assets/
 public/source.tar*
 public/.well-known
-tmp/**/*
-tmp/*
+tmp/**/
+tmp/
 *.sqlite3
 
 # Temporary files of every sort
-.sass-cache/*
+.sass-cache/
 .DS_Store
 .idea
 .redcar
@@ -54,7 +68,6 @@ tmp/*
 *.swp
 *~
 *#
-bin/*
 nbproject
 patches-*
 capybara-*.html
@@ -63,6 +76,8 @@ dump.rdb
 #Rubinius's JIT
 *.rbc
 
-# Ignore precompiled assets
-# Heroku or Capistrano can and should regenerate them on every deploy
-public/assets
+#IDE
+diaspora.iml
+
+# Dolphin's directory's preferences files
+*.directory

.hound.yml

@@ -0,0 +1,9 @@
+java_script:
+  enabled: true
+  config_file: config/.jshint.json
+  ignore_file: config/.jshint_ignore
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+scss:
+  enabled: false

.jshintignore

@@ -0,0 +1 @@
+config/.jshint_ignore

.jshintrc

@@ -0,0 +1 @@
+config/.jshint.json

.pairs

@@ -1,15 +0,0 @@
-pairs:
-  dg: Daniel Grippi; daniel
-  rs: Raphael Sofaer; raphael
-  iz: Ilya Zhitomirskiy; ilya
-  ms: Maxwell Salzberg; maxwell
-  dh: Dan Hansen; ohaibbq
-  sm: Sarah Mei; sarah
-  mjs: Michael Sofaer; michael
-  jd: Jeff Dickey; dickeytk
-  dc: Dennis Collinson
-  tf: Tim Frazer
-  kf: Kevin Fitzpatrick
-email:
-  prefix: pair
-  domain: joindiaspora.com

.powenv

@@ -1 +0,0 @@
-export NEW_HOTNESS=yessir

.powrc

@@ -1,4 +0,0 @@
-if [ -f "$rvm_path/scripts/rvm" ] && [ -f ".rvmrc" ]; then
-  source "$rvm_path/scripts/rvm"
-  source ".rvmrc"
-fi

.rspec

@@ -3,4 +3,3 @@
 --color
 --tag ~performance
 --order random
---drb

.rubocop.yml

@@ -0,0 +1,130 @@
+AllCops:
+  RunRailsCops: true
+
+# Commonly used screens these days easily fit more than 80 characters.
+Metrics/LineLength:
+  Max: 120
+
+# Too short methods lead to extraction of single-use methods, which can make
+# the code easier to read (by naming things), but can also clutter the class
+Metrics/MethodLength: 
+  Max: 20
+
+# The guiding principle of classes is SRP, SRP can't be accurately measured by LoC
+Metrics/ClassLength:
+  Max: 1500
+
+# No space makes the method definition shorter and differentiates
+# from a regular assignment.
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+# Single quotes being faster is hardly measurable and only affects parse time.
+# Enforcing double quotes reduces the times where you need to change them
+# when introducing an interpolation. Use single quotes only if their semantics
+# are needed.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+# We do not need to support Ruby 1.9, so this is good to use.
+Style/SymbolArray:
+  Enabled: true
+
+# Most readable form.
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+# Mixing the styles looks just silly.
+# REVIEW: Enable once https://github.com/bbatsov/rubocop/commit/760ce1ed2cf10beda5e163f934c03a6fb6daa38e
+#   is released.
+#Style/HashSyntax:
+#  EnforcedStyle: ruby19_no_mixed_keys
+
+# has_key? and has_value? are far more readable than key? and value?
+Style/DeprecatedHashMethods:
+  Enabled: false
+
+# String#% is by far the least verbose and only object oriented variant.
+Style/FormatString:
+  EnforcedStyle: percent
+
+Style/CollectionMethods:
+  Enabled: true
+  PreferredMethods:
+    # inject seems more common in the community.
+    reduce: "inject"
+
+
+# Either allow this style or don't. Marking it as safe with parenthesis
+# is silly. Let's try to live without them for now.
+Style/ParenthesesAroundCondition:
+  AllowSafeAssignment: false
+Lint/AssignmentInCondition:
+  AllowSafeAssignment: false
+
+# A specialized exception class will take one or more arguments and construct the message from it.
+# So both variants make sense. 
+Style/RaiseArgs:
+  Enabled: false
+
+# Fail is an alias of raise. Avoid aliases, it's more cognitive load for no gain.
+# The argument that fail should be used to abort the program is wrong too,
+# there's Kernel#abort for that.
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+# Suppressing exceptions can be perfectly fine, and be it to avoid to
+# explicitly type nil into the rescue since that's what you want to return,
+# or suppressing LoadError for optional dependencies
+Lint/HandleExceptions:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  # The space here provides no real gain in readability while consuming
+  # horizontal space that could be used for a better parameter name.
+  # Also {| differentiates better from a hash than { | does.
+  SpaceBeforeBlockParameters: false
+
+# No trailing space differentiates better from the block:
+# foo} means hash, foo } means block.
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
+# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
+Style/Blocks:
+  Enabled: false
+
+# do / end blocks should be used for side effects,
+# methods that run a block for side effects and have
+# a useful return value are rare, assign the return
+# value to a local variable for those cases.
+Style/MethodCalledOnDoEndBlock:
+  Enabled: true
+
+# Enforcing the names of variables? To single letter ones? Just no.
+Style/SingleLineBlockParams:
+  Enabled: false
+
+# Shadowing outer local variables with block parameters is often useful
+# to not reinvent a new name for the same thing, it highlights the relation
+# between the outer variable and the parameter. The cases where it's actually
+# confusing are rare, and usually bad for other reasons already, for example
+# because the method is too long.
+Lint/ShadowingOuterLocalVariable:
+  Enabled: false
+
+# Check with yard instead.
+Style/Documentation:
+  Enabled: false 
+
+# This is just silly. Calling the argument `other` in all cases makes no sense.
+Style/OpMethod:
+  Enabled: false 
+
+# There are valid cases, for example debugging Cucumber steps,
+# also they'll fail CI anyway
+Lint/Debugger:
+  Enabled: false
+

.ruby-gemset

@@ -0,0 +1 @@
+diaspora

.ruby-version

@@ -0,0 +1 @@
+2.1

.rvmrc

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-. ./script/env/ruby_env
-
-if [ -e '.rvmrc.local' ]; then
-  . .rvmrc.local;
-elif [ -e '.rvmrc_custom' ] ; then
-  . .rvmrc_custom;
-else
-  if rvm list strings | grep -q "$ruby_version" ; then
-    rvm --create use "$ruby_version@$gemset"
-  else
-    printf "\e[00;31mPLEASE INSTALL RUBY $ruby_version WITH \`rvm install $ruby_version\`"
-    printf "Don't forget to run \`cd .. && cd -\` afterwards!\e[00m"
-    return 1
-  fi
-fi
-
-. ./script/env/ensure_right_rubygems

.travis.yml

@@ -1,12 +1,8 @@
-branches:
-  only:
-    - 'master'
-    - 'develop'
-
 language: ruby
-rvm:
-  - 1.9.3
 
+rvm:
+  - 2.1
+  - 2.0
 
 env:
   - DB=postgres BUILD_TYPE=other
@@ -14,12 +10,22 @@ env:
   - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
+sudo: false
+cache:
+  bundler: true
+  directories:
+    - app/assets/images
+
+branches:
+  only:
+    - 'master'
+    - 'develop'
+
+before_install: gem install bundler
+bundler_args: "--without development production heroku --jobs 3 --retry 3"
 
-bundler_args: "--without development production heroku"
-before_install: "./script/ci/before_install.sh"
 script: "./script/ci/build.sh"
 
-
 notifications:
   irc:
     channels:

Capfile

@@ -1,11 +0,0 @@
-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3 or later.  See
-#   the COPYRIGHT file.
-
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-# Precompile assets in deployment (for Capistrano >= 2.8.0)
-load 'deploy/assets' if respond_to?(:namespace)
-
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-
-load 'config/deploy' # remove this line to skip loading any of the default tasks

Gemfile

@@ -1,170 +1,275 @@
-source 'http://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rails', '3.2.8'
+gem "rails", "4.2.1"
 
-gem 'foreman', '0.60.2'
+# Legacy Rails features, remove me!
 
-gem 'unicorn', '4.4.0', :require => false
+# caches_page
+gem "actionpack-action_caching"
+gem "actionpack-page_caching"
 
-gem 'rails_autolink', '1.0.9'
+# responders (class level)
+gem "responders", "2.1.0"
 
-# cross-origin resource sharing
+# Appserver
 
-gem 'rack-cors', '0.2.7', :require => 'rack/cors'
+gem "unicorn", "4.8.3", require: false
 
-# click-jacking protection
+# API and JSON
 
-gem 'rack-protection', '1.2'
+gem "acts_as_api", "0.4.2"
+gem "json",        "1.8.2"
 
-# authentication
+# Authentication
 
-gem 'devise', '2.1.2'
+gem "devise", "3.4.1"
+gem "devise_lastseenable", "0.0.4"
+gem "devise-token_authenticatable", "~> 0.3.0"
 
-gem 'remotipart', '1.0.2'
+# Captcha
 
-gem 'omniauth', '1.1.1'
-gem 'omniauth-facebook', '1.4.1'
-gem 'omniauth-tumblr', '1.1'
-gem 'omniauth-twitter', '0.0.13'
+gem "simple_captcha2", "0.3.4", require: "simple_captcha"
 
-gem 'twitter', '4.2.0'
+# Background processing
 
-# mail
+gem "sidekiq", "3.3.3"
+gem "sinatra", "1.4.6"
 
-gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
-gem 'messagebus_ruby_api', '1.0.3'
+# Scheduled processing
 
-group :production do # we don't install these on travis to speed up test runs
-  gem 'rails_admin', '0.2.0'
-  gem 'fastercsv', '1.5.5', :require => false
-  gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
-  gem 'rack-rewrite', '1.3.1', :require => false
+gem "sidetiq", "0.6.3"
 
-  # analytics
-  gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
-  gem 'rack-piwik', '0.1.3', :require => 'rack/piwik', :require => false
-  
+# Compression
+
+gem "uglifier", "2.7.1"
+
+# Configuration
+
+gem "configurate", "0.2.0"
+
+# Cross-origin resource sharing
+
+gem "rack-cors", "0.3.1", require: "rack/cors"
+
+# CSS
+
+gem "bootstrap-sass", "2.3.2.2"
+gem "compass-rails",  "2.0.4"
+gem "sass-rails",     "5.0.1"
+gem "autoprefixer-rails", "5.1.7.1"
+
+# Database
+
+ENV["DB"] ||= "mysql"
+
+gem "mysql2", "0.3.18" if ENV["DB"] == "all" || ENV["DB"] == "mysql"
+gem "pg",     "0.18.1" if ENV["DB"] == "all" || ENV["DB"] == "postgres"
+
+gem "activerecord-import", "0.7.0"
+
+# File uploading
+
+gem "carrierwave", "0.10.0"
+gem "fog",         "1.28.0"
+gem "mini_magick", "4.2.0"
+gem "remotipart",  "1.2.1"
+
+# GUID generation
+gem "uuid", "2.3.7"
+
+# Icons
+
+gem "entypo-rails", "2.2.2"
+
+# JavaScript
+
+gem "backbone-on-rails",                                "1.1.2"
+gem "handlebars_assets",                                "0.20.1"
+gem "jquery-rails",                                     "3.1.2"
+gem "js_image_paths",                                   "0.0.2"
+gem "js-routes",                                        "1.0.0"
+
+source "https://rails-assets.org" do
+  gem "rails-assets-jquery",                              "1.11.1" # Should be kept in sync with jquery-rails
+
+  gem "rails-assets-markdown-it",                         "4.2.0"
+  gem "rails-assets-markdown-it-hashtag",                 "0.3.0"
+  gem "rails-assets-markdown-it-diaspora-mention",        "0.3.0"
+  gem "rails-assets-markdown-it-sanitizer",               "0.3.0"
+  gem "rails-assets-markdown-it--markdown-it-for-inline", "0.1.0"
+  gem "rails-assets-markdown-it-sub",                     "1.0.0"
+  gem "rails-assets-markdown-it-sup",                     "1.0.0"
+
+  # jQuery plugins
+
+  gem "rails-assets-jeresig--jquery.hotkeys", "0.2.0"
+  gem "rails-assets-jquery-idletimer",        "1.0.1"
+  gem "rails-assets-jquery-placeholder",      "2.1.1"
+  gem "rails-assets-jquery-textchange",       "0.2.3"
+  gem "rails-assets-perfect-scrollbar",       "0.5.9"
 end
 
+# Localization
 
-# database
+gem "http_accept_language", "2.0.5"
+gem "i18n-inflector-rails", "1.0.7"
+gem "rails-i18n",           "4.0.4"
 
-gem "activerecord-import", "0.2.11"
-gem 'foreigner', '1.2.1'
-gem 'mysql2', '0.3.11' if ENV['DB'].nil? || ENV['DB'] == 'all' || ENV['DB'] == 'mysql'
-gem 'pg', '0.14.1' if ENV['DB'] == 'all' || ENV['DB'] == 'postgres'
-gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
+# Mail
 
-# file uploading
+gem "markerb",             "1.0.2"
+gem "messagebus_ruby_api", "1.0.3"
 
-gem 'carrierwave', '0.7.1'
-gem 'fog', '1.6.0'
-gem 'mini_magick', '3.4'
+# Parsing
 
-# JSON and API
+gem "nokogiri",          "1.6.6.2"
+gem "redcarpet",         "3.2.3"
+gem "twitter-text",      "1.11.0"
+gem "roxml",             "3.1.6"
+gem "ruby-oembed",       "0.8.12"
+gem "open_graph_reader", "0.5.0"
 
-gem 'json', '1.7.5'
-gem 'acts_as_api', '0.4.1 '
+# Services
 
-# localization
+gem "omniauth",           "1.2.2"
+gem "omniauth-facebook",  "1.6.0"
+gem "omniauth-tumblr",    "1.1"
+gem "omniauth-twitter",   "1.0.1"
+gem "twitter",            "4.8.1"
+gem "omniauth-wordpress", "0.2.1"
 
-gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n', '0.7.0'
+# Serializers
 
-# parsing
+gem "active_model_serializers", "0.9.3"
 
-gem 'nokogiri', '1.5.5'
-gem 'redcarpet', "2.2.2"
-gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
-gem 'ruby-oembed', '0.8.7'
+# XMPP chat dependencies
+gem "diaspora-vines",             "~> 0.1.27"
+gem "rails-assets-diaspora_jsxc", "~> 0.1.1", source: "https://rails-assets.org"
 
-# queue
+# Tags
 
-gem 'resque', '1.23.0'
-gem 'resque-timeout', '1.0.0'
-
-# tags
-
-gem 'acts-as-taggable-on', '2.3.3'
+gem "acts-as-taggable-on", "3.5.0"
 
 # URIs and HTTP
 
-gem 'addressable', '2.3.2', :require => 'addressable/uri'
-gem 'http_accept_language', '1.0.2'
-gem 'typhoeus', '0.3.3'
+gem "addressable",        "2.3.7", require: "addressable/uri"
+gem "faraday",            "0.9.1"
+gem "faraday_middleware", "0.9.1"
+gem "faraday-cookie_jar", "0.0.6"
+gem "typhoeus",           "0.7.1"
 
-# views
+# Views
 
-gem 'haml', '3.1.7'
-gem 'mobile-fu', '1.1.0'
+gem "gon",                     "5.2.3"
+gem "haml",                    "4.0.6"
+gem "mobile-fu",               "1.3.1"
+gem "will_paginate",           "3.0.7"
+gem "rails-timeago",           "2.11.0"
 
-gem 'will_paginate', '3.0.3'
-gem 'client_side_validations', '3.2.1'
-gem 'gon', '4.0.1'
+# Workarounds
+# https://github.com/rubyzip/rubyzip#important-note
+gem "zip-zip"
 
-# assets
+# Prevent occasions where minitest is not bundled in
+# packaged versions of ruby. See following issues/prs:
+# https://github.com/gitlabhq/gitlabhq/issues/3826
+# https://github.com/gitlabhq/gitlabhq/pull/3852
+# https://github.com/discourse/discourse/pull/238
+gem "minitest"
 
-group :assets do
-  gem 'bootstrap-sass', '2.1.1.0'
-  gem 'sass-rails', '3.2.5'
+# Windows and OSX have an execjs compatible runtime built-in, Linux users should
+# install Node.js or use "therubyracer".
+#
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
 
-  # Windows and OSX have an execjs compatible runtime built-in, Linux users should
-  # install Node.js or use 'therubyracer'.
-  #
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+# gem "therubyracer", :platform => :ruby
 
-  # gem 'therubyracer', :platform => :ruby
+group :production do # we don"t install these on travis to speed up test runs
+  # Administration
 
-  gem 'handlebars_assets', '0.6.6'
-  gem 'uglifier', '1.3.0'
+  gem "rails_admin", "0.6.7"
 
-  gem "asset_sync", '0.5.0', :require => false
-end
+  # Analytics
 
-gem 'jquery-rails', '2.1.3'
+  gem "rack-google-analytics", "1.2.0"
+  gem "rack-piwik",            "0.3.0",  require: "rack/piwik"
 
-# web
+  # Click-jacking protection
 
-gem 'faraday', '0.8.4'
-gem 'faraday_middleware', '0.9.0'
+  gem "rack-protection", "1.5.3"
 
+  # Process management
 
-gem 'jasmine', '1.2.1'
+  gem "foreman", "0.62"
 
-### GROUPS ####
+  # Redirects
 
-group :test do
+  gem "rack-rewrite", "1.5.1", require: false
+  gem "rack-ssl",     "1.4.1", require: "rack/ssl"
 
+  # Third party asset hosting
 
-  gem 'capybara', '1.1.3'
-  gem 'cucumber-rails', '1.3.0', :require => false
-  gem 'database_cleaner', '0.9.1'
-
-  gem 'timecop', '0.5.3'
-  gem 'factory_girl_rails', '4.1.0'
-  gem 'fixture_builder', '0.3.4'
-  gem 'fuubar', '1.1.0'
-  gem 'rspec-instafail', '0.2.4', :require => false
-  gem 'selenium-webdriver', '2.26.0'
-
-  gem 'webmock', '1.8.11', :require => false
-
-  gem 'spork', '1.0.0rc3'
-  gem 'guard-rspec', '2.1.1'
-  gem 'guard-spork', '1.2.3'
-  gem 'guard-cucumber', '1.2.2'
-  gem 'rb-inotify', '0.8.8', :require => false
-  gem 'rb-fsevent', '0.9.2', :require => false
-
-end
-
-group :test, :development do
-  gem 'debugger', '1.2.1'
-  gem "rspec-rails", "2.11.4" 
+  gem "asset_sync", "1.1.0", require: false
 end
 
 group :development do
-  gem 'capistrano', '2.12.0', :require => false
-  gem 'capistrano_colors', '0.5.5', :require => false
-  gem 'capistrano-ext', '1.2.1', :require => false
+  # Automatic test runs
+  gem "guard-cucumber", "1.5.4"
+  gem "guard-jshintrb", "1.1.1"
+  gem "guard-rspec",    "4.5.0"
+  gem "guard-rubocop",  "1.2.0"
+  gem "guard",          "2.12.5", require: false
+  gem "rb-fsevent",     "0.9.4", require: false
+  gem "rb-inotify",     "0.9.5", require: false
+
+  # Linters
+  gem "jshintrb", "0.3.0"
+  gem "rubocop",  "0.29.1"
+
+  # Preloading environment
+
+  gem "spring", "1.3.3"
+  gem "spring-commands-rspec", "1.0.4"
+  gem "spring-commands-cucumber", "1.0.1"
+
+  # Debugging
+  gem "pry"
+  gem "pry-debundle"
+  gem "pry-byebug"
+end
+
+group :test do
+  # RSpec (unit tests, some integration tests)
+
+  gem "fixture_builder",   "0.3.6"
+  gem "fuubar",            "2.0.0"
+  gem "rspec-instafail",   "0.2.6", require: false
+  gem "test_after_commit", "0.4.1"
+
+  # Cucumber (integration tests)
+
+  gem "capybara",           "2.4.4"
+  gem "database_cleaner" ,  "1.4.1"
+  gem "selenium-webdriver", "2.45.0"
+
+  # General helpers
+
+  gem "factory_girl_rails", "4.5.0"
+  gem "timecop",            "0.7.3"
+  gem "webmock",            "1.20.4", require: false
+  gem "shoulda-matchers",   "2.8.0", require: false
+end
+
+group :development, :test do
+  # RSpec (unit tests, some integration tests)
+  gem "rspec-rails",     "3.2.1"
+
+  # Cucumber (integration tests)
+  gem "cucumber-rails",     "1.4.2", require: false
+
+  # Jasmine (client side application tests (JS))
+  gem "jasmine",                   "2.2.0"
+  gem "jasmine-jquery-rails",      "2.0.3"
+  gem "rails-assets-jasmine-ajax", "3.1.0", source: "https://rails-assets.org"
+  gem "sinon-rails",               "1.10.3"
 end

Guardfile

@@ -1,38 +1,45 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-# also, http://asciicasts.com/episodes/264-guard
-guard 'rspec', :all_on_start => false do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+guard :rspec, cmd: "bin/spring rspec", all_on_start: false, all_after_pass: false do
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^lib\/(.+)\.rb$/)       {|m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(/spec\/spec_helper.rb/)  { "spec" }
 
   # Rails example
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(/^spec\/.+_spec\.rb$/)
+  watch(/^app\/(.+)\.rb$/)                            {|m| "spec/#{m[1]}_spec.rb" }
+  watch(/^lib\/(.+)\.rb$/)                            {|m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) {|m|
+    ["spec/routing/#{m[1]}_routing_spec.rb",
+     "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",
+     "spec/acceptance/#{m[1]}_spec.rb"]
+  }
   watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('spec/spec_helper.rb')                        { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch("spec/spec_helper.rb")                        { "spec" }
+  watch("config/routes.rb")                           { "spec/routing" }
+  watch("app/controllers/application_controller.rb")  { "spec/controllers" }
+
   # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          {|m| "spec/requests/#{m[1]}_spec.rb" }
 end
 
-guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' }, :all_on_start => false , :wait => 70 do
-  watch('config/application.rb')
-  watch('config/environment.rb')
-  watch(%r{^config/environments/.+\.rb$})
-  watch(%r{^config/initializers/.+\.rb$})
-  watch('Gemfile')
-  watch('Gemfile.lock')
-  watch('spec/spec_helper.rb') { :rspec }
-  watch('test/test_helper.rb') { :test_unit }
-  watch(%r{features/support/}) { :cucumber }
+guard(:cucumber,
+      command_prefix: "bin/spring",
+      bundler:        false,
+      all_on_start:   false,
+      all_after_pass: false) do
+  watch(/^features\/.+\.feature$/)
+  watch(%r{^features/support/.+$})          { "features" }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) {|m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "features"
+  }
 end
 
-guard 'cucumber', :all_on_start => false do
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$})          { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+guard :rubocop, all_on_start: false, keep_failed: false do
+  watch(/(?:app|config|db|lib|features|spec)\/.+\.rb$/)
+  watch(/(config.ru|Gemfile|Guardfile|Rakefile)$/)
+end
+
+guard :jshintrb do
+  watch(/^app\/assets\/javascripts\/.+\.js$/)
+  watch(/^lib\/assets\/javascripts\/.+\.js$/)
+  watch(/^spec\/javascripts\/.+\.js$/)
 end

Procfile

@@ -1,2 +1,3 @@
-web: bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
-worker: env QUEUE=* bundle exec rake resque:work
+web: bin/bundle exec unicorn_rails -c config/unicorn.rb -p $PORT
+sidekiq: bin/bundle exec sidekiq
+xmpp: bin/bundle exec vines start

README.md

@@ -1,65 +1,37 @@
-Diaspora*
+# diaspora* 
+### a privacy-aware, distributed, open source social network
 
-Diaspora is a privacy-aware, personally-controlled, do-it-all open source social network. Check out our [project site](http://diasporaproject.org).
+**master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
+**develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora) |
+[![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
+[![Code Climate](https://codeclimate.com/github/diaspora/diaspora.png)](https://codeclimate.com/github/diaspora/diaspora)
 
-* **master:** [![Build Status master](https://secure.travis-ci.org/diaspora/diaspora.png?branch=master)](http://travis-ci.org/diaspora/diaspora)
-* **develop:** [![Build Status develop](https://secure.travis-ci.org/diaspora/diaspora.png?branch=develop)](http://travis-ci.org/diaspora/diaspora)
-* [![Dependency Status](https://gemnasium.com/diaspora/diaspora.png?travis)](https://gemnasium.com/diaspora/diaspora)
-* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/diaspora/diaspora)
+[Project site](https://diasporafoundation.org) |
+[Wiki](https://wiki.diasporafoundation.org) |
+[Bugtracker](http://github.com/diaspora/diaspora/issues) |
+[Discussions](https://www.loomio.org/groups/194) |
+[Mailing lists](https://wiki.diasporafoundation.org/How_We_Communicate#Mailing_Lists) |
+[License](/COPYRIGHT) |
+[Authors](https://github.com/diaspora/diaspora/contributors)
+
+## Installation
 
 
-With Diaspora you can:
+You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our [tips for finding a home](https://wiki.diasporafoundation.org/Choosing_a_pod), or you can just go straight to the [list of open servers](http://podupti.me) to sign up.
 
-- Make cool stuff
-- Share it across the web
-- Own your own data
+Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our [installation guides](https://wiki.diasporafoundation.org/Installation) will get you started!
 
+## Questions?
 
-## Quick Start:
+Have a look at our FAQs [for users](https://wiki.diasporafoundation.org/FAQ_for_users), [for pod administrators](https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers) or [for developers](https://wiki.diasporafoundation.org/FAQ_for_developers).
 
-Here's how you can get a **[development](http://guides.rubyonrails.org/getting_started.html)** environment up and running.  This is where any new pod runner should start, as well as people
-looking to contribute to D*.  This script assumes you have [a basic Rails setup installed](http://railsapps.github.com/installing-rails-3-1.html).
+Still haven't found an answer? Talk to us! Read [how we communicate](https://wiki.diasporafoundation.org/How_we_communicate). We're here to answer all your questions.
 
-### Step 1: Run the script and follow the on screen instructions.
-```
-  bash <(curl https://raw.github.com/diaspora/diaspora/master/script/install.sh)
-```
+## Contribute
 
+To keep diaspora*  growing and improving we need all help we can get. Whether you can contribute [code](https://wiki.diasporafoundation.org/Getting_started_with_contributing), [ideas](https://wiki.diasporafoundation.org/How_we_communicate#Loomio), [translations](https://wiki.diasporafoundation.org/Contribute_translations), [bug reports](https://wiki.diasporafoundation.org/How_to_report_a_bug) or simply extend the community as a [helpful user](https://wiki.diasporafoundation.org/Welcoming_committee) or [pod administrator](https://wiki.diasporafoundation.org/Installation), your help is welcome!
 
-### Step 2: Run the development server
-```
-  rails s
-```
+## Security
 
-then visit 'http://localhost:3000' in your browser.
+Found a security issue? Please disclose it responsibly. We have a team of developers listening to [security@diasporafoundation.org](mailto:security@diasporafoundation.org). The PGP fingerprint is [AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A](http://pgp.mit.edu:11371/pks/lookup?op=get&search=0x6F70243F27AD886A)
 
-### Step 3 (for developers): Run tests
-```
-  rake
-```
-
-### Step 4 (for everyone): Party.
-
-
-### Want a production setup? Having trouble with install script? Want to install D* the slow way?
-  Look to more specific install guides [here](https://github.com/diaspora/diaspora/wiki/Installation-Guides).
-
-## Contributing
-We love community contributions, and we work extra hard to make sure every code contribution is looked at and given feedback. 
-To help everyone involved, please review our [Pull Request Guidelines](https://github.com/diaspora/diaspora/wiki/Pull-Request-Guidelines)
-to make sure all contributions are submitted smoothly.
-
-Documentation is available on our [wiki](https://github.com/diaspora/diaspora/wiki)
-
-Also, feel free to jump in and check things that need to be done in our [Community Pivotal Tracker](https://www.pivotaltracker.com/projects/61641#)
-
-Before submitting code, please sign our [Contributor License Agreement](https://github.com/diaspora/diaspora/wiki/New-CLA--12-13-10) [Sign Here](https://spreadsheets.google.com/a/joindiaspora.com/spreadsheet/viewform?formkey=dFdRTnY0TGtfaklKQXZNUndsMlJ2eGc6MQ)
-
-## More Resources:
-
-- [Wiki](https://github.com/diaspora/diaspora/wiki)
-- [Podmin Resources](https://github.com/diaspora/diaspora/wiki/Podmin-Resources)
-- [Contributing](https://github.com/diaspora/diaspora/wiki/Getting-Started-With-Contributing)
-- [Dev List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-dev)
-- [Discuss List](https://groups.google.com/forum/?fromgroups#!forum/diaspora-discuss)
-- [IRC](https://github.com/diaspora/diaspora/wiki/How-we-use-IRC)

Rakefile

@@ -7,7 +7,6 @@
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'resque/tasks'
 
 # for rake 0.9.0
 module Diaspora

app/assets/javascripts/app/app.js

@@ -1,3 +1,5 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 //= require_self
 //= require_tree ./helpers
 
@@ -11,7 +13,8 @@
 //= require_tree ./pages
 //= require_tree ./collections
 //= require_tree ./views
-//= require_tree ./forms
+
+//= require perfect-scrollbar
 
 var app = {
   collections: {},
@@ -21,65 +24,113 @@ var app = {
   pages: {},
   forms: {},
 
-  user: function(userAttrs) {
-    if(userAttrs) { return this._user = new app.models.User(userAttrs) }
-    return this._user || false
-  },
+  // global event broker - use event names in the form of "object:action:data"
+  //   [object]: the class of the acting object
+  //   [action]: infinitive verb naming the performed action
+  //   [data]:   (optional) unique name or ID of the specific instance
+  // e.g. "person:ignore:123"
+  // if your event has to pass more than one datum (singular) - or in case you
+  // need structured data - specify them as arguments to the `#trigger` call
+  // e.g. `app.events.trigger('example:event', {more: 'data'})`
+  events: _.extend({}, Backbone.Events),
 
-  baseImageUrl: function(baseUrl){
-    if(baseUrl) { return this._baseImageUrl = baseUrl }
-    return this._baseImageUrl || "assets/"
+  user: function(userAttrs) {
+    if(userAttrs) {
+      this._user = new app.models.User(userAttrs);
+      return this._user;
+    }
+    return this._user || false;
   },
 
   initialize: function() {
     app.router = new app.Router();
 
-    app.currentUser = app.user(window.current_user_attributes) || new app.models.User()
-
-    if(app.currentUser.authenticated()){
-      app.header = new app.views.Header;
-      $("header").prepend(app.header.el);
-      app.header.render();
-    }
-
-
-    Backbone.history.start({pushState: true});
-
-    // there's probably a better way to do this...
-    $("a[rel=backbone]").live("click", function(evt){
-      evt.preventDefault();
-      var link = $(this);
-
-      $(".stream_title").text(link.text())
-      app.router.navigate(link.attr("href").substring(1) ,true)
-    })
+    this.setupDummyPreloads();
+    this.setupFacebox();
+    this.setupUser();
+    this.setupHeader();
+    this.setupBackboneLinks();
+    this.setupGlobalViews();
+    this.setupDisabledLinks();
   },
 
   hasPreload : function(prop) {
-    return !!(window.preloads && window.preloads[prop]) //returning boolean variable so that parsePreloads, which cleans up properly is used instead
+    return !!(window.gon.preloads && window.gon.preloads[prop]); //returning boolean variable so that parsePreloads, which cleans up properly is used instead
   },
 
   setPreload : function(prop, val) {
-    window.preloads = window.preloads || {}
-    window.preloads[prop] = val
+    window.gon.preloads = window.gon.preloads || {};
+    window.gon.preloads[prop] = val;
   },
 
-  parsePreload : function(prop){
+  parsePreload : function(prop) {
       if(!app.hasPreload(prop)) { return }
 
-      var preload = window.preloads[prop]
-      delete window.preloads[prop] //prevent dirty state across navigates
+      var preload = window.gon.preloads[prop];
+      delete window.gon.preloads[prop]; //prevent dirty state across navigates
 
-      return(preload)
+      return(preload);
+  },
+
+  setupDummyPreloads: function() {
+    if (window.gon === undefined) {
+      window.gon = {preloads:{}};
+    }
+  },
+
+  setupUser: function() {
+    app.currentUser = app.user(window.gon.user) || new app.models.User();
+  },
+
+  setupHeader: function() {
+    if(app.currentUser.authenticated()) {
+      app.header = new app.views.Header();
+      $("header").prepend(app.header.el);
+      app.header.render();
+    }
+  },
+
+  setupFacebox: function() {
+    $.facebox.settings.closeImage = ImagePaths.get('facebox/closelabel.png');
+    $.facebox.settings.loadingImage = ImagePaths.get('facebox/loading.gif');
+    $.facebox.settings.opacity = 0.75;
+  },
+
+  setupBackboneLinks: function() {
+    Backbone.history.start({pushState: true});
+
+    // there's probably a better way to do this...
+    $(document).on("click", "a[rel=backbone]", function(evt){
+      evt.preventDefault();
+      var link = $(this);
+
+      $(".stream_title").text(link.text());
+      app.router.navigate(link.attr("href").substring(1) ,true);
+    });
+  },
+
+  setupGlobalViews: function() {
+    app.hovercard = new app.views.Hovercard();
+    $('.aspect_membership_dropdown').each(function(){
+      new app.views.AspectMembership({el: this});
+    });
+    app.sidebar = new app.views.Sidebar();
   },
 
   /* mixpanel wrapper function */
   instrument : function(type, name, object, callback) {
     if(!window.mixpanel) { return }
-    window.mixpanel[type](name, object, callback)
-  }
+    window.mixpanel[type](name, object, callback);
+  },
+
+  setupDisabledLinks: function() {
+    $("a.disabled").click(function(event) {
+      event.preventDefault();
+    });
+  },
 };
 
 $(function() {
   app.initialize();
 });
+// @license-end

app/assets/javascripts/app/collections/aspect_memberships.js

@@ -0,0 +1,6 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.collections.AspectMemberships = Backbone.Collection.extend({
+  model: app.models.AspectMembership
+});
+// @license-end

app/assets/javascripts/app/collections/aspects.js

@@ -0,0 +1,29 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.collections.Aspects = Backbone.Collection.extend({
+  model: app.models.Aspect,
+
+  selectedAspects: function(attribute){
+    return _.pluck(_.filter(this.toJSON(), function(a){
+              return a.selected;
+      }), attribute);
+  },
+
+  allSelected: function(){
+    return this.length === _.filter(this.toJSON(), function(a){ return a.selected; }).length;
+  },
+
+  selectAll: function(){
+    this.map(function(a){ a.set({ 'selected' : true })} );
+  },
+
+  deselectAll: function(){
+    this.map(function(a){ a.set({ 'selected' : false })} );
+  },
+
+  toSentence: function(){
+    var separator = Diaspora.I18n.t("comma") + ' ';
+    return this.selectedAspects('name').join(separator).replace(/,\s([^,]+)$/, ' ' + Diaspora.I18n.t("and") + ' $1') || Diaspora.I18n.t("my_aspects");
+  }
+});
+// @license-end

app/assets/javascripts/app/collections/comments.js

@@ -1,24 +1,27 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.collections.Comments = Backbone.Collection.extend({
   model: app.models.Comment,
-
-  url : function(){
-    return this.post.url() + "/comments"
-  },
+  url: function() { return _.result(this.post, 'url') + '/comments'; },
 
   initialize : function(models, options) {
-    this.post = options.post
+    this.post = options.post;
   },
 
   make : function(text){
-    var self = this
+    var self = this;
 
-    var comment = new app.models.Comment({text: text })
-      , deferred = comment.save({}, {url : self.url()})
+    var comment = new app.models.Comment({text: text });
 
-    comment.set({author: app.currentUser.toJSON(), parent: self.post })
+    var deferred = comment.save({}, {
+      url: '/posts/'+this.post.id+'/comments',
+      success: function() {
+        comment.set({author: app.currentUser.toJSON(), parent: self.post });
+        self.add(comment);
+      }
+    });
 
-    this.add(comment)
-
-    return deferred
+    return deferred;
   }
 });
+// @license-end

app/assets/javascripts/app/collections/contacts.js

@@ -0,0 +1,21 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.collections.Contacts = Backbone.Collection.extend({
+  model: app.models.Contact,
+
+  comparator : function(con1, con2) {
+    if( !con1.person || !con2.person ) return 1;
+
+    if(app.aspect) {
+      var inAspect1 = con1.inAspect(app.aspect.get('id'));
+      var inAspect2 = con2.inAspect(app.aspect.get('id'));
+      if(  inAspect1 && !inAspect2 ) return -1;
+      if( !inAspect1 &&  inAspect2 ) return 1;
+    }
+
+    var n1 = con1.person.get('name');
+    var n2 = con2.person.get('name');
+    return n1.localeCompare(n2);
+  }
+});
+// @license-end

app/assets/javascripts/app/collections/likes.js

@@ -1,7 +1,10 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.collections.Likes = Backbone.Collection.extend({
   model: app.models.Like,
 
   initialize : function(models, options) {
-    this.url = "/posts/" + options.post.id + "/likes" //not delegating to post.url() because when it is in a stream collection it delegates to that url
+    this.url = "/posts/" + options.post.id + "/likes"; //not delegating to post.url() because when it is in a stream collection it delegates to that url
   }
 });
+// @license-end

app/assets/javascripts/app/collections/photos.js

@@ -1,8 +1,10 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.collections.Photos = Backbone.Collection.extend({
   url : "/photos",
 
   model: function(attrs, options) {
-    var modelClass = app.models.Photo
+    var modelClass = app.models.Photo;
     return new modelClass(attrs, options);
   },
 
@@ -10,3 +12,4 @@ app.collections.Photos = Backbone.Collection.extend({
     return resp.photos;
   }
 });
+// @license-end

app/assets/javascripts/app/collections/posts.js

@@ -1,4 +1,8 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.collections.Posts = Backbone.Collection.extend({
   model: app.models.Post,
   url : "/posts"
 });
+// @license-end
+

app/assets/javascripts/app/collections/reshares.js

@@ -1,4 +1,8 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.collections.Reshares = Backbone.Collection.extend({
   model: app.models.Reshare,
   url : "/reshares"
 });
+// @license-end
+

app/assets/javascripts/app/collections/tag_followings.js

@@ -0,0 +1,23 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.collections.TagFollowings = Backbone.Collection.extend({
+
+  model: app.models.TagFollowing,
+  url : "/tag_followings",
+  comparator: function(first_tf, second_tf) {
+    return  -first_tf.get("name").localeCompare(second_tf.get("name"));
+  },
+
+  create : function(model) {
+    var name = model.name || model.get("name");
+    if(!this.any(
+        function(tagFollowing){
+          return tagFollowing.get("name") === name; 
+        })) {
+      Backbone.Collection.prototype.create.apply(this, arguments);
+    }
+  }
+
+});
+// @license-end
+

app/assets/javascripts/app/forms/picture_form.js

@@ -1,59 +0,0 @@
-app.forms.PictureBase = app.views.Base.extend({
-  events : {
-    'ajax:complete .new_photo' : "photoUploaded",
-    "change input[name='photo[user_file]']" : "submitForm"
-  },
-
-  onSubmit : $.noop,
-  uploadSuccess : $.noop,
-
-  postRenderTemplate : function(){
-    this.$("input[name=authenticity_token]").val($("meta[name=csrf-token]").attr("content"))
-  },
-
-  submitForm : function (){
-    this.$("form").submit();
-    this.onSubmit();
-  },
-
-  photoUploaded : function(evt, xhr) {
-    resp = JSON.parse(xhr.responseText)
-    if(resp.success) {
-      this.uploadSuccess(resp)
-    } else {
-      alert("Upload failed!  Please try again. " + resp.error);
-    }
-  }
-});
-
-/* multi photo uploader */
-app.forms.Picture = app.forms.PictureBase.extend({
-  templateName : "picture-form",
-
-  initialize : function() {
-    this.photos = this.model.photos || new Backbone.Collection()
-    this.photos.bind("add", this.render, this)
-  },
-
-  postRenderTemplate : function(){
-    this.$("input[name=authenticity_token]").val($("meta[name=csrf-token]").attr("content"))
-    this.$("input[name=photo_ids]").val(this.photos.pluck("id"))
-    this.renderPhotos();
-  },
-
-  onSubmit : function (){
-    this.$(".photos").append($('<span class="loader" style="margin-left: 80px;"></span>'))
-  },
-
-  uploadSuccess : function(resp) {
-    this.photos.add(new Backbone.Model(resp.data))
-  },
-
-  renderPhotos : function(){
-    var photoContainer = this.$(".photos")
-    this.photos.each(function(photo){
-      var photoView = new app.views.Photo({model : photo}).render().el
-      photoContainer.append(photoView)
-    })
-  }
-});

app/assets/javascripts/app/forms/post_form.js

@@ -1,18 +0,0 @@
-app.forms.Post = app.views.Base.extend({
-  templateName : "post-form",
-  className : "post-form",
-
-  subviews : {
-    ".new_picture" : "pictureForm"
-   },
-
-  initialize : function() {
-    this.pictureForm = new app.forms.Picture({model: this.model});
-  },
-
-  postRenderTemplate : function() {
-    Mentions.initialize(this.$("textarea.text"));
-    Mentions.fetchContacts(); //mentions should use app.currentUser
-    this.$('textarea').autoResize({minHeight: '200', maxHeight:'300', animate: false});
-  }
-});

app/assets/javascripts/app/helpers/date_formatter.js

@@ -1,3 +1,5 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 (function(){
   app.helpers.dateFormatter = {
     parse:function (dateString) {
@@ -12,5 +14,6 @@
 
       return timestamp || 0;
     }
-  }
+  };
 })();
+// @license-end

app/assets/javascripts/app/helpers/direction_detector.js

@@ -0,0 +1,95 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+(function() {
+  app.helpers.txtDirection = {
+    setCssFor: function(str, on_element) {
+      if( this.isRTL(str) ) {
+        $(on_element).css('direction', 'rtl');
+      } else {
+        $(on_element).css('direction', 'ltr');
+      }
+    },
+
+    classFor: function(str) {
+      if( this.isRTL(str) ) return 'rtl';
+      return 'ltr';
+    },
+
+    isRTL: function(str) {
+      if(typeof str !== "string" || str.length < 1) {
+                return false;
+      }
+
+      var charCode = this._fixedCharCodeAt(str, 0);
+      if(charCode >= 1536 && charCode <= 1791) // Sarabic, Persian, ...
+                return true;
+
+      else if(charCode >= 65136 && charCode <= 65279) // Arabic present 1
+                return true;
+
+      else if(charCode >= 64336 && charCode <= 65023) // Arabic present 2
+                return true;
+
+      else if(charCode>=1424 && charCode<=1535) // Hebrew
+                return true;
+
+      else if(charCode>=64256 && charCode<=64335) // Hebrew present
+                return true;
+
+      else if(charCode>=68096 && charCode<=68184)  // Kharoshthi
+                return true;
+
+      else if(charCode>=67840 && charCode<=67871)  // Phoenician
+                return true;
+
+      else if(charCode>=1792 && charCode<=1871) // Syriac
+                return true;
+
+      else if(charCode>=1920 && charCode<=1983) // Thaana
+                return true;
+
+      else if(charCode>=1984 && charCode<=2047) // NKo
+                return true;
+
+      else if(charCode>=11568 && charCode<=11647) // Tifinagh
+                return true;
+
+      return false;
+    },
+
+    // source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/charCodeAt
+    _fixedCharCodeAt: function(str, idx) {
+      str += '';
+      var code,
+          end = str.length;
+
+      var surrogatePairs = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+      while ((surrogatePairs.exec(str)) != null) {
+        var li = surrogatePairs.lastIndex;
+        if (li - 2 < idx) {
+          idx++;
+        }
+        else {
+          break;
+        }
+      }
+
+      if (idx >= end || idx < 0) {
+        return NaN;
+      }
+
+      code = str.charCodeAt(idx);
+
+      var hi, low;
+      if (0xD800 <= code && code <= 0xDBFF) {
+        hi = code;
+        low = str.charCodeAt(idx+1);
+        // Go one further, since one of the "characters" is part of a surrogate pair
+        return ((hi - 0xD800) * 0x400) + (low - 0xDC00) + 0x10000;
+      }
+      return code;
+    }
+  };
+})();
+// @license-end
+

app/assets/javascripts/app/helpers/handlebars-helpers.js

@@ -1,26 +1,134 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 Handlebars.registerHelper('t', function(scope, values) {
-  return Diaspora.I18n.t(scope, values.hash)
-})
+  return Diaspora.I18n.t(scope, values.hash);
+});
+
+Handlebars.registerHelper('txtDirClass', function(str) {
+  return app.helpers.txtDirection.classFor(str);
+});
 
 Handlebars.registerHelper('imageUrl', function(path){
-  return app.baseImageUrl() + path;
-})
+  return ImagePaths.get(path);
+});
+
+Handlebars.registerHelper('urlTo', function(path_helper, id, data){
+  if( !data ) {
+    // only one argument given to helper, mangle parameters
+    data = id;
+    return Routes[path_helper+'_path'](data.hash);
+  }
+  return Routes[path_helper+'_path'](id, data.hash);
+});
+
+Handlebars.registerHelper('linkToAuthor', function(context, block) {
+  if( !context ) context = this;
+  var html = "<a href=\"/people/" + context.guid + "\" class=\"author-name ";
+      html += Handlebars.helpers.hovercardable(context);
+      html += "\">";
+      html += block.fn(context);
+      html += "</a>";
+
+  return html;
+});
 
 Handlebars.registerHelper('linkToPerson', function(context, block) {
-  var html = "<a href=\"/people/" + context.guid + "\" class=\"author-name\">";
-      html+= block.fn(context);
-      html+= "</a>";
+  if( !context ) context = this;
+  var html = "<a href=\"/people/" + context.guid + "\" class=\"name\">";
+      html += block.fn(context);
+      html += "</a>";
 
-  return html
-})
+  return html;
+});
+
+// relationship indicator for profile page
+Handlebars.registerHelper('sharingMessage', function(person) {
+  var i18n_scope = 'people.helper.is_not_sharing';
+  var icon = "circle";
+  if( person.is_sharing ) {
+    i18n_scope = 'people.helper.is_sharing';
+    icon = "entypo check";
+  }
+
+  var title = Diaspora.I18n.t(i18n_scope, {name: person.name});
+  var html = '<span class="sharing_message_container" title="'+title+'" data-placement="bottom">'+
+             '  <i id="sharing_message" class="'+icon+'"></i>'+
+             '</span>';
+  return html;
+});
+
+
+// allow hovercards for users that are not the current user.
+// returns the html class name used to trigger hovercards.
+Handlebars.registerHelper('hovercardable', function(person) {
+  if( app.currentUser.get('guid') !== person.guid ) {
+    return 'hovercardable';
+  }
+  return '';
+});
 
 Handlebars.registerHelper('personImage', function(person, size, imageClass) {
   /* we return here if person.avatar is blank, because this happens when a
    * user is unauthenticated.  we don't know why this happens... */
-  if(typeof(person.avatar) == "undefined") { return }
+  if( !person.avatar &&
+      !(person.profile && person.profile.avatar) ) return;
+  var avatar = person.avatar || person.profile.avatar;
 
-  size = (typeof(size) != "string" ? "small" : size);
-  imageClass = (typeof(imageClass) != "string" ? size : imageClass);
+  var name = ( person.name ) ? person.name : 'avatar';
+  size = ( !_.isString(size) ) ? "small" : size;
+  imageClass = ( !_.isString(imageClass) ) ? size : imageClass;
 
-  return "<img src=\"" + person.avatar[size] +"\" class=\"avatar " + imageClass + "\" title=\"" + _.escape(person.name) +"\" />";
-})
+  return _.template('<img src="<%= src %>" class="avatar <%= img_class %>" title="<%= title %>" alt="<%= title %>" />')({
+    'src': avatar[size],
+    'img_class': imageClass,
+    'title': _.escape(name)
+  });
+});
+
+Handlebars.registerHelper('localTime', function(timestamp) {
+  return new Date(timestamp).toLocaleString();
+});
+
+Handlebars.registerHelper('fmtTags', function(tags) {
+  var links = _.map(tags, function(tag) {
+    return '<a class="tag" href="' + Routes.tag_path(tag) + '">' +
+           '  #' + tag +
+           '</a>';
+  }).join(' ');
+  return new Handlebars.SafeString(links);
+});
+
+Handlebars.registerHelper('fmtText', function(text) {
+  return new Handlebars.SafeString(app.helpers.textFormatter(text));
+});
+
+Handlebars.registerHelper('isCurrentPage', function(path_helper, id, options){
+  var currentPage = "/"+Backbone.history.fragment;
+  if (currentPage === Handlebars.helpers.urlTo(path_helper, id, options.data)) {
+    return options.fn(this);
+  } else {
+    return options.inverse(this);
+  }
+});
+
+Handlebars.registerHelper('isCurrentProfilePage', function(id, diaspora_handle, options){
+  var username = diaspora_handle.split("@")[0];
+  return Handlebars.helpers.isCurrentPage('person', id, options) ||
+         Handlebars.helpers.isCurrentPage('user_profile', username, options);
+});
+
+Handlebars.registerHelper('aspectMembershipIndicator', function(contact,in_aspect) {
+  if(!app.aspect || !app.aspect.get('id')) return '<div class="aspect_membership_dropdown placeholder"></div>';
+
+  var html = '<i class="entypo ';
+  if( in_aspect === 'in_aspect' ) {
+    html += 'circled-cross contact_remove-from-aspect" ';
+    html += 'title="' + Diaspora.I18n.t('contacts.remove_contact') + '" ';
+  } else {
+    html += 'circled-plus contact_add-to-aspect" ';
+    html += 'title="' + Diaspora.I18n.t('contacts.add_contact') + '" ';
+  }
+  html += '></i>';
+  return html;
+});
+// @license-end

app/assets/javascripts/app/helpers/handlebars-partials.js

@@ -1,4 +1,7 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 /* we need to wrap this in a document ready to ensure JST is accessible */
 $(function(){
-  Handlebars.registerPartial('status-message', JST['status-message_tpl'])
+  Handlebars.registerPartial('status-message', HandlebarsTemplates['status-message_tpl']);
 });
+// @license-end

app/assets/javascripts/app/helpers/o_embed.js

@@ -1,14 +1,17 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 (function(){
   app.helpers.oEmbed = {
     html : function (o_embed_cache) {
       if (!o_embed_cache) { return "" }
 
       var data = o_embed_cache.data;
-      if (data.type == "photo") {
-        return '<img src="' + data.url + '" width="' + data.width + '" height="' + data.height + '" />'
+      if (data.type === "photo") {
+        return '<img src="' + data.url + '" width="' + data.width + '" height="' + data.height + '" />';
       } else {
-        return data.html || ""
+        return data.html || "";
       }
     }
-  }
-})();
+  };
+})();
+// @license-end

app/assets/javascripts/app/helpers/open_graph.js

@@ -0,0 +1,12 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+(function(){
+  app.helpers.openGraph = {
+    html : function (open_graph_cache) {
+      if (!open_graph_cache) { return ""; }
+      return '<img src="' + open_graph_cache.image + '" />';
+    },
+  };
+})();
+// @license-end
+

app/assets/javascripts/app/helpers/text_formatter.js

@@ -1,130 +1,66 @@
-
-// cache url regex globally, for direct acces when testing
-$(function() {
-  Diaspora.url_regex = /(^|\s)\b((?:(?:https?|ftp):(?:\/{1,3})|www\.)(?:[^"<>\)\s]|\(([^\s()<>]+|(\([^\s()<>]+\)))\))+)(?=\s|$)/gi;
-});
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
 (function(){
-  //make it so I take text and mentions rather than the modelapp.helpers.textFormatter(
-  var textFormatter = function textFormatter(text, model) {
-    var mentions = model.get("mentioned_people");
+  app.helpers.textFormatter = function(text, mentions) {
+    mentions = mentions ? mentions : [];
 
-    return textFormatter.mentionify(
-      textFormatter.hashtagify(
-        textFormatter.markdownify(text)
-        ), mentions
-      )
-  };
+    var md = window.markdownit({
+      breaks:      true,
+      html:        true,
+      linkify:     true,
+      typographer: true
+    });
 
-  textFormatter.markdownify = function markdownify(text){
-    var converter = Markdown.getSanitizingConverter();
+    var inlinePlugin = window.markdownitForInline;
+    md.use(inlinePlugin, "utf8_symbols", "text", function (tokens, idx) {
+      tokens[idx].content = tokens[idx].content.replace(/<->/g, "↔")
+                                               .replace(/<-/g,  "←")
+                                               .replace(/->/g,  "→")
+                                               .replace(/<3/g,  "♥");
+    });
 
-    // punycode non-ascii chars in urls
-    converter.hooks.chain("preConversion", function(text) {
-
-      // add < > around plain urls, effectively making them "autolinks"
-      text = text.replace(Diaspora.url_regex, function() {
-        var url = arguments[2];
-        if( url.match(/^[^\w]/) ) return url; // evil witchcraft, noop
-        return arguments[1]+"<"+url+">";
-      });
-
-      // process links
-      // regex copied from: https://code.google.com/p/pagedown/source/browse/Markdown.Converter.js#1198 (and slightly expanded)
-      var linkRegex = /(\[.*\]:\s)?(<|\()((?:(https?|ftp):\/\/[^\/'">\s]|www)[^'">\s]+?)([>\)]{1,2})/gi;
-      text = text.replace(linkRegex, function() {
-        var unicodeUrl = arguments[3];
-        var urlSuffix = arguments[5];
-
-        unicodeUrl = ( unicodeUrl.match(/^www/) ) ? ('http://' + unicodeUrl) : unicodeUrl;
-
-        // handle parentheses, especially in case the link ends with ')'
-        if( urlSuffix.indexOf(')') != -1 && urlSuffix.indexOf('>') != -1 ) {
-          unicodeUrl += ')';
-          urlSuffix = '>';
-        }
-        // markdown doesn't like '(' or ')' anywhere, except where it wants
-        var workingUrl = unicodeUrl.replace(/\(/, "%28").replace(/\)/, "%29");
-
-        var addr = parse_url(unicodeUrl);
-        if( !addr.host ) addr.host = ""; // must not be 'undefined'
-
-        var asciiUrl = // rebuild the url
-          (!addr.scheme ? '' : addr.scheme +
-          ( (addr.scheme.toLowerCase()=="mailto") ? ':' : '://')) +
-          (!addr.user ? '' : addr.user +
-          (!addr.pass ? '' : ':'+addr.pass) + '@') +
-         punycode.toASCII(addr.host) +
-          (!addr.port ? '' : ':' + addr.port) +
-          (!addr.path ? '' : encodeURI(addr.path) ) +
-          (!addr.query ? '' : '?' + encodeURI(addr.query) ) +
-          (!addr.fragment ? '' : '#' + encodeURI(addr.fragment) );
-        if( !arguments[1] || arguments[1] == "") { // inline link
-          if(arguments[2] == "<") return "["+workingUrl+"]("+asciiUrl+")"; // without link text
-          else return arguments[2]+asciiUrl+urlSuffix; // with link text
-        } else { // reference style link
-          return arguments[1]+asciiUrl;
+    md.use(inlinePlugin, "link_new_window_and_missing_http", "link_open", function (tokens, idx) {
+      tokens[idx].attrs.forEach(function(attribute, index, array) {
+        if( attribute[0] === "href" ) {
+          array[index][1] = attribute[1].replace(/^www\./, "http://www.");
         }
       });
-
-      return text;
+      tokens[idx].attrPush([ "target", "_blank" ]);
     });
 
-    // make nice little utf-8 symbols
-    converter.hooks.chain("preConversion", function(text) {
-      var input_strings = [
-        "<->", "->", "<-",
-        "(c)", "(r)", "(tm)",
-        "<3"
-      ];
-      var output_symbols = [
-        "↔", "→", "←",
-        "©", "®", "™",
-        "♥"
-      ];
-      // quote function from: http://stackoverflow.com/a/494122
-      var quote = function(str) {
-        return str.replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
-      };
-
-      _.each(input_strings, function(str, idx) {
-        var r = new RegExp(quote(str), "gi");
-        text = text.replace(r, output_symbols[idx]);
-      });
-      return text;
+    var hashtagPlugin = window.markdownitHashtag;
+    md.use(hashtagPlugin, {
+      // compare tag_text_regexp in app/models/acts_as_taggable_on-tag.rb
+      hashtagRegExp: "[" + PosixBracketExpressions.alnum + "_\\-]+|<3",
+      // compare tag_strings in lib/diaspora/taggabe.rb
+      preceding: "^|\\s"
     });
 
-    converter.hooks.chain("postConversion", function (text) {
-      return text.replace(/(\"(?:(?:http|https):\/\/)?[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,3}(?:\/\S*)?\")(\>)/g, '$1 target="_blank">')
+    var mentionPlugin = window.markdownitDiasporaMention;
+    md.use(mentionPlugin, {
+      mentions: mentions,
+      allowHovercards: true,
+      currentUserId: app.currentUser.get("guid")
     });
 
-    return converter.makeHtml(text)
+    var subPlugin = window.markdownitSub;
+    md.use(subPlugin);
+    var supPlugin = window.markdownitSup;
+    md.use(supPlugin);
+    var sanitizerPlugin = window.markdownitSanitizer;
+    md.use(sanitizerPlugin);
+
+    // xmpp: should behave like mailto:
+    md.linkify.add("xmpp:","mailto:");
+    // mumble:// should behave like http://:
+    md.linkify.add("mumble:","http:");
+    md.linkify.set({ fuzzyLink: false });
+
+    // Bootstrap table markup
+    md.renderer.rules.table_open = function () { return "<table class=\"table table-striped\">\n"; };
+
+    return md.render(text);
   };
-
-  textFormatter.hashtagify = function hashtagify(text){
-    var utf8WordCharcters =/(\s|^|>)#([\u0080-\uFFFF|\w|-]+|&lt;3)/g
-    return text.replace(utf8WordCharcters, function(hashtag, preceeder, tagText) {
-      return preceeder + "<a href='/tags/" + tagText + "' class='tag'>#" + tagText + "</a>"
-    })
-  };
-
-  textFormatter.mentionify = function mentionify(text, mentions) {
-    var mentionRegex = /@\{([^;]+); ([^\}]+)\}/g
-    return text.replace(mentionRegex, function(mentionText, fullName, diasporaId) {
-      var person = _.find(mentions, function(person){
-        return (diasporaId == person.diaspora_id || person.handle) //jquery.mentionsInput gives us person.handle
-      })
-      if(person) {
-        var url = person.url || "/people/" + person.guid //jquery.mentionsInput gives us person.url
-          , personText = "<a href='" + url + "' class='mention'>" + fullName + "</a>"
-      } else {
-        personText = fullName;
-      }
-
-      return personText
-    })
-  }
-
-  app.helpers.textFormatter = textFormatter;
 })();
+// @license-end
 

app/assets/javascripts/app/helpers/timeago.js

@@ -0,0 +1,9 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+(function(){
+  app.helpers.timeago = function(el) {
+    el.find('time.timeago').each(function(i,e) {
+      $(e).attr('title', new Date($(e).attr('datetime')).toLocaleString());
+    }).timeago().tooltip();
+  };
+})();
+// @license-end

app/assets/javascripts/app/helpers/truncate.js

@@ -0,0 +1,14 @@
+(function() {
+  app.helpers.truncate = function(passedString, length) {
+    if (passedString === null || passedString === undefined) {
+      return passedString;
+    }
+
+    if (passedString.length > length) {
+      var lastBlank = passedString.lastIndexOf(' ', length);
+      var trimstring = passedString.substring(0, Math.min(length, lastBlank));
+      return new Handlebars.SafeString(trimstring + " ...");
+    }
+    return new Handlebars.SafeString(passedString);
+  };
+})();

app/assets/javascripts/app/models.js

@@ -1,3 +1,4 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
 
 // Mixin to provide date formatting and "createdAt" method
 // other attributes can be accessed by calling this.timeOf("timestamp-field")
@@ -14,3 +15,5 @@ app.models.formatDateMixin = {
   }
 
 };
+// @license-end
+

app/assets/javascripts/app/models/aspect.js

@@ -0,0 +1,9 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.models.Aspect = Backbone.Model.extend({
+  toggleSelected: function(){
+    this.set({'selected' : !this.get('selected')}, {async: false});
+  }
+});
+// @license-end
+

app/assets/javascripts/app/models/aspect_membership.js

@@ -0,0 +1,11 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+/**
+ * this model represents the assignment of an aspect to a person.
+ * (only valid for the context of the current user)
+ */
+app.models.AspectMembership = Backbone.Model.extend({
+  urlRoot: "/aspect_memberships"
+});
+// @license-end
+

app/assets/javascripts/app/models/block.js

@@ -1,3 +1,7 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.models.Block = Backbone.Model.extend({
   urlRoot : "/blocks"
 });
+// @license-end
+

app/assets/javascripts/app/models/comment.js

@@ -1,3 +1,7 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.models.Comment = Backbone.Model.extend({
   urlRoot: "/comments"
 });
+// @license-end
+

app/assets/javascripts/app/models/contact.js

@@ -0,0 +1,13 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.models.Contact = Backbone.Model.extend({
+  initialize : function() {
+    this.aspect_memberships = new app.collections.AspectMemberships(this.get('aspect_memberships'));
+    if( this.get('person') ) this.person = new app.models.Person(this.get('person'));
+  },
+
+  inAspect : function(id) {
+    return this.aspect_memberships.any(function(membership){ return membership.get('aspect').id === id; });
+  }
+});
+// @license-end

app/assets/javascripts/app/models/like.js

@@ -1 +1,5 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.models.Like = Backbone.Model.extend({ });
+// @license-end
+

app/assets/javascripts/app/models/person.js

@@ -0,0 +1,53 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.models.Person = Backbone.Model.extend({
+  url: function() {
+    return Routes.person_path(this.get('guid'));
+  },
+
+  initialize: function() {
+    if( this.get('profile') )
+      this.profile = new app.models.Profile(this.get('profile'));
+  },
+
+  isSharing: function() {
+    var rel = this.get('relationship');
+    return (rel === 'mutual' || rel === 'sharing');
+  },
+
+  isReceiving: function() {
+    var rel = this.get('relationship');
+    return (rel === 'mutual' || rel === 'receiving');
+  },
+
+  isMutual: function() {
+    return (this.get('relationship') === 'mutual');
+  },
+
+  isBlocked: function() {
+    return (this.get('relationship') === 'blocked');
+  },
+
+  block: function() {
+    var self = this;
+    var block = new app.models.Block({block: {person_id: this.id}});
+
+    // return the jqXHR with Promise interface
+    return block.save()
+      .done(function() { app.events.trigger('person:block:'+self.id); });
+  },
+
+  unblock: function() {
+    var self = this;
+    if( !this.get('block') ) {
+      var def = $.Deferred();
+      return def.reject();
+    }
+
+    var block = new app.models.Block({id: this.get('block').id});
+    return block.destroy()
+      .done(function() { app.events.trigger('person:unblock:'+self.id); });
+  }
+});
+// @license-end
+

app/assets/javascripts/app/models/photo.js

@@ -1,6 +1,10 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.models.Photo = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin, {
   urlRoot : "/photos",
 
   initialize : function() {},
 
 }));
+// @license-end
+

app/assets/javascripts/app/models/poll_participation.js

@@ -0,0 +1,9 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
+app.models.PollParticipation = Backbone.Model.extend({
+  urlRoot: function(){
+    return '/posts/' + this.get('post_id') + "/poll_participations";
+  }
+});
+// @license-end
+

app/assets/javascripts/app/models/post.js

@@ -1,26 +1,20 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin, {
   urlRoot : "/posts",
 
   initialize : function() {
-    this.interactions = new app.models.Post.Interactions(_.extend({post : this}, this.get("interactions")))
-    this.delegateToInteractions()
+    this.interactions = new app.models.Post.Interactions(_.extend({post : this}, this.get("interactions")));
+    this.delegateToInteractions();
   },
 
   delegateToInteractions : function(){
-    this.comments = this.interactions.comments
-    this.likes = this.interactions.likes
+    this.comments = this.interactions.comments;
+    this.likes = this.interactions.likes;
 
     this.comment = function(){
-      this.interactions.comment.apply(this.interactions, arguments)
-    }
-  },
-
-  setFrameName : function(){
-    this.set({frame_name : new app.models.Post.TemplatePicker(this).getFrameName()})
-  },
-
-  applicableTemplates: function() {
-    return new app.models.Post.TemplatePicker(this).applicableTemplates()
+      this.interactions.comment.apply(this.interactions, arguments);
+    };
   },
 
   interactedAt : function() {
@@ -28,15 +22,24 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin,
   },
 
   reshare : function(){
-    return this._reshare = this._reshare || new app.models.Reshare({root_guid : this.get("guid")});
+    this._reshare = this._reshare || new app.models.Reshare({root_guid : this.get("guid")});
+    return this._reshare;
   },
 
   reshareAuthor : function(){
-    return this.get("author")
+    return this.get("author");
+  },
+
+  blockAuthor: function() {
+    var personId = this.get("author").id;
+    var block = new app.models.Block();
+
+    return block.save({block : {person_id : personId}})
+             .done(function(){ app.events.trigger('person:block:'+personId); });
   },
 
   toggleFavorite : function(options){
-    this.set({favorite : !this.get("favorite")})
+    this.set({favorite : !this.get("favorite")});
 
     /* guard against attempting to save a model that a user doesn't own */
     if(options.save){ this.save() }
@@ -44,36 +47,29 @@ app.models.Post = Backbone.Model.extend(_.extend({}, app.models.formatDateMixin,
 
   headline : function() {
     var headline = this.get("text").trim()
-      , newlineIdx = headline.indexOf("\n")
-    return (newlineIdx > 0 ) ? headline.substr(0, newlineIdx) : headline
+      , newlineIdx = headline.indexOf("\n");
+    return (newlineIdx > 0 ) ? headline.substr(0, newlineIdx) : headline;
   },
 
   body : function(){
     var body = this.get("text").trim()
-      , newlineIdx = body.indexOf("\n")
-    return (newlineIdx > 0 ) ? body.substr(newlineIdx+1, body.length) : ""
+      , newlineIdx = body.indexOf("\n");
+    return (newlineIdx > 0 ) ? body.substr(newlineIdx+1, body.length) : "";
   },
 
   //returns a promise
   preloadOrFetch : function(){
-    var action = app.hasPreload("post") ? this.set(app.parsePreload("post")) : this.fetch()
-    return $.when(action)
+    var action = app.hasPreload("post") ? this.set(app.parsePreload("post")) : this.fetch();
+    return $.when(action);
   },
 
   hasPhotos : function(){
-    return this.get("photos") && this.get("photos").length > 0
+    return this.get("photos") && this.get("photos").length > 0;
   },
 
   hasText : function(){
-    return $.trim(this.get("text")) !== ""
+    return $.trim(this.get("text")) !== "";
   }
-}), {
-  headlineLimit : 118,
+}));
+// @license-end
 
-  frameMoods : [
-    "Wallpaper",
-    "Vanilla",
-    "Typist",
-    "Fridge"
-  ]
-});

app/assets/javascripts/app/models/post/interactions.js

@@ -1,125 +1,139 @@
+// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPL-v3-or-Later
+
 //require ../post
 
 app.models.Post.Interactions = Backbone.Model.extend({
   url : function(){
-    return this.post.url() + "/interactions"
+    return this.post.url() + "/interactions";
   },
 
   initialize : function(options){
-    this.post = options.post
-    this.comments = new app.collections.Comments(this.get("comments"), {post : this.post})
+    this.post = options.post;
+    this.comments = new app.collections.Comments(this.get("comments"), {post : this.post});
     this.likes = new app.collections.Likes(this.get("likes"), {post : this.post});
     this.reshares = new app.collections.Reshares(this.get("reshares"), {post : this.post});
   },
 
   parse : function(resp){
-    this.comments.reset(resp.comments)
-    this.likes.reset(resp.likes)
-    this.reshares.reset(resp.reshares)
+    this.comments.reset(resp.comments);
+    this.likes.reset(resp.likes);
+    this.reshares.reset(resp.reshares);
 
     var comments = this.comments
       , likes = this.likes
-      , reshares = this.reshares
+      , reshares = this.reshares;
 
     return {
       comments : comments,
       likes : likes,
       reshares : reshares,
       fetched : true
-    }
+    };
   },
 
   likesCount : function(){
-    return (this.get("fetched") ? this.likes.models.length : this.get("likes_count") )
+    return (this.get("fetched") ? this.likes.models.length : this.get("likes_count") );
   },
 
   resharesCount : function(){
-    return this.get("fetched") ? this.reshares.models.length : this.get("reshares_count")
+    return this.get("fetched") ? this.reshares.models.length : this.get("reshares_count");
   },
 
   commentsCount : function(){
-    return this.get("fetched") ? this.comments.models.length : this.get("comments_count")
+    return this.get("fetched") ? this.comments.models.length : this.get("comments_count");
   },
 
   userLike : function(){
-    return this.likes.select(function(like){ return like.get("author").guid == app.currentUser.get("guid")})[0]
+    return this.likes.select(function(like){ return like.get("author").guid === app.currentUser.get("guid")})[0];
   },
 
   userReshare : function(){
     return this.reshares.select(function(reshare){
-      return reshare.get("author") &&  reshare.get("author").guid == app.currentUser.get("guid")})[0]
+      return reshare.get("author") &&  reshare.get("author").guid === app.currentUser.get("guid")})[0];
   },
 
   toggleLike : function() {
     if(this.userLike()) {
-      this.unlike()
+      this.unlike();
     } else {
-      this.like()
+      this.like();
     }
   },
 
   like : function() {
     var self = this;
     this.likes.create({}, {success : function(){
-      self.trigger("change")
-      self.set({"likes_count" : self.get("likes_count") + 1})
-    }})
+      self.trigger("change");
+      self.set({"likes_count" : self.get("likes_count") + 1});
+    }});
 
-    app.instrument("track", "Like")
+    app.instrument("track", "Like");
   },
 
   unlike : function() {
     var self = this;
-    this.userLike().destroy({success : function(model, resp) {
-      self.trigger('change')
-      self.set({"likes_count" : self.get("likes_count") - 1})
+    this.userLike().destroy({success : function() {
+      self.trigger('change');
+      self.set({"likes_count" : self.get("likes_count") - 1});
     }});
 
-    app.instrument("track", "Unlike")
+    app.instrument("track", "Unlike");
   },
 
   comment : function (text) {
     var self = this;
 
     this.comments.make(text).fail(function () {
-      alert(Diaspora.I18n.t("failed_to_post_message"));
+      var flash = new Diaspora.Widgets.FlashMessages();
+      flash.render({
+        success: false,
+        notice: Diaspora.I18n.t("failed_to_post_message")
+      });
     }).done(function() {
-      self.trigger('change') //updates after sync
+      self.trigger('change'); //updates after sync
     });
 
-    this.trigger("change") //updates count in an eager manner
+    this.trigger("change"); //updates count in an eager manner
 
-    app.instrument("track", "Comment")
+    app.instrument("track", "Comment");
   },
 
   reshare : function(){
     var interactions = this
       , reshare = this.post.reshare()
+      , flash = new Diaspora.Widgets.FlashMessages();
 
-    reshare.save({}, {
-      success : function(resp){
-        var flash = new Diaspora.Widgets.FlashMessages;
+    reshare.save()
+      .done(function(reshare) {
         flash.render({
           success: true,
           notice: Diaspora.I18n.t("reshares.successful")
         });
-      }
-    }).done(function(){
-        interactions.reshares.add(reshare)
-      }).done(function(){
-        interactions.trigger("change")
+        interactions.reshares.add(reshare);
+        if (app.stream && /^\/(?:stream|activity|aspects)/.test(app.stream.basePath())) {
+          app.stream.addNow(reshare);
+        }
+        interactions.trigger("change");
+      })
+      .fail(function(){
+        flash.render({
+          success: false,
+          notice: Diaspora.I18n.t("reshares.duplicate")
+        });
       });
 
-    app.instrument("track", "Reshare")
+    app.instrument("track", "Reshare");
   },
 
   userCanReshare : function(){
-    var isReshare = this.post.get("post_type") == "Reshare"
+    var isReshare = this.post.get("post_type") === "Reshare"
       , rootExists = (isReshare ? this.post.get("root") : true)
       , publicPost = this.post.get("public")
-      , userIsNotAuthor = this.post.get("author").diaspora_id != app.currentUser.get("diaspora_id")
-      , userIsNotRootAuthor = rootExists && (isReshare ? this.post.get("root").author.diaspora_id != app.currentUser.get("diaspora_id") : true)
+      , userIsNotAuthor = this.post.get("author").diaspora_id !== app.currentUser.get("diaspora_id")
+      , userIsNotRootAuthor = rootExists && (isReshare ? this.post.get("root").author.diaspora_id !== app.currentUser.get("diaspora_id") : true)
+      , notReshared = !this.userReshare();
 
-    return publicPost && app.currentUser.authenticated() && userIsNotAuthor && userIsNotRootAuthor;
+    return publicPost && app.currentUser.authenticated() && userIsNotAuthor && userIsNotRootAuthor && notReshared;
   }
-});
+});
+// @license-end

app/assets/javascripts/app/models/post/template_picker.js

@@ -1,35 +0,0 @@
-//require ../post
-
-app.models.Post.TemplatePicker = function(model){
-  this.model = model
-}
-
-_.extend(app.models.Post.TemplatePicker.prototype, {
-  getFrameName : function getFrameName() {
-    var frameName
-
-    if(this.isNewspaper()){
-      frameName = "Typist"
-    } else if(this.isWallpaper()) {
-      frameName =  "Wallpaper"
-    } else {
-      frameName = "Vanilla"
-    }
-
-    return frameName
-  },
-
-  isNewspaper : function(){
-    return this.model.get("text").length > 300
-  },
-
-  isWallpaper : function(){
-    return this.model.get("photos").length == 1
-  },
-
-  applicableTemplates : function(){
-    /* don't show the wallpaper option if there is no image */
-    var moods = app.models.Post.frameMoods;
-    return (!this.isWallpaper() ? _.without(moods, "Wallpaper") : moods)
-  }
-});