From 1840a352f5cdf676284c1d8d32bef7776fbb536d Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Sat, 17 Jun 2017 05:38:26 +0900
Subject: [PATCH 001/382] Fix ogp url (#3802)

---
 app/views/about/show.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index fd21c2a7f..d15b04163 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -10,7 +10,7 @@
   %meta{ property: 'og:type', content: 'website' }/
   %meta{ property: 'og:title', content: site_hostname }/
   %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon')) }/
-  %meta{ property: 'og:image', content: asset_pack_path('mastodon_small.jpg') }/
+  %meta{ property: 'og:image', content: asset_pack_path('mastodon_small.jpg', protocol: :request) }/
   %meta{ property: 'og:image:width', content: '400' }/
   %meta{ property: 'og:image:height', content: '400' }/
   %meta{ property: 'twitter:card', content: 'summary' }/

From 2356580cee9d485d6e33d7b51ea2d83632cf791e Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 17 Jun 2017 08:14:42 +0900
Subject: [PATCH 002/382] Use cross-env for npm run on Windows (#3789)

---
 package.json |  9 +++++----
 yarn.lock    | 29 +++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 462772e18..a6aa1ce1c 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,14 @@
   "license": "AGPL-3.0",
   "scripts": {
     "postversion": "git push --tags",
-    "build:development": "NODE_ENV=development yarn webpack -- --config config/webpack/development.js",
-    "build:production": "NODE_ENV=production yarn webpack -- --config config/webpack/production.js",
+    "build:development": "cross-env NODE_ENV=development yarn webpack -- --config config/webpack/development.js",
+    "build:production": "cross-env NODE_ENV=production yarn webpack -- --config config/webpack/production.js",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",
-    "storybook": "NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook",
+    "storybook": "cross-env NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",
     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ storybook/ streaming/",
-    "test:mocha": "NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.js",
+    "test:mocha": "cross-env NODE_ENV=test mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.js",
     "postinstall": "npm rebuild node-sass"
   },
   "repository": {
@@ -40,6 +40,7 @@
     "babel-preset-react": "^6.24.1",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^0.4.0",
+    "cross-env": "^5.0.1",
     "css-loader": "^0.28.4",
     "dotenv": "^4.0.0",
     "emojione": "^2.2.7",
diff --git a/yarn.lock b/yarn.lock
index c11b7718a..960c2ca02 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1894,6 +1894,13 @@ create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.5
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
+cross-env@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.1.tgz#ff4e72ea43b47da2486b43a7f2043b2609e44913"
+  dependencies:
+    cross-spawn "^5.1.0"
+    is-windows "^1.0.0"
+
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -1908,6 +1915,14 @@ cross-spawn@^4.0.0:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
+cross-spawn@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
+  dependencies:
+    lru-cache "^4.0.1"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -3668,6 +3683,10 @@ is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
 
+is-windows@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
+
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -6201,6 +6220,16 @@ shallowequal@0.2.x, shallowequal@^0.2.2:
   dependencies:
     lodash.keys "^3.1.2"
 
+shebang-command@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  dependencies:
+    shebang-regex "^1.0.0"
+
+shebang-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+
 shelljs@^0.7.5, shelljs@^0.7.7:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"

From 74d10b9b9d60426ed44e5c6d361db7a44996236a Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Sat, 17 Jun 2017 08:15:00 +0900
Subject: [PATCH 003/382] Spec UserMailer (#3757)

---
 spec/mailers/user_mailer_spec.rb | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 spec/mailers/user_mailer_spec.rb

diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
new file mode 100644
index 000000000..1f6d44015
--- /dev/null
+++ b/spec/mailers/user_mailer_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe UserMailer, type: :mailer do
+  let(:receiver) { Fabricate(:user) }
+
+  shared_examples 'localized subject' do |*args, **kwrest|
+    it 'renders subject localized for the locale of the receiver' do
+      locale = I18n.available_locales.sample
+      receiver.update!(locale: locale)
+      expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: locale))
+    end
+
+    it 'renders subject localized for the default locale if the locale of the receiver is unavailable' do
+      receiver.update!(locale: nil)
+      expect(mail.subject).to eq I18n.t(*args, kwrest.merge(locale: I18n.default_locale))
+    end
+  end
+
+  describe 'confirmation_instructions' do
+    let(:mail) { UserMailer.confirmation_instructions(receiver, 'spec') }
+
+    it 'renders confirmation instructions' do
+      receiver.update!(locale: nil)
+      expect(mail.body.encoded).to include receiver.email
+      expect(mail.body.encoded).to include 'spec'
+      expect(mail.body.encoded).to include Rails.configuration.x.local_domain
+    end
+
+    include_examples 'localized subject',
+                     'devise.mailer.confirmation_instructions.subject',
+                     instance: Rails.configuration.x.local_domain
+  end
+
+  describe 'reset_password_instructions' do
+    let(:mail) { UserMailer.reset_password_instructions(receiver, 'spec') }
+
+    it 'renders reset password instructions' do
+      receiver.update!(locale: nil)
+      expect(mail.body.encoded).to include receiver.email
+      expect(mail.body.encoded).to include 'spec'
+    end
+
+    include_examples 'localized subject',
+                     'devise.mailer.reset_password_instructions.subject'
+  end
+
+  describe 'password_change' do
+    let(:mail) { UserMailer.password_change(receiver) }
+
+    it 'renders password change notification' do
+      receiver.update!(locale: nil)
+      expect(mail.body.encoded).to include receiver.email
+    end
+
+    include_examples 'localized subject',
+                     'devise.mailer.password_change.subject'
+  end
+end

From 8fd931dc126d0f90417a6614bd21bb945543e4f4 Mon Sep 17 00:00:00 2001
From: Quent-in <pages_quentin@hotmail.com>
Date: Sat, 17 Jun 2017 20:21:25 +0200
Subject: [PATCH 004/382] l10n update for account deletion  (#3820)

* l10n update for acount deletion

* l10n little change

* l10n little changes

Less passive voice, more natural.

* Update oc.yml

Correction, " added
---
 config/locales/devise.oc.yml |  2 +-
 config/locales/oc.yml        | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/config/locales/devise.oc.yml b/config/locales/devise.oc.yml
index 2913078ff..77740f230 100644
--- a/config/locales/devise.oc.yml
+++ b/config/locales/devise.oc.yml
@@ -35,7 +35,7 @@ oc:
       updated_not_active: Vòstre senhal es ben estat cambiat.
     registrations:
       destroyed: Adiu ! Vòstra inscripcion es estada anullada amb succès. Esperem vos tornar veire lèu.
-      signed_up: Benvengut ! Sètz ben marcat al malhum.
+      signed_up: La benvenguda ! Sètz ben marcat al malhum.
       signed_up_but_inactive: Sètz ben marcat. Pasmens, avèm pas pogut vos connectar perque vòstre compte es pas encara validat.
       signed_up_but_locked: Sètz ben marcat. Pasmens, avèm pas pogut vos connectar perque vòstre compte es pas encara blocat.
       signed_up_but_unconfirmed: Un messatge amb un ligam de confirmacion es estat enviat a vòstra adreça de corrièl. Clicatz sul ligam per activar vòstre compte. Mercés de verificar tanben vòstre dorsièr de corrièls indesirables.
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 709f6ddb4..3770c0671 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -195,6 +195,8 @@ oc:
     invalid_url: L’URL donada es invalida
   auth:
     change_password: Cambiar lo senhal
+    delete_account: Suprimir lo compte
+    delete_account_html: Se volètz suprimir vòstre compte, podètz <a href="%{path}">o far aquí</a>. Vos demandarem que confirmetz.
     didnt_get_confirmation: Avètz pas recebut las instruccions de confirmacion ?
     forgot_password: Senhal oblidat ?
     login: Se connectar
@@ -281,6 +283,14 @@ oc:
       x_minutes: Fa %{count} minutas
       x_months: Fa %{count} meses
       x_seconds: Fa %{count} segondas
+  deletes:
+    bad_password_msg: Ben ensajat pirata ! Senhal incorrècte
+    confirm_password: Picatz vòstre senhal acutal per verificar vòstra identitat
+    description_html: Aquò suprimirà <strong>definitivament e sens possibilitat de retorn</strong> lo contengut de vòstre compte e lo desactivarà. Lo nom d’utilizaire serà gardat per evitar una futura impostura.
+    proceed: Delete account
+    success_msg: Your account was successfully deleted
+    warning_html: La supression del contengut d’aquesta instància es sola assegurada. Lo contengut fòrça partejat daissarà problablament de traças. Los servidors fòra-linha e los que vos sègon pas mai auràn pas la mesa a jorn de lor basa de donada.
+    warning_title: Disponibilitat del contengut difusat
   errors:
     '404': La pagina que recercatz existís pas.
     '410': La pagina que cercatz existís pas mai.
@@ -342,13 +352,13 @@ oc:
       subject: "%{name} a mes vòstre estatut en favorit"
     follow:
       body: "%{name} vos sèc ara !"
-      subject: "%{name} es a vos sègre ara"
+      subject: "%{name} vos sèc ara"
     follow_request:
-      body: "%{name} a demandar a vos sègre"
+      body: "%{name} a demandat a vos sègre"
       subject: 'Demanda d’abonament : %{name}'
     mention:
-      body: 'Sètz estat mencionat per %{name} dins :'
-      subject: Sètz estat mencionat per %{name}
+      body: "%{name} vos a mencionat dins :"
+      subject: "%{name} vos a mencionat"
     reblog:
       body: "%{name} a tornat partejar vòstre estatut :"
       subject: "%{name} a tornat partejar vòstre estatut"
@@ -364,6 +374,7 @@ oc:
   settings:
     authorized_apps: Aplicacions autorizadas
     back: Tornar a Mastodon
+    delete: Supression de compte
     edit_profile: Modificar lo perfil
     export: Export donadas
     followers: Seguidors autorizats
@@ -383,7 +394,7 @@ oc:
       unlisted: Pas listat
       unlisted_long: Tot lo mond pòt veire mai serà pas visible sul flux public
   stream_entries:
-    click_to_show: Clic per afichar
+    click_to_show: Clicatz per afichar
     reblogged: a partejat
     sensitive_content: Contengut sensible
   time:

From 94d0e012dea89058b9c059636fb6d42f6565e534 Mon Sep 17 00:00:00 2001
From: nightpool <eg1290@gmail.com>
Date: Sat, 17 Jun 2017 14:26:05 -0400
Subject: [PATCH 005/382] Whitelist allowed classes for federated statuses
 (#3810)

* Whitelist allowed classes for federated statuses

Allowed classes are currently:

 - Any microformats class (h/p/u/dt/e-*)
 - the classes mention, hashtag, ellipses and invisible.

this last one is somewhat suspect, but Mastodon currently uses it to render hidden link text.

resolved #3790

* Fix code style
---
 app/lib/sanitize_config.rb | 21 ++++++++++++++++++++-
 spec/lib/formatter_spec.rb |  8 ++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 9cf9b3db0..f09288fcd 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -4,6 +4,21 @@ class Sanitize
   module Config
     HTTP_PROTOCOLS ||= ['http', 'https', :relative].freeze
 
+    CLASS_WHITELIST_TRANSFORMER = lambda do |env|
+      node = env[:node]
+      class_list = node['class']&.split(' ')
+
+      return unless class_list
+
+      class_list.keep_if do |e|
+        return true if e =~ /^(h|p|u|dt|e)-/ # microformats classes
+        return true if e =~ /^(mention|hashtag)$/ # semantic classes
+        return true if e =~ /^(ellipsis|invisible)$/ # link formatting classes
+      end
+
+      node['class'] = class_list.join(' ')
+    end
+
     MASTODON_STRICT ||= freeze_config(
       elements: %w(p br span a),
 
@@ -21,7 +36,11 @@ class Sanitize
 
       protocols: {
         'a' => { 'href' => HTTP_PROTOCOLS },
-      }
+      },
+
+      transformers: [
+        CLASS_WHITELIST_TRANSFORMER,
+      ]
     )
 
     MASTODON_OEMBED ||= freeze_config merge(
diff --git a/spec/lib/formatter_spec.rb b/spec/lib/formatter_spec.rb
index cc32f7fd6..dfe1d8b8f 100644
--- a/spec/lib/formatter_spec.rb
+++ b/spec/lib/formatter_spec.rb
@@ -204,6 +204,14 @@ RSpec.describe Formatter do
         is_expected.to_not include '<script>alert("Hello")</script>'
       end
     end
+
+    context 'contains malicious classes' do
+      let(:text) { '<span class="status__content__spoiler-link">Show more</span>' }
+
+      it 'strips malicious classes' do
+        is_expected.to_not include 'status__content__spoiler-link'
+      end
+    end
   end
 
   describe '#plaintext' do

From 53e42bf91ef2c705168f8d04b9374c349ec14074 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 18 Jun 2017 09:57:09 +0900
Subject: [PATCH 006/382] Upgrade Webpacker to version 2.0 (#3729)

---
 .gitignore                                  |   1 +
 .travis.yml                                 |   2 +-
 Gemfile                                     |   2 +-
 Gemfile.lock                                |   4 +-
 bin/webpack                                 |  25 ++--
 bin/webpack-dev-server                      |  30 +++--
 bin/yarn                                    |  11 --
 config/webpack/configuration.js             |  35 +++--
 config/webpack/development.js               |  16 +++
 config/webpack/development.server.js        |  20 ---
 config/webpack/development.server.yml       |  17 ---
 config/webpack/loaders/sass.js              |   3 +-
 config/webpack/production.js                |  15 ++-
 config/webpack/shared.js                    |  32 +++--
 config/{webpack/paths.yml => webpacker.yml} |  17 ++-
 package.json                                |   5 +-
 yarn.lock                                   | 134 +++++++++++++++++++-
 17 files changed, 241 insertions(+), 128 deletions(-)
 delete mode 100755 bin/yarn
 delete mode 100644 config/webpack/development.server.js
 delete mode 100644 config/webpack/development.server.yml
 rename config/{webpack/paths.yml => webpacker.yml} (61%)

diff --git a/.gitignore b/.gitignore
index 31743fccf..38ebc934f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ coverage
 public/system
 public/assets
 public/packs
+public/packs-test
 .env
 .env.production
 node_modules/
diff --git a/.travis.yml b/.travis.yml
index a855aa31c..8bef9c4ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ cache:
   directories:
   - node_modules
   - public/assets
-  - public/packs
+  - public/packs-test
 dist: trusty
 sudo: false
 
diff --git a/Gemfile b/Gemfile
index b014ba03c..77fffe7a6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,7 +59,7 @@ gem 'sprockets-rails', '~> 3.2', require: 'sprockets/railtie'
 gem 'statsd-instrument', '~> 2.1'
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2017'
-gem 'webpacker', '~> 1.2'
+gem 'webpacker', '~> 2.0'
 
 group :development, :test do
   gem 'fabrication', '~> 2.16'
diff --git a/Gemfile.lock b/Gemfile.lock
index ef7e40376..00ce84556 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -461,7 +461,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (1.2)
+    webpacker (2.0)
       activesupport (>= 4.2)
       multi_json (~> 1.2)
       railties (>= 4.2)
@@ -558,7 +558,7 @@ DEPENDENCIES
   tzinfo-data (~> 1.2017)
   uglifier (~> 3.2)
   webmock (~> 3.0)
-  webpacker (~> 1.2)
+  webpacker (~> 2.0)
 
 RUBY VERSION
    ruby 2.4.1p111
diff --git a/bin/webpack b/bin/webpack
index a871ce77b..867550eb8 100755
--- a/bin/webpack
+++ b/bin/webpack
@@ -5,29 +5,24 @@ require "shellwords"
 require "yaml"
 
 ENV["RAILS_ENV"] ||= "development"
-RAILS_ENV   = ENV["RAILS_ENV"]
+RAILS_ENV = ENV["RAILS_ENV"]
 
 ENV["NODE_ENV"] ||= RAILS_ENV
-NODE_ENV    = ENV["NODE_ENV"]
+NODE_ENV = ENV["NODE_ENV"]
 
-APP_PATH               = File.expand_path("../", __dir__)
-CONFIG_PATH            = File.join(APP_PATH, "config/webpack/paths.yml")
+APP_PATH          = File.expand_path("../", __dir__)
+NODE_MODULES_PATH = File.join(APP_PATH, "node_modules")
+WEBPACK_CONFIG    = File.join(APP_PATH, "config/webpack/#{NODE_ENV}.js")
 
-begin
-  paths            = YAML.load(File.read(CONFIG_PATH))[NODE_ENV]
-
-  NODE_MODULES_PATH   = File.join(APP_PATH.shellescape, paths["node_modules"])
-  WEBPACK_CONFIG_PATH = File.join(APP_PATH.shellescape, paths["config"])
-rescue Errno::ENOENT, NoMethodError
-  puts "Configuration not found in config/webpack/paths.yml"
+unless File.exist?(WEBPACK_CONFIG)
+  puts "Webpack configuration not found."
   puts "Please run bundle exec rails webpacker:install to install webpacker"
   exit!
 end
 
-WEBPACK_BIN    = "#{NODE_MODULES_PATH}/.bin/webpack"
-WEBPACK_CONFIG = "#{WEBPACK_CONFIG_PATH}/#{NODE_ENV}.js"
+newenv  = { "NODE_PATH" => NODE_MODULES_PATH.shellescape }
+cmdline = ["yarn", "run", "webpack", "--", "--config", WEBPACK_CONFIG] + ARGV
 
 Dir.chdir(APP_PATH) do
-  exec "NODE_PATH=#{NODE_MODULES_PATH} #{WEBPACK_BIN} --config #{WEBPACK_CONFIG}" \
-    " #{ARGV.join(" ")}"
+  exec newenv, *cmdline
 end
diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
index c2a61ff5e..a867f2c01 100755
--- a/bin/webpack-dev-server
+++ b/bin/webpack-dev-server
@@ -10,24 +10,34 @@ RAILS_ENV = ENV["RAILS_ENV"]
 ENV["NODE_ENV"] ||= RAILS_ENV
 NODE_ENV = ENV["NODE_ENV"]
 
-APP_PATH    = File.expand_path("../", __dir__)
-CONFIG_PATH = File.join(APP_PATH, "config/webpack/paths.yml")
+APP_PATH          = File.expand_path("../", __dir__)
+CONFIG_FILE       = File.join(APP_PATH, "config/webpacker.yml")
+NODE_MODULES_PATH = File.join(APP_PATH, "node_modules")
+WEBPACK_CONFIG    = File.join(APP_PATH, "config/webpack/development.js")
+
+def args(key)
+  index = ARGV.index(key)
+  index ? ARGV[index + 1] : nil
+end
 
 begin
-  paths = YAML.load(File.read(CONFIG_PATH))[NODE_ENV]
+  dev_server = YAML.load_file(CONFIG_FILE)["development"]["dev_server"]
 
-  NODE_MODULES_PATH   = File.join(APP_PATH.shellescape, paths["node_modules"])
-  WEBPACK_CONFIG_PATH = File.join(APP_PATH.shellescape, paths["config"])
+  DEV_SERVER_HOST = "http#{"s" if args('--https') || dev_server["https"]}://#{args('--host') || dev_server["host"]}:#{args('--port') || dev_server["port"]}"
 
-  WEBPACK_BIN       = "#{NODE_MODULES_PATH}/.bin/webpack-dev-server"
-  DEV_SERVER_CONFIG = "#{WEBPACK_CONFIG_PATH}/development.server.js"
 rescue Errno::ENOENT, NoMethodError
-  puts "Configuration not found in config/webpacker/paths.yml."
+  puts "Webpack dev_server configuration not found in #{CONFIG_FILE}."
   puts "Please run bundle exec rails webpacker:install to install webpacker"
   exit!
 end
 
+newenv = {
+  "NODE_PATH" => NODE_MODULES_PATH.shellescape,
+  "ASSET_HOST" => DEV_SERVER_HOST.shellescape
+}.freeze
+
+cmdline = ["yarn", "run", "webpack-dev-server", "--", "--progress", "--color", "--config", WEBPACK_CONFIG] + ARGV
+
 Dir.chdir(APP_PATH) do
-  exec "NODE_PATH=#{NODE_MODULES_PATH} #{WEBPACK_BIN} --progress --color " \
-    "--config #{DEV_SERVER_CONFIG} #{ARGV.join(" ")}"
+  exec newenv, *cmdline
 end
diff --git a/bin/yarn b/bin/yarn
deleted file mode 100755
index c2bacef83..000000000
--- a/bin/yarn
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
-  begin
-    exec "yarnpkg #{ARGV.join(" ")}"
-  rescue Errno::ENOENT
-    $stderr.puts "Yarn executable was not detected in the system."
-    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
-    exit 1
-  end
-end
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js
index 2a54080cf..6ef484c3a 100644
--- a/config/webpack/configuration.js
+++ b/config/webpack/configuration.js
@@ -1,26 +1,35 @@
-// Common configuration for webpacker loaded from config/webpack/paths.yml
+// Common configuration for webpacker loaded from config/webpacker.yml
 
 const { join, resolve } = require('path');
 const { env } = require('process');
 const { safeLoad } = require('js-yaml');
 const { readFileSync } = require('fs');
 
-const configPath = resolve('config', 'webpack');
+const configPath = resolve('config', 'webpacker.yml');
 const loadersDir = join(__dirname, 'loaders');
-const paths = safeLoad(readFileSync(join(configPath, 'paths.yml'), 'utf8'))[env.NODE_ENV || 'development'];
-const devServer = safeLoad(readFileSync(join(configPath, 'development.server.yml'), 'utf8'))[env.NODE_ENV || 'development'];
+const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV];
 
-// Compute public path based on environment and CDN_HOST in production
-const ifHasCDN = env.CDN_HOST !== undefined && env.NODE_ENV === 'production';
-const devServerUrl = `http://${env.LOCAL_DOMAIN || devServer.host}:${devServer.port}/${paths.entry}/`;
-const publicUrl = ifHasCDN ? `${env.CDN_HOST}/${paths.entry}/` : `/${paths.entry}/`;
-const publicPath = env.NODE_ENV !== 'production' ? devServerUrl : publicUrl;
+function removeOuterSlashes(string) {
+  return string.replace(/^\/*/, '').replace(/\/*$/, '');
+}
+
+function formatPublicPath(host = '', path = '') {
+  let formattedHost = removeOuterSlashes(host);
+  if (formattedHost && !/^http/i.test(formattedHost)) {
+    formattedHost = `//${formattedHost}`;
+  }
+  const formattedPath = removeOuterSlashes(path);
+  return `${formattedHost}/${formattedPath}/`;
+}
+
+const output = {
+  path: resolve('public', settings.public_output_path),
+  publicPath: formatPublicPath(env.ASSET_HOST, settings.public_output_path),
+};
 
 module.exports = {
-  devServer,
+  settings,
   env,
-  paths,
   loadersDir,
-  publicUrl,
-  publicPath,
+  output,
 };
diff --git a/config/webpack/development.js b/config/webpack/development.js
index f6235f42e..7fce7e3f9 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -2,6 +2,7 @@
 
 const merge = require('webpack-merge');
 const sharedConfig = require('./shared.js');
+const { settings, output } = require('./configuration.js');
 
 module.exports = merge(sharedConfig, {
   devtool: 'cheap-module-eval-source-map',
@@ -13,4 +14,19 @@ module.exports = merge(sharedConfig, {
   output: {
     pathinfo: true,
   },
+
+  devServer: {
+    clientLogLevel: 'none',
+    https: settings.dev_server.https,
+    host: settings.dev_server.host,
+    port: settings.dev_server.port,
+    contentBase: output.path,
+    publicPath: output.publicPath,
+    compress: true,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+    historyApiFallback: true,
+    watchOptions: {
+      ignored: /node_modules/,
+    },
+  },
 });
diff --git a/config/webpack/development.server.js b/config/webpack/development.server.js
deleted file mode 100644
index 8e8a399e8..000000000
--- a/config/webpack/development.server.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Note: You must restart bin/webpack-dev-server for changes to take effect
-
-const { resolve } = require('path');
-const { env } = require('process');
-const merge = require('webpack-merge');
-const devConfig = require('./development.js');
-const { devServer, publicPath, paths } = require('./configuration.js');
-
-module.exports = merge(devConfig, {
-  devServer: {
-    host: env.LOCAL_DOMAIN ? '0.0.0.0' : devServer.host,
-    port: devServer.port,
-    headers: { 'Access-Control-Allow-Origin': '*' },
-    compress: true,
-    historyApiFallback: true,
-    contentBase: resolve(paths.output, paths.entry),
-    publicPath,
-    disableHostCheck: true,
-  },
-});
diff --git a/config/webpack/development.server.yml b/config/webpack/development.server.yml
deleted file mode 100644
index ee588a888..000000000
--- a/config/webpack/development.server.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Note: You must restart bin/webpack-dev-server for changes to take effect
-
-default: &default
-  enabled: true
-  host: localhost
-  port: 8080
-
-development:
-  <<: *default
-
-test:
-  <<: *default
-  enabled: false
-
-production:
-  <<: *default
-  enabled: false
diff --git a/config/webpack/loaders/sass.js b/config/webpack/loaders/sass.js
index 24abf1685..88d94c684 100644
--- a/config/webpack/loaders/sass.js
+++ b/config/webpack/loaders/sass.js
@@ -7,7 +7,8 @@ module.exports = {
     fallback: 'style-loader',
     use: [
       { loader: 'css-loader', options: { minimize: env.NODE_ENV === 'production' } },
-      'postcss-loader',
+      { loader: 'postcss-loader', options: { sourceMap: true } },
+      'resolve-url-loader',
       'sass-loader',
     ],
   }),
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 755464061..303fca81b 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -7,26 +7,27 @@ const sharedConfig = require('./shared.js');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = merge(sharedConfig, {
-
-  devtool: 'source-map', // separate sourcemap file, suitable for production
-
   output: { filename: '[name]-[chunkhash].js' },
+  devtool: 'source-map', // separate sourcemap file, suitable for production
+  stats: 'normal',
 
   plugins: [
     new webpack.optimize.UglifyJsPlugin({
-      compress: true,
+      sourceMap: true,
       mangle: true,
 
+      compress: {
+        warnings: false,
+      },
+
       output: {
         comments: false,
       },
-
-      sourceMap: true,
     }),
     new CompressionPlugin({
       asset: '[path].gz[query]',
       algorithm: 'gzip',
-      test: /\.(js|css|svg|eot|ttf|woff|woff2)$/,
+      test: /\.(js|css|html|json|ico|svg|eot|otf|ttf)$/,
     }),
     new BundleAnalyzerPlugin({ // generates report.html and stats.json
       analyzerMode: 'static',
diff --git a/config/webpack/shared.js b/config/webpack/shared.js
index de57ecb68..4d865b816 100644
--- a/config/webpack/shared.js
+++ b/config/webpack/shared.js
@@ -7,21 +7,22 @@ const { sync } = require('glob');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const ManifestPlugin = require('webpack-manifest-plugin');
 const extname = require('path-complete-extname');
-const { env, paths, publicPath, loadersDir } = require('./configuration.js');
+const { env, settings, output, loadersDir } = require('./configuration.js');
 const localePackPaths = require('./generateLocalePacks');
 
-const extensionGlob = `**/*{${paths.extensions.join(',')}}*`;
-const packPaths = sync(join(paths.source, paths.entry, extensionGlob));
-const entryPacks = [].concat(packPaths).concat(localePackPaths).filter(path => path !== join(paths.source, paths.entry, 'custom.js'));
+const extensionGlob = `**/*{${settings.extensions.join(',')}}*`;
+const entryPath = join(settings.source_path, settings.source_entry_path);
+const packPaths = sync(join(entryPath, extensionGlob));
+const entryPacks = [...packPaths, ...localePackPaths].filter(path => path !== join(entryPath, 'custom.js'));
 
-const customApplicationStyle = resolve(join(paths.source, 'styles/custom.scss'));
-const originalApplicationStyle = resolve(join(paths.source, 'styles/application.scss'));
+const customApplicationStyle = resolve(join(settings.source_path, 'styles/custom.scss'));
+const originalApplicationStyle = resolve(join(settings.source_path, 'styles/application.scss'));
 
 module.exports = {
   entry: entryPacks.reduce(
     (map, entry) => {
       const localMap = map;
-      let namespace = relative(join(paths.source, paths.entry), dirname(entry));
+      let namespace = relative(join(entryPath), dirname(entry));
       if (namespace === join('..', '..', '..', 'tmp', 'packs')) {
         namespace = ''; // generated by generateLocalePacks.js
       }
@@ -33,8 +34,8 @@ module.exports = {
   output: {
     filename: '[name].js',
     chunkFilename: '[name]-[chunkhash].js',
-    path: resolve(paths.output, paths.entry),
-    publicPath,
+    path: output.path,
+    publicPath: output.publicPath,
   },
 
   module: {
@@ -44,7 +45,10 @@ module.exports = {
   plugins: [
     new webpack.EnvironmentPlugin(JSON.parse(JSON.stringify(env))),
     new ExtractTextPlugin(env.NODE_ENV === 'production' ? '[name]-[hash].css' : '[name].css'),
-    new ManifestPlugin({ fileName: paths.manifest, publicPath, writeToFileEmit: true }),
+    new ManifestPlugin({
+      publicPath: output.publicPath,
+      writeToFileEmit: true,
+    }),
     new webpack.optimize.CommonsChunkPlugin({
       name: 'common',
       minChunks: (module, count) => {
@@ -67,15 +71,15 @@ module.exports = {
       'mastodon-application-style': existsSync(customApplicationStyle) ?
                                     customApplicationStyle : originalApplicationStyle,
     },
-    extensions: paths.extensions,
+    extensions: settings.extensions,
     modules: [
-      resolve(paths.source),
-      resolve(paths.node_modules),
+      resolve(settings.source_path),
+      'node_modules',
     ],
   },
 
   resolveLoader: {
-    modules: [paths.node_modules],
+    modules: ['node_modules'],
   },
 
   node: {
diff --git a/config/webpack/paths.yml b/config/webpacker.yml
similarity index 61%
rename from config/webpack/paths.yml
rename to config/webpacker.yml
index fdae76141..c1cd6e93b 100644
--- a/config/webpack/paths.yml
+++ b/config/webpacker.yml
@@ -1,12 +1,9 @@
 # Note: You must restart bin/webpack-dev-server for changes to take effect
 
 default: &default
-  config: config/webpack
-  entry: packs
-  output: public
-  manifest: manifest.json
-  node_modules: node_modules
-  source: app/javascript
+  source_path: app/javascript
+  source_entry_path: packs
+  public_output_path: packs
   extensions:
     - .js
     - .sass
@@ -21,9 +18,15 @@ default: &default
 development:
   <<: *default
 
+  dev_server:
+    host: 0.0.0.0
+    port: 8080
+    https: false
+
 test:
   <<: *default
-  manifest: manifest-test.json
+
+  public_output_path: packs-test
 
 production:
   <<: *default
diff --git a/package.json b/package.json
index a6aa1ce1c..0abea3235 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "license": "AGPL-3.0",
   "scripts": {
     "postversion": "git push --tags",
-    "build:development": "cross-env NODE_ENV=development yarn webpack -- --config config/webpack/development.js",
-    "build:production": "cross-env NODE_ENV=production yarn webpack -- --config config/webpack/production.js",
+    "build:development": "cross-env RAILS_ENV=development ASSET_HOST=http://0.0.0.0:8080 ./bin/webpack",
+    "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",
     "storybook": "cross-env NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook",
@@ -97,6 +97,7 @@
     "redux-thunk": "^2.2.0",
     "requestidlecallback": "^0.3.0",
     "reselect": "^3.0.1",
+    "resolve-url-loader": "^2.0.2",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.5",
     "stringz": "^0.2.1",
diff --git a/yarn.lock b/yarn.lock
index 960c2ca02..5532efa6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -163,6 +163,18 @@ acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
+adjust-sourcemap-loader@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz#412d92404eb61e4113635012cba53a33d008e0e2"
+  dependencies:
+    assert "^1.3.0"
+    camelcase "^1.2.1"
+    loader-utils "^1.0.2"
+    lodash.assign "^4.0.1"
+    lodash.defaults "^3.1.2"
+    object-path "^0.9.2"
+    regex-parser "^2.2.1"
+
 airbnb-js-shims@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/airbnb-js-shims/-/airbnb-js-shims-1.1.1.tgz#27224f0030f244e6570442ed1020772c1434aec2"
@@ -342,7 +354,7 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1:
+assert@^1.1.1, assert@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
@@ -386,6 +398,10 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+atob@~1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
+
 autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
@@ -1488,7 +1504,7 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase@^1.0.2:
+camelcase@^1.0.2, camelcase@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
@@ -1500,7 +1516,7 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-camelcase@^4.1.0:
+camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
@@ -1823,7 +1839,11 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-convert-source-map@^1.1.0:
+convert-source-map@^0.3.3:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
+
+convert-source-map@^1.1.0, convert-source-map@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -2007,6 +2027,15 @@ css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
 
+css@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css/-/css-2.2.1.tgz#73a4c81de85db664d4ee674f7d47085e3b2d55dc"
+  dependencies:
+    inherits "^2.0.1"
+    source-map "^0.1.38"
+    source-map-resolve "^0.3.0"
+    urix "^0.1.0"
+
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
@@ -3914,7 +3943,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.x:
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -3948,6 +3977,18 @@ lodash._basecreate@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz#1bc661614daa7fc311b7d03bf16806a0213cf821"
 
+lodash._bindcallback@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
+
+lodash._createassigner@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
+  dependencies:
+    lodash._bindcallback "^3.0.0"
+    lodash._isiterateecall "^3.0.0"
+    lodash.restparam "^3.0.0"
+
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@@ -3956,7 +3997,15 @@ lodash._isiterateecall@^3.0.0:
   version "3.0.9"
   resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
 
-lodash.assign@^4.2.0:
+lodash.assign@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
+  dependencies:
+    lodash._baseassign "^3.0.0"
+    lodash._createassigner "^3.0.0"
+    lodash.keys "^3.0.0"
+
+lodash.assign@^4.0.1, lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
@@ -3984,7 +4033,14 @@ lodash.create@3.1.1:
     lodash._basecreate "^3.0.0"
     lodash._isiterateecall "^3.0.0"
 
-lodash.defaults@^4.0.1:
+lodash.defaults@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
+  dependencies:
+    lodash.assign "^3.0.0"
+    lodash.restparam "^3.0.0"
+
+lodash.defaults@^4.0.0, lodash.defaults@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
 
@@ -4044,6 +4100,10 @@ lodash.reject@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
 
+lodash.restparam@^3.0.0:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
+
 lodash.some@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
@@ -4516,6 +4576,10 @@ object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object-path@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
+
 object.assign@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
@@ -5897,6 +5961,10 @@ regex-cache@^0.4.2:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
+regex-parser@^2.2.1:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.7.tgz#bd090e09181849acc45457e765f7be2a63f50ef1"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -6017,6 +6085,24 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-url-loader@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.2.tgz#c465e97ea0a4791f3961f766cea775ff2e3ceb8c"
+  dependencies:
+    adjust-sourcemap-loader "^1.1.0"
+    camelcase "^4.0.0"
+    convert-source-map "^1.1.1"
+    loader-utils "^1.0.0"
+    lodash.defaults "^4.0.0"
+    rework "^1.0.1"
+    rework-visit "^1.0.0"
+    source-map "^0.5.6"
+    urix "^0.1.0"
+
+resolve-url@~0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+
 resolve@^1.1.6, resolve@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
@@ -6030,6 +6116,17 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
+rework-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
+
+rework@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
+  dependencies:
+    convert-source-map "^0.3.3"
+    css "^2.0.0"
+
 rgb@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/rgb/-/rgb-0.1.0.tgz#be27b291e8feffeac1bd99729721bfa40fc037b5"
@@ -6315,12 +6412,31 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
+source-map-resolve@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
+  dependencies:
+    atob "~1.1.0"
+    resolve-url "~0.2.1"
+    source-map-url "~0.3.0"
+    urix "~0.1.0"
+
 source-map-support@^0.4.2:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.15.tgz#03202df65c06d2bd8c7ec2362a193056fef8d3b1"
   dependencies:
     source-map "^0.5.6"
 
+source-map-url@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
+
+source-map@^0.1.38:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -6780,6 +6896,10 @@ unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+urix@^0.1.0, urix@~0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+
 url-loader@^0.5.8:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"

From 1d9f9352a66e24f21efef4e61fa4f997219bbea3 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 17 Jun 2017 17:57:41 -0700
Subject: [PATCH 007/382] handle resize in a debounce() (#3834)

---
 app/javascript/mastodon/features/ui/index.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index fe775b434..9f31b5443 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -13,8 +13,6 @@ import { refreshNotifications } from '../../actions/notifications';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
 
-const noOp = () => false;
-
 class UI extends React.PureComponent {
 
   static propTypes = {
@@ -27,9 +25,11 @@ class UI extends React.PureComponent {
     draggingOver: false,
   };
 
-  handleResize = () => {
+  handleResize = debounce(() => {
     this.setState({ width: window.innerWidth });
-  }
+  }, 500, {
+    trailing: true,
+  });
 
   handleDragEnter = (e) => {
     e.preventDefault();

From 1f2abd8d672288939232cbe1e2ce063f3ab4f0b4 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sat, 17 Jun 2017 17:59:29 -0700
Subject: [PATCH 008/382] Fix jittery scrolling for Chromium browsers (#3776)
 (#3832)

---
 .../mastodon/components/status_list.js        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index b5a853589..b73a73d1b 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -6,6 +6,7 @@ import StatusContainer from '../containers/status_container';
 import LoadMore from './load_more';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
+import { debounce } from 'lodash';
 
 class StatusList extends ImmutablePureComponent {
 
@@ -29,7 +30,7 @@ class StatusList extends ImmutablePureComponent {
 
   intersectionObserverWrapper = new IntersectionObserverWrapper();
 
-  handleScroll = (e) => {
+  handleScroll = debounce((e) => {
     const { scrollTop, scrollHeight, clientHeight } = e.target;
     const offset = scrollHeight - scrollTop - clientHeight;
     this._oldScrollPosition = scrollHeight - scrollTop;
@@ -41,7 +42,9 @@ class StatusList extends ImmutablePureComponent {
     } else if (this.props.onScroll) {
       this.props.onScroll();
     }
-  }
+  }, 200, {
+    trailing: true,
+  });
 
   componentDidMount () {
     this.attachScrollListener();
@@ -49,8 +52,16 @@ class StatusList extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    if ((prevProps.statusIds.size < this.props.statusIds.size && prevProps.statusIds.first() !== this.props.statusIds.first() && !!this._oldScrollPosition) && this.node.scrollTop > 0) {
-      this.node.scrollTop = this.node.scrollHeight - this._oldScrollPosition;
+    // Reset the scroll position when a new toot comes in in order not to
+    // jerk the scrollbar around if you're already scrolled down the page.
+    if (prevProps.statusIds.size < this.props.statusIds.size &&
+        prevProps.statusIds.first() !== this.props.statusIds.first() &&
+        this._oldScrollPosition &&
+        this.node.scrollTop > 0) {
+      let newScrollTop = this.node.scrollHeight - this._oldScrollPosition;
+      if (this.node.scrollTop !== newScrollTop) {
+        this.node.scrollTop = newScrollTop;
+      }
     }
   }
 

From b51945f09649a4c010b8f4a8279f6f7856c832dd Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Sun, 18 Jun 2017 09:59:49 +0900
Subject: [PATCH 009/382] Spec AccountDomainBlock (#3816)

---
 spec/models/account_domain_block_spec.rb | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/spec/models/account_domain_block_spec.rb b/spec/models/account_domain_block_spec.rb
index bd64e10fb..469bc05cb 100644
--- a/spec/models/account_domain_block_spec.rb
+++ b/spec/models/account_domain_block_spec.rb
@@ -1,5 +1,22 @@
 require 'rails_helper'
 
 RSpec.describe AccountDomainBlock, type: :model do
+  it 'removes blocking cache after creation' do
+    account = Fabricate(:account)
+    Rails.cache.write("exclude_domains_for:#{account.id}", 'a.domain.already.blocked')
 
+    AccountDomainBlock.create!(account: account, domain: 'a.domain.blocked.later')
+
+    expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to eq false
+  end
+
+  it 'removes blocking cache after destruction' do
+    account = Fabricate(:account)
+    block = AccountDomainBlock.create!(account: account, domain: 'domain')
+    Rails.cache.write("exclude_domains_for:#{account.id}", 'domain')
+
+    block.destroy!
+
+    expect(Rails.cache.exist?("exclude_domains_for:#{account.id}")).to eq false
+  end
 end

From 05e4728de781209d13405240eca0dd4f3ef6baa8 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 19 Jun 2017 08:38:50 +0900
Subject: [PATCH 010/382] Cover Favourite more (#3841)

---
 spec/models/favourite_spec.rb | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/spec/models/favourite_spec.rb b/spec/models/favourite_spec.rb
index 5b7126506..ba1410a45 100644
--- a/spec/models/favourite_spec.rb
+++ b/spec/models/favourite_spec.rb
@@ -1,9 +1,29 @@
 require 'rails_helper'
 
 RSpec.describe Favourite, type: :model do
-  let(:alice)  { Fabricate(:account, username: 'alice') }
-  let(:bob)    { Fabricate(:account, username: 'bob') }
-  let(:status) { Fabricate(:status, account: bob) }
+  let(:account) { Fabricate(:account) }
 
-  subject { Favourite.new(account: alice, status: status) }
+  context 'when status is a reblog' do
+    let(:reblog) { Fabricate(:status, reblog: nil) }
+    let(:status) { Fabricate(:status, reblog: reblog) }
+
+    it 'invalidates if the reblogged status is already a favourite' do
+      Favourite.create!(account: account, status: reblog)
+      expect(Favourite.new(account: account, status: status).valid?).to eq false
+    end
+
+    it 'replaces status with the reblogged one if it is a reblog' do
+      favourite = Favourite.create!(account: account, status: status)
+      expect(favourite.status).to eq reblog
+    end
+  end
+
+  context 'when status is not a reblog' do
+    let(:status) { Fabricate(:status, reblog: nil) }
+
+    it 'saves with the specified status' do
+      favourite = Favourite.create!(account: account, status: status)
+      expect(favourite.status).to eq status
+    end
+  end
 end

From aebebdc5d1967e2110a9caafc3238c8b8ec055c4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 19 Jun 2017 01:50:56 +0200
Subject: [PATCH 011/382] Debounce autosuggestions (#3836)

* Debounce autosuggestions

* Remove duplicate import
---
 .../mastodon/features/compose/components/compose_form.js      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 621ec43ab..8da3f8046 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -74,9 +74,9 @@ class ComposeForm extends ImmutablePureComponent {
     this.props.onClearSuggestions();
   }
 
-  onSuggestionsFetchRequested = (token) => {
+  onSuggestionsFetchRequested = debounce((token) => {
     this.props.onFetchSuggestions(token);
-  }
+  }, 500, { trailing: true })
 
   onSuggestionSelected = (tokenStart, token, value) => {
     this._restoreCaret = null;

From f3be6052867343ab15cc84bc91edcaf0c1d70115 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 19 Jun 2017 01:51:04 +0200
Subject: [PATCH 012/382] Rename FollowRemoteAccountService to
 ResolveRemoteAccountService (#3847)

Rename Activitypub to ActivityPub
---
 app/controllers/api/activitypub/activities_controller.rb      | 2 +-
 app/controllers/api/activitypub/notes_controller.rb           | 2 +-
 app/controllers/api/activitypub/outbox_controller.rb          | 2 +-
 app/controllers/authorize_follows_controller.rb               | 2 +-
 app/services/account_search_service.rb                        | 2 +-
 app/services/concerns/author_extractor.rb                     | 2 +-
 app/services/follow_service.rb                                | 2 +-
 app/services/process_mentions_service.rb                      | 2 +-
 ...e_account_service.rb => resolve_remote_account_service.rb} | 2 +-
 app/views/activitypub/types/collection.activitystreams2.rabl  | 2 +-
 .../types/ordered_collection_page.activitystreams2.rabl       | 2 +-
 app/workers/import_worker.rb                                  | 4 ++--
 config/initializers/inflections.rb                            | 1 +
 .../controllers/api/activitypub/activities_controller_spec.rb | 2 +-
 spec/controllers/api/activitypub/notes_controller_spec.rb     | 2 +-
 spec/controllers/api/activitypub/outbox_controller_spec.rb    | 2 +-
 spec/controllers/authorize_follows_controller_spec.rb         | 4 ++--
 spec/controllers/settings/imports_controller_spec.rb          | 4 ++--
 spec/services/account_search_service_spec.rb                  | 4 ++--
 ...service_spec.rb => resolve_remote_account_service_spec.rb} | 4 ++--
 20 files changed, 25 insertions(+), 24 deletions(-)
 rename app/services/{follow_remote_account_service.rb => resolve_remote_account_service.rb} (98%)
 rename spec/services/{follow_remote_account_service_spec.rb => resolve_remote_account_service_spec.rb} (97%)

diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb
index 740c8589a..a880ee92f 100644
--- a/app/controllers/api/activitypub/activities_controller.rb
+++ b/app/controllers/api/activitypub/activities_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::Activitypub::ActivitiesController < Api::BaseController
+class Api::ActivityPub::ActivitiesController < Api::BaseController
   include Authorization
 
   # before_action :set_follow, only: [:show_follow]
diff --git a/app/controllers/api/activitypub/notes_controller.rb b/app/controllers/api/activitypub/notes_controller.rb
index 783c1c4ed..96652b879 100644
--- a/app/controllers/api/activitypub/notes_controller.rb
+++ b/app/controllers/api/activitypub/notes_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::Activitypub::NotesController < Api::BaseController
+class Api::ActivityPub::NotesController < Api::BaseController
   include Authorization
 
   before_action :set_status
diff --git a/app/controllers/api/activitypub/outbox_controller.rb b/app/controllers/api/activitypub/outbox_controller.rb
index 0738d7dee..1af04cb54 100644
--- a/app/controllers/api/activitypub/outbox_controller.rb
+++ b/app/controllers/api/activitypub/outbox_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::Activitypub::OutboxController < Api::BaseController
+class Api::ActivityPub::OutboxController < Api::BaseController
   before_action :set_account
 
   respond_to :activitystreams2
diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
index b15883d58..da4ef022a 100644
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -40,7 +40,7 @@ class AuthorizeFollowsController < ApplicationController
   end
 
   def account_from_remote_follow
-    FollowRemoteAccountService.new.call(acct_without_prefix)
+    ResolveRemoteAccountService.new.call(acct_without_prefix)
   end
 
   def acct_param_is_url?
diff --git a/app/services/account_search_service.rb b/app/services/account_search_service.rb
index 2b77ad7c6..c266494f0 100644
--- a/app/services/account_search_service.rb
+++ b/app/services/account_search_service.rb
@@ -18,7 +18,7 @@ class AccountSearchService < BaseService
     return [] if query_blank_or_hashtag? || limit < 1
 
     if resolving_non_matching_remote_account?
-      [FollowRemoteAccountService.new.call("#{query_username}@#{query_domain}")]
+      [ResolveRemoteAccountService.new.call("#{query_username}@#{query_domain}")]
     else
       search_results_and_exact_match.compact.uniq.slice(0, limit)
     end
diff --git a/app/services/concerns/author_extractor.rb b/app/services/concerns/author_extractor.rb
index ae32eebbb..00fe1c663 100644
--- a/app/services/concerns/author_extractor.rb
+++ b/app/services/concerns/author_extractor.rb
@@ -18,6 +18,6 @@ module AuthorExtractor
       acct   = "#{username}@#{domain}"
     end
 
-    FollowRemoteAccountService.new.call(acct, update_profile)
+    ResolveRemoteAccountService.new.call(acct, update_profile)
   end
 end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 4de75e98d..e54ff7d0f 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -7,7 +7,7 @@ class FollowService < BaseService
   # @param [Account] source_account From which to follow
   # @param [String] uri User URI to follow in the form of username@domain
   def call(source_account, uri)
-    target_account = FollowRemoteAccountService.new.call(uri)
+    target_account = ResolveRemoteAccountService.new.call(uri)
 
     raise ActiveRecord::RecordNotFound if target_account.nil? || target_account.id == source_account.id || target_account.suspended?
     raise Mastodon::NotPermittedError  if target_account.blocking?(source_account) || source_account.blocking?(target_account)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index aa0a4d71b..438033d22 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -41,6 +41,6 @@ class ProcessMentionsService < BaseService
   private
 
   def follow_remote_account_service
-    @follow_remote_account_service ||= FollowRemoteAccountService.new
+    @follow_remote_account_service ||= ResolveRemoteAccountService.new
   end
 end
diff --git a/app/services/follow_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
similarity index 98%
rename from app/services/follow_remote_account_service.rb
rename to app/services/resolve_remote_account_service.rb
index 30ba7bc75..362d0df98 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class FollowRemoteAccountService < BaseService
+class ResolveRemoteAccountService < BaseService
   include OStatus2::MagicKey
   include HttpHelper
 
diff --git a/app/views/activitypub/types/collection.activitystreams2.rabl b/app/views/activitypub/types/collection.activitystreams2.rabl
index d3f8ddcac..cc0e532b7 100644
--- a/app/views/activitypub/types/collection.activitystreams2.rabl
+++ b/app/views/activitypub/types/collection.activitystreams2.rabl
@@ -1,3 +1,3 @@
 extends 'activitypub/intransient.activitystreams2.rabl'
 
-node(:type)       { 'Collection' }
+node(:type) { 'Collection' }
diff --git a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl b/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
index c821fa928..9937d11e9 100644
--- a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
+++ b/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
@@ -1,3 +1,3 @@
 extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
 
-node(:type)     { 'OrderedCollectionPage' }
+node(:type) { 'OrderedCollectionPage' }
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index e93fa33cf..90a226206 100644
--- a/app/workers/import_worker.rb
+++ b/app/workers/import_worker.rb
@@ -41,7 +41,7 @@ class ImportWorker
   def process_mutes
     import_rows.each do |row|
       begin
-        target_account = FollowRemoteAccountService.new.call(row.first)
+        target_account = ResolveRemoteAccountService.new.call(row.first)
         next if target_account.nil?
         MuteService.new.call(from_account, target_account)
       rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
@@ -53,7 +53,7 @@ class ImportWorker
   def process_blocks
     import_rows.each do |row|
       begin
-        target_account = FollowRemoteAccountService.new.call(row.first)
+        target_account = ResolveRemoteAccountService.new.call(row.first)
         next if target_account.nil?
         BlockService.new.call(from_account, target_account)
       rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index b5e43e705..a7b1ef690 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -13,4 +13,5 @@
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'StatsD'
   inflect.acronym 'OEmbed'
+  inflect.acronym 'ActivityPub'
 end
diff --git a/spec/controllers/api/activitypub/activities_controller_spec.rb b/spec/controllers/api/activitypub/activities_controller_spec.rb
index 2c966a45a..07df28ac2 100644
--- a/spec/controllers/api/activitypub/activities_controller_spec.rb
+++ b/spec/controllers/api/activitypub/activities_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Api::Activitypub::ActivitiesController, type: :controller do
+RSpec.describe Api::ActivityPub::ActivitiesController, type: :controller do
   render_views
 
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
diff --git a/spec/controllers/api/activitypub/notes_controller_spec.rb b/spec/controllers/api/activitypub/notes_controller_spec.rb
index 39ddec03e..a0f05dc65 100644
--- a/spec/controllers/api/activitypub/notes_controller_spec.rb
+++ b/spec/controllers/api/activitypub/notes_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Api::Activitypub::NotesController, type: :controller do
+RSpec.describe Api::ActivityPub::NotesController, type: :controller do
   render_views
 
   let(:user_alice)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
diff --git a/spec/controllers/api/activitypub/outbox_controller_spec.rb b/spec/controllers/api/activitypub/outbox_controller_spec.rb
index 99797c582..049cf451d 100644
--- a/spec/controllers/api/activitypub/outbox_controller_spec.rb
+++ b/spec/controllers/api/activitypub/outbox_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Api::Activitypub::OutboxController, type: :controller do
+RSpec.describe Api::ActivityPub::OutboxController, type: :controller do
   render_views
 
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb
index 1bc4eb6b7..b801aa661 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_follows_controller_spec.rb
@@ -30,7 +30,7 @@ describe AuthorizeFollowsController do
 
       it 'renders error when account cant be found' do
         service = double
-        allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+        allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('missing@hostname').and_return(nil)
 
         get :show, params: { acct: 'acct:missing@hostname' }
@@ -54,7 +54,7 @@ describe AuthorizeFollowsController do
       it 'sets account from acct uri' do
         account = Account.new
         service = double
-        allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+        allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('found@hostname').and_return(account)
 
         get :show, params: { acct: 'acct:found@hostname' }
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index 8bf6aec2b..4810be701 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
   describe 'POST #create' do
     it 'redirects to settings path with successful following import' do
       service = double(call: nil)
-      allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+      allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
       post :create, params: {
         import: {
           type: 'following',
@@ -30,7 +30,7 @@ RSpec.describe Settings::ImportsController, type: :controller do
 
     it 'redirects to settings path with successful blocking import' do
       service = double(call: nil)
-      allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+      allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
       post :create, params: {
         import: {
           type: 'blocking',
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 697ac8f23..25bb56bca 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -123,7 +123,7 @@ describe AccountSearchService do
     describe 'when there is a domain but no exact match' do
       it 'follows the remote account when resolve is true' do
         service = double(call: nil)
-        allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+        allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
 
         results = subject.call('newuser@remote.com', 10, true)
         expect(service).to have_received(:call).with('newuser@remote.com')
@@ -131,7 +131,7 @@ describe AccountSearchService do
 
       it 'does not follow the remote account when resolve is false' do
         service = double(call: nil)
-        allow(FollowRemoteAccountService).to receive(:new).and_return(service)
+        allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
 
         results = subject.call('newuser@remote.com', 10, false)
         expect(service).not_to have_received(:call)
diff --git a/spec/services/follow_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb
similarity index 97%
rename from spec/services/follow_remote_account_service_spec.rb
rename to spec/services/resolve_remote_account_service_spec.rb
index 9ae9ff0ce..ad4d436ba 100644
--- a/spec/services/follow_remote_account_service_spec.rb
+++ b/spec/services/resolve_remote_account_service_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
-RSpec.describe FollowRemoteAccountService do
-  subject { FollowRemoteAccountService.new }
+RSpec.describe ResolveRemoteAccountService do
+  subject { ResolveRemoteAccountService.new }
 
   before do
     stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))

From 8d2b3ada801c347f58343adf614a0b1658523506 Mon Sep 17 00:00:00 2001
From: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Mon, 19 Jun 2017 17:28:35 +0900
Subject: [PATCH 013/382] Fixes streaming callbacks of HashtagTimeline (#3849)

---
 app/javascript/mastodon/features/hashtag_timeline/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index ba6dbe6e5..3b2f1ba93 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -60,7 +60,7 @@ class HashtagTimeline extends React.PureComponent {
       received (data) {
         switch(data.event) {
         case 'update':
-          dispatch(updateTimeline('tag', JSON.parse(data.payload)));
+          dispatch(updateTimeline(`hashtag:${id}`, JSON.parse(data.payload)));
           break;
         case 'delete':
           dispatch(deleteFromTimelines(data.payload));

From 436744328726d5ba32a90dbdaf60e57272c788db Mon Sep 17 00:00:00 2001
From: spla <spla@mastodont.cat>
Date: Mon, 19 Jun 2017 10:29:18 +0200
Subject: [PATCH 014/382] Added new Catalan strings (#3843)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master
---
 config/locales/ca.yml             | 24 +++++++++++++++++++++---
 config/locales/simple_form.ca.yml | 13 +++++++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 73d6efb3d..24fc5690d 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -4,7 +4,7 @@ ca:
     about_mastodon: Mastodon és un servidor de xarxa social <em>lliure i de codi obert</em>. Una alternativa <em>descentralitzada</em> a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la <em>xarxa social</em>.
     about_this: Sobre aquesta instància
     apps: Apps
-    business_email: 'Correu de negocis:'
+    business_email: 'Adreça de contacte:'
     closed_registrations: Els registres estan actualment tancats en aquesta instància.
     contact: Contacte
     description_headline: Què es %{domain}?
@@ -39,6 +39,7 @@ ca:
     people_who_follow: Usuaris que segueixn a %{name}
     posts: Toots
     remote_follow: Seguir
+    reserved_username: El nom d'usuari està reservat
     unfollow: Deixar de seguir
   activitypub:
     activity:
@@ -85,8 +86,10 @@ ca:
       profile_url: URL del perfil
       public: Públic
       push_subscription_expires: La subscripció PuSH expira
+      redownload: Refrescar avatar
       reset: Reajustar
       reset_password: Restablir la contrasenya
+      resubscribe: Resubscribir
       salmon_url: URL Salmon
       search: Cerca
       show:
@@ -95,9 +98,11 @@ ca:
         targeted_reports: Informes realitzats sobre aquest compte
       silence: Silenci
       statuses: Estats
+      subscribe: Subscribir
       title: Comptes
       undo_silenced: Desfer silenci
       undo_suspension: Desfer suspensió
+      unsubscribe: Donar-se de baixa
       username: Nom d'usuari
       web: Web
     domain_blocks:
@@ -135,6 +140,7 @@ ca:
       domain_name: Domini
       title: Instàncies conegudes
     reports:
+      action_taken_by: Mesures adoptades per
       are_you_sure: Estàs segur?
       comment:
         label: Comentari
@@ -195,8 +201,10 @@ ca:
     invalid_url: La URL proporcionada es incorrecte
   auth:
     change_password: Canviar contrasenya
-    didnt_get_confirmation: "¿No vas rebre el correu de confirmació?"
-    forgot_password: "¿Has oblidat la contrassenya?"
+    delete_account: Esborrar el compte
+    delete_account_html: Si vols esborrar el teu compte pots <a href="%{path}">fer-ho aquí</a>. S'et demanarà confirmació.
+    didnt_get_confirmation: "No vas rebre el correu de confirmació?"
+    forgot_password: "Has oblidat la contrasenya?"
     login: Iniciar sessió
     logout: Tancar sessió
     register: Enregistrarse
@@ -222,6 +230,14 @@ ca:
       x_minutes: "%{count}m"
       x_months: "%{count}m"
       x_seconds: "%{count}s"
+  deletes:
+    bad_password_msg: Bon intent hackers! Contrasenya incorrecta
+    confirm_password: Introdueix la contrasenya actual per verificar la teva identitat
+    description_html: Això eliminarà de forma <strong>irreversible i permanent</strong> el contingut del teu compte i el desactivarà. El teu nom d'usuari romandrà reservat per evitar que algú volgués fer-se passar per tu.
+    proceed: Esborrar el compte
+    success_msg: El teu compte s'ha eliminat correctament
+    warning_html: Només està garantida l'eliminació d'aquesta particular instància. El contingut que ha estat àmpliament compartit que deixi petjades. Els servidors fora de línia i els que ja no estan subscrits no actualitzaran les seves bases de dades.
+    warning_title: Disponibilitat de contingut disseminat
   errors:
     '403': No tens permís per veure aquesta pàgina.
     '404': La pàgina que estàs buscant no existeix.
@@ -230,6 +246,7 @@ ca:
       content: La verificació de seguretat ha fallat. Bloquejes les galetes?
       title: La verificació de seguretat ha fallat
     '429': Estrangulat
+    noscript: Per utilitzar Mastodon si us plau activa JavaScript.
   exports:
     blocks: Persones que has bloquejat
     csv: CSV
@@ -306,6 +323,7 @@ ca:
   settings:
     authorized_apps: Aplicacions autoritzades
     back: Tornar al inici
+    delete: Eliminació del compte
     edit_profile: Editar perfil
     export: Exportar informació
     followers: Seguidors autoritzats
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 7940ed37d..7bcc21e66 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -4,12 +4,20 @@ ca:
     hints:
       defaults:
         avatar: PNG, GIF o JPG. Màxim 2MB. Serà escalat a 120x120px
-        display_name: Màxim 30 caràcters
+        display_name:
+          one: <span class="name-counter">1</span> character left
+          other: <span class="name-counter">%{count}</span> characters left
         header: PNG, GIF o JPG. Màxim 2MB. Serà escalat a 700x335px
         locked: Requereix que aprovis manualment seguidors i les publicacions seran mostrades només als teus seguidors 
-        note: Màxim 160 caràcters
+        note: 
+          one: <span class="note-counter">1</span> character left
+          other: <span class="note-counter">%{count}</span> characters left
       imports:
         data: Arxiu CSV exportat desde una altra instància de Mastodon
+      sessions:
+        otp: Introdueix el codi de dos factors des del teu telèfon o utilitza un dels teus codis de recuperació.
+      user:
+        filtered_languages: Els idiomes seleccionats seran eliminats de les línies de temps públiques.
     labels:
       defaults:
         avatar: Avatar
@@ -29,6 +37,7 @@ ca:
         setting_auto_play_gif: Auto-reproducció de GIFs animats
         setting_boost_modal: Mostrar finestra de confirmació abans d'un Retoot
         setting_default_privacy: Privacitat de publicacions
+        setting_delete_modal: Mostrar finestra de confirmació abans d'esborrar un toot
         severity: Severitat
         type: Importar tipus
         username: Nom d´usuari

From cf6fe4f8cbafeb2f4e3a92bac4f3909cfc327edf Mon Sep 17 00:00:00 2001
From: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Mon, 19 Jun 2017 18:29:57 +0900
Subject: [PATCH 015/382] Unobserve status on unmount (#3851)

---
 app/javascript/mastodon/components/status.js           | 10 ++++++++++
 .../features/ui/util/intersection_observer_wrapper.js  |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 7ca898c39..3b8f88bf7 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -88,6 +88,16 @@ class Status extends ImmutablePureComponent {
     );
   }
 
+  componentWillUnmount () {
+    if (!this.props.intersectionObserverWrapper) {
+      // TODO: enable IntersectionObserver optimization for notification statuses.
+      // These are managed in notifications/index.js rather than status_list.js
+      return;
+    }
+
+    this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
+  }
+
   handleIntersection = (entry) => {
     // Edge 15 doesn't support isIntersecting, but we can infer it
     // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12156111/
diff --git a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
index 0e959f9ae..b15f8b9ef 100644
--- a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
+++ b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
@@ -37,6 +37,13 @@ class IntersectionObserverWrapper {
     }
   }
 
+  unobserve (id, node) {
+    if (this.observer) {
+      delete this.callbacks[id];
+      this.observer.unobserve(node);
+    }
+  }
+
   disconnect () {
     if (this.observer) {
       this.observer.disconnect();

From d55f207274648369cba30ff001aa3e354fa30dca Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 19 Jun 2017 18:30:27 +0900
Subject: [PATCH 016/382] Cover Export more (#3840)

---
 .../media_attachment_fabricator.rb            |  1 +
 spec/models/export_spec.rb                    | 49 ++++++++++++++-----
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/spec/fabricators/media_attachment_fabricator.rb b/spec/fabricators/media_attachment_fabricator.rb
index dc91d708f..c5dfe12e5 100644
--- a/spec/fabricators/media_attachment_fabricator.rb
+++ b/spec/fabricators/media_attachment_fabricator.rb
@@ -1,3 +1,4 @@
 Fabricator(:media_attachment) do
   account
+  file { [attachment_fixture(['attachment.gif', 'attachment.jpg', 'attachment.webm'].sample), nil].sample }
 end
diff --git a/spec/models/export_spec.rb b/spec/models/export_spec.rb
index 3ee042fb6..6daa46145 100644
--- a/spec/models/export_spec.rb
+++ b/spec/models/export_spec.rb
@@ -1,17 +1,16 @@
 require 'rails_helper'
 
 describe Export do
+  let(:account) { Fabricate(:account) }
+  let(:target_accounts) do
+    [ {}, { username: 'one', domain: 'local.host' } ].map(&method(:Fabricate).curry(2).call(:account))
+  end
+
   describe 'to_csv' do
-    before do
-      one = Account.new(username: 'one', domain: 'local.host')
-      two = Account.new(username: 'two', domain: 'local.host')
-      accounts = [one, two]
-
-      @account = double(blocking: accounts, muting: accounts, following: accounts)
-    end
-
     it 'returns a csv of the blocked accounts' do
-      export = Export.new(@account).to_blocked_accounts_csv
+      target_accounts.each(&account.method(:block!))
+
+      export = Export.new(account).to_blocked_accounts_csv
       results = export.strip.split
 
       expect(results.size).to eq 2
@@ -19,7 +18,9 @@ describe Export do
     end
 
     it 'returns a csv of the muted accounts' do
-      export = Export.new(@account).to_muted_accounts_csv
+      target_accounts.each(&account.method(:mute!))
+
+      export = Export.new(account).to_muted_accounts_csv
       results = export.strip.split
 
       expect(results.size).to eq 2
@@ -27,11 +28,37 @@ describe Export do
     end
 
     it 'returns a csv of the following accounts' do
-      export = Export.new(@account).to_following_accounts_csv
+      target_accounts.each(&account.method(:follow!))
+
+      export = Export.new(account).to_following_accounts_csv
       results = export.strip.split
 
       expect(results.size).to eq 2
       expect(results.first).to eq 'one@local.host'
     end
   end
+
+  describe 'total_storage' do
+    it 'returns the total size of the media attachments' do
+      media_attachment = Fabricate(:media_attachment, account: account)
+      expect(Export.new(account).total_storage).to eq media_attachment.file_file_size || 0
+    end
+  end
+
+  describe 'total_follows' do
+    it 'returns the total number of the followed accounts' do
+      target_accounts.each(&account.method(:follow!))
+      expect(Export.new(account).total_follows).to eq 2
+    end
+
+    it 'returns the total number of the blocked accounts' do
+      target_accounts.each(&account.method(:block!))
+      expect(Export.new(account).total_blocks).to eq 2
+    end
+
+    it 'returns the total number of the muted accounts' do
+      target_accounts.each(&account.method(:mute!))
+      expect(Export.new(account).total_mutes).to eq 2
+    end
+  end
 end

From 29a22691d2a9eefbc2eb886659843f87d187c98e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B4=20Shoemake?= <marrus-sh@users.noreply.github.com>
Date: Mon, 19 Jun 2017 02:31:14 -0700
Subject: [PATCH 017/382] Fix character/grapheme count stuff (#3839)

* Bring Toot button in line with counter

Both should use stringz I guess

* Use grapheme_length for character count
---
 .../mastodon/features/compose/components/compose_form.js       | 3 ++-
 app/validators/status_length_validator.rb                      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 8da3f8046..0ee45c978 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -18,6 +18,7 @@ import UploadFormContainer from '../containers/upload_form_container';
 import TextIconButton from './text_icon_button';
 import WarningContainer from '../containers/warning_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import { length } from 'stringz';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@@ -193,7 +194,7 @@ class ComposeForm extends ImmutablePureComponent {
 
           <div className='compose-form__publish'>
             <div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div>
-            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || this.props.is_uploading || text.replace(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g, '_').length > 500 || (text.length !==0 && text.trim().length === 0)} block /></div>
+            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabled || this.props.is_uploading || length(text) > 500 || (text.length !==0 && text.trim().length === 0)} block /></div>
           </div>
         </div>
       </div>
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 55135a598..3f3e422d9 100644
--- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb
@@ -5,6 +5,6 @@ class StatusLengthValidator < ActiveModel::Validator
 
   def validate(status)
     return unless status.local? && !status.reblog?
-    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.length > MAX_CHARS
+    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.mb_chars.grapheme_length > MAX_CHARS
   end
 end

From 6eefccdacc96161d06ce38070002b7d0ce582aee Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 19 Jun 2017 18:31:27 +0900
Subject: [PATCH 018/382] Cover DomainBlock more (#3838)

---
 spec/models/domain_block_spec.rb | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/spec/models/domain_block_spec.rb b/spec/models/domain_block_spec.rb
index b19c8083e..89cadccfe 100644
--- a/spec/models/domain_block_spec.rb
+++ b/spec/models/domain_block_spec.rb
@@ -13,11 +13,27 @@ RSpec.describe DomainBlock, type: :model do
       expect(domain_block).to model_have_error_on_field(:domain)
     end
 
-    it 'is invalid if the domain already exists' do
-      domain_block_1 = Fabricate(:domain_block, domain: 'dalek.com')
-      domain_block_2 = Fabricate.build(:domain_block, domain: 'dalek.com')
+    it 'is invalid if the same normalized domain already exists' do
+      domain_block_1 = Fabricate(:domain_block, domain: 'にゃん')
+      domain_block_2 = Fabricate.build(:domain_block, domain: 'xn--r9j5b5b')
       domain_block_2.valid?
       expect(domain_block_2).to model_have_error_on_field(:domain)
     end
   end
+
+  describe 'blocked?' do
+    it 'returns true if the domain is suspended' do
+      Fabricate(:domain_block, domain: 'domain', severity: :suspend)
+      expect(DomainBlock.blocked?('domain')).to eq true
+    end
+
+    it 'returns false even if the domain is silenced' do
+      Fabricate(:domain_block, domain: 'domain', severity: :silence)
+      expect(DomainBlock.blocked?('domain')).to eq false
+    end
+
+    it 'returns false if the domain is not suspended nor silenced' do
+      expect(DomainBlock.blocked?('domain')).to eq false
+    end
+  end
 end

From 3d13f6ea0c6cf0022c9fa57c570f93462647dd12 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 19 Jun 2017 18:31:37 +0900
Subject: [PATCH 019/382] Cover Block more (#3837)

---
 spec/models/block_spec.rb | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb
index cabb41c3e..acbdc77f5 100644
--- a/spec/models/block_spec.rb
+++ b/spec/models/block_spec.rb
@@ -19,4 +19,29 @@ RSpec.describe Block, type: :model do
       expect(block).to model_have_error_on_field(:target_account)
     end
   end
+
+  it 'removes blocking cache after creation' do
+    account = Fabricate(:account)
+    target_account = Fabricate(:account)
+    Rails.cache.write("exclude_account_ids_for:#{account.id}", [])
+    Rails.cache.write("exclude_account_ids_for:#{target_account.id}", [])
+
+    Block.create!(account: account, target_account: target_account)
+
+    expect(Rails.cache.exist?("exclude_account_ids_for:#{account.id}")).to eq false
+    expect(Rails.cache.exist?("exclude_account_ids_for:#{target_account.id}")).to eq false
+  end
+
+  it 'removes blocking cache after destruction' do
+    account = Fabricate(:account)
+    target_account = Fabricate(:account)
+    block = Block.create!(account: account, target_account: target_account)
+    Rails.cache.write("exclude_account_ids_for:#{account.id}", [target_account.id])
+    Rails.cache.write("exclude_account_ids_for:#{target_account.id}", [account.id])
+
+    block.destroy!
+
+    expect(Rails.cache.exist?("exclude_account_ids_for:#{account.id}")).to eq false
+    expect(Rails.cache.exist?("exclude_account_ids_for:#{target_account.id}")).to eq false
+  end
 end

From 5bd3715a4c11d533d9b859dadce45adc99e97373 Mon Sep 17 00:00:00 2001
From: Daigo 3 Dango <zunda@users.noreply.github.com>
Date: Sun, 18 Jun 2017 23:32:28 -1000
Subject: [PATCH 020/382] Link to /about from public page on a single user
 instance (#3814)

There was no link for visitors to follow to see the about page.
---
 app/views/layouts/public.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml
index 09e12b691..83e92b938 100644
--- a/app/views/layouts/public.html.haml
+++ b/app/views/layouts/public.html.haml
@@ -8,7 +8,9 @@
       %span.single-user-login
         = link_to t('auth.login'), new_user_session_path
         &mdash;
-    %span.domain= link_to site_hostname, root_path
+      %span.domain= link_to site_hostname, about_path
+    - else
+      %span.domain= link_to site_hostname, root_path
     %span.powered-by
       != t('generic.powered_by', link: link_to('Mastodon', 'https://joinmastodon.org'))
 

From 500e28442f8e6657de766fbdb4a4cfdb164b2b92 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 19 Jun 2017 21:01:31 +0900
Subject: [PATCH 021/382] Re-add disableHostCheck (regression #3729) (#3854)

ref #2790
---
 config/webpack/development.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/webpack/development.js b/config/webpack/development.js
index 7fce7e3f9..830183c0d 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -25,6 +25,7 @@ module.exports = merge(sharedConfig, {
     compress: true,
     headers: { 'Access-Control-Allow-Origin': '*' },
     historyApiFallback: true,
+    disableHostCheck: true,
     watchOptions: {
       ignored: /node_modules/,
     },

From ff142eb64d2d1251f9df1baa0b302fd532ec30ed Mon Sep 17 00:00:00 2001
From: masarakki <masaki182@gmail.com>
Date: Mon, 19 Jun 2017 22:12:31 +0900
Subject: [PATCH 022/382] setting-for-account-deletable (#3852)

---
 app/controllers/settings/deletes_controller.rb     |  5 +++++
 app/helpers/application_helper.rb                  |  4 ++++
 app/views/auth/registrations/edit.html.haml        |  7 ++++---
 config/settings.yml                                |  1 +
 .../settings/deletes_controller_spec.rb            | 14 ++++++++++++++
 5 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/controllers/settings/deletes_controller.rb b/app/controllers/settings/deletes_controller.rb
index dd18b4c2f..80002b995 100644
--- a/app/controllers/settings/deletes_controller.rb
+++ b/app/controllers/settings/deletes_controller.rb
@@ -3,6 +3,7 @@
 class Settings::DeletesController < ApplicationController
   layout 'admin'
 
+  before_action :check_enabled_deletion
   before_action :authenticate_user!
 
   def show
@@ -21,6 +22,10 @@ class Settings::DeletesController < ApplicationController
 
   private
 
+  def check_enabled_deletion
+    redirect_to root_path unless Setting.open_deletion
+  end
+
   def delete_params
     params.require(:form_delete_confirmation).permit(:password)
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 42f6ab3db..36c37fae0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -13,6 +13,10 @@ module ApplicationHelper
     Setting.open_registrations
   end
 
+  def open_deletion?
+    Setting.open_deletion
+  end
+
   def add_rtl_body_class(other_classes)
     other_classes = "#{other_classes} rtl" if [:ar, :fa, :he].include?(I18n.locale)
     other_classes
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index cbaa75ae0..38d4349cb 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -12,7 +12,8 @@
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
 
-%hr/
+- if open_deletion?
+  %hr/
 
-%h6= t('auth.delete_account')
-%p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
+  %h6= t('auth.delete_account')
+  %p.muted-hint= t('auth.delete_account_html', path: settings_delete_path)
diff --git a/config/settings.yml b/config/settings.yml
index bffb7052a..7b78b6cdb 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -14,6 +14,7 @@ defaults: &defaults
   site_contact_email: ''
   open_registrations: true
   closed_registrations_message: ''
+  open_deletion: true
   boost_modal: false
   auto_play_gif: true
   delete_modal: true
diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb
index b9c7c3068..9b55090df 100644
--- a/spec/controllers/settings/deletes_controller_spec.rb
+++ b/spec/controllers/settings/deletes_controller_spec.rb
@@ -68,5 +68,19 @@ describe Settings::DeletesController do
         expect(response).to redirect_to '/auth/sign_in'
       end
     end
+
+    context do
+      around do |example|
+        open_deletion = Setting.open_deletion
+        example.run
+        Setting.open_deletion = open_deletion
+      end
+
+      it 'redirects' do
+        Setting.open_deletion = false
+        delete :destroy
+        expect(response).to redirect_to root_path
+      end
+    end
   end
 end

From 5cc7cd8518eea864ce29228a8c04a65f9cdbb87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=82=89?= <noraworld@users.noreply.github.com>
Date: Mon, 19 Jun 2017 22:12:41 +0900
Subject: [PATCH 023/382] Add Japanese translation "Action taken by" (#3850)

---
 config/locales/ja.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 840fdca3f..94f02e940 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -140,6 +140,7 @@ ja:
       domain_name: ドメイン名
       title: 既知のインスタンス
     reports:
+      action_taken_by: レポート処理者
       are_you_sure: 本当に実行しますか？
       comment:
         label: コメント

From aa58cca040f332eefc6ef0e98752dd0f1a770c6e Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Tue, 20 Jun 2017 01:27:07 +0900
Subject: [PATCH 024/382] Set cursor:pointer only when necessary (#3857)

---
 app/javascript/mastodon/components/status_content.js | 6 +++---
 app/javascript/styles/components.scss                | 6 +-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 89031b3dc..4e435b2c4 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -136,7 +136,7 @@ class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className='status__content' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className='status__content status__content--with_action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}
@@ -152,7 +152,7 @@ class StatusContent extends React.PureComponent {
       return (
         <div
           ref={this.setRef}
-          className='status__content'
+          className='status__content status__content--with-action'
           style={directionStyle}
           onMouseDown={this.handleMouseDown}
           onMouseUp={this.handleMouseUp}
@@ -163,7 +163,7 @@ class StatusContent extends React.PureComponent {
       return (
         <div
           ref={this.setRef}
-          className='status__content status__content--no-action'
+          className='status__content'
           style={directionStyle}
           dangerouslySetInnerHTML={content}
         />
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4b5802cee..1cd0eba74 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -436,14 +436,10 @@
   margin-right: 5px;
 }
 
-.status__content {
+.status__content--with-action {
   cursor: pointer;
 }
 
-.status__content--no-action {
-  cursor: default;
-}
-
 .status__content,
 .reply-indicator__content {
   font-size: 15px;

From bf8c2c43483650bc046a3b3dd114f1cdfa49d2b4 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Tue, 20 Jun 2017 08:34:10 +0900
Subject: [PATCH 025/382] Clicking on the CW text should expand the status
 (#3855)

---
 app/javascript/mastodon/components/status_content.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 4e435b2c4..0a71cbba7 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -81,7 +81,7 @@ class StatusContent extends React.PureComponent {
     const [ startX, startY ] = this.startXY;
     const [ deltaX, deltaY ] = [Math.abs(e.clientX - startX), Math.abs(e.clientY - startY)];
 
-    if (e.target.localName === 'button' || e.target.localName === 'span' || e.target.localName === 'a' || (e.target.parentNode && e.target.parentNode.localName === 'a')) {
+    if (e.target.localName === 'button' || e.target.localName === 'a' || (e.target.parentNode && (e.target.parentNode.localName === 'button' || e.target.parentNode.localName === 'a'))) {
       return;
     }
 

From 94ad0706f514e25c58c0a8f3201f96c1d1ccbbd8 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Tue, 20 Jun 2017 11:12:51 +0900
Subject: [PATCH 026/382] Don't attach IntersectionObserver for wrapped
 statuses (#3863)

This fixes a bug that sometimes boosted statuses being hidden on scrolling.

Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. This will call intersection handler twice,
so this may results race condition...probably.
---
 app/javascript/mastodon/components/status.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3b8f88bf7..17f2eb9d3 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -154,7 +154,10 @@ class Status extends ImmutablePureComponent {
   render () {
     let media = null;
     let statusAvatar;
-    const { status, account, ...other } = this.props;
+
+    // Exclude intersectionObserverWrapper from `other` variable
+    // because intersection is managed in here.
+    const { status, account, intersectionObserverWrapper, ...other } = this.props;
     const { isExpanded, isIntersecting, isHidden } = this.state;
 
     if (status === null) {

From da6fa029f66d50f38f2b6c85687994793f7766aa Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 20 Jun 2017 18:34:27 +0200
Subject: [PATCH 027/382] i18n: Fixed typo in Polish translation (#3864)

---
 config/locales/pl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 78f78a893..7376c3e2b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -355,7 +355,7 @@ pl:
       default: "%b %d, %Y, %H:%M"
   two_factor_authentication:
     code_hint: Aby kontynuować, wprowadź kod wyświetlany przez aplikację uwierzytelniającą
-    description_html: Jeśli włączysz <strong>uwierzytelnianie dwuetapowe</strong>, logowanie się będzie wymagało podania tokenu wyświetlonego na Twoim telefone.
+    description_html: Jeśli włączysz <strong>uwierzytelnianie dwuetapowe</strong>, logowanie się będzie wymagało podania tokenu wyświetlonego na Twoim telefonie.
     disable: Wyłącz
     enable: Włącz
     enabled_success: Pomyślnie aktywowano uwierzytelnianie dwuetapowe

From b16b69350eb4ded2e1011931433b51dac5e34b53 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Wed, 21 Jun 2017 01:45:09 +0900
Subject: [PATCH 028/382] Fix RTL detection on Ruby side (#3867)

This fixes below bugs:

* pipe characters being counted as RTL character
* only first word being checked
---
 app/helpers/stream_entries_helper.rb       | 10 +++++-----
 spec/helpers/stream_entries_helper_spec.rb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index a17b02128..4ef7cffb0 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -53,11 +53,11 @@ module StreamEntriesHelper
 
   def rtl?(text)
     text = simplified_text(text)
-    rtl_characters = /[\p{Hebrew}|\p{Arabic}|\p{Syriac}|\p{Thaana}|\p{Nko}]+/m.match(text)
+    rtl_words = text.scan(/[\p{Hebrew}\p{Arabic}\p{Syriac}\p{Thaana}\p{Nko}]+/m)
 
-    if rtl_characters.present?
+    if rtl_words.present?
       total_size = text.size.to_f
-      rtl_size(rtl_characters.to_a) / total_size > 0.3
+      rtl_size(rtl_words) / total_size > 0.3
     else
       false
     end
@@ -77,8 +77,8 @@ module StreamEntriesHelper
     end
   end
 
-  def rtl_size(characters)
-    characters.reduce(0) { |acc, elem| acc + elem.size }.to_f
+  def rtl_size(words)
+    words.reduce(0) { |acc, elem| acc + elem.size }.to_f
   end
 
   def embedded_view?
diff --git a/spec/helpers/stream_entries_helper_spec.rb b/spec/helpers/stream_entries_helper_spec.rb
index 1ef49a3ab..2c0d7b239 100644
--- a/spec/helpers/stream_entries_helper_spec.rb
+++ b/spec/helpers/stream_entries_helper_spec.rb
@@ -217,7 +217,7 @@ RSpec.describe StreamEntriesHelper, type: :helper do
     end
 
     it 'is true if right to left characters are greater than 1/3 of total text' do
-      expect(helper).to be_rtl 'aaݟ'
+      expect(helper).to be_rtl 'aaݟaaݟ'
     end
   end
 end

From eb832e88f44d661a504a091defc051e052eb1252 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 21 Jun 2017 02:43:09 +0900
Subject: [PATCH 029/382] Replace TextIconButton for SensitiveButton to
 IconButton (#3759)

* Replace TextIconButton for SensitiveButton to IconButton

* line-height
---
 .../containers/sensitive_button_container.js  | 28 +++++++++++++++----
 app/javascript/styles/components.scss         | 12 ++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
index 761ae8c08..63c0e8ae4 100644
--- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js
@@ -1,7 +1,8 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import TextIconButton from '../components/text_icon_button';
+import classNames from 'classnames';
+import IconButton from '../../../components/icon_button';
 import { changeComposeSensitivity } from '../../../actions/compose';
 import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
@@ -38,11 +39,26 @@ class SensitiveButton extends React.PureComponent {
 
     return (
       <Motion defaultStyle={{ scale: 0.87 }} style={{ scale: spring(visible ? 1 : 0.87, { stiffness: 200, damping: 3 }) }}>
-        {({ scale }) =>
-          <div style={{ display: visible ? 'block' : 'none', transform: `translateZ(0) scale(${scale})` }}>
-            <TextIconButton onClick={onClick} label='NSFW' title={intl.formatMessage(messages.title)} active={active} />
-          </div>
-        }
+        {({ scale }) => {
+          const icon = active ? 'eye-slash' : 'eye';
+          const className = classNames('compose-form__sensitive-button', {
+            'compose-form__sensitive-button--visible': visible,
+          });
+          return (
+            <div className={className} style={{ transform: `translateZ(0) scale(${scale})` }}>
+              <IconButton
+                className='compose-form__sensitive-button__icon'
+                title={intl.formatMessage(messages.title)}
+                icon={icon}
+                onClick={onClick}
+                size={18}
+                active={active}
+                style={{ lineHeight: null, height: null }}
+                inverted
+              />
+            </div>
+          );
+        }}
       </Motion>
     );
   }
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 1cd0eba74..ecfc186eb 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -306,6 +306,18 @@
   line-height: 27px;
 }
 
+.compose-form__sensitive-button {
+  display: none;
+
+  &.compose-form__sensitive-button--visible {
+    display: block;
+  }
+
+  .compose-form__sensitive-button__icon {
+    line-height: 27px;
+  }
+}
+
 .compose-form__upload-wrapper {
   overflow: hidden;
 }

From 1fc6cb499742c1a872ad717a689c58a80aeb714d Mon Sep 17 00:00:00 2001
From: alpaca-tc <alpaca-tc@alpaca.tc>
Date: Wed, 21 Jun 2017 03:37:09 +0900
Subject: [PATCH 030/382] Do not call setState from unmounted component (#3853)

Stop an executing task if the component already unmounted.
---
 app/javascript/mastodon/components/status.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 17f2eb9d3..8c4443967 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -86,6 +86,8 @@ class Status extends ImmutablePureComponent {
       this.node,
       this.handleIntersection
     );
+
+    this.componentMounted = true;
   }
 
   componentWillUnmount () {
@@ -96,6 +98,8 @@ class Status extends ImmutablePureComponent {
     }
 
     this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
+
+    this.componentMounted = false;
   }
 
   handleIntersection = (entry) => {
@@ -116,6 +120,10 @@ class Status extends ImmutablePureComponent {
   }
 
   hideIfNotIntersecting = () => {
+    if (!this.componentMounted) {
+      return;
+    }
+
     // When the browser gets a chance, test if we're still not intersecting,
     // and if so, set our isHidden to true to trigger an unrender. The point of
     // this is to save DOM nodes and avoid using up too much memory.

From 8f03fdce7fa16fcaa829a40f395cefc85eb957d5 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 20 Jun 2017 20:40:03 +0200
Subject: [PATCH 031/382] Upgrade React Router (#3677)

* chore(yarn): Remove react-router

* chore(yarn): Remove react-router-scroll

* chore(yarn): Remove history

* chore(yarn): Add react-router-dom

* chore: Remove usages of react-router-scroll

* refactor: Upgrade to react-router-web

* refactor: Use fork of react-router-scroll

This reverts commit 2ddea9a6c8d39fc64b7d0b587f3fbda7a45a7fa2.

* fix: Issues mentions in the PR feedback
---
 .../mastodon/components/column_back_button.js |  4 +-
 .../components/column_back_button_slim.js     |  4 +-
 .../mastodon/components/column_header.js      |  4 +-
 .../mastodon/components/dropdown_menu.js      |  2 +-
 .../mastodon/components/permalink.js          |  2 +-
 app/javascript/mastodon/components/status.js  |  4 +-
 .../mastodon/components/status_action_bar.js  |  8 +-
 .../mastodon/components/status_content.js     |  4 +-
 .../mastodon/containers/mastodon.js           | 70 ++------------
 .../features/account/components/action_bar.js |  2 +-
 .../account_timeline/components/header.js     |  4 +-
 .../compose/components/navigation_bar.js      |  2 +-
 .../compose/components/reply_indicator.js     |  2 +-
 .../compose/components/search_results.js      |  2 +-
 .../mastodon/features/compose/index.js        |  2 +-
 .../features/follow_requests/index.js         |  1 +
 .../features/getting_started/index.js         |  2 +-
 .../mastodon/features/home_timeline/index.js  |  2 +-
 .../mastodon/features/report/index.js         |  4 +-
 .../features/status/components/action_bar.js  |  4 +-
 .../status/components/detailed_status.js      |  4 +-
 .../mastodon/features/status/index.js         |  2 +-
 .../features/ui/components/boost_modal.js     |  2 +-
 .../features/ui/components/column_link.js     |  2 +-
 .../features/ui/components/tabs_bar.js        | 14 +--
 app/javascript/mastodon/features/ui/index.js  | 95 ++++++++++++++++++-
 package.json                                  |  5 +-
 yarn.lock                                     | 63 +++++++-----
 28 files changed, 186 insertions(+), 130 deletions(-)

diff --git a/app/javascript/mastodon/components/column_back_button.js b/app/javascript/mastodon/components/column_back_button.js
index 3add65968..191c0f597 100644
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@@ -9,8 +9,8 @@ class ColumnBackButton extends React.PureComponent {
   };
 
   handleClick = () => {
-    if (window.history && window.history.length === 1) this.context.router.push('/');
-    else this.context.router.goBack();
+    if (window.history && window.history.length === 1) this.context.router.history.push('/');
+    else this.context.router.history.goBack();
   }
 
   render () {
diff --git a/app/javascript/mastodon/components/column_back_button_slim.js b/app/javascript/mastodon/components/column_back_button_slim.js
index 2d3f1b57a..ffb05fa02 100644
--- a/app/javascript/mastodon/components/column_back_button_slim.js
+++ b/app/javascript/mastodon/components/column_back_button_slim.js
@@ -9,8 +9,8 @@ class ColumnBackButtonSlim extends React.PureComponent {
   };
 
   handleClick = () => {
-    if (window.history && window.history.length === 1) this.context.router.push('/');
-    else this.context.router.goBack();
+    if (window.history && window.history.length === 1) this.context.router.history.push('/');
+    else this.context.router.history.goBack();
   }
 
   render () {
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 175ee800f..076f1cdad 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -45,8 +45,8 @@ class ColumnHeader extends React.PureComponent {
   }
 
   handleBackClick = () => {
-    if (window.history && window.history.length === 1) this.context.router.push('/');
-    else this.context.router.goBack();
+    if (window.history && window.history.length === 1) this.context.router.history.push('/');
+    else this.context.router.history.goBack();
   }
 
   handleTransitionEnd = () => {
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 5712cffab..6e394a95d 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -41,7 +41,7 @@ class DropdownMenu extends React.PureComponent {
       action();
     } else if (to) {
       e.preventDefault();
-      this.context.router.push(to);
+      this.context.router.history.push(to);
     }
 
     this.dropdown.hide();
diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
index b45969d85..7149e8380 100644
--- a/app/javascript/mastodon/components/permalink.js
+++ b/app/javascript/mastodon/components/permalink.js
@@ -17,7 +17,7 @@ class Permalink extends React.PureComponent {
   handleClick = (e) => {
     if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
-      this.context.router.push(this.props.to);
+      this.context.router.history.push(this.props.to);
     }
   }
 
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 8c4443967..b2214f72a 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -144,14 +144,14 @@ class Status extends ImmutablePureComponent {
 
   handleClick = () => {
     const { status } = this.props;
-    this.context.router.push(`/statuses/${status.getIn(['reblog', 'id'], status.get('id'))}`);
+    this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'id'], status.get('id'))}`);
   }
 
   handleAccountClick = (e) => {
     if (e.button === 0) {
       const id = Number(e.currentTarget.getAttribute('data-id'));
       e.preventDefault();
-      this.context.router.push(`/accounts/${id}`);
+      this.context.router.history.push(`/accounts/${id}`);
     }
   }
 
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 99e01d972..800f0d0fb 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -53,7 +53,7 @@ class StatusActionBar extends ImmutablePureComponent {
   ]
 
   handleReplyClick = () => {
-    this.props.onReply(this.props.status, this.context.router);
+    this.props.onReply(this.props.status, this.context.router.history);
   }
 
   handleFavouriteClick = () => {
@@ -69,7 +69,7 @@ class StatusActionBar extends ImmutablePureComponent {
   }
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.context.router);
+    this.props.onMention(this.props.status.get('account'), this.context.router.history);
   }
 
   handleMuteClick = () => {
@@ -81,12 +81,12 @@ class StatusActionBar extends ImmutablePureComponent {
   }
 
   handleOpen = () => {
-    this.context.router.push(`/statuses/${this.props.status.get('id')}`);
+    this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
   }
 
   handleReport = () => {
     this.props.onReport(this.props.status);
-    this.context.router.push('/report');
+    this.context.router.history.push('/report');
   }
 
   handleConversationMuteClick = () => {
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 0a71cbba7..d02083d3e 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -56,7 +56,7 @@ class StatusContent extends React.PureComponent {
   onMentionClick = (mention, e) => {
     if (e.button === 0) {
       e.preventDefault();
-      this.context.router.push(`/accounts/${mention.get('id')}`);
+      this.context.router.history.push(`/accounts/${mention.get('id')}`);
     }
   }
 
@@ -65,7 +65,7 @@ class StatusContent extends React.PureComponent {
 
     if (e.button === 0) {
       e.preventDefault();
-      this.context.router.push(`/timelines/tag/${hashtag}`);
+      this.context.router.history.push(`/timelines/tag/${hashtag}`);
     }
   }
 
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 5e009cfa3..d44cb1be4 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -12,35 +12,10 @@ import {
 } from '../actions/timelines';
 import { showOnboardingOnce } from '../actions/onboarding';
 import { updateNotifications, refreshNotifications } from '../actions/notifications';
-import createBrowserHistory from 'history/lib/createBrowserHistory';
-import applyRouterMiddleware from 'react-router/lib/applyRouterMiddleware';
-import useRouterHistory from 'react-router/lib/useRouterHistory';
-import Router from 'react-router/lib/Router';
-import Route from 'react-router/lib/Route';
-import IndexRedirect from 'react-router/lib/IndexRedirect';
-import IndexRoute from 'react-router/lib/IndexRoute';
-import { useScroll } from 'react-router-scroll';
+import BrowserRouter from 'react-router-dom/BrowserRouter';
+import Route from 'react-router-dom/Route';
+import ScrollContext from 'react-router-scroll/lib/ScrollBehaviorContext';
 import UI from '../features/ui';
-import Status from '../features/status';
-import GettingStarted from '../features/getting_started';
-import PublicTimeline from '../features/public_timeline';
-import CommunityTimeline from '../features/community_timeline';
-import AccountTimeline from '../features/account_timeline';
-import AccountGallery from '../features/account_gallery';
-import HomeTimeline from '../features/home_timeline';
-import Compose from '../features/compose';
-import Followers from '../features/followers';
-import Following from '../features/following';
-import Reblogs from '../features/reblogs';
-import Favourites from '../features/favourites';
-import HashtagTimeline from '../features/hashtag_timeline';
-import Notifications from '../features/notifications';
-import FollowRequests from '../features/follow_requests';
-import GenericNotFound from '../features/generic_not_found';
-import FavouritedStatuses from '../features/favourited_statuses';
-import Blocks from '../features/blocks';
-import Mutes from '../features/mutes';
-import Report from '../features/report';
 import { hydrateStore } from '../actions/store';
 import createStream from '../stream';
 import { IntlProvider, addLocaleData } from 'react-intl';
@@ -52,10 +27,6 @@ const store = configureStore();
 const initialState = JSON.parse(document.getElementById('initial-state').textContent);
 store.dispatch(hydrateStore(initialState));
 
-const browserHistory = useRouterHistory(createBrowserHistory)({
-  basename: '/web',
-});
-
 class Mastodon extends React.PureComponent {
 
   componentDidMount() {
@@ -136,36 +107,11 @@ class Mastodon extends React.PureComponent {
     return (
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
-          <Router history={browserHistory} render={applyRouterMiddleware(useScroll())}>
-            <Route path='/' component={UI}>
-              <IndexRedirect to='/getting-started' />
-              <Route path='getting-started' component={GettingStarted} />
-              <Route path='timelines/home' component={HomeTimeline} />
-              <Route path='timelines/public' component={PublicTimeline} />
-              <Route path='timelines/public/local' component={CommunityTimeline} />
-              <Route path='timelines/tag/:id' component={HashtagTimeline} />
-
-              <Route path='notifications' component={Notifications} />
-              <Route path='favourites' component={FavouritedStatuses} />
-
-              <Route path='statuses/new' component={Compose} />
-              <Route path='statuses/:statusId' component={Status} />
-              <Route path='statuses/:statusId/reblogs' component={Reblogs} />
-              <Route path='statuses/:statusId/favourites' component={Favourites} />
-
-              <Route path='accounts/:accountId' component={AccountTimeline} />
-              <Route path='accounts/:accountId/followers' component={Followers} />
-              <Route path='accounts/:accountId/following' component={Following} />
-              <Route path='accounts/:accountId/media' component={AccountGallery} />
-
-              <Route path='follow_requests' component={FollowRequests} />
-              <Route path='blocks' component={Blocks} />
-              <Route path='mutes' component={Mutes} />
-              <Route path='report' component={Report} />
-
-              <Route path='*' component={GenericNotFound} />
-            </Route>
-          </Router>
+          <BrowserRouter basename='/web'>
+            <ScrollContext>
+              <Route path='/' component={UI} />
+            </ScrollContext>
+          </BrowserRouter>
         </Provider>
       </IntlProvider>
     );
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 15fdd1a50..0ea8ad347 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -2,7 +2,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import DropdownMenu from '../../../components/dropdown_menu';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import { defineMessages, injectIntl, FormattedMessage, FormattedNumber } from 'react-intl';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index d2fe86476..55fdc4167 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -33,12 +33,12 @@ class Header extends ImmutablePureComponent {
   }
 
   handleMention = () => {
-    this.props.onMention(this.props.account, this.context.router);
+    this.props.onMention(this.props.account, this.context.router.history);
   }
 
   handleReport = () => {
     this.props.onReport(this.props.account);
-    this.context.router.push('/report');
+    this.context.router.history.push('/report');
   }
 
   handleMute = () => {
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index 6f3dbc5af..1c135a733 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -5,7 +5,7 @@ import IconButton from '../../../components/icon_button';
 import DisplayName from '../../../components/display_name';
 import Permalink from '../../../components/permalink';
 import { FormattedMessage } from 'react-intl';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 class NavigationBar extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 8ad401121..474549a5f 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -31,7 +31,7 @@ class ReplyIndicator extends ImmutablePureComponent {
   handleAccountClick = (e) => {
     if (e.button === 0) {
       e.preventDefault();
-      this.context.router.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
   }
 
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index a553a8280..26d766a1c 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';
 import StatusContainer from '../../../containers/status_container';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 class SearchResults extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index e7d933e86..a87e48a23 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -5,7 +5,7 @@ import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { mountCompose, unmountCompose } from '../../actions/compose';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import { injectIntl, defineMessages } from 'react-intl';
 import SearchContainer from './containers/search_container';
 import Motion from 'react-motion/lib/Motion';
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 446fdbc6e..286f128f4 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -54,6 +54,7 @@ class FollowRequests extends ImmutablePureComponent {
     return (
       <Column icon='users' heading={intl.formatMessage(messages.heading)}>
         <ColumnBackButtonSlim />
+
         <ScrollContainer scrollKey='follow_requests'>
           <div className='scrollable' onScroll={this.handleScroll}>
             {accountIds.map(id =>
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index f30dea446..a4549e609 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Column from '../ui/components/column';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index 6d3968751..ddebf2379 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -8,7 +8,7 @@ import ColumnHeader from '../../components/column_header';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
diff --git a/app/javascript/mastodon/features/report/index.js b/app/javascript/mastodon/features/report/index.js
index 217802b5c..23aba39de 100644
--- a/app/javascript/mastodon/features/report/index.js
+++ b/app/javascript/mastodon/features/report/index.js
@@ -52,7 +52,7 @@ class Report extends React.PureComponent {
 
   componentWillMount () {
     if (!this.props.account) {
-      this.context.router.replace('/');
+      this.context.router.history.replace('/');
     }
   }
 
@@ -76,7 +76,7 @@ class Report extends React.PureComponent {
 
   handleSubmit = () => {
     this.props.dispatch(submitReport());
-    this.context.router.replace('/');
+    this.context.router.history.replace('/');
   }
 
   render () {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 16ea83e40..21c2fd682 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -50,12 +50,12 @@ class ActionBar extends React.PureComponent {
   }
 
   handleMentionClick = () => {
-    this.props.onMention(this.props.status.get('account'), this.context.router);
+    this.props.onMention(this.props.status.get('account'), this.context.router.history);
   }
 
   handleReport = () => {
     this.props.onReport(this.props.status);
-    this.context.router.push('/report');
+    this.context.router.history.push('/report');
   }
 
   render () {
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 6bbb8ca33..a77c4f0bb 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -7,7 +7,7 @@ import StatusContent from '../../../components/status_content';
 import MediaGallery from '../../../components/media_gallery';
 import VideoPlayer from '../../../components/video_player';
 import AttachmentList from '../../../components/attachment_list';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 import { FormattedDate, FormattedNumber } from 'react-intl';
 import CardContainer from '../containers/card_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -28,7 +28,7 @@ class DetailedStatus extends ImmutablePureComponent {
   handleAccountClick = (e) => {
     if (e.button === 0) {
       e.preventDefault();
-      this.context.router.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
 
     e.stopPropagation();
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index f8a87ccb1..19cee2435 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -93,7 +93,7 @@ class Status extends ImmutablePureComponent {
   }
 
   handleReplyClick = (status) => {
-    this.props.dispatch(replyCompose(status, this.context.router));
+    this.props.dispatch(replyCompose(status, this.context.router.history));
   }
 
   handleModalReblog = (status) => {
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 9d99b5336..da2be5264 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -40,7 +40,7 @@ class BoostModal extends ImmutablePureComponent {
     if (e.button === 0) {
       e.preventDefault();
       this.props.onClose();
-      this.context.router.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
+      this.context.router.history.push(`/accounts/${this.props.status.getIn(['account', 'id'])}`);
     }
   }
 
diff --git a/app/javascript/mastodon/features/ui/components/column_link.js b/app/javascript/mastodon/features/ui/components/column_link.js
index 24387af57..cbdb6534f 100644
--- a/app/javascript/mastodon/features/ui/components/column_link.js
+++ b/app/javascript/mastodon/features/ui/components/column_link.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Link from 'react-router/lib/Link';
+import Link from 'react-router-dom/Link';
 
 const ColumnLink = ({ icon, text, to, href, method, hideOnMobile }) => {
   if (href) {
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index b108e8244..265cb818b 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Link from 'react-router/lib/Link';
+import NavLink from 'react-router-dom/NavLink';
 import { FormattedMessage } from 'react-intl';
 
 class TabsBar extends React.Component {
@@ -7,14 +7,14 @@ class TabsBar extends React.Component {
   render () {
     return (
       <div className='tabs-bar'>
-        <Link className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></Link>
-        <Link className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></Link>
-        <Link className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></Link>
+        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>
+        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
+        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
 
-        <Link className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></Link>
-        <Link className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></Link>
+        <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
+        <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
 
-        <Link className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></Link>
+        <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 9f31b5443..39600607f 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -1,4 +1,7 @@
 import React from 'react';
+import Switch from 'react-router-dom/Switch';
+import Route from 'react-router-dom/Route';
+import Redirect from 'react-router-dom/Redirect';
 import NotificationsContainer from './containers/notifications_container';
 import PropTypes from 'prop-types';
 import LoadingBarContainer from './containers/loading_bar_container';
@@ -13,6 +16,67 @@ import { refreshNotifications } from '../../actions/notifications';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
 
+import Status from '../../features/status';
+import GettingStarted from '../../features/getting_started';
+import PublicTimeline from '../../features/public_timeline';
+import CommunityTimeline from '../../features/community_timeline';
+import AccountTimeline from '../../features/account_timeline';
+import AccountGallery from '../../features/account_gallery';
+import HomeTimeline from '../../features/home_timeline';
+import Compose from '../../features/compose';
+import Followers from '../../features/followers';
+import Following from '../../features/following';
+import Reblogs from '../../features/reblogs';
+import Favourites from '../../features/favourites';
+import HashtagTimeline from '../../features/hashtag_timeline';
+import Notifications from '../../features/notifications';
+import FollowRequests from '../../features/follow_requests';
+import GenericNotFound from '../../features/generic_not_found';
+import FavouritedStatuses from '../../features/favourited_statuses';
+import Blocks from '../../features/blocks';
+import Mutes from '../../features/mutes';
+import Report from '../../features/report';
+
+// Small wrapper to pass multiColumn to the route components
+const WrappedSwitch = ({ multiColumn, children }) => (
+  <Switch>
+    {React.Children.map(children, child => React.cloneElement(child, { multiColumn }))}
+  </Switch>
+);
+
+WrappedSwitch.propTypes = {
+  multiColumn: PropTypes.bool,
+  children: PropTypes.node,
+};
+
+// Small Wraper to extract the params from the route and pass
+// them to the rendered component, together with the content to
+// be rendered inside (the children)
+class WrappedRoute extends React.Component {
+
+  static propTypes = {
+    component: PropTypes.func.isRequired,
+    content: PropTypes.node,
+    multiColumn: PropTypes.bool,
+  }
+
+  renderComponent = ({ match: { params } }) => {
+    const { component: Component, content, multiColumn } = this.props;
+
+    return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
+  }
+
+  render () {
+    const { component: Component, content, ...rest } = this.props;
+
+    return <Route {...rest} render={this.renderComponent} />;
+  }
+
+}
+
+const noOp = () => false;
+
+
 class UI extends React.PureComponent {
 
   static propTypes = {
@@ -119,7 +183,36 @@ class UI extends React.PureComponent {
     return (
       <div className='ui' ref={this.setRef}>
         <TabsBar />
-        <ColumnsAreaContainer singleColumn={isMobile(width)}>{children}</ColumnsAreaContainer>
+        <ColumnsAreaContainer singleColumn={isMobile(width)}>
+          <WrappedSwitch>
+            <Redirect from='/' to='/getting-started' exact />
+            <WrappedRoute path='/getting-started' component={GettingStarted} content={children} />
+            <WrappedRoute path='/timelines/home' component={HomeTimeline} content={children} />
+            <WrappedRoute path='/timelines/public' exact component={PublicTimeline} content={children} />
+            <WrappedRoute path='/timelines/public/local' component={CommunityTimeline} content={children} />
+            <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
+
+            <WrappedRoute path='/notifications' component={Notifications} content={children} />
+            <WrappedRoute path='/favourites' component={FavouritedStatuses} content={children} />
+
+            <WrappedRoute path='/statuses/new' component={Compose} content={children} />
+            <WrappedRoute path='/statuses/:statusId' exact component={Status} content={children} />
+            <WrappedRoute path='/statuses/:statusId/reblogs' component={Reblogs} content={children} />
+            <WrappedRoute path='/statuses/:statusId/favourites' component={Favourites} content={children} />
+
+            <WrappedRoute path='/accounts/:accountId' exact component={AccountTimeline} content={children} />
+            <WrappedRoute path='/accounts/:accountId/followers' component={Followers} content={children} />
+            <WrappedRoute path='/accounts/:accountId/following' component={Following} content={children} />
+            <WrappedRoute path='/accounts/:accountId/media' component={AccountGallery} content={children} />
+
+            <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
+            <WrappedRoute path='/blocks' component={Blocks} content={children} />
+            <WrappedRoute path='/mutes' component={Mutes} content={children} />
+            <WrappedRoute path='/report' component={Report} content={children} />
+
+            <WrappedRoute component={GenericNotFound} content={children} />
+          </WrappedSwitch>
+        </ColumnsAreaContainer>
         <NotificationsContainer />
         <LoadingBarContainer className='loading-bar' />
         <ModalContainer />
diff --git a/package.json b/package.json
index 0abea3235..e6fc02bbb 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,6 @@
     "file-loader": "^0.11.2",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
-    "history": "^3.3.0",
     "http-link-header": "^0.8.0",
     "immutable": "^3.8.1",
     "intersection-observer": "^0.3.0",
@@ -86,8 +85,8 @@
     "react-notification": "^6.7.0",
     "react-redux": "^5.0.4",
     "react-redux-loading-bar": "^2.9.2",
-    "react-router": "^3.0.5",
-    "react-router-scroll": "^0.4.2",
+    "react-router-dom": "^4.1.1",
+    "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
     "react-textarea-autosize": "^5.0.6",
     "react-toggle": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 5532efa6b..26c6f7c7a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1906,7 +1906,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.5.1, create-react-class@^15.5.2, create-react-class@^15.5.3:
+create-react-class@^15.5.2, create-react-class@^15.5.3:
   version "15.5.3"
   resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.3.tgz#fb0f7cae79339e9a179e194ef466efa3923820fe"
   dependencies:
@@ -3244,13 +3244,14 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-history@^3.0.0, history@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c"
+history@^4.5.1, history@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd"
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
-    query-string "^4.2.2"
+    resolve-pathname "^2.0.0"
+    value-equal "^0.2.0"
     warning "^3.0.0"
 
 hmac-drbg@^1.0.0:
@@ -4806,7 +4807,7 @@ path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
 
-path-to-regexp@^1.7.0:
+path-to-regexp@^1.5.3, path-to-regexp@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
   dependencies:
@@ -5511,7 +5512,7 @@ qs@6.4.0, qs@^6.4.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-query-string@^4.1.0, query-string@^4.2.2:
+query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
   dependencies:
@@ -5711,24 +5712,32 @@ react-redux@^5.0.4:
     loose-envify "^1.1.0"
     prop-types "^15.5.10"
 
-react-router-scroll@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/react-router-scroll/-/react-router-scroll-0.4.2.tgz#4b90e8707edf96eba7f066d94c5b4338bd6848b7"
+react-router-dom@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.1.1.tgz#3021ade1f2c160af97cf94e25594c5f294583025"
   dependencies:
-    prop-types "^15.5.6"
-    scroll-behavior "^0.9.3"
+    history "^4.5.1"
+    loose-envify "^1.3.1"
+    prop-types "^15.5.4"
+    react-router "^4.1.1"
+
+react-router-scroll@ytase/react-router-scroll#build:
+  version "0.4.1"
+  resolved "https://codeload.github.com/ytase/react-router-scroll/tar.gz/991ecddb08885e1fb80ec1e9dbf3a35844b7d4cd"
+  dependencies:
+    scroll-behavior "^0.9.1"
     warning "^3.0.0"
 
-react-router@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.5.tgz#c3b7873758045a8bbc9562aef4ff4bc8cce7c136"
+react-router@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.1.1.tgz#d448f3b7c1b429a6fbb03395099949c606b1fe95"
   dependencies:
-    create-react-class "^15.5.1"
-    history "^3.0.0"
+    history "^4.6.0"
     hoist-non-react-statics "^1.2.0"
-    invariant "^2.2.1"
-    loose-envify "^1.2.0"
-    prop-types "^15.5.6"
+    invariant "^2.2.2"
+    loose-envify "^1.3.1"
+    path-to-regexp "^1.5.3"
+    prop-types "^15.5.4"
     warning "^3.0.0"
 
 react-simple-di@^1.2.0:
@@ -6085,9 +6094,13 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-pathname@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944"
+
 resolve-url-loader@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.2.tgz#c465e97ea0a4791f3961f766cea775ff2e3ceb8c"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.3.tgz#f54cd1b040e8f0ab72b2cb32c9fbb8544152d9e9"
   dependencies:
     adjust-sourcemap-loader "^1.1.0"
     camelcase "^4.0.0"
@@ -6201,7 +6214,7 @@ schema-utils@^0.3.0, schema-utils@^0.x:
   dependencies:
     ajv "^5.0.0"
 
-scroll-behavior@^0.9.3:
+scroll-behavior@^0.9.1:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/scroll-behavior/-/scroll-behavior-0.9.3.tgz#e48bcc8af364f3f07176e8dbca3968bd5e71557b"
   dependencies:
@@ -6977,6 +6990,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "~1.0.0"
     spdx-expression-parse "~1.0.0"
 
+value-equal@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d"
+
 vary@~1.1.0, vary@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"

From 356df7ae6b6edfc600fbc532f32fbc46314e00a0 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 21 Jun 2017 03:40:45 +0900
Subject: [PATCH 032/382] Update fabricator for MediaAttachment to attach a
 file according to type (#3862)

This fixes a random spec failures since commit
d55f207274648369cba30ff001aa3e354fa30dca.
---
 spec/fabricators/media_attachment_fabricator.rb | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/spec/fabricators/media_attachment_fabricator.rb b/spec/fabricators/media_attachment_fabricator.rb
index c5dfe12e5..bb938e36d 100644
--- a/spec/fabricators/media_attachment_fabricator.rb
+++ b/spec/fabricators/media_attachment_fabricator.rb
@@ -1,4 +1,16 @@
 Fabricator(:media_attachment) do
   account
-  file { [attachment_fixture(['attachment.gif', 'attachment.jpg', 'attachment.webm'].sample), nil].sample }
+  file do |attrs|
+    [
+      case attrs[:type]
+      when :gifv
+        attachment_fixture ['attachment.gif', 'attachment.webm'].sample
+      when :image
+        attachment_fixture 'attachment.jpg'
+      when nil
+        attachment_fixture ['attachment.gif', 'attachment.jpg', 'attachment.webm'].sample
+      end,
+      nil
+    ].sample
+  end
 end

From a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Wed, 21 Jun 2017 03:40:56 +0900
Subject: [PATCH 033/382] Fix RemoteFollow behavior (#3868)

* Invalid acct is an error. not "2 errors".
* Empty input should be different error from invalid acct
---
 app/models/remote_follow.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/remote_follow.rb b/app/models/remote_follow.rb
index 3da3ba0ae..8366d43c5 100644
--- a/app/models/remote_follow.rb
+++ b/app/models/remote_follow.rb
@@ -5,11 +5,15 @@ class RemoteFollow
 
   attr_accessor :acct, :addressable_template
 
+  validates :acct, presence: true
+
   def initialize(attrs = {})
     @acct = attrs[:acct].gsub(/\A@/, '').strip unless attrs[:acct].nil?
   end
 
   def valid?
+    return false unless super
+
     populate_template
     errors.empty?
   end
@@ -39,7 +43,6 @@ class RemoteFollow
   def acct_resource
     @_acct_resource ||= Goldfinger.finger("acct:#{acct}")
   rescue Goldfinger::Error
-    missing_resource_error
     nil
   end
 

From bab5a18232a163b0c3c6a245f7f95d50d7022b36 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 21 Jun 2017 03:41:23 +0900
Subject: [PATCH 034/382] Filter direct statuses in Status.as_home_timeline
 (#3842)

The classes using Status.as_home_timeline, namely Feed and
PrecomputeFeedService are expected to filter direct statuses as
FanOutWriteService does, but their filtering were incomplete or missing.

This commit solves the problem by filtering direct statuses in
as_home_timeline as the other similar methods such as as_public_timeline
does.
---
 app/models/status.rb                    | 10 ++++++++-
 app/services/precompute_feed_service.rb |  6 +-----
 spec/models/status_spec.rb              | 28 +++++++++++++++++++------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 24d3db2bf..544d2e005 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -131,7 +131,15 @@ class Status < ApplicationRecord
     end
 
     def as_home_timeline(account)
-      where(account: [account] + account.following)
+      # 'references' is a workaround for the following issue:
+      # Inconsistent results with #or in ActiveRecord::Relation with respect to documentation Issue #24055 rails/rails
+      # https://github.com/rails/rails/issues/24055
+      references(:mentions)
+        .where.not(visibility: :direct)
+        .or(where(mentions: { account: account }))
+        .where(follows: { account_id: account })
+        .or(references(:mentions, :follows).where(account: account))
+        .left_outer_joins(account: :followers).left_outer_joins(:mentions).group(:id)
     end
 
     def as_public_timeline(account = nil, local_only = false)
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 626ec2f6c..83765bb05 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -23,11 +23,7 @@ class PrecomputeFeedService < BaseService
   end
 
   def process_status(status)
-    add_status_to_feed(status) unless skip_status?(status)
-  end
-
-  def skip_status?(status)
-    status.direct_visibility? || status_filtered?(status)
+    add_status_to_feed(status) unless status_filtered?(status)
   end
 
   def add_status_to_feed(status)
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index dd52a5d43..a3ced1abc 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -181,15 +181,18 @@ RSpec.describe Status, type: :model do
   end
 
   describe '.as_home_timeline' do
+    let(:account) { Fabricate(:account) }
+    let(:followed) { Fabricate(:account) }
+    let(:not_followed) { Fabricate(:account) }
+
     before do
-      account = Fabricate(:account)
-      followed = Fabricate(:account)
-      not_followed = Fabricate(:account)
       Fabricate(:follow, account: account, target_account: followed)
 
-      @self_status = Fabricate(:status, account: account)
-      @followed_status = Fabricate(:status, account: followed)
-      @not_followed_status = Fabricate(:status, account: not_followed)
+      @self_status = Fabricate(:status, account: account, visibility: :public)
+      @self_direct_status = Fabricate(:status, account: account, visibility: :direct)
+      @followed_status = Fabricate(:status, account: followed, visibility: :public)
+      @followed_direct_status = Fabricate(:status, account: followed, visibility: :direct)
+      @not_followed_status = Fabricate(:status, account: not_followed, visibility: :public)
 
       @results = Status.as_home_timeline(account)
     end
@@ -198,10 +201,23 @@ RSpec.describe Status, type: :model do
       expect(@results).to include(@self_status)
     end
 
+    it 'includes direct statuses from self' do
+      expect(@results).to include(@self_direct_status)
+    end
+
     it 'includes statuses from followed' do
       expect(@results).to include(@followed_status)
     end
 
+    it 'includes direct statuses mentioning recipient from followed' do
+      Fabricate(:mention, account: account, status: @followed_direct_status)
+      expect(@results).to include(@followed_direct_status)
+    end
+
+    it 'does not include direct statuses not mentioning recipient from followed' do
+      expect(@results).not_to include(@followed_direct_status)
+    end
+
     it 'does not include statuses from non-followed' do
       expect(@results).not_to include(@not_followed_status)
     end

From d8ec83280637e53ded67d4938a198cbeb9e8db05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=AB=E5=90=B8=E8=A1=80=E9=AC=BC=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=83=95=E3=83=AA=E3=82=B9=20/=20=E7=8C=AB=E3=83=AD=E3=82=ADP?=
 <deflis@gmail.com>
Date: Wed, 21 Jun 2017 03:41:41 +0900
Subject: [PATCH 035/382] Fix streaming server. Redis connection subscribe for
 each channel. (#3828)

---
 streaming/index.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 270ed6f70..5afdd5961 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -115,7 +115,7 @@ const startWorker = (workerId) => {
 
   const subs = {};
 
-  redisSubscribeClient.on('pmessage', (_, channel, message) => {
+  redisSubscribeClient.on('message', (channel, message) => {
     const callbacks = subs[channel];
 
     log.silly(`New message on channel ${channel}`);
@@ -127,8 +127,6 @@ const startWorker = (workerId) => {
     callbacks.forEach(callback => callback(message));
   });
 
-  redisSubscribeClient.psubscribe(`${redisPrefix}timeline:*`);
-
   const subscriptionHeartbeat = (channel) => {
     const interval = 6*60;
     const tellSubscribed = () => {
@@ -144,12 +142,20 @@ const startWorker = (workerId) => {
   const subscribe = (channel, callback) => {
     log.silly(`Adding listener for ${channel}`);
     subs[channel] = subs[channel] || [];
+    if (subs[channel].length === 0) {
+      log.verbose(`Subscribe ${channel}`);
+      redisSubscribeClient.subscribe(channel);
+    }
     subs[channel].push(callback);
   };
 
   const unsubscribe = (channel, callback) => {
     log.silly(`Removing listener for ${channel}`);
     subs[channel] = subs[channel].filter(item => item !== callback);
+    if (subs[channel].length === 0) {
+      log.verbose(`Unsubscribe ${channel}`);
+      redisSubscribeClient.unsubscribe(channel);
+    }
   };
 
   const allowCrossDomain = (req, res, next) => {

From 15b43f555dcb06742c677d84c25d05774ef1bde2 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Tue, 20 Jun 2017 20:44:32 +0200
Subject: [PATCH 036/382] Fix conversations (fixes #3869) (#3870)

* Actually create conversations given explicit URIs

* Try to get the parent toot in before validation, to avoid creating a new conversation
---
 app/services/process_feed_service.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index eabeb1799..fbdf92caa 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -66,8 +66,6 @@ class ProcessFeedService < BaseService
           status.reblog = original_status.reblog? ? original_status.reblog : original_status
         end
 
-        status.thread = find_status(thread(@xml).first) if thread?(@xml)
-
         status.save!
       end
 
@@ -155,7 +153,8 @@ class ProcessFeedService < BaseService
         reply: thread?(entry),
         language: content_language(entry),
         visibility: visibility_scope(entry),
-        conversation: find_or_create_conversation(entry)
+        conversation: find_or_create_conversation(entry),
+        thread: thread?(entry) ? find_status(thread(entry).first) : nil
       )
 
       mentions_from_xml(status, entry)
@@ -174,7 +173,7 @@ class ProcessFeedService < BaseService
         return Conversation.find_by(id: local_id)
       end
 
-      Conversation.find_by(uri: uri)
+      Conversation.find_by(uri: uri) || Conversation.create!(uri: uri)
     end
 
     def find_status(uri)

From 1585b0c6cce6cebda3fdc8ba944aa2247e76d1be Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 20 Jun 2017 21:32:37 +0200
Subject: [PATCH 037/382] Bump version to 1.4.4

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 234073f3a..5f90e83bb 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      3
+      4
     end
 
     def pre

From 31cd64904198551e222a47aa7b2ce4cd8d4370d2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 21 Jun 2017 01:33:14 +0200
Subject: [PATCH 038/382] Revert "Don't attach IntersectionObserver for wrapped
 statuses" (#3877)

* Revert "Bump version to 1.4.4"

This reverts commit 1585b0c6cce6cebda3fdc8ba944aa2247e76d1be.

* Revert "Fix conversations (fixes #3869) (#3870)"

This reverts commit 15b43f555dcb06742c677d84c25d05774ef1bde2.

* Revert "Fix streaming server. Redis connection subscribe for each channel. (#3828)"

This reverts commit d8ec83280637e53ded67d4938a198cbeb9e8db05.

* Revert "Filter direct statuses in Status.as_home_timeline (#3842)"

This reverts commit bab5a18232a163b0c3c6a245f7f95d50d7022b36.

* Revert "Fix RemoteFollow behavior (#3868)"

This reverts commit a20cf3b64e93d764f1dfe88ecdb39f3fd4eefe03.

* Revert "Update fabricator for MediaAttachment to attach a file according to type (#3862)"

This reverts commit 356df7ae6b6edfc600fbc532f32fbc46314e00a0.

* Revert "Upgrade React Router (#3677)"

This reverts commit 8f03fdce7fa16fcaa829a40f395cefc85eb957d5.

* Revert "Do not call setState from unmounted component (#3853)"

This reverts commit 1fc6cb499742c1a872ad717a689c58a80aeb714d.

* Revert "Replace TextIconButton for SensitiveButton to IconButton (#3759)"

This reverts commit eb832e88f44d661a504a091defc051e052eb1252.

* Revert "Fix RTL detection on Ruby side (#3867)"

This reverts commit b16b69350eb4ded2e1011931433b51dac5e34b53.

* Revert "i18n: Fixed typo in Polish translation (#3864)"

This reverts commit da6fa029f66d50f38f2b6c85687994793f7766aa.

* Revert "Don't attach IntersectionObserver for wrapped statuses (#3863)"

This reverts commit 94ad0706f514e25c58c0a8f3201f96c1d1ccbbd8.
---
 app/javascript/mastodon/components/status.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index b2214f72a..e77d1eb91 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -162,10 +162,7 @@ class Status extends ImmutablePureComponent {
   render () {
     let media = null;
     let statusAvatar;
-
-    // Exclude intersectionObserverWrapper from `other` variable
-    // because intersection is managed in here.
-    const { status, account, intersectionObserverWrapper, ...other } = this.props;
+    const { status, account, ...other } = this.props;
     const { isExpanded, isIntersecting, isHidden } = this.state;
 
     if (status === null) {

From 946a166791e5a1a10778e15ca4a9f5f10c961134 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 21 Jun 2017 01:37:15 +0200
Subject: [PATCH 039/382] Revert #3851 (#3878)

---
 app/javascript/mastodon/components/status.js              | 8 --------
 .../features/ui/util/intersection_observer_wrapper.js     | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index e77d1eb91..325aceb5b 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -91,14 +91,6 @@ class Status extends ImmutablePureComponent {
   }
 
   componentWillUnmount () {
-    if (!this.props.intersectionObserverWrapper) {
-      // TODO: enable IntersectionObserver optimization for notification statuses.
-      // These are managed in notifications/index.js rather than status_list.js
-      return;
-    }
-
-    this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
-
     this.componentMounted = false;
   }
 
diff --git a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
index b15f8b9ef..0e959f9ae 100644
--- a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
+++ b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
@@ -37,13 +37,6 @@ class IntersectionObserverWrapper {
     }
   }
 
-  unobserve (id, node) {
-    if (this.observer) {
-      delete this.callbacks[id];
-      this.observer.unobserve(node);
-    }
-  }
-
   disconnect () {
     if (this.observer) {
       this.observer.disconnect();

From cc382c5006ed5c4c18c3547150b214807b217c7b Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Wed, 21 Jun 2017 13:47:36 +0900
Subject: [PATCH 040/382] Don't attach IntersectionObserver for wrapped
 statuses (#3883)

(This patch has been merged as bugfix and reverted, but still valuable as
improvement)

Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. but wrapped Status don't need to manage
intersection and visibility by itself, because it's a part of wrapper Status.
---
 app/javascript/mastodon/components/status.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 325aceb5b..1363956cf 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -154,7 +154,10 @@ class Status extends ImmutablePureComponent {
   render () {
     let media = null;
     let statusAvatar;
-    const { status, account, ...other } = this.props;
+
+    // Exclude intersectionObserverWrapper from `other` variable
+    // because intersection is managed in here.
+    const { status, account, intersectionObserverWrapper, ...other } = this.props;
     const { isExpanded, isIntersecting, isHidden } = this.state;
 
     if (status === null) {

From 0190aac240fd804180a56b5fe174526a9e4c3f6d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 22 Jun 2017 02:38:50 +0200
Subject: [PATCH 041/382] Fix regression from #3842 (#3892)

* Fix regression from #3842

Simplify the query by omitting all direct statuses. Private statuses
are allowed because they are from accounts we are following (so
by definition)

Resolves #3887 (alternative)

* Adjust test
---
 app/models/status.rb       | 10 +---------
 spec/models/status_spec.rb |  8 ++++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/models/status.rb b/app/models/status.rb
index 544d2e005..791d96df1 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -131,15 +131,7 @@ class Status < ApplicationRecord
     end
 
     def as_home_timeline(account)
-      # 'references' is a workaround for the following issue:
-      # Inconsistent results with #or in ActiveRecord::Relation with respect to documentation Issue #24055 rails/rails
-      # https://github.com/rails/rails/issues/24055
-      references(:mentions)
-        .where.not(visibility: :direct)
-        .or(where(mentions: { account: account }))
-        .where(follows: { account_id: account })
-        .or(references(:mentions, :follows).where(account: account))
-        .left_outer_joins(account: :followers).left_outer_joins(:mentions).group(:id)
+      where(account: [account] + account.following).where(visibility: [:public, :unlisted, :private])
     end
 
     def as_public_timeline(account = nil, local_only = false)
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index a3ced1abc..0b90205ee 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -201,17 +201,17 @@ RSpec.describe Status, type: :model do
       expect(@results).to include(@self_status)
     end
 
-    it 'includes direct statuses from self' do
-      expect(@results).to include(@self_direct_status)
+    it 'does not include direct statuses from self' do
+      expect(@results).to_not include(@self_direct_status)
     end
 
     it 'includes statuses from followed' do
       expect(@results).to include(@followed_status)
     end
 
-    it 'includes direct statuses mentioning recipient from followed' do
+    it 'does not include direct statuses mentioning recipient from followed' do
       Fabricate(:mention, account: account, status: @followed_direct_status)
-      expect(@results).to include(@followed_direct_status)
+      expect(@results).to_not include(@followed_direct_status)
     end
 
     it 'does not include direct statuses not mentioning recipient from followed' do

From f566c47ddafd1e119887133c35581a5aef1c07fc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 22 Jun 2017 13:24:00 +0200
Subject: [PATCH 042/382] Fix travis builds

https://github.com/travis-ci/travis-ci/issues/7941#issuecomment-310320597
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8bef9c4ae..4bb332666 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ cache:
   - public/assets
   - public/packs-test
 dist: trusty
-sudo: false
+sudo: required
 
 notifications:
   email: false

From 98fab24beada0bb681a25d9a48918f3ea903a90a Mon Sep 17 00:00:00 2001
From: Quent-in <pages_quentin@hotmail.com>
Date: Thu, 22 Jun 2017 13:39:13 +0200
Subject: [PATCH 043/382] Update of doorkeeper.oc.yml (#3896)

Just some adjustements
---
 config/locales/doorkeeper.oc.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/locales/doorkeeper.oc.yml b/config/locales/doorkeeper.oc.yml
index b60c28404..9f5d3fe55 100644
--- a/config/locales/doorkeeper.oc.yml
+++ b/config/locales/doorkeeper.oc.yml
@@ -25,18 +25,18 @@ oc:
       confirmations:
         destroy: Sètz segur ?
       edit:
-        title: Modificar l'aplicacion
+        title: Modificar l’aplicacion
       form:
         error: Ops ! Verificatz vòstre formulari
       help:
-        native_redirect_uri: Emplegatz %{native_redirect_uri} per d'ensages locales
+        native_redirect_uri: Emplegatz %{native_redirect_uri} per d’ensages locales
         redirect_uri: Utilizatz una linha per URI
         scopes: Separatz los encastres amb d’espacis. Daissatz void per utilizar l’encastre per defaut.
       index:
         callback_url: URL de rapèl
         name: Nom
         new: Nòva aplicacion
-        title: Vòstra aplicacions
+        title: Vòstras aplicacions
       new:
         title: Nòva aplicacion
       show:
@@ -45,7 +45,7 @@ oc:
         callback_urls: urls de rapèls
         scopes: Encastres
         secret: Secret
-        title: 'Aplicacion: %{name}'
+        title: 'Aplicacion : %{name}'
     authorizations:
       buttons:
         authorize: Autorizar
@@ -62,7 +62,7 @@ oc:
       buttons:
         revoke: Revocar
       confirmations:
-        revoke: Ne sètz segur?
+        revoke: Ne sètz segur ?
       index:
         application: Aplicacion
         created_at: Creada lo
@@ -75,7 +75,7 @@ oc:
         credential_flow_not_configured: Lo flux de qualificacion del senhal del proprietari de la ressorça capitèt pas pr’amor que Doorkeeper.configure.resource_owner_from_credentials es pas configurat.
         invalid_client: L’autorizacion del client capitèt pas pr’amor que lo client es desconegut, l’autorizacion del client es pas enclús, o lo metòde d’autorizacion es pas suportat.
         invalid_grant: L’acòrdi d’autorizacion donadat es pas valid, expirat, revocat, una redireccion URI utilizat en la demanda d’autorizacion no correspond, o a estat desliurat a un altre client.
-        invalid_redirect_uri: L'URL de redireccion es pas valida.
+        invalid_redirect_uri: L’URL de redireccion es pas valida.
         invalid_request: La demanda a un paramètre que li manca, a una valor qu’es pas suportada, o quicòm mal format.
         invalid_resource_owner: La qualificacion del proprietari de la ressorça donada es pas valid, o lo proprietari de la ressorça se pòt pas trobar.
         invalid_scope: L’encastre demandat es pas valid, o mal format.
@@ -109,5 +109,5 @@ oc:
         title: Cal una autorizacion OAuth
     scopes:
       follow: sègre, blocar, quitar de blocar e quitar de sègre de comptes
-      read: legissètz las donadas de vòstre compte
-      write: publicatz per vos
+      read: legir las donadas de vòstre compte
+      write: publicar per vos

From e27f792c24d1040246bc6ae890e6052f763cdb84 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 23 Jun 2017 01:34:27 +0900
Subject: [PATCH 044/382] Some minor change and spec for Account (#3813)

* Introduce domains method to Account relation

Account had followers_domains method, which was excessively specific.
Let relation of Account have domains method instead.

* Move follow_mapping in Account to AccountInteractions

* Introduce shared examples for AccountAvatar inclusion

* Cover Account more
---
 app/models/account.rb                         |  12 +-
 app/models/concerns/account_interactions.rb   |   6 +
 .../pubsubhubbub/distribution_worker.rb       |   2 +-
 spec/models/account_spec.rb                   | 417 +++++++++++++++---
 .../models/concerns/account_avatar.rb         |  19 +
 5 files changed, 380 insertions(+), 76 deletions(-)
 create mode 100644 spec/support/examples/models/concerns/account_avatar.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index 72bad51a2..2b54cee5f 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -124,10 +124,6 @@ class Account < ApplicationRecord
     subscription_expires_at.present?
   end
 
-  def followers_domains
-    followers.reorder(nil).pluck('distinct accounts.domain')
-  end
-
   def keypair
     OpenSSL::PKey::RSA.new(private_key || public_key)
   end
@@ -163,6 +159,10 @@ class Account < ApplicationRecord
   end
 
   class << self
+    def domains
+      reorder(nil).pluck('distinct accounts.domain')
+    end
+
     def triadic_closures(account, limit: 5, offset: 0)
       sql = <<-SQL.squish
         WITH first_degree AS (
@@ -236,10 +236,6 @@ class Account < ApplicationRecord
 
       [textsearch, query]
     end
-
-    def follow_mapping(query, field)
-      query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
-    end
   end
 
   before_create :generate_keys
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index de5979958..9ffed2910 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -29,6 +29,12 @@ module AccountInteractions
       blocked_domains = AccountDomainBlock.where(account_id: account_id, domain: accounts_map.values).pluck(:domain)
       accounts_map.map { |id, domain| [id, blocked_domains.include?(domain)] }.to_h
     end
+
+    private
+
+    def follow_mapping(query, field)
+      query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true }
+    end
   end
 
   included do
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index da01dcd91..b41cec90d 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -33,7 +33,7 @@ class Pubsubhubbub::DistributionWorker
     return if stream_entries.empty?
 
     @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
-    @domains = @account.followers_domains
+    @domains = @account.followers.domains
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url) }) do |subscription|
       [subscription.id, @payload]
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 73ae34f8e..eeaebb779 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -1,10 +1,9 @@
 require 'rails_helper'
 
 RSpec.describe Account, type: :model do
-  subject { Fabricate(:account, username: 'alice') }
-
   context do
     let(:bob) { Fabricate(:account, username: 'bob') }
+    subject { Fabricate(:account) }
 
     describe '#follow!' do
       it 'creates a follow' do
@@ -45,12 +44,13 @@ RSpec.describe Account, type: :model do
 
   describe '#local?' do
     it 'returns true when the account is local' do
-      expect(subject.local?).to be true
+      account = Fabricate(:account, domain: nil)
+      expect(account.local?).to be true
     end
 
     it 'returns false when the account is on a different domain' do
-      subject.domain = 'foreign.tld'
-      expect(subject.local?).to be false
+      account = Fabricate(:account, domain: 'foreign.tld')
+      expect(account.local?).to be false
     end
   end
 
@@ -61,6 +61,8 @@ RSpec.describe Account, type: :model do
       Rails.configuration.x.local_domain = before
     end
 
+    subject { Fabricate(:account, domain: nil, username: 'alice') }
+
     describe '#to_webfinger_s' do
       it 'returns a webfinger string for the account' do
         Rails.configuration.x.local_domain = 'example.com'
@@ -80,41 +82,72 @@ RSpec.describe Account, type: :model do
 
   describe '#acct' do
     it 'returns username for local users' do
-      expect(subject.acct).to eql 'alice'
+      account = Fabricate(:account, domain: nil, username: 'alice')
+      expect(account.acct).to eql 'alice'
     end
 
     it 'returns username@domain for foreign users' do
-      subject.domain = 'foreign.tld'
-      expect(subject.acct).to eql 'alice@foreign.tld'
+      account = Fabricate(:account, domain: 'foreign.tld', username: 'alice')
+      expect(account.acct).to eql 'alice@foreign.tld'
+    end
+  end
+
+  describe '#save_with_optional_media!' do
+    it 'sets default avatar, header, avatar_remote_url, and header_remote_url if some of them are invalid' do
+      stub_request(:get, 'https://remote/valid_avatar').to_return(request_fixture('avatar.txt'))
+      stub_request(:get, 'https://remote/invalid_avatar').to_return(request_fixture('feed.txt'))
+      account = Fabricate(:account,
+                          avatar_remote_url: 'https://remote/valid_avatar',
+                          header_remote_url: 'https://remote/valid_avatar')
+
+      account.avatar_remote_url = 'https://remote/invalid_avatar'
+      account.save_with_optional_media!
+
+      account.reload
+      expect(account.avatar_remote_url).to eq ''
+      expect(account.header_remote_url).to eq ''
+      expect(account.avatar_file_name).to eq nil
+      expect(account.header_file_name).to eq nil
     end
   end
 
   describe '#subscribed?' do
     it 'returns false when no subscription expiration information is present' do
-      expect(subject.subscribed?).to be false
+      account = Fabricate(:account, subscription_expires_at: nil)
+      expect(account.subscribed?).to be false
     end
 
     it 'returns true when subscription expiration has been set' do
-      subject.subscription_expires_at = 30.days.from_now
-      expect(subject.subscribed?).to be true
+      account = Fabricate(:account, subscription_expires_at: 30.days.from_now)
+      expect(account.subscribed?).to be true
+    end
+  end
+
+  describe '#to_param' do
+    it 'returns username' do
+      account = Fabricate(:account, username: 'alice')
+      expect(account.to_param).to eq 'alice'
     end
   end
 
   describe '#keypair' do
     it 'returns an RSA key pair' do
-      expect(subject.keypair).to be_instance_of OpenSSL::PKey::RSA
+      account = Fabricate(:account)
+      expect(account.keypair).to be_instance_of OpenSSL::PKey::RSA
     end
   end
 
   describe '#subscription' do
     it 'returns an OStatus subscription' do
-      expect(subject.subscription('')).to be_instance_of OStatus2::Subscription
+      account = Fabricate(:account)
+      expect(account.subscription('')).to be_instance_of OStatus2::Subscription
     end
   end
 
   describe '#object_type' do
     it 'is always a person' do
-      expect(subject.object_type).to be :person
+      account = Fabricate(:account)
+      expect(account.object_type).to be :person
     end
   end
 
@@ -124,6 +157,8 @@ RSpec.describe Account, type: :model do
       Fabricate(:status, account: author)
     end
 
+    subject { Fabricate(:account) }
+
     context 'when the status is a reblog of another status' do
       let(:original_reblog) do
         author = Fabricate(:account, username: 'original_reblogger')
@@ -160,6 +195,8 @@ RSpec.describe Account, type: :model do
       Fabricate(:status, account: author)
     end
 
+    subject { Fabricate(:account) }
+
     context 'when the status is a reblog of another status'do
       let(:original_reblog) do
         author = Fabricate(:account, username: 'original_reblogger')
@@ -205,14 +242,16 @@ RSpec.describe Account, type: :model do
     end
   end
 
+  describe '#excluded_from_timeline_domains' do
+    it 'returns the domains blocked by the account' do
+      account = Fabricate(:account)
+      account.block_domain!('domain')
+      expect(account.excluded_from_timeline_domains).to match_array ['domain']
+    end
+  end
+
   describe '.search_for' do
     before do
-      @match = Fabricate(
-        :account,
-        display_name: "Display Name",
-        username: "username",
-        domain: "example.com"
-      )
       _missing = Fabricate(
         :account,
         display_name: "Missing",
@@ -221,33 +260,103 @@ RSpec.describe Account, type: :model do
       )
     end
 
+    it 'accepts ?, \, : and space as delimiter' do
+      match = Fabricate(
+        :account,
+        display_name: 'A & l & i & c & e',
+        username: 'username',
+        domain: 'example.com'
+      )
+
+      results = Account.search_for('A?l\i:c e')
+      expect(results).to eq [match]
+    end
+
     it 'finds accounts with matching display_name' do
+      match = Fabricate(
+        :account,
+        display_name: "Display Name",
+        username: "username",
+        domain: "example.com"
+      )
+
       results = Account.search_for("display")
-      expect(results).to eq [@match]
+      expect(results).to eq [match]
     end
 
     it 'finds accounts with matching username' do
+      match = Fabricate(
+        :account,
+        display_name: "Display Name",
+        username: "username",
+        domain: "example.com"
+      )
+
       results = Account.search_for("username")
-      expect(results).to eq [@match]
+      expect(results).to eq [match]
     end
 
     it 'finds accounts with matching domain' do
+      match = Fabricate(
+        :account,
+        display_name: "Display Name",
+        username: "username",
+        domain: "example.com"
+      )
+
       results = Account.search_for("example")
-      expect(results).to eq [@match]
+      expect(results).to eq [match]
+    end
+
+    it 'limits by 10 by default' do
+      11.times.each { Fabricate(:account, display_name: "Display Name") }
+      results = Account.search_for("display")
+      expect(results.size).to eq 10
+    end
+
+    it 'accepts arbitrary limits' do
+      2.times.each { Fabricate(:account, display_name: "Display Name") }
+      results = Account.search_for("display", 1)
+      expect(results.size).to eq 1
     end
 
     it 'ranks multiple matches higher' do
-      account = Fabricate(
-        :account,
-        username: "username",
-        display_name: "username"
-      )
+      matches = [
+        { username: "username", display_name: "username" },
+        { display_name: "Display Name", username: "username", domain: "example.com" },
+      ].map(&method(:Fabricate).curry(2).call(:account))
+
       results = Account.search_for("username")
-      expect(results).to eq [account, @match]
+      expect(results).to eq matches
     end
   end
 
   describe '.advanced_search_for' do
+    it 'accepts ?, \, : and space as delimiter' do
+      account = Fabricate(:account)
+      match = Fabricate(
+        :account,
+        display_name: 'A & l & i & c & e',
+        username: 'username',
+        domain: 'example.com'
+      )
+
+      results = Account.advanced_search_for('A?l\i:c e', account)
+      expect(results).to eq [match]
+    end
+
+    it 'limits by 10 by default' do
+      11.times { Fabricate(:account, display_name: "Display Name") }
+      results = Account.search_for("display")
+      expect(results.size).to eq 10
+    end
+
+    it 'accepts arbitrary limits' do
+      2.times { Fabricate(:account, display_name: "Display Name") }
+      results = Account.search_for("display", 1)
+      expect(results.size).to eq 1
+    end
+
     it 'ranks followed accounts higher' do
       account = Fabricate(:account)
       match = Fabricate(:account, username: "Matching")
@@ -260,9 +369,14 @@ RSpec.describe Account, type: :model do
     end
   end
 
-  describe '.triadic_closures' do
-    subject { described_class.triadic_closures(me) }
+  describe '.domains' do
+    it 'returns domains' do
+      Fabricate(:account, domain: 'domain')
+      expect(Account.domains).to match_array(['domain'])
+    end
+  end
 
+  describe '.triadic_closures' do
     let!(:me) { Fabricate(:account) }
     let!(:friend) { Fabricate(:account) }
     let!(:friends_friend) { Fabricate(:account) }
@@ -277,7 +391,39 @@ RSpec.describe Account, type: :model do
     end
 
     it 'finds accounts you dont follow which are followed by accounts you do follow' do
-      is_expected.to eq [friends_friend]
+      expect(described_class.triadic_closures(me)).to eq [friends_friend]
+    end
+
+    it 'limits by 5 with offset 0 by defualt' do
+      first_degree = 6.times.map { Fabricate(:account) }
+      matches = 5.times.map { Fabricate(:account) }
+      first_degree.each { |account| me.follow!(account) }
+      matches.each do |match|
+        first_degree.each { |account| account.follow!(match) }
+        first_degree.shift
+      end
+
+      expect(described_class.triadic_closures(me)).to eq matches
+    end
+
+    it 'accepts arbitrary limits' do
+      another_friend = Fabricate(:account)
+      higher_friends_friend = Fabricate(:account)
+      me.follow!(another_friend)
+      friend.follow!(higher_friends_friend)
+      another_friend.follow!(higher_friends_friend)
+
+      expect(described_class.triadic_closures(me, limit: 1)).to eq [higher_friends_friend]
+    end
+
+    it 'acceps arbitrary offset' do
+      another_friend = Fabricate(:account)
+      higher_friends_friend = Fabricate(:account)
+      me.follow!(another_friend)
+      friend.follow!(higher_friends_friend)
+      another_friend.follow!(higher_friends_friend)
+
+      expect(described_class.triadic_closures(me, offset: 1)).to eq [friends_friend]
     end
 
     context 'when you block account' do
@@ -286,7 +432,7 @@ RSpec.describe Account, type: :model do
       end
 
       it 'rejects blocked accounts' do
-        is_expected.to be_empty
+        expect(described_class.triadic_closures(me)).to be_empty
       end
     end
 
@@ -296,7 +442,7 @@ RSpec.describe Account, type: :model do
       end
 
       it 'rejects muted accounts' do
-        is_expected.to be_empty
+        expect(described_class.triadic_closures(me)).to be_empty
       end
     end
   end
@@ -374,26 +520,26 @@ RSpec.describe Account, type: :model do
       expect(account).to model_have_error_on_field(:username)
     end
 
-    it 'is invalid if the username already exists' do
-      account_1 = Fabricate(:account, username: 'the_doctor')
-      account_2 = Fabricate.build(:account, username: 'the_doctor')
-      account_2.valid?
-      expect(account_2).to model_have_error_on_field(:username)
-    end
-
-    it 'is invalid if the username is reserved' do
-      account = Fabricate.build(:account, username: 'support')
-      account.valid?
-      expect(account).to model_have_error_on_field(:username)
-    end
-
-    it 'is valid when username is reserved but record has already been created' do
-      account = Fabricate.build(:account, username: 'support')
-      account.save(validate: false)
-      expect(account.valid?).to be true
-    end
-
     context 'when is local' do
+      it 'is invalid if the username is not unique in case-insensitive comparsion among local accounts' do
+        account_1 = Fabricate(:account, username: 'the_doctor')
+        account_2 = Fabricate.build(:account, username: 'the_Doctor')
+        account_2.valid?
+        expect(account_2).to model_have_error_on_field(:username)
+      end
+
+      it 'is invalid if the username is reserved' do
+        account = Fabricate.build(:account, username: 'support')
+        account.valid?
+        expect(account).to model_have_error_on_field(:username)
+      end
+
+      it 'is valid when username is reserved but record has already been created' do
+        account = Fabricate.build(:account, username: 'support')
+        account.save(validate: false)
+        expect(account.valid?).to be true
+      end
+
       it 'is invalid if the username doesn\'t only contains letters, numbers and underscores' do
         account = Fabricate.build(:account, username: 'the-doctor')
         account.valid?
@@ -405,10 +551,109 @@ RSpec.describe Account, type: :model do
         account.valid?
         expect(account).to model_have_error_on_field(:username)
       end
+
+      it 'is invalid if the display name is longer than 30 characters' do
+        account = Fabricate.build(:account, display_name: Faker::Lorem.characters(31))
+        account.valid?
+        expect(account).to model_have_error_on_field(:display_name)
+      end
+
+      it 'is invalid if the note is longer than 160 characters' do
+        account = Fabricate.build(:account, note: Faker::Lorem.characters(161))
+        account.valid?
+        expect(account).to model_have_error_on_field(:note)
+      end
+    end
+
+    context 'when is remote' do
+      it 'is invalid if the username is not unique in case-sensitive comparison among accounts in the same normalized domain' do
+        Fabricate(:account, domain: 'にゃん', username: 'username')
+        account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'username')
+        account.valid?
+        expect(account).to model_have_error_on_field(:username)
+      end
+
+      it 'is valid even if the username is unique only in case-sensitive comparison among accounts in the same normalized domain' do
+        Fabricate(:account, domain: 'にゃん', username: 'username')
+        account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'Username')
+        account.valid?
+        expect(account).not_to model_have_error_on_field(:username)
+      end
+
+      it 'is valid even if the username doesn\'t only contains letters, numbers and underscores' do
+        account = Fabricate.build(:account, domain: 'domain', username: 'the-doctor')
+        account.valid?
+        expect(account).not_to model_have_error_on_field(:username)
+      end
+
+      it 'is valid even if the username is longer then 30 characters' do
+        account = Fabricate.build(:account, domain: 'domain', username: Faker::Lorem.characters(31))
+        account.valid?
+        expect(account).not_to model_have_error_on_field(:username)
+      end
+
+      it 'is valid even if the display name is longer than 30 characters' do
+        account = Fabricate.build(:account, domain: 'domain', display_name: Faker::Lorem.characters(31))
+        account.valid?
+        expect(account).not_to model_have_error_on_field(:display_name)
+      end
+
+      it 'is valid even if the note is longer than 160 characters' do
+        account = Fabricate.build(:account, domain: 'domain', note: Faker::Lorem.characters(161))
+        account.valid?
+        expect(account).not_to model_have_error_on_field(:note)
+      end
     end
   end
 
   describe 'scopes' do
+    describe 'alphabetic' do
+      it 'sorts by alphabetic order of domain and username' do
+        matches = [
+          { username: 'a', domain: 'a' },
+          { username: 'b', domain: 'a' },
+          { username: 'a', domain: 'b' },
+          { username: 'b', domain: 'b' },
+        ].map(&method(:Fabricate).curry(2).call(:account))
+
+        expect(Account.alphabetic).to eq matches
+      end
+    end
+
+    describe 'matches_display_name' do
+      it 'matches display name which starts with the given string' do
+        match = Fabricate(:account, display_name: 'pattern and suffix')
+        Fabricate(:account, display_name: 'prefix and pattern')
+
+        expect(Account.matches_display_name('pattern')).to eq [match]
+      end
+    end
+
+    describe 'matches_username' do
+      it 'matches display name which starts with the given string' do
+        match = Fabricate(:account, username: 'pattern_and_suffix')
+        Fabricate(:account, username: 'prefix_and_pattern')
+
+        expect(Account.matches_username('pattern')).to eq [match]
+      end
+    end
+
+    describe 'expiring' do
+      it 'returns remote accounts with followers whose subscription expiration date is past or not given' do
+        local = Fabricate(:account, domain: nil)
+        matches = [
+          { domain: 'remote', subscription_expires_at: nil },
+          { domain: 'remote', subscription_expires_at: '2000-01-01T00:00:00Z' },
+        ].map(&method(:Fabricate).curry(2).call(:account))
+        matches.each(&local.method(:follow!))
+        Fabricate(:account, domain: 'remote', subscription_expires_at: nil)
+        local.follow!(Fabricate(:account, domain: 'remote', subscription_expires_at: '2000-01-03T00:00:00Z'))
+        local.follow!(Fabricate(:account, domain: nil, subscription_expires_at: nil))
+
+        expect(Account.expiring('2000-01-02T00:00:00Z').recent).to eq matches.reverse
+      end
+    end
+
     describe 'remote' do
       it 'returns an array of accounts who have a domain' do
         account_1 = Fabricate(:account, domain: nil)
@@ -439,6 +684,24 @@ RSpec.describe Account, type: :model do
       end
     end
 
+    describe 'partitioned' do
+      it 'returns a relation of accounts partitioned by domain' do
+        matches = ['a', 'b', 'a', 'b']
+        matches.size.times.to_a.shuffle.each do |index|
+          matches[index] = Fabricate(:account, domain: matches[index])
+        end
+
+        expect(Account.partitioned).to match_array(matches)
+      end
+    end
+
+    describe 'recent' do
+      it 'returns a relation of accounts sorted by recent creation' do
+        matches = 2.times.map { Fabricate(:account) }
+        expect(Account.recent).to match_array(matches)
+      end
+    end
+
     describe 'silenced' do
       it 'returns an array of accounts who are silenced' do
         account_1 = Fabricate(:account, silenced: true)
@@ -454,25 +717,45 @@ RSpec.describe Account, type: :model do
         expect(Account.suspended).to match_array([account_1])
       end
     end
-  end
 
-  describe 'static avatars' do
-    describe 'when GIF' do
-      it 'creates a png static style' do
-        subject.avatar = attachment_fixture('avatar.gif')
-        subject.save
-
-        expect(subject.avatar_static_url).to_not eq subject.avatar_original_url
+    describe 'without_followers' do
+      it 'returns a relation of accounts without followers' do
+        account_1 = Fabricate(:account)
+        account_2 = Fabricate(:account)
+        Fabricate(:follow, account: account_1, target_account: account_2)
+        expect(Account.without_followers).to match_array([account_1])
       end
     end
 
-    describe 'when non-GIF' do
-      it 'does not create extra static style' do
-        subject.avatar = attachment_fixture('attachment.jpg')
-        subject.save
-
-        expect(subject.avatar_static_url).to eq subject.avatar_original_url
+    describe 'with_followers' do
+      it 'returns a relation of accounts with followers' do
+        account_1 = Fabricate(:account)
+        account_2 = Fabricate(:account)
+        Fabricate(:follow, account: account_1, target_account: account_2)
+        expect(Account.with_followers).to match_array([account_2])
       end
     end
   end
+
+  context 'when is local' do
+    it 'generates keys' do
+      account = Account.create!(domain: nil, username: Faker::Internet.user_name(nil, ['_']))
+      expect(account.keypair.private?).to eq true
+    end
+  end
+
+  context 'when is remote' do
+    it 'does not generate keys' do
+      key = OpenSSL::PKey::RSA.new(1024).public_key
+      account = Account.create!(domain: 'remote', username: Faker::Internet.user_name(nil, ['_']), public_key: key.to_pem)
+      expect(account.keypair.params).to eq key.params
+    end
+
+    it 'normalizes domain' do
+      account = Account.create!(domain: 'にゃん', username: Faker::Internet.user_name(nil, ['_']))
+      expect(account.domain).to eq 'xn--r9j5b5b'
+    end
+  end
+
+  include_examples 'AccountAvatar', :account
 end
diff --git a/spec/support/examples/models/concerns/account_avatar.rb b/spec/support/examples/models/concerns/account_avatar.rb
new file mode 100644
index 000000000..f2a8a2459
--- /dev/null
+++ b/spec/support/examples/models/concerns/account_avatar.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+shared_examples 'AccountAvatar' do |fabricator|
+  describe 'static avatars' do
+    describe 'when GIF' do
+      it 'creates a png static style' do
+        account = Fabricate(fabricator, avatar: attachment_fixture('avatar.gif'))
+        expect(account.avatar_static_url).to_not eq account.avatar_original_url
+      end
+    end
+
+    describe 'when non-GIF' do
+      it 'does not create extra static style' do
+        account = Fabricate(fabricator, avatar: attachment_fixture('attachment.jpg'))
+        expect(account.avatar_static_url).to eq account.avatar_original_url
+      end
+    end
+  end
+end

From 7bc18058270bd4d3b376bf0bf8f104ebdd178230 Mon Sep 17 00:00:00 2001
From: Charlotte Fields <charlottelilyfields48@gmail.com>
Date: Fri, 23 Jun 2017 02:35:27 +1000
Subject: [PATCH 045/382] fixed vagrantfile (#3897)

---
 Vagrantfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Vagrantfile b/Vagrantfile
index f2302b24f..77b5e8350 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -45,6 +45,9 @@ gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB8
 curl -sSL https://get.rvm.io | bash -s stable --ruby=$RUBY_VERSION
 source /home/vagrant/.rvm/scripts/rvm
 
+# Install Ruby
+rvm install ruby-$RUBY_VERSION
+
 # Configure database
 sudo -u postgres createuser -U postgres vagrant -s
 sudo -u postgres createdb -U postgres mastodon_development

From 3e8e9c8ae40991ed17fecd504018c2b2fedb0c21 Mon Sep 17 00:00:00 2001
From: nightpool <eg1290@gmail.com>
Date: Thu, 22 Jun 2017 17:28:52 -0400
Subject: [PATCH 046/382] Use the stable RVM installer (#3901)

as mentioned by ElvenSpellmaker here: https://github.com/rvm/rvm/issues/4068

Adds a workaround for the issue mentioned by @abcang here: https://github.com/tootsuite/mastodon/pull/3897#issuecomment-310436668 and makes sure that we're using the stable installer to install the stable version.
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 77b5e8350..1f56fcfb3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,7 +42,7 @@ sudo apt-get install \
 # Install rvm
 read RUBY_VERSION < .ruby-version
 gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
-curl -sSL https://get.rvm.io | bash -s stable --ruby=$RUBY_VERSION
+curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION
 source /home/vagrant/.rvm/scripts/rvm
 
 # Install Ruby

From 9ca02a00a62855fa0daa39870e03bc88f695bbc0 Mon Sep 17 00:00:00 2001
From: Ratmir Karabut <rkarabut@users.noreply.github.com>
Date: Fri, 23 Jun 2017 00:28:58 +0300
Subject: [PATCH 047/382] Update Russian translation (#3902)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line
---
 config/locales/ru.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b8c8b98b3..c16ab6869 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -169,6 +169,8 @@ ru:
     invalid_url: Введенный URL неверен
   auth:
     change_password: Изменить пароль
+    delete_account: Удалить аккаунт
+    delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете <a href="%{path}">перейти сюда</a>. У Вас будет запрошено подтверждение.
     didnt_get_confirmation: Не получили инструкцию для подтверждения?
     forgot_password: Забыли пароль?
     login: Войти
@@ -196,6 +198,14 @@ ru:
       x_minutes: "%{count}мин"
       x_months: "%{count}мес"
       x_seconds: "%{count}сек"
+  deletes:
+    bad_password_msg: Не вышло, хакеры! Неверный пароль
+    confirm_password: Введите текущий пароль для подтверждения Вашей личности
+    description_html: Это действие <strong>перманентно и необратимо</strong> удалит контент Вашего аккаунта и деактивирует его. Ваше имя пользователя будет зарезервировано для предотвращения имперсонации в будущем.
+    proceed: Удалить аккаунт
+    success_msg: Ваш аккаунт был успешно удален
+    warning_html: Гарантируется удаление контента только на этом узле. Широко распространившийся контент, скорее всего, оставит следы. Сервера, отключенные от сети или отписавшиеся от Ваших обновлений, не обновят свои базы данных.
+    warning_title: О доступности распространившегося контента
   errors:
     '403': У Вас нет доступа к просмотру этой страницы.
     '404': Страница, которую Вы искали, не существует.
@@ -203,6 +213,8 @@ ru:
     '422':
       content: Проверка безопасности не удалась. Возможно, Вы блокируете cookies?
       title: Проверка безопасности не удалась.
+    '429': Слишком много запросов
+    noscript: Для работы с Mastodon, пожалуйста, включите JavaScript.
   exports:
     blocks: Список блокировки
     csv: CSV
@@ -283,6 +295,7 @@ ru:
   settings:
     authorized_apps: Авторизованные приложения
     back: Назад в Mastodon
+    delete: Удаление аккаунта
     edit_profile: Изменить профиль
     export: Экспорт данных
     followers: Авторизованные подписчики

From 3d403a013d3ad4878d47b8dbd24ce371efecdfbf Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:36:01 +0200
Subject: [PATCH 048/382] chore(yarn): Install react-swipeable

---
 package.json | 1 +
 yarn.lock    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/package.json b/package.json
index e6fc02bbb..4a611e685 100644
--- a/package.json
+++ b/package.json
@@ -88,6 +88,7 @@
     "react-router-dom": "^4.1.1",
     "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
+    "react-swipeable": "^4.0.1",
     "react-textarea-autosize": "^5.0.6",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
diff --git a/yarn.lock b/yarn.lock
index 26c6f7c7a..2eb1a5c75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5774,6 +5774,12 @@ react-style-proptype@^3.0.0:
   dependencies:
     prop-types "^15.5.4"
 
+react-swipeable@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/react-swipeable/-/react-swipeable-4.0.1.tgz#2cb3a04a52ccebf5361881b30e233dc13ee4b115"
+  dependencies:
+    prop-types "^15.5.8"
+
 react-test-renderer@^15.5.4:
   version "15.5.4"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc"

From a6d8d1036a1a4336cb8fde6e3c318685cf6a7226 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:41:32 +0200
Subject: [PATCH 049/382] feat: Swipeable columns

---
 .../features/ui/components/columns_area.js    | 26 +++++++++++-
 .../features/ui/components/tabs_bar.js        | 40 +++++++++++++++----
 2 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 6ed8bc20d..43be34840 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -2,12 +2,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+import ReactSwipeable from 'react-swipeable';
 import HomeTimeline from '../../home_timeline';
 import Notifications from '../../notifications';
 import PublicTimeline from '../../public_timeline';
 import CommunityTimeline from '../../community_timeline';
 import HashtagTimeline from '../../hashtag_timeline';
 import Compose from '../../compose';
+import { getPreviousLink, getNextLink } from './tabs_bar';
 
 const componentMap = {
   'COMPOSE': Compose,
@@ -20,20 +22,40 @@ const componentMap = {
 
 class ColumnsArea extends ImmutablePureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object.isRequired,
+  };
+
   static propTypes = {
     columns: ImmutablePropTypes.list.isRequired,
     singleColumn: PropTypes.bool,
     children: PropTypes.node,
   };
 
+  handleRightSwipe = () => {
+    const previousLink = getPreviousLink(this.context.router.history.location.pathname);
+
+    if (previousLink) {
+      this.context.router.history.push(previousLink);
+    }
+  }
+
+  handleLeftSwipe = () => {
+    const previousLink = getNextLink(this.context.router.history.location.pathname);
+
+    if (previousLink) {
+      this.context.router.history.push(previousLink);
+    }
+  };
+
   render () {
     const { columns, children, singleColumn } = this.props;
 
     if (singleColumn) {
       return (
-        <div className='columns-area'>
+        <ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} className='columns-area'>
           {children}
-        </div>
+        </ReactSwipeable>
       );
     }
 
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 265cb818b..09acee067 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -2,19 +2,43 @@ import React from 'react';
 import NavLink from 'react-router-dom/NavLink';
 import { FormattedMessage } from 'react-intl';
 
+const links = [
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
+
+  <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
+  <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
+
+  <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>,
+];
+
+export function getPreviousLink (path) {
+  const index = links.findIndex(link => link.props.to === path);
+
+  if (index > 0) {
+    return links[index - 1].props.to;
+  }
+
+  return null;
+};
+
+export function getNextLink (path) {
+  const index = links.findIndex(link => link.props.to === path);
+
+  if (index !== -1 && index < links.length - 1) {
+    return links[index + 1].props.to;
+  }
+
+  return null;
+};
+
 class TabsBar extends React.Component {
 
   render () {
     return (
       <div className='tabs-bar'>
-        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>
-        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
-        <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
-
-        <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
-        <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-
-        <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>
+        {React.Children.toArray(links)}
       </div>
     );
   }

From bc6e95822930dc21f4f1a2c264ed9b976ef162f4 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:41:43 +0200
Subject: [PATCH 050/382] feat: Swipeable media

---
 .../mastodon/features/ui/components/media_modal.js           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index cff1a0cf5..c6b293aeb 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import ReactSwipeable from 'react-swipeable';
 import LoadingIndicator from '../../../components/loading_indicator';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
@@ -84,7 +85,9 @@ class MediaModal extends ImmutablePureComponent {
 
         <div className='media-modal__content'>
           <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} />
-          {content}
+          <ReactSwipeable onSwipedRight={this.handlePrevClick} onSwipedLeft={this.handleNextClick}>
+            {content}
+          </ReactSwipeable>
         </div>
 
         {rightNav}

From d8c47813771795893fe739e066708b84974130b8 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 10 Jun 2017 20:47:07 +0200
Subject: [PATCH 051/382] fix: Apply :hover, :focus and :active only when
 multiple columns

---
 app/javascript/styles/components.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index ecfc186eb..c2062c398 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1473,8 +1473,10 @@
   &:hover,
   &:focus,
   &:active {
-    background: lighten($ui-base-color, 14%);
-    transition: all 100ms linear;
+    @media screen and (min-width: 1025px) {
+      background: lighten($ui-base-color, 14%);
+      transition: all 100ms linear;
+    }
   }
 
   span {

From 6fbb3841a6dd4ec3d84b098437e35f41d41e8407 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 23 Jun 2017 20:55:05 +0900
Subject: [PATCH 052/382] Add prefix to setting toggle ID (#3907)

---
 .../components/column_settings.js             |  6 ++---
 .../components/column_settings.js             | 24 +++++++++----------
 .../components/setting_toggle.js              |  9 +++----
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 104d8ff37..ba870a360 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -28,17 +28,17 @@ class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='home.column_settings.basic' defaultMessage='Basic' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
+          <SettingToggle prefix='home_timeline' settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_reblogs' defaultMessage='Show boosts' />} />
         </div>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
+          <SettingToggle prefix='home_timeline' settings={settings} settingKey={['shows', 'reply']} onChange={onChange} label={<FormattedMessage id='home.column_settings.show_replies' defaultMessage='Show replies' />} />
         </div>
 
         <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
 
         <div className='column-settings__row'>
-          <SettingText settings={settings} settingKey={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
+          <SettingText prefix='home_timeline' settings={settings} settingKey={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 7bfd02f11..13ac78826 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -31,33 +31,33 @@ class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
-          <SettingToggle settings={settings} settingKey={['shows', 'follow']} onChange={onChange} label={showStr} />
-          <SettingToggle settings={settings} settingKey={['sounds', 'follow']} onChange={onChange} label={soundStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'follow']} onChange={onChange} label={showStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'follow']} onChange={onChange} label={soundStr} />
         </div>
 
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favourites:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
-          <SettingToggle settings={settings} settingKey={['shows', 'favourite']} onChange={onChange} label={showStr} />
-          <SettingToggle settings={settings} settingKey={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'favourite']} onChange={onChange} label={showStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
         </div>
 
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
-          <SettingToggle settings={settings} settingKey={['shows', 'mention']} onChange={onChange} label={showStr} />
-          <SettingToggle settings={settings} settingKey={['sounds', 'mention']} onChange={onChange} label={soundStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'mention']} onChange={onChange} label={showStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'mention']} onChange={onChange} label={soundStr} />
         </div>
 
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
-          <SettingToggle settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={showStr} />
-          <SettingToggle settings={settings} settingKey={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={showStr} />
+          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index a37abbd9c..aefc14ee3 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -6,19 +6,20 @@ import Toggle from 'react-toggle';
 class SettingToggle extends React.PureComponent {
 
   static propTypes = {
+    prefix: PropTypes.string,
     settings: ImmutablePropTypes.map.isRequired,
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
     onChange: PropTypes.func.isRequired,
   }
 
-  onChange = (e) => {
-    this.props.onChange(this.props.settingKey, e.target.checked);
+  onChange = ({ target }) => {
+    this.props.onChange(this.props.settingKey, target.checked);
   }
 
   render () {
-    const { settings, settingKey, label, onChange } = this.props;
-    const id = `setting-toggle-${settingKey.join('-')}`;
+    const { prefix, settings, settingKey, label, onChange } = this.props;
+    const id = ['setting-toggle', prefix, ...settingKey].filter(Boolean).join('-');
 
     return (
       <div className='setting-toggle'>

From eff94164696ecb126ab47b85ee842e65692b649a Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 23 Jun 2017 23:05:04 +0900
Subject: [PATCH 053/382] Remove unused variables (#3906)

---
 .eslintrc.yml                                 | 13 ++++-
 app/javascript/mastodon/actions/accounts.js   |  5 +-
 .../mastodon/actions/domain_blocks.js         |  4 +-
 .../mastodon/actions/notifications.js         |  2 +-
 app/javascript/mastodon/actions/statuses.js   |  6 +--
 .../mastodon/components/dropdown_menu.js      |  2 +-
 .../mastodon/components/media_gallery.js      |  2 +-
 app/javascript/mastodon/components/status.js  |  1 -
 .../mastodon/components/status_content.js     |  1 -
 .../mastodon/components/status_list.js        |  2 +-
 .../mastodon/containers/mastodon.js           |  1 -
 .../mastodon/containers/status_container.js   |  2 -
 .../features/account/components/header.js     |  2 +-
 .../features/account_gallery/index.js         |  1 -
 .../components/column_settings.js             |  5 +-
 .../containers/column_settings_container.js   |  6 +--
 .../features/community_timeline/index.js      |  1 -
 .../compose/components/compose_form.js        |  5 +-
 .../components/emoji_picker_dropdown.js       |  2 +-
 .../compose/components/navigation_bar.js      |  3 --
 .../compose/components/privacy_dropdown.js    |  2 +-
 .../features/compose/components/search.js     |  2 +-
 .../compose/components/search_results.js      |  2 +-
 .../compose/components/upload_button.js       |  2 +-
 .../containers/navigation_container.js        |  2 +-
 .../containers/reply_indicator_container.js   |  2 +-
 .../containers/upload_form_container.js       |  2 +-
 .../containers/upload_progress_container.js   |  2 +-
 .../mastodon/features/compose/index.js        |  1 -
 .../features/favourited_statuses/index.js     |  7 +--
 .../containers/account_authorize_container.js |  4 +-
 .../features/getting_started/index.js         |  1 -
 .../features/hashtag_timeline/index.js        |  1 -
 .../components/column_settings.js             |  4 +-
 .../components/column_settings.js             |  3 +-
 .../notifications/components/notification.js  |  1 -
 .../components/setting_toggle.js              |  2 +-
 .../containers/column_settings_container.js   |  6 +--
 .../features/public_timeline/index.js         |  1 -
 .../mastodon/features/report/index.js         |  2 +-
 .../mastodon/features/status/index.js         | 13 +----
 .../features/ui/components/boost_modal.js     |  3 +-
 .../ui/components/confirmation_modal.js       |  2 +-
 .../features/ui/components/image_loader.js    |  2 +-
 .../features/ui/components/media_modal.js     |  1 -
 .../ui/components/onboarding_modal.js         |  5 +-
 .../features/ui/components/video_modal.js     |  1 -
 .../ui/containers/notifications_container.js  |  7 +--
 app/javascript/mastodon/features/ui/index.js  |  3 --
 app/javascript/mastodon/middleware/errors.js  |  2 -
 app/javascript/mastodon/middleware/sounds.js  |  2 +-
 app/javascript/mastodon/reducers/compose.js   |  1 -
 app/javascript/mastodon/reducers/modal.js     |  1 -
 app/javascript/mastodon/reducers/search.js    | 54 -------------------
 app/javascript/mastodon/reducers/timelines.js |  6 ---
 app/javascript/mastodon/selectors/index.js    |  3 --
 .../mastodon/store/configureStore.js          |  1 -
 spec/javascript/.eslintrc.yml                 |  3 ++
 .../components/loading_indicator.test.js      |  8 ---
 storybook/config.js                           |  1 -
 storybook/stories/character_counter.story.js  |  1 -
 storybook/stories/loading_indicator.story.js  |  1 -
 streaming/index.js                            |  6 +--
 63 files changed, 60 insertions(+), 182 deletions(-)
 create mode 100644 spec/javascript/.eslintrc.yml
 delete mode 100644 spec/javascript/components/loading_indicator.test.js

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 2fb54ae66..a816bffef 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,7 +1,9 @@
 ---
+root: true
+
 env:
   browser: true
-  node: false
+  node: true
   es6: true
 
 parser: babel-eslint
@@ -52,8 +54,14 @@ rules:
   no-mixed-spaces-and-tabs: warn
   no-nested-ternary: warn
   no-trailing-spaces: warn
+  no-undef: error
   no-unreachable: error
   no-unused-expressions: error
+  no-unused-vars:
+  - error
+  - vars: all
+    args: after-used
+    ignoreRestSiblings: true
   object-curly-spacing:
   - error
   - always
@@ -81,7 +89,10 @@ rules:
   - 2
   react/jsx-no-bind: error
   react/jsx-no-duplicate-props: error
+  react/jsx-no-undef: error
   react/jsx-tag-spacing: error
+  react/jsx-uses-react: error
+  react/jsx-uses-vars: error
   react/jsx-wrap-multilines: error
   react/no-multi-comp: off
   react/no-string-refs: error
diff --git a/app/javascript/mastodon/actions/accounts.js b/app/javascript/mastodon/actions/accounts.js
index a862798f9..03e3d3d9f 100644
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -1,5 +1,4 @@
 import api, { getLinks } from '../api';
-import Immutable from 'immutable';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
@@ -597,7 +596,7 @@ export function authorizeFollowRequest(id) {
 
     api(getState)
       .post(`/api/v1/follow_requests/${id}/authorize`)
-      .then(response => dispatch(authorizeFollowRequestSuccess(id)))
+      .then(() => dispatch(authorizeFollowRequestSuccess(id)))
       .catch(error => dispatch(authorizeFollowRequestFail(id, error)));
   };
 };
@@ -631,7 +630,7 @@ export function rejectFollowRequest(id) {
 
     api(getState)
       .post(`/api/v1/follow_requests/${id}/reject`)
-      .then(response => dispatch(rejectFollowRequestSuccess(id)))
+      .then(() => dispatch(rejectFollowRequestSuccess(id)))
       .catch(error => dispatch(rejectFollowRequestFail(id, error)));
   };
 };
diff --git a/app/javascript/mastodon/actions/domain_blocks.js b/app/javascript/mastodon/actions/domain_blocks.js
index 530ba9cf1..44363697a 100644
--- a/app/javascript/mastodon/actions/domain_blocks.js
+++ b/app/javascript/mastodon/actions/domain_blocks.js
@@ -16,7 +16,7 @@ export function blockDomain(domain, accountId) {
   return (dispatch, getState) => {
     dispatch(blockDomainRequest(domain));
 
-    api(getState).post('/api/v1/domain_blocks', { domain }).then(response => {
+    api(getState).post('/api/v1/domain_blocks', { domain }).then(() => {
       dispatch(blockDomainSuccess(domain, accountId));
     }).catch(err => {
       dispatch(blockDomainFail(domain, err));
@@ -51,7 +51,7 @@ export function unblockDomain(domain, accountId) {
   return (dispatch, getState) => {
     dispatch(unblockDomainRequest(domain));
 
-    api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(response => {
+    api(getState).delete('/api/v1/domain_blocks', { params: { domain } }).then(() => {
       dispatch(unblockDomainSuccess(domain, accountId));
     }).catch(err => {
       dispatch(unblockDomainFail(domain, err));
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index d3de2d871..cda636139 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -17,7 +17,7 @@ export const NOTIFICATIONS_EXPAND_FAIL    = 'NOTIFICATIONS_EXPAND_FAIL';
 export const NOTIFICATIONS_CLEAR      = 'NOTIFICATIONS_CLEAR';
 export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP';
 
-const messages = defineMessages({
+defineMessages({
   mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
 });
 
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 6956447ba..8d385715c 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -74,7 +74,7 @@ export function deleteStatus(id) {
   return (dispatch, getState) => {
     dispatch(deleteStatusRequest(id));
 
-    api(getState).delete(`/api/v1/statuses/${id}`).then(response => {
+    api(getState).delete(`/api/v1/statuses/${id}`).then(() => {
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
     }).catch(error => {
@@ -152,7 +152,7 @@ export function muteStatus(id) {
   return (dispatch, getState) => {
     dispatch(muteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/mute`).then(response => {
+    api(getState).post(`/api/v1/statuses/${id}/mute`).then(() => {
       dispatch(muteStatusSuccess(id));
     }).catch(error => {
       dispatch(muteStatusFail(id, error));
@@ -186,7 +186,7 @@ export function unmuteStatus(id) {
   return (dispatch, getState) => {
     dispatch(unmuteStatusRequest(id));
 
-    api(getState).post(`/api/v1/statuses/${id}/unmute`).then(response => {
+    api(getState).post(`/api/v1/statuses/${id}/unmute`).then(() => {
       dispatch(unmuteStatusSuccess(id));
     }).catch(error => {
       dispatch(unmuteStatusFail(id, error));
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 6e394a95d..deaab938e 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -56,7 +56,7 @@ class DropdownMenu extends React.PureComponent {
       return <li key={`sep-${i}`} className='dropdown__sep' />;
     }
 
-    const { text, action, href = '#' } = item;
+    const { text, href = '#' } = item;
 
     return (
       <li className='dropdown__content-list-item' key={`${text}-${i}`}>
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 465130cec..cbed90f82 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -138,7 +138,7 @@ class MediaGallery extends React.PureComponent {
     visible: !this.props.sensitive,
   };
 
-  handleOpen = (e) => {
+  handleOpen = () => {
     this.setState({ visible: !this.state.visible });
   }
 
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 1363956cf..3be3685ec 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -7,7 +7,6 @@ import RelativeTimestamp from './relative_timestamp';
 import DisplayName from './display_name';
 import MediaGallery from './media_gallery';
 import VideoPlayer from './video_player';
-import AttachmentList from './attachment_list';
 import StatusContent from './status_content';
 import StatusActionBar from './status_action_bar';
 import { FormattedMessage } from 'react-intl';
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index d02083d3e..605d42138 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -32,7 +32,6 @@ class StatusContent extends React.PureComponent {
     for (var i = 0; i < links.length; ++i) {
       let link    = links[i];
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
-      let media   = this.props.status.get('media_attachments').find(item => link.href === item.get('text_url') || (item.get('remote_url').length > 0 && link.href === item.get('remote_url')));
 
       if (mention) {
         link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index b73a73d1b..40e9d38c1 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -99,7 +99,7 @@ class StatusList extends ImmutablePureComponent {
   }
 
   render () {
-    const { statusIds, onScrollToBottom, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
+    const { statusIds, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
 
     let loadMore       = null;
     let scrollableArea = null;
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index d44cb1be4..e3cb815c9 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -3,7 +3,6 @@ import { Provider } from 'react-redux';
 import PropTypes from 'prop-types';
 import configureStore from '../store/configureStore';
 import {
-  refreshTimelineSuccess,
   updateTimeline,
   deleteFromTimelines,
   refreshHomeTimeline,
diff --git a/app/javascript/mastodon/containers/status_container.js b/app/javascript/mastodon/containers/status_container.js
index 2592e9a69..438ecfe43 100644
--- a/app/javascript/mastodon/containers/status_container.js
+++ b/app/javascript/mastodon/containers/status_container.js
@@ -19,8 +19,6 @@ import {
 import { muteStatus, unmuteStatus, deleteStatus } from '../actions/statuses';
 import { initReport } from '../actions/reports';
 import { openModal } from '../actions/modal';
-import { createSelector } from 'reselect';
-import { isMobile } from '../is_mobile';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 653023cba..80a671a01 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -17,7 +17,7 @@ const messages = defineMessages({
 });
 
 const makeMapStateToProps = () => {
-  const mapStateToProps = (state, props) => ({
+  const mapStateToProps = state => ({
     autoPlayGif: state.getIn(['meta', 'auto_play_gif']),
   });
 
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index fcbee3c89..1e4af30a4 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -7,7 +7,6 @@ import { refreshAccountMediaTimeline, expandAccountMediaTimeline } from '../../a
 import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import ColumnBackButton from '../../components/column_back_button';
-import Immutable from 'immutable';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { getAccountGallery } from '../../selectors';
 import MediaItem from './components/media_item';
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.js b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
index dbbe8ceaa..aa487e34e 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
@@ -2,8 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ColumnCollapsable from '../../../components/column_collapsable';
-import SettingToggle from '../../notifications/components/setting_toggle';
 import SettingText from '../../../components/setting_text';
 
 const messages = defineMessages({
@@ -16,12 +14,11 @@ class ColumnSettings extends React.PureComponent {
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
-    onSave: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
 
   render () {
-    const { settings, onChange, onSave, intl } = this.props;
+    const { settings, onChange, intl } = this.props;
 
     return (
       <div>
diff --git a/app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js
index 1efc2ef33..f3489b409 100644
--- a/app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/community_timeline/containers/column_settings_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import ColumnSettings from '../components/column_settings';
-import { changeSetting, saveSettings } from '../../../actions/settings';
+import { changeSetting } from '../../../actions/settings';
 
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'community']),
@@ -12,10 +12,6 @@ const mapDispatchToProps = dispatch => ({
     dispatch(changeSetting(['community', ...key], checked));
   },
 
-  onSave () {
-    dispatch(saveSettings());
-  },
-
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 4fbe67038..6c4b5dacf 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -14,7 +14,6 @@ import {
 } from '../../actions/timelines';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import createStream from '../../stream';
 
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 0ee45c978..d75bbdf9c 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -7,15 +7,13 @@ import ReplyIndicatorContainer from '../containers/reply_indicator_container';
 import AutosuggestTextarea from '../../../components/autosuggest_textarea';
 import { debounce } from 'lodash';
 import UploadButtonContainer from '../containers/upload_button_container';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import Toggle from 'react-toggle';
+import { defineMessages, injectIntl } from 'react-intl';
 import Collapsable from '../../../components/collapsable';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import SensitiveButtonContainer from '../containers/sensitive_button_container';
 import EmojiPickerDropdown from './emoji_picker_dropdown';
 import UploadFormContainer from '../containers/upload_form_container';
-import TextIconButton from './text_icon_button';
 import WarningContainer from '../containers/warning_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { length } from 'stringz';
@@ -141,7 +139,6 @@ class ComposeForm extends ImmutablePureComponent {
     const text = [this.props.spoiler_text, this.props.text].join('');
 
     let publishText    = '';
-    let reply_to_other = false;
 
     if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
       publishText = <span className='compose-form__publish-private'><i className='fa fa-lock' /> {intl.formatMessage(messages.publish)}</span>;
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 9ac674bb3..afaff1be1 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -52,7 +52,7 @@ class EmojiPickerDropdown extends React.PureComponent {
       import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
         EmojiPicker = TheEmojiPicker.default;
         this.setState({ loading: false });
-      }).catch(err => {
+      }).catch(() => {
         // TODO: show the user an error?
         this.setState({ loading: false });
       });
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index 1c135a733..00f27dea1 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -1,11 +1,8 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Avatar from '../../../components/avatar';
-import IconButton from '../../../components/icon_button';
-import DisplayName from '../../../components/display_name';
 import Permalink from '../../../components/permalink';
 import { FormattedMessage } from 'react-intl';
-import Link from 'react-router-dom/Link';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 class NavigationBar extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index 49f1179a0..f368186a5 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -64,7 +64,7 @@ class PrivacyDropdown extends React.PureComponent {
   }
 
   render () {
-    const { value, onChange, intl } = this.props;
+    const { value, intl } = this.props;
     const { open } = this.state;
 
     const options = [
diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 800080a7d..21b3cf34b 100644
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 const messages = defineMessages({
   placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index 26d766a1c..1a2605c15 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../../containers/account_container';
 import StatusContainer from '../../../containers/status_container';
 import Link from 'react-router-dom/Link';
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index 326b9851a..0f11b9e8b 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -11,7 +11,7 @@ const messages = defineMessages({
 });
 
 const makeMapStateToProps = () => {
-  const mapStateToProps = (state, props) => ({
+  const mapStateToProps = state => ({
     acceptContentTypes: state.getIn(['media_attachments', 'accept_content_types']),
   });
 
diff --git a/app/javascript/mastodon/features/compose/containers/navigation_container.js b/app/javascript/mastodon/features/compose/containers/navigation_container.js
index 75f288f18..8cc53c087 100644
--- a/app/javascript/mastodon/features/compose/containers/navigation_container.js
+++ b/app/javascript/mastodon/features/compose/containers/navigation_container.js
@@ -1,7 +1,7 @@
 import { connect }   from 'react-redux';
 import NavigationBar from '../components/navigation_bar';
 
-const mapStateToProps = (state, props) => {
+const mapStateToProps = state => {
   return {
     account: state.getIn(['accounts', state.getIn(['meta', 'me'])]),
   };
diff --git a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
index 7f3eeb89c..73f394c1a 100644
--- a/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
+++ b/app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
@@ -6,7 +6,7 @@ import ReplyIndicator from '../components/reply_indicator';
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
-  const mapStateToProps = (state, props) => ({
+  const mapStateToProps = state => ({
     status: getStatus(state, state.getIn(['compose', 'in_reply_to'])),
   });
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_form_container.js b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
index 3125564c2..4612599f1 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_form_container.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import UploadForm from '../components/upload_form';
 import { undoUploadCompose } from '../../../actions/compose';
 
-const mapStateToProps = (state, props) => ({
+const mapStateToProps = state => ({
   media: state.getIn(['compose', 'media_attachments']),
 });
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
index 51af4440c..0cfee96da 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_progress_container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import UploadProgress from '../components/upload_progress';
 
-const mapStateToProps = (state, props) => ({
+const mapStateToProps = state => ({
   active: state.getIn(['compose', 'is_uploading']),
   progress: state.getIn(['compose', 'progress']),
 });
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index a87e48a23..0452de856 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import ComposeFormContainer from './containers/compose_form_container';
-import UploadFormContainer from './containers/upload_form_container';
 import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 2b343ba5a..caf0d2ca2 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import LoadingIndicator from '../../components/loading_indicator';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
 import Column from '../ui/components/column';
@@ -15,19 +14,15 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
-  statusIds: state.getIn(['status_lists', 'favourites', 'items']),
   loaded: state.getIn(['status_lists', 'favourites', 'loaded']),
-  me: state.getIn(['meta', 'me']),
 });
 
 class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
-    statusIds: ImmutablePropTypes.list.isRequired,
     loaded: PropTypes.bool,
     intl: PropTypes.object.isRequired,
-    me: PropTypes.number.isRequired,
   };
 
   componentWillMount () {
@@ -39,7 +34,7 @@ class Favourites extends ImmutablePureComponent {
   }
 
   render () {
-    const { statusIds, loaded, intl, me } = this.props;
+    const { loaded, intl } = this.props;
 
     if (!loaded) {
       return (
diff --git a/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js b/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
index a423bc79b..8db471f73 100644
--- a/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
+++ b/app/javascript/mastodon/features/follow_requests/containers/account_authorize_container.js
@@ -14,11 +14,11 @@ const makeMapStateToProps = () => {
 };
 
 const mapDispatchToProps = (dispatch, { id }) => ({
-  onAuthorize (account) {
+  onAuthorize () {
     dispatch(authorizeFollowRequest(id));
   },
 
-  onReject (account) {
+  onReject () {
     dispatch(rejectFollowRequest(id));
   },
 });
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index a4549e609..c1eb06fcb 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -2,7 +2,6 @@ import React from 'react';
 import Column from '../ui/components/column';
 import ColumnLink from '../ui/components/column_link';
 import ColumnSubheading from '../ui/components/column_subheading';
-import Link from 'react-router-dom/Link';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 3b2f1ba93..853434d4b 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -11,7 +11,6 @@ import {
   deleteFromTimelines,
 } from '../../actions/timelines';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import { FormattedMessage } from 'react-intl';
 import createStream from '../../stream';
 
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index ba870a360..47cd340af 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ColumnCollapsable from '../../../components/column_collapsable';
 import SettingToggle from '../../notifications/components/setting_toggle';
 import SettingText from '../../../components/setting_text';
 
@@ -16,12 +15,11 @@ class ColumnSettings extends React.PureComponent {
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
-    onSave: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
   };
 
   render () {
-    const { settings, onChange, onSave, intl } = this.props;
+    const { settings, onChange, intl } = this.props;
 
     return (
       <div>
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 13ac78826..2051e0c86 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { FormattedMessage } from 'react-intl';
-import ColumnCollapsable from '../../../components/column_collapsable';
 import ClearColumnButton from './clear_column_button';
 import SettingToggle from './setting_toggle';
 
@@ -16,7 +15,7 @@ class ColumnSettings extends React.PureComponent {
   };
 
   render () {
-    const { settings, onChange, onSave, onClear } = this.props;
+    const { settings, onChange, onClear } = this.props;
 
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr  = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 6ec4d5dc6..ede37f66a 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -2,7 +2,6 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import StatusContainer from '../../../containers/status_container';
 import AccountContainer from '../../../containers/account_container';
-import Avatar from '../../../components/avatar';
 import { FormattedMessage } from 'react-intl';
 import Permalink from '../../../components/permalink';
 import emojify from '../../../emoji';
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index aefc14ee3..8707a993e 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -18,7 +18,7 @@ class SettingToggle extends React.PureComponent {
   }
 
   render () {
-    const { prefix, settings, settingKey, label, onChange } = this.props;
+    const { prefix, settings, settingKey, label } = this.props;
     const id = ['setting-toggle', prefix, ...settingKey].filter(Boolean).join('-');
 
     return (
diff --git a/app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js b/app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js
index 62d4e7e5a..203e1da92 100644
--- a/app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/public_timeline/containers/column_settings_container.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import ColumnSettings from '../../community_timeline/components/column_settings';
-import { changeSetting, saveSettings } from '../../../actions/settings';
+import { changeSetting } from '../../../actions/settings';
 
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'public']),
@@ -12,10 +12,6 @@ const mapDispatchToProps = dispatch => ({
     dispatch(changeSetting(['public', ...key], checked));
   },
 
-  onSave () {
-    dispatch(saveSettings());
-  },
-
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings);
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 02ddb418f..3de54ef8b 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -14,7 +14,6 @@ import {
 } from '../../actions/timelines';
 import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import createStream from '../../stream';
 
diff --git a/app/javascript/mastodon/features/report/index.js b/app/javascript/mastodon/features/report/index.js
index 23aba39de..0a5268430 100644
--- a/app/javascript/mastodon/features/report/index.js
+++ b/app/javascript/mastodon/features/report/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { cancelReport, changeReportComment, submitReport } from '../../actions/reports';
+import { changeReportComment, submitReport } from '../../actions/reports';
 import { refreshAccountTimeline } from '../../actions/timelines';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index 19cee2435..afd8a7811 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -3,8 +3,6 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { fetchStatus } from '../../actions/statuses';
-import Immutable from 'immutable';
-import EmbeddedStatus from '../../components/status';
 import MissingIndicator from '../../components/missing_indicator';
 import DetailedStatus from './components/detailed_status';
 import ActionBar from './components/action_bar';
@@ -21,17 +19,12 @@ import {
 } from '../../actions/compose';
 import { deleteStatus } from '../../actions/statuses';
 import { initReport } from '../../actions/reports';
-import {
-  makeGetStatus,
-  getStatusAncestors,
-  getStatusDescendants,
-} from '../../selectors';
+import { makeGetStatus } from '../../selectors';
 import { ScrollContainer } from 'react-router-scroll';
 import ColumnBackButton from '../../components/column_back_button';
 import StatusContainer from '../../containers/status_container';
 import { openModal } from '../../actions/modal';
-import { isMobile } from '../../is_mobile';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const messages = defineMessages({
@@ -159,8 +152,6 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    const account = status.get('account');
-
     if (ancestorsIds && ancestorsIds.size > 0) {
       ancestors = <div>{this.renderChildren(ancestorsIds)}</div>;
     }
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index da2be5264..9a8b96333 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -2,7 +2,6 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import IconButton from '../../../components/icon_button';
 import Button from '../../../components/button';
 import StatusContent from '../../../components/status_content';
 import Avatar from '../../../components/avatar';
@@ -49,7 +48,7 @@ class BoostModal extends ImmutablePureComponent {
   }
 
   render () {
-    const { status, intl, onClose } = this.props;
+    const { status, intl } = this.props;
 
     return (
       <div className='modal-root__modal boost-modal'>
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.js b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
index f33bfd445..a45c220fa 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { injectIntl, FormattedMessage } from 'react-intl';
 import Button from '../../../components/button';
 
 class ConfirmationModal extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index a2514d6be..94bf55bad 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -41,7 +41,7 @@ class ImageLoader extends React.PureComponent {
 
   render() {
     const { alt, src, previewSrc, width, height } = this.props;
-    const { loading, error } = this.state;
+    const { loading } = this.state;
 
     return (
       <div className='image-loader'>
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index cff1a0cf5..0f4105ee1 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import LoadingIndicator from '../../../components/loading_indicator';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ExtendedVideoPlayer from '../../../components/extended_video_player';
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index c8985dc83..279599169 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -72,7 +72,7 @@ PageTwo.propTypes = {
   me: ImmutablePropTypes.map.isRequired,
 };
 
-const PageThree = ({ me, domain }) => (
+const PageThree = ({ me }) => (
   <div className='onboarding-modal__page onboarding-modal__page-three'>
     <div className='figure non-interactive'>
       <Search
@@ -95,7 +95,6 @@ const PageThree = ({ me, domain }) => (
 
 PageThree.propTypes = {
   me: ImmutablePropTypes.map.isRequired,
-  domain: PropTypes.string.isRequired,
 };
 
 const PageFour = ({ domain, intl }) => (
@@ -187,7 +186,7 @@ class OnboardingModal extends React.PureComponent {
     this.pages = [
       <PageOne acct={me.get('acct')} domain={domain} />,
       <PageTwo me={me} />,
-      <PageThree me={me} domain={domain} />,
+      <PageThree me={me} />,
       <PageFour domain={domain} intl={intl} />,
       <PageSix admin={admin} domain={domain} />,
     ];
diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js
index c622085f9..3599ab775 100644
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import LoadingIndicator from '../../../components/loading_indicator';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ExtendedVideoPlayer from '../../../components/extended_video_player';
diff --git a/app/javascript/mastodon/features/ui/containers/notifications_container.js b/app/javascript/mastodon/features/ui/containers/notifications_container.js
index 8bc30df35..5924197f1 100644
--- a/app/javascript/mastodon/features/ui/containers/notifications_container.js
+++ b/app/javascript/mastodon/features/ui/containers/notifications_container.js
@@ -1,12 +1,9 @@
 import { connect } from 'react-redux';
 import { NotificationStack } from 'react-notification';
-import {
-  dismissAlert,
-  clearAlerts,
-} from '../../../actions/alerts';
+import { dismissAlert } from '../../../actions/alerts';
 import { getAlerts } from '../../../selectors';
 
-const mapStateToProps = (state, props) => ({
+const mapStateToProps = state => ({
   notifications: getAlerts(state),
 });
 
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 39600607f..e48e9dbe9 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -74,9 +74,6 @@ class WrappedRoute extends React.Component {
 
 }
 
-const noOp = () => false;
-
-
 class UI extends React.PureComponent {
 
   static propTypes = {
diff --git a/app/javascript/mastodon/middleware/errors.js b/app/javascript/mastodon/middleware/errors.js
index 4aca75f1e..b2c5f0898 100644
--- a/app/javascript/mastodon/middleware/errors.js
+++ b/app/javascript/mastodon/middleware/errors.js
@@ -1,13 +1,11 @@
 import { showAlert } from '../actions/alerts';
 
-const defaultSuccessSuffix = 'SUCCESS';
 const defaultFailSuffix = 'FAIL';
 
 export default function errorsMiddleware() {
   return ({ dispatch }) => next => action => {
     if (action.type && !action.skipAlert) {
       const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
-      const isSuccess = new RegExp(`${defaultSuccessSuffix}$`, 'g');
 
       if (action.type.match(isFail)) {
         if (action.error.response) {
diff --git a/app/javascript/mastodon/middleware/sounds.js b/app/javascript/mastodon/middleware/sounds.js
index fd5a2b960..372e7c835 100644
--- a/app/javascript/mastodon/middleware/sounds.js
+++ b/app/javascript/mastodon/middleware/sounds.js
@@ -32,7 +32,7 @@ export default function soundsMiddleware() {
     ]),
   };
 
-  return ({ dispatch }) => next => (action) => {
+  return () => next => action => {
     if (action.meta && action.meta.sound && soundCache[action.meta.sound]) {
       play(soundCache[action.meta.sound]);
     }
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 2413df9e2..d0b47a85c 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -20,7 +20,6 @@ import {
   COMPOSE_SPOILERNESS_CHANGE,
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
-  COMPOSE_LISTABILITY_CHANGE,
   COMPOSE_EMOJI_INSERT,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
diff --git a/app/javascript/mastodon/reducers/modal.js b/app/javascript/mastodon/reducers/modal.js
index 8fd9a69cd..599a2443e 100644
--- a/app/javascript/mastodon/reducers/modal.js
+++ b/app/javascript/mastodon/reducers/modal.js
@@ -1,5 +1,4 @@
 import { MODAL_OPEN, MODAL_CLOSE } from '../actions/modal';
-import Immutable from 'immutable';
 
 const initialState = {
   modalType: null,
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index ed395427e..0a3adac05 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -14,60 +14,6 @@ const initialState = Immutable.Map({
   results: Immutable.Map(),
 });
 
-const normalizeSuggestions = (state, value, accounts, hashtags, statuses) => {
-  let newSuggestions = [];
-
-  if (accounts.length > 0) {
-    newSuggestions.push({
-      title: 'account',
-      items: accounts.map(item => ({
-        type: 'account',
-        id: item.id,
-        value: item.acct,
-      })),
-    });
-  }
-
-  if (value.indexOf('@') === -1 && value.indexOf(' ') === -1 || hashtags.length > 0) {
-    let hashtagItems = hashtags.map(item => ({
-      type: 'hashtag',
-      id: item,
-      value: `#${item}`,
-    }));
-
-    if (value.indexOf('@') === -1 && value.indexOf(' ') === -1 && !value.startsWith('http://') && !value.startsWith('https://') && hashtags.indexOf(value) === -1) {
-      hashtagItems.unshift({
-        type: 'hashtag',
-        id: value,
-        value: `#${value}`,
-      });
-    }
-
-    if (hashtagItems.length > 0) {
-      newSuggestions.push({
-        title: 'hashtag',
-        items: hashtagItems,
-      });
-    }
-  }
-
-  if (statuses.length > 0) {
-    newSuggestions.push({
-      title: 'status',
-      items: statuses.map(item => ({
-        type: 'status',
-        id: item.id,
-        value: item.id,
-      })),
-    });
-  }
-
-  return state.withMutations(map => {
-    map.set('suggestions', newSuggestions);
-    map.set('loaded_value', value);
-  });
-};
-
 export default function search(state = initialState, action) {
   switch(action.type) {
   case SEARCH_CHANGE:
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 2bc1c8050..1b738a16a 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -11,12 +11,6 @@ import {
   TIMELINE_CONNECT,
   TIMELINE_DISCONNECT,
 } from '../actions/timelines';
-import {
-  REBLOG_SUCCESS,
-  UNREBLOG_SUCCESS,
-  FAVOURITE_SUCCESS,
-  UNFAVOURITE_SUCCESS,
-} from '../actions/interactions';
 import {
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index d5d736e2f..07d9a2629 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,9 +1,6 @@
 import { createSelector } from 'reselect';
 import Immutable from 'immutable';
 
-const getStatuses = state => state.get('statuses');
-const getAccounts = state => state.get('accounts');
-
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
 const getAccountCounters     = (state, id) => state.getIn(['accounts_counters', id], null);
 const getAccountRelationship = (state, id) => state.getIn(['relationships', id], null);
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index a92d756f5..1376d4cba 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -4,7 +4,6 @@ import appReducer from '../reducers';
 import loadingBarMiddleware from '../middleware/loading_bar';
 import errorsMiddleware from '../middleware/errors';
 import soundsMiddleware from '../middleware/sounds';
-import Immutable from 'immutable';
 
 export default function configureStore() {
   return createStore(appReducer, compose(applyMiddleware(
diff --git a/spec/javascript/.eslintrc.yml b/spec/javascript/.eslintrc.yml
new file mode 100644
index 000000000..6db2a46c5
--- /dev/null
+++ b/spec/javascript/.eslintrc.yml
@@ -0,0 +1,3 @@
+---
+env:
+  mocha: true
diff --git a/spec/javascript/components/loading_indicator.test.js b/spec/javascript/components/loading_indicator.test.js
deleted file mode 100644
index 0859dd192..000000000
--- a/spec/javascript/components/loading_indicator.test.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { expect } from 'chai';
-import { shallow } from 'enzyme';
-import React from 'react';
-import LoadingIndicator from '../../../app/javascript/mastodon/components/loading_indicator';
-
-describe('<LoadingIndicator />', () => {
-
-});
diff --git a/storybook/config.js b/storybook/config.js
index 1078059a7..87479560f 100644
--- a/storybook/config.js
+++ b/storybook/config.js
@@ -1,5 +1,4 @@
 import { configure } from '@storybook/react';
-import React from 'react';
 import { addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';
 import '../app/javascript/styles/application.scss';
diff --git a/storybook/stories/character_counter.story.js b/storybook/stories/character_counter.story.js
index 15a401a25..39d9afb56 100644
--- a/storybook/stories/character_counter.story.js
+++ b/storybook/stories/character_counter.story.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
 import CharacterCounter from 'mastodon/features/compose/components/character_counter';
 
 storiesOf('CharacterCounter', module)
diff --git a/storybook/stories/loading_indicator.story.js b/storybook/stories/loading_indicator.story.js
index 3e12f61ca..6ee822758 100644
--- a/storybook/stories/loading_indicator.story.js
+++ b/storybook/stories/loading_indicator.story.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { IntlProvider } from 'react-intl';
 import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
 import en from 'mastodon/locales/en.json';
 import LoadingIndicator from 'mastodon/components/loading_indicator';
 
diff --git a/streaming/index.js b/streaming/index.js
index 5afdd5961..fb23be34d 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -242,7 +242,7 @@ const startWorker = (workerId) => {
     accountFromRequest(req, next);
   };
 
-  const errorMiddleware = (err, req, res, next) => {
+  const errorMiddleware = (err, req, res) => {
     log.error(req.requestId, err.toString());
     res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: err.statusCode ? err.toString() : 'An unexpected error occurred' }));
@@ -366,7 +366,7 @@ const startWorker = (workerId) => {
       }
     });
 
-    ws.on('error', e => {
+    ws.on('error', () => {
       log.verbose(req.requestId, `Ending stream for ${req.accountId}`);
       unsubscribe(id, listener);
       if (closeHandler) {
@@ -443,7 +443,7 @@ const startWorker = (workerId) => {
     }
   });
 
-  const wsInterval = setInterval(() => {
+  setInterval(() => {
     wss.clients.forEach(ws => {
       if (ws.isAlive === false) {
         ws.terminate();

From 3f59238207e7cd9b2b1b73e3d4259bd6e82ebc64 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2017 17:01:53 +0200
Subject: [PATCH 054/382] Add important test for full-width hashtags (#3911)

---
 spec/models/tag_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 2496946cb..7c574eabe 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -11,6 +11,10 @@ RSpec.describe Tag, type: :model do
     it 'does not match URLs with hashtag-like anchors' do
       expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil
     end
+
+    it 'matches #ａｅｓｔｈｅｔｉｃ' do
+      expect(subject.match('this is #ａｅｓｔｈｅｔｉｃ')).to_not be_nil
+    end
   end
 
   describe '.search_for' do

From 7b13e6efc2402bde71d3bcf69c859ce8974ac9cb Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2017 17:02:14 +0200
Subject: [PATCH 055/382] Bump version to 1.4.6

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 5f90e83bb..44f3e4390 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      4
+      6
     end
 
     def pre

From e078919f07c3542f8cc6aedc3c554404f328e907 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 23 Jun 2017 08:44:55 -0700
Subject: [PATCH 056/382] Upgrade to Webpack 3 with module concatenation
 (#3912)

---
 config/webpack/production.js |  1 +
 package.json                 |  2 +-
 yarn.lock                    | 56 +++++++++++++++++++++++++++++++++---
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/config/webpack/production.js b/config/webpack/production.js
index 303fca81b..0d2c9acfb 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -12,6 +12,7 @@ module.exports = merge(sharedConfig, {
   stats: 'normal',
 
   plugins: [
+    new webpack.optimize.ModuleConcatenationPlugin(),
     new webpack.optimize.UglifyJsPlugin({
       sourceMap: true,
       mangle: true,
diff --git a/package.json b/package.json
index e6fc02bbb..79e8467cb 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "tiny-queue": "^0.2.1",
     "uuid": "^3.0.1",
     "uws": "^0.14.5",
-    "webpack": "^2.5.1",
+    "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-manifest-plugin": "^1.1.0",
     "webpack-merge": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index 26c6f7c7a..a03f0cdc8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -192,6 +192,10 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
+ajv-keywords@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.0.tgz#a296e17f7bfae7c1ce4f7e0de53d29cb32162df0"
+
 ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
@@ -199,7 +203,7 @@ ajv@^4.7.0, ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-ajv@^5.0.0:
+ajv@^5.0.0, ajv@^5.1.5:
   version "5.1.5"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
   dependencies:
@@ -3944,7 +3948,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.x:
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.x:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -6675,7 +6679,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2, supports-color@^3.1.0, supports-color@^3.1.1:
+supports-color@3.1.2, supports-color@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -6685,7 +6689,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -6873,10 +6877,27 @@ uglify-js@^2.8.27:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
+uglify-js@^2.8.29:
+  version "2.8.29"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
+  dependencies:
+    source-map "~0.5.1"
+    yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
+
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
+uglifyjs-webpack-plugin@^0.4.4:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+  dependencies:
+    source-map "^0.5.6"
+    uglify-js "^2.8.29"
+    webpack-sources "^1.0.1"
+
 uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
@@ -7158,6 +7179,33 @@ webpack@^2.5.1:
     webpack-sources "^0.2.3"
     yargs "^6.0.0"
 
+webpack@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.0.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^3.1.0"
+    tapable "~0.2.5"
+    uglifyjs-webpack-plugin "^0.4.4"
+    watchpack "^1.3.1"
+    webpack-sources "^1.0.1"
+    yargs "^6.0.0"
+
 websocket-driver@>=0.5.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"

From 6f34a6a77f5df6ddd6980c85c9edcc6aa400df73 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Sat, 24 Jun 2017 00:46:00 +0900
Subject: [PATCH 057/382] Add index statuses on account_id and id (#3895)

---
 ...610000000_add_statuses_index_on_account_id_id.rb | 13 +++++++++++++
 db/schema.rb                                        |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb

diff --git a/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb b/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb
new file mode 100644
index 000000000..3e74346a8
--- /dev/null
+++ b/db/migrate/20170610000000_add_statuses_index_on_account_id_id.rb
@@ -0,0 +1,13 @@
+class AddStatusesIndexOnAccountIdId < ActiveRecord::Migration[5.1]
+  disable_ddl_transaction!
+
+  def change
+    # Statuses queried by account_id are often sorted by id. Querying statuses
+    # of an account to show them in his status page is one of the most
+    # significant examples.
+    # Add this index to improve the performance in such cases.
+    add_index 'statuses', ['account_id', 'id'], algorithm: :concurrently, name: 'index_statuses_on_account_id_id'
+
+    remove_index 'statuses', algorithm: :concurrently, column: 'account_id', name: 'index_statuses_on_account_id'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index ba6c0e876..2f12c7308 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170609145826) do
+ActiveRecord::Schema.define(version: 20170610000000) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -279,7 +279,7 @@ ActiveRecord::Schema.define(version: 20170609145826) do
     t.integer "reblogs_count", default: 0, null: false
     t.string "language"
     t.bigint "conversation_id"
-    t.index ["account_id"], name: "index_statuses_on_account_id"
+    t.index ["account_id", "id"], name: "index_statuses_on_account_id_id"
     t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id"
     t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id"

From 3783cadf2d7a2b7ace078d1d337645f53c190c69 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 23 Jun 2017 09:21:33 -0700
Subject: [PATCH 058/382] Apply babel to react-intl to remove prop-types
 (#3914)

---
 config/webpack/loaders/babel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index 1acf5e0e6..c23aa9375 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -1,6 +1,7 @@
 module.exports = {
   test: /\.js$/,
-  exclude: /node_modules/,
+  // include react-intl because transform-react-remove-prop-types needs to apply to it
+  exclude: /node_modules\/(?!react-intl)/,
   loader: 'babel-loader',
   options: {
     forceEnv: process.env.NODE_ENV || 'development',

From 2211e8d1cd6eb97a8a04e24c1fea7031a201edb5 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 23 Jun 2017 18:50:53 +0200
Subject: [PATCH 059/382] Revocable sessions (#3616)

* feat: Revocable sessions

* fix: Tests using sign_in

* feat: Configuration entry for the maximum number of session activations
---
 app/models/session_activation.rb              | 38 +++++++++++++++++++
 app/models/user.rb                            | 14 +++++++
 config/initializers/devise.rb                 | 16 ++++++++
 config/initializers/session_activations.rb    |  5 +++
 ...170623152212_create_session_activations.rb | 13 +++++++
 db/schema.rb                                  | 11 +++++-
 .../session_activation_fabricator.rb          |  4 ++
 spec/models/session_activation_spec.rb        |  5 +++
 spec/rails_helper.rb                          | 11 ++++++
 9 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 app/models/session_activation.rb
 create mode 100644 config/initializers/session_activations.rb
 create mode 100644 db/migrate/20170623152212_create_session_activations.rb
 create mode 100644 spec/fabricators/session_activation_fabricator.rb
 create mode 100644 spec/models/session_activation_spec.rb

diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
new file mode 100644
index 000000000..71e9f023c
--- /dev/null
+++ b/app/models/session_activation.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: session_activations
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  session_id :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class SessionActivation < ApplicationRecord
+  LIMIT = Rails.configuration.x.max_session_activations
+
+  def self.active?(id)
+    id && where(session_id: id).exists?
+  end
+
+  def self.activate(id)
+    activation = create!(session_id: id)
+    purge_old
+    activation
+  end
+
+  def self.deactivate(id)
+    return unless id
+    where(session_id: id).destroy_all
+  end
+
+  def self.purge_old
+    order('created_at desc').offset(LIMIT).destroy_all
+  end
+
+  def self.exclusive(id)
+    where('session_id != ?', id).destroy_all
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index ca11f2f5d..fccf1089b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -63,6 +63,8 @@ class User < ApplicationRecord
   # handle this itself, and this can be removed from our User class.
   attribute :otp_secret
 
+  has_many :session_activations, dependent: :destroy
+
   def confirmed?
     confirmed_at.present?
   end
@@ -89,6 +91,18 @@ class User < ApplicationRecord
     settings.auto_play_gif
   end
 
+  def activate_session
+    session_activations.activate(SecureRandom.hex).session_id
+  end
+
+  def exclusive_session(id)
+    session_activations.exclusive(id)
+  end
+
+  def session_active?(id)
+    session_activations.active? id
+  end
+
   protected
 
   def send_devise_notification(notification, *args)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 4754c2c8c..6d3a73ef6 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,3 +1,19 @@
+Warden::Manager.after_set_user except: :fetch do |user, warden|
+  SessionActivation.deactivate warden.raw_session['auth_id']
+  warden.raw_session['auth_id'] = user.activate_session
+end
+
+Warden::Manager.after_fetch do |user, warden|
+  unless user.session_active?(warden.raw_session['auth_id'])
+    warden.logout
+    throw :warden, message: :unauthenticated
+  end
+end
+
+Warden::Manager.before_logout do |_, warden|
+  SessionActivation.deactivate warden.raw_session['auth_id']
+end
+
 Devise.setup do |config|
   config.warden do |manager|
     manager.default_strategies(scope: :user).unshift :two_factor_authenticatable
diff --git a/config/initializers/session_activations.rb b/config/initializers/session_activations.rb
new file mode 100644
index 000000000..ff3efc852
--- /dev/null
+++ b/config/initializers/session_activations.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+  config.x.max_session_activations = ENV['MAX_SESSION_ACTIVATIONS'] || 10
+end
diff --git a/db/migrate/20170623152212_create_session_activations.rb b/db/migrate/20170623152212_create_session_activations.rb
new file mode 100644
index 000000000..81c776135
--- /dev/null
+++ b/db/migrate/20170623152212_create_session_activations.rb
@@ -0,0 +1,13 @@
+class CreateSessionActivations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :session_activations do |t|
+      t.integer :user_id,   null: false
+      t.string :session_id, null: false
+
+      t.timestamps
+    end
+
+    add_index :session_activations, :user_id
+    add_index :session_activations, :session_id, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2f12c7308..b6aceb930 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170610000000) do
+ActiveRecord::Schema.define(version: 20170623152212) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -250,6 +250,15 @@ ActiveRecord::Schema.define(version: 20170610000000) do
     t.index ["target_account_id"], name: "index_reports_on_target_account_id"
   end
 
+  create_table "session_activations", force: :cascade do |t|
+    t.integer "user_id", null: false
+    t.string "session_id", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
+    t.index ["user_id"], name: "index_session_activations_on_user_id"
+  end
+
   create_table "settings", id: :serial, force: :cascade do |t|
     t.string "var", null: false
     t.text "value"
diff --git a/spec/fabricators/session_activation_fabricator.rb b/spec/fabricators/session_activation_fabricator.rb
new file mode 100644
index 000000000..46050bdab
--- /dev/null
+++ b/spec/fabricators/session_activation_fabricator.rb
@@ -0,0 +1,4 @@
+Fabricator(:session_activation) do
+  user_id    1
+  session_id "MyString"
+end
diff --git a/spec/models/session_activation_spec.rb b/spec/models/session_activation_spec.rb
new file mode 100644
index 000000000..49c72fbd4
--- /dev/null
+++ b/spec/models/session_activation_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SessionActivation, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index c9bdc8add..31c94b1e4 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -16,6 +16,17 @@ WebMock.disable_net_connect!
 Sidekiq::Testing.inline!
 Sidekiq::Logging.logger = nil
 
+Devise::Test::ControllerHelpers.module_eval do
+  alias_method :original_sign_in, :sign_in
+
+  def sign_in(resource, deprecated = nil, scope: nil)
+    original_sign_in(resource, scope: scope)
+
+    SessionActivation.deactivate warden.raw_session["auth_id"]
+    warden.raw_session["auth_id"] = resource.activate_session
+  end
+end
+
 RSpec.configure do |config|
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
   config.use_transactional_fixtures = true

From 0c44316b22c3711ad5369dae2f66f0fd5c79799e Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Sat, 24 Jun 2017 02:22:02 +0900
Subject: [PATCH 060/382] Fix errorMiddleware to prevent "TypeError:
 res.writeHead is not a function" (#3913)

* Fix errorMiddleware

* Add "eslint-disable-line no-unused-vars"
---
 streaming/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/index.js b/streaming/index.js
index fb23be34d..156e1d4bc 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -242,7 +242,7 @@ const startWorker = (workerId) => {
     accountFromRequest(req, next);
   };
 
-  const errorMiddleware = (err, req, res) => {
+  const errorMiddleware = (err, req, res, next) => {  // eslint-disable-line no-unused-vars
     log.error(req.requestId, err.toString());
     res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: err.statusCode ? err.toString() : 'An unexpected error occurred' }));

From c1a8e3d1ebaa6d69e1ae23369a5dedd93ba7226f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 24 Jun 2017 02:36:54 +0900
Subject: [PATCH 061/382] Use Class and Property Decorators (#3730)

ref https://tc39.github.io/proposal-decorators/
---
 .babelrc                                      |  1 +
 app/javascript/mastodon/components/account.js |  5 ++---
 .../mastodon/components/attachment_list.js    |  4 +---
 .../components/autosuggest_textarea.js        |  4 +---
 app/javascript/mastodon/components/avatar.js  |  4 +---
 .../mastodon/components/avatar_overlay.js     |  4 +---
 app/javascript/mastodon/components/button.js  |  4 +---
 app/javascript/mastodon/components/column.js  |  4 +---
 .../mastodon/components/column_back_button.js |  4 +---
 .../components/column_back_button_slim.js     |  4 +---
 .../mastodon/components/column_collapsable.js |  4 +---
 .../mastodon/components/column_header.js      |  4 +---
 .../mastodon/components/display_name.js       |  4 +---
 .../mastodon/components/dropdown_menu.js      |  4 +---
 .../components/extended_video_player.js       |  4 +---
 .../mastodon/components/icon_button.js        |  4 +---
 .../mastodon/components/load_more.js          |  4 +---
 .../mastodon/components/media_gallery.js      |  5 ++---
 .../mastodon/components/permalink.js          |  4 +---
 .../mastodon/components/relative_timestamp.js |  5 ++---
 .../mastodon/components/setting_text.js       |  4 +---
 app/javascript/mastodon/components/status.js  |  4 +---
 .../mastodon/components/status_action_bar.js  |  5 ++---
 .../mastodon/components/status_content.js     |  4 +---
 .../mastodon/components/status_list.js        |  4 +---
 .../mastodon/components/video_player.js       |  5 ++---
 .../mastodon/containers/mastodon.js           | 12 +++++------
 .../features/account/components/action_bar.js |  5 ++---
 .../features/account/components/header.js     |  6 +++---
 .../account_gallery/components/media_item.js  |  4 +---
 .../features/account_gallery/index.js         |  5 ++---
 .../account_timeline/components/header.js     |  4 +---
 .../features/account_timeline/index.js        |  5 ++---
 .../mastodon/features/blocks/index.js         |  6 +++---
 .../components/column_settings.js             |  5 ++---
 .../features/community_timeline/index.js      |  6 +++---
 .../compose/components/autosuggest_account.js |  4 +---
 .../compose/components/character_counter.js   |  4 +---
 .../compose/components/compose_form.js        |  5 ++---
 .../components/emoji_picker_dropdown.js       |  5 ++---
 .../compose/components/navigation_bar.js      |  4 +---
 .../compose/components/privacy_dropdown.js    |  5 ++---
 .../compose/components/reply_indicator.js     |  5 ++---
 .../features/compose/components/search.js     |  5 ++---
 .../compose/components/search_results.js      |  4 +---
 .../compose/components/text_icon_button.js    |  4 +---
 .../compose/components/upload_button.js       |  6 +++---
 .../compose/components/upload_form.js         |  5 ++---
 .../compose/components/upload_progress.js     |  4 +---
 .../features/compose/components/warning.js    |  4 +---
 .../mastodon/features/compose/index.js        |  6 +++---
 .../features/favourited_statuses/index.js     |  6 +++---
 .../mastodon/features/favourites/index.js     |  5 ++---
 .../components/account_authorize.js           |  5 ++---
 .../features/follow_requests/index.js         |  6 +++---
 .../mastodon/features/followers/index.js      |  5 ++---
 .../mastodon/features/following/index.js      |  5 ++---
 .../features/getting_started/index.js         |  6 +++---
 .../features/hashtag_timeline/index.js        |  5 ++---
 .../components/column_settings.js             |  5 ++---
 .../mastodon/features/home_timeline/index.js  |  6 +++---
 .../mastodon/features/mutes/index.js          | 20 +++++++++----------
 .../components/clear_column_button.js         |  4 +---
 .../components/column_settings.js             |  4 +---
 .../notifications/components/notification.js  |  4 +---
 .../components/setting_toggle.js              |  4 +---
 .../mastodon/features/notifications/index.js  |  6 +++---
 .../features/public_timeline/index.js         |  6 +++---
 .../mastodon/features/reblogs/index.js        |  5 ++---
 .../report/components/status_check_box.js     |  4 +---
 .../mastodon/features/report/index.js         |  6 +++---
 .../features/status/components/action_bar.js  |  5 ++---
 .../features/status/components/card.js        |  4 +---
 .../status/components/detailed_status.js      |  4 +---
 .../mastodon/features/status/index.js         |  6 +++---
 .../features/ui/components/boost_modal.js     |  5 ++---
 .../mastodon/features/ui/components/column.js |  4 +---
 .../features/ui/components/column_header.js   |  4 +---
 .../features/ui/components/columns_area.js    |  4 +---
 .../ui/components/confirmation_modal.js       |  5 ++---
 .../features/ui/components/image_loader.js    |  4 +---
 .../features/ui/components/media_modal.js     |  5 ++---
 .../features/ui/components/modal_root.js      |  4 +---
 .../ui/components/onboarding_modal.js         |  6 +++---
 .../features/ui/components/tabs_bar.js        |  4 +---
 .../features/ui/components/upload_area.js     |  4 +---
 .../features/ui/components/video_modal.js     |  5 ++---
 app/javascript/mastodon/features/ui/index.js  |  5 ++---
 package.json                                  |  1 +
 yarn.lock                                     | 12 +++++++++--
 90 files changed, 168 insertions(+), 274 deletions(-)

diff --git a/.babelrc b/.babelrc
index 081c4f963..292d52e27 100644
--- a/.babelrc
+++ b/.babelrc
@@ -15,6 +15,7 @@
   "plugins": [
     "syntax-dynamic-import",
     ["transform-object-rest-spread", { "useBuiltIns": true }],
+    "transform-decorators-legacy",
     "transform-class-properties",
     [
       "react-intl",
diff --git a/app/javascript/mastodon/components/account.js b/app/javascript/mastodon/components/account.js
index 960d136d3..b6ca0661f 100644
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -16,7 +16,8 @@ const messages = defineMessages({
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
 });
 
-class Account extends ImmutablePureComponent {
+@injectIntl
+export default class Account extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -82,5 +83,3 @@ class Account extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(Account);
diff --git a/app/javascript/mastodon/components/attachment_list.js b/app/javascript/mastodon/components/attachment_list.js
index a57c25ad0..b3d00b335 100644
--- a/app/javascript/mastodon/components/attachment_list.js
+++ b/app/javascript/mastodon/components/attachment_list.js
@@ -4,7 +4,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const filename = url => url.split('/').pop().split('#')[0].split('?')[0];
 
-class AttachmentList extends ImmutablePureComponent {
+export default class AttachmentList extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
@@ -31,5 +31,3 @@ class AttachmentList extends ImmutablePureComponent {
   }
 
 }
-
-export default AttachmentList;
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.js b/app/javascript/mastodon/components/autosuggest_textarea.js
index 9a5760a2c..fa41e59e1 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@@ -31,7 +31,7 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
   }
 };
 
-class AutosuggestTextarea extends ImmutablePureComponent {
+export default class AutosuggestTextarea extends ImmutablePureComponent {
 
   static propTypes = {
     value: PropTypes.string,
@@ -196,5 +196,3 @@ class AutosuggestTextarea extends ImmutablePureComponent {
   }
 
 }
-
-export default AutosuggestTextarea;
diff --git a/app/javascript/mastodon/components/avatar.js b/app/javascript/mastodon/components/avatar.js
index 3531a42b5..4f8170657 100644
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class Avatar extends React.PureComponent {
+export default class Avatar extends React.PureComponent {
 
   static propTypes = {
     src: PropTypes.string.isRequired,
@@ -66,5 +66,3 @@ class Avatar extends React.PureComponent {
   }
 
 }
-
-export default Avatar;
diff --git a/app/javascript/mastodon/components/avatar_overlay.js b/app/javascript/mastodon/components/avatar_overlay.js
index c82c89637..de43e0ef5 100644
--- a/app/javascript/mastodon/components/avatar_overlay.js
+++ b/app/javascript/mastodon/components/avatar_overlay.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class AvatarOverlay extends React.PureComponent {
+export default class AvatarOverlay extends React.PureComponent {
 
   static propTypes = {
     staticSrc: PropTypes.string.isRequired,
@@ -28,5 +28,3 @@ class AvatarOverlay extends React.PureComponent {
   }
 
 }
-
-export default AvatarOverlay;
diff --git a/app/javascript/mastodon/components/button.js b/app/javascript/mastodon/components/button.js
index 52af193e7..51e2e6a7a 100644
--- a/app/javascript/mastodon/components/button.js
+++ b/app/javascript/mastodon/components/button.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
-class Button extends React.PureComponent {
+export default class Button extends React.PureComponent {
 
   static propTypes = {
     text: PropTypes.node,
@@ -61,5 +61,3 @@ class Button extends React.PureComponent {
   }
 
 }
-
-export default Button;
diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js
index 157a89c0e..3cbb745c5 100644
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import scrollTop from '../scroll';
 
-class Column extends React.PureComponent {
+export default class Column extends React.PureComponent {
 
   static propTypes = {
     children: PropTypes.node,
@@ -41,5 +41,3 @@ class Column extends React.PureComponent {
   }
 
 }
-
-export default Column;
diff --git a/app/javascript/mastodon/components/column_back_button.js b/app/javascript/mastodon/components/column_back_button.js
index 191c0f597..ba2736d7a 100644
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 
-class ColumnBackButton extends React.PureComponent {
+export default class ColumnBackButton extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -23,5 +23,3 @@ class ColumnBackButton extends React.PureComponent {
   }
 
 }
-
-export default ColumnBackButton;
diff --git a/app/javascript/mastodon/components/column_back_button_slim.js b/app/javascript/mastodon/components/column_back_button_slim.js
index ffb05fa02..3b4f46d99 100644
--- a/app/javascript/mastodon/components/column_back_button_slim.js
+++ b/app/javascript/mastodon/components/column_back_button_slim.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 
-class ColumnBackButtonSlim extends React.PureComponent {
+export default class ColumnBackButtonSlim extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -25,5 +25,3 @@ class ColumnBackButtonSlim extends React.PureComponent {
   }
 
 }
-
-export default ColumnBackButtonSlim;
diff --git a/app/javascript/mastodon/components/column_collapsable.js b/app/javascript/mastodon/components/column_collapsable.js
index c7c953acd..d6b4edb9f 100644
--- a/app/javascript/mastodon/components/column_collapsable.js
+++ b/app/javascript/mastodon/components/column_collapsable.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class ColumnCollapsable extends React.PureComponent {
+export default class ColumnCollapsable extends React.PureComponent {
 
   static propTypes = {
     icon: PropTypes.string.isRequired,
@@ -48,5 +48,3 @@ class ColumnCollapsable extends React.PureComponent {
   }
 
 }
-
-export default ColumnCollapsable;
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 076f1cdad..a309f74e8 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { FormattedMessage } from 'react-intl';
 
-class ColumnHeader extends React.PureComponent {
+export default class ColumnHeader extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -141,5 +141,3 @@ class ColumnHeader extends React.PureComponent {
   }
 
 }
-
-export default ColumnHeader;
diff --git a/app/javascript/mastodon/components/display_name.js b/app/javascript/mastodon/components/display_name.js
index 6fbc1dfc0..dc3665a2b 100644
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import escapeTextContentForBrowser from 'escape-html';
 import emojify from '../emoji';
 
-class DisplayName extends React.PureComponent {
+export default class DisplayName extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -21,5 +21,3 @@ class DisplayName extends React.PureComponent {
   }
 
 }
-
-export default DisplayName;
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index deaab938e..12e1b44fa 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -2,7 +2,7 @@ import React from 'react';
 import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
 import PropTypes from 'prop-types';
 
-class DropdownMenu extends React.PureComponent {
+export default class DropdownMenu extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -92,5 +92,3 @@ class DropdownMenu extends React.PureComponent {
   }
 
 }
-
-export default DropdownMenu;
diff --git a/app/javascript/mastodon/components/extended_video_player.js b/app/javascript/mastodon/components/extended_video_player.js
index 4d92bd779..4c62fa7b3 100644
--- a/app/javascript/mastodon/components/extended_video_player.js
+++ b/app/javascript/mastodon/components/extended_video_player.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class ExtendedVideoPlayer extends React.PureComponent {
+export default class ExtendedVideoPlayer extends React.PureComponent {
 
   static propTypes = {
     src: PropTypes.string.isRequired,
@@ -44,5 +44,3 @@ class ExtendedVideoPlayer extends React.PureComponent {
   }
 
 }
-
-export default ExtendedVideoPlayer;
diff --git a/app/javascript/mastodon/components/icon_button.js b/app/javascript/mastodon/components/icon_button.js
index 302e63df5..ac734f5ad 100644
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -3,7 +3,7 @@ import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
 import PropTypes from 'prop-types';
 
-class IconButton extends React.PureComponent {
+export default class IconButton extends React.PureComponent {
 
   static propTypes = {
     className: PropTypes.string,
@@ -86,5 +86,3 @@ class IconButton extends React.PureComponent {
   }
 
 }
-
-export default IconButton;
diff --git a/app/javascript/mastodon/components/load_more.js b/app/javascript/mastodon/components/load_more.js
index fa0caaae9..2996d4dc8 100644
--- a/app/javascript/mastodon/components/load_more.js
+++ b/app/javascript/mastodon/components/load_more.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import PropTypes from 'prop-types';
 
-class LoadMore extends React.PureComponent {
+export default class LoadMore extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func,
@@ -17,5 +17,3 @@ class LoadMore extends React.PureComponent {
   }
 
 }
-
-export default LoadMore;
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index cbed90f82..78ff35130 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -123,7 +123,8 @@ class Item extends React.PureComponent {
 
 }
 
-class MediaGallery extends React.PureComponent {
+@injectIntl
+export default class MediaGallery extends React.PureComponent {
 
   static propTypes = {
     sensitive: PropTypes.bool,
@@ -183,5 +184,3 @@ class MediaGallery extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(MediaGallery);
diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
index 7149e8380..5d3e4738d 100644
--- a/app/javascript/mastodon/components/permalink.js
+++ b/app/javascript/mastodon/components/permalink.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class Permalink extends React.PureComponent {
+export default class Permalink extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -32,5 +32,3 @@ class Permalink extends React.PureComponent {
   }
 
 }
-
-export default Permalink;
diff --git a/app/javascript/mastodon/components/relative_timestamp.js b/app/javascript/mastodon/components/relative_timestamp.js
index 3eed88df8..2717d2326 100644
--- a/app/javascript/mastodon/components/relative_timestamp.js
+++ b/app/javascript/mastodon/components/relative_timestamp.js
@@ -11,7 +11,8 @@ const dateFormatOptions = {
   minute: '2-digit',
 };
 
-class RelativeTimestamp extends React.Component {
+@injectIntl
+export default class RelativeTimestamp extends React.Component {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -37,5 +38,3 @@ class RelativeTimestamp extends React.Component {
   }
 
 }
-
-export default injectIntl(RelativeTimestamp);
diff --git a/app/javascript/mastodon/components/setting_text.js b/app/javascript/mastodon/components/setting_text.js
index d4f177f8a..dd975bc99 100644
--- a/app/javascript/mastodon/components/setting_text.js
+++ b/app/javascript/mastodon/components/setting_text.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 
-class SettingText extends React.PureComponent {
+export default class SettingText extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
@@ -29,5 +29,3 @@ class SettingText extends React.PureComponent {
   }
 
 }
-
-export default SettingText;
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3be3685ec..81196c82a 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -15,7 +15,7 @@ import escapeTextContentForBrowser from 'escape-html';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
 
-class Status extends ImmutablePureComponent {
+export default class Status extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -233,5 +233,3 @@ class Status extends ImmutablePureComponent {
   }
 
 }
-
-export default Status;
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 800f0d0fb..edb2d6eb0 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -22,7 +22,8 @@ const messages = defineMessages({
   unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
 });
 
-class StatusActionBar extends ImmutablePureComponent {
+@injectIntl
+export default class StatusActionBar extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -149,5 +150,3 @@ class StatusActionBar extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(StatusActionBar);
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 605d42138..0acea033c 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -7,7 +7,7 @@ import { isRtl } from '../rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
 
-class StatusContent extends React.PureComponent {
+export default class StatusContent extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -171,5 +171,3 @@ class StatusContent extends React.PureComponent {
   }
 
 }
-
-export default StatusContent;
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 40e9d38c1..5bc46e8ee 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -8,7 +8,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
 import { debounce } from 'lodash';
 
-class StatusList extends ImmutablePureComponent {
+export default class StatusList extends ImmutablePureComponent {
 
   static propTypes = {
     scrollKey: PropTypes.string.isRequired,
@@ -142,5 +142,3 @@ class StatusList extends ImmutablePureComponent {
   }
 
 }
-
-export default StatusList;
diff --git a/app/javascript/mastodon/components/video_player.js b/app/javascript/mastodon/components/video_player.js
index 66c3a64bc..452a84319 100644
--- a/app/javascript/mastodon/components/video_player.js
+++ b/app/javascript/mastodon/components/video_player.js
@@ -11,7 +11,8 @@ const messages = defineMessages({
   expand_video: { id: 'video_player.expand', defaultMessage: 'Expand video' },
 });
 
-class VideoPlayer extends React.PureComponent {
+@injectIntl
+export default class VideoPlayer extends React.PureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
@@ -193,5 +194,3 @@ class VideoPlayer extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(VideoPlayer);
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index e3cb815c9..3bd89902f 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -26,7 +26,11 @@ const store = configureStore();
 const initialState = JSON.parse(document.getElementById('initial-state').textContent);
 store.dispatch(hydrateStore(initialState));
 
-class Mastodon extends React.PureComponent {
+export default class Mastodon extends React.PureComponent {
+
+  static propTypes = {
+    locale: PropTypes.string.isRequired,
+  };
 
   componentDidMount() {
     const { locale }  = this.props;
@@ -117,9 +121,3 @@ class Mastodon extends React.PureComponent {
   }
 
 }
-
-Mastodon.propTypes = {
-  locale: PropTypes.string.isRequired,
-};
-
-export default Mastodon;
diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 0ea8ad347..374da103e 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -21,7 +21,8 @@ const messages = defineMessages({
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
 });
 
-class ActionBar extends React.PureComponent {
+@injectIntl
+export default class ActionBar extends React.PureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -105,5 +106,3 @@ class ActionBar extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(ActionBar);
diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index 80a671a01..3239b1085 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -70,7 +70,9 @@ class Avatar extends ImmutablePureComponent {
 
 }
 
-class Header extends ImmutablePureComponent {
+@connect(makeMapStateToProps)
+@injectIntl
+export default class Header extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map,
@@ -140,5 +142,3 @@ class Header extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(makeMapStateToProps)(injectIntl(Header));
diff --git a/app/javascript/mastodon/features/account_gallery/components/media_item.js b/app/javascript/mastodon/features/account_gallery/components/media_item.js
index 31c05c866..dda3d4e37 100644
--- a/app/javascript/mastodon/features/account_gallery/components/media_item.js
+++ b/app/javascript/mastodon/features/account_gallery/components/media_item.js
@@ -3,7 +3,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Permalink from '../../../components/permalink';
 
-class MediaItem extends ImmutablePureComponent {
+export default class MediaItem extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
@@ -37,5 +37,3 @@ class MediaItem extends ImmutablePureComponent {
   }
 
 }
-
-export default MediaItem;
diff --git a/app/javascript/mastodon/features/account_gallery/index.js b/app/javascript/mastodon/features/account_gallery/index.js
index 1e4af30a4..0cfd98f23 100644
--- a/app/javascript/mastodon/features/account_gallery/index.js
+++ b/app/javascript/mastodon/features/account_gallery/index.js
@@ -22,7 +22,8 @@ const mapStateToProps = (state, props) => ({
   autoPlayGif: state.getIn(['meta', 'auto_play_gif']),
 });
 
-class AccountGallery extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class AccountGallery extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -111,5 +112,3 @@ class AccountGallery extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(AccountGallery);
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 55fdc4167..7f80e39e8 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -6,7 +6,7 @@ import ActionBar from '../../account/components/action_bar';
 import MissingIndicator from '../../../components/missing_indicator';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class Header extends ImmutablePureComponent {
+export default class Header extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map,
@@ -91,5 +91,3 @@ class Header extends ImmutablePureComponent {
   }
 
 }
-
-export default Header;
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 1aab8f130..955d0000e 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -19,7 +19,8 @@ const mapStateToProps = (state, props) => ({
   me: state.getIn(['meta', 'me']),
 });
 
-class AccountTimeline extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class AccountTimeline extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -77,5 +78,3 @@ class AccountTimeline extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(AccountTimeline);
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js
index de02e53cc..b16af4b28 100644
--- a/app/javascript/mastodon/features/blocks/index.js
+++ b/app/javascript/mastodon/features/blocks/index.js
@@ -19,7 +19,9 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'blocks', 'items']),
 });
 
-class Blocks extends ImmutablePureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class Blocks extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -66,5 +68,3 @@ class Blocks extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(Blocks));
diff --git a/app/javascript/mastodon/features/community_timeline/components/column_settings.js b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
index aa487e34e..a992b27bb 100644
--- a/app/javascript/mastodon/features/community_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/community_timeline/components/column_settings.js
@@ -9,7 +9,8 @@ const messages = defineMessages({
   settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });
 
-class ColumnSettings extends React.PureComponent {
+@injectIntl
+export default class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
@@ -32,5 +33,3 @@ class ColumnSettings extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/community_timeline/index.js b/app/javascript/mastodon/features/community_timeline/index.js
index 6c4b5dacf..0e2300f8c 100644
--- a/app/javascript/mastodon/features/community_timeline/index.js
+++ b/app/javascript/mastodon/features/community_timeline/index.js
@@ -27,7 +27,9 @@ const mapStateToProps = state => ({
   accessToken: state.getIn(['meta', 'access_token']),
 });
 
-class CommunityTimeline extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class CommunityTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -141,5 +143,3 @@ class CommunityTimeline extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(CommunityTimeline));
diff --git a/app/javascript/mastodon/features/compose/components/autosuggest_account.js b/app/javascript/mastodon/features/compose/components/autosuggest_account.js
index 23665811e..ebfa3c247 100644
--- a/app/javascript/mastodon/features/compose/components/autosuggest_account.js
+++ b/app/javascript/mastodon/features/compose/components/autosuggest_account.js
@@ -4,7 +4,7 @@ import DisplayName from '../../../components/display_name';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class AutosuggestAccount extends ImmutablePureComponent {
+export default class AutosuggestAccount extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -22,5 +22,3 @@ class AutosuggestAccount extends ImmutablePureComponent {
   }
 
 }
-
-export default AutosuggestAccount;
diff --git a/app/javascript/mastodon/features/compose/components/character_counter.js b/app/javascript/mastodon/features/compose/components/character_counter.js
index e35f2b879..6c488b661 100644
--- a/app/javascript/mastodon/features/compose/components/character_counter.js
+++ b/app/javascript/mastodon/features/compose/components/character_counter.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { length } from 'stringz';
 
-class CharacterCounter extends React.PureComponent {
+export default class CharacterCounter extends React.PureComponent {
 
   static propTypes = {
     text: PropTypes.string.isRequired,
@@ -23,5 +23,3 @@ class CharacterCounter extends React.PureComponent {
   }
 
 }
-
-export default CharacterCounter;
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index d75bbdf9c..c379c1855 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -25,7 +25,8 @@ const messages = defineMessages({
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
 });
 
-class ComposeForm extends ImmutablePureComponent {
+@injectIntl
+export default class ComposeForm extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -199,5 +200,3 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(ComposeForm);
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index afaff1be1..c83dbb63e 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -24,7 +24,8 @@ const settings = {
 
 let EmojiPicker; // load asynchronously
 
-class EmojiPickerDropdown extends React.PureComponent {
+@injectIntl
+export default class EmojiPickerDropdown extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -123,5 +124,3 @@ class EmojiPickerDropdown extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(EmojiPickerDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index 00f27dea1..fa4f560f3 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -5,7 +5,7 @@ import Permalink from '../../../components/permalink';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class NavigationBar extends ImmutablePureComponent {
+export default class NavigationBar extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -30,5 +30,3 @@ class NavigationBar extends ImmutablePureComponent {
   }
 
 }
-
-export default NavigationBar;
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
index f368186a5..9524f7501 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.js
@@ -20,7 +20,8 @@ const iconStyle = {
   lineHeight: '27px',
 };
 
-class PrivacyDropdown extends React.PureComponent {
+@injectIntl
+export default class PrivacyDropdown extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
@@ -95,5 +96,3 @@ class PrivacyDropdown extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(PrivacyDropdown);
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.js b/app/javascript/mastodon/features/compose/components/reply_indicator.js
index 474549a5f..da00e46c5 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.js
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.js
@@ -12,7 +12,8 @@ const messages = defineMessages({
   cancel: { id: 'reply_indicator.cancel', defaultMessage: 'Cancel' },
 });
 
-class ReplyIndicator extends ImmutablePureComponent {
+@injectIntl
+export default class ReplyIndicator extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -61,5 +62,3 @@ class ReplyIndicator extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(ReplyIndicator);
diff --git a/app/javascript/mastodon/features/compose/components/search.js b/app/javascript/mastodon/features/compose/components/search.js
index 21b3cf34b..cdc7952c0 100644
--- a/app/javascript/mastodon/features/compose/components/search.js
+++ b/app/javascript/mastodon/features/compose/components/search.js
@@ -6,7 +6,8 @@ const messages = defineMessages({
   placeholder: { id: 'search.placeholder', defaultMessage: 'Search' },
 });
 
-class Search extends React.PureComponent {
+@injectIntl
+export default class Search extends React.PureComponent {
 
   static propTypes = {
     value: PropTypes.string.isRequired,
@@ -70,5 +71,3 @@ class Search extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(Search);
diff --git a/app/javascript/mastodon/features/compose/components/search_results.js b/app/javascript/mastodon/features/compose/components/search_results.js
index 1a2605c15..ae4d1e86a 100644
--- a/app/javascript/mastodon/features/compose/components/search_results.js
+++ b/app/javascript/mastodon/features/compose/components/search_results.js
@@ -6,7 +6,7 @@ import StatusContainer from '../../../containers/status_container';
 import Link from 'react-router-dom/Link';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class SearchResults extends ImmutablePureComponent {
+export default class SearchResults extends ImmutablePureComponent {
 
   static propTypes = {
     results: ImmutablePropTypes.map.isRequired,
@@ -63,5 +63,3 @@ class SearchResults extends ImmutablePureComponent {
   }
 
 }
-
-export default SearchResults;
diff --git a/app/javascript/mastodon/features/compose/components/text_icon_button.js b/app/javascript/mastodon/features/compose/components/text_icon_button.js
index cc0fbd11a..9c8ffab1f 100644
--- a/app/javascript/mastodon/features/compose/components/text_icon_button.js
+++ b/app/javascript/mastodon/features/compose/components/text_icon_button.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class TextIconButton extends React.PureComponent {
+export default class TextIconButton extends React.PureComponent {
 
   static propTypes = {
     label: PropTypes.string.isRequired,
@@ -27,5 +27,3 @@ class TextIconButton extends React.PureComponent {
   }
 
 }
-
-export default TextIconButton;
diff --git a/app/javascript/mastodon/features/compose/components/upload_button.js b/app/javascript/mastodon/features/compose/components/upload_button.js
index 0f11b9e8b..badd6cfc5 100644
--- a/app/javascript/mastodon/features/compose/components/upload_button.js
+++ b/app/javascript/mastodon/features/compose/components/upload_button.js
@@ -23,7 +23,9 @@ const iconStyle = {
   lineHeight: '27px',
 };
 
-class UploadButton extends ImmutablePureComponent {
+@connect(makeMapStateToProps)
+@injectIntl
+export default class UploadButton extends ImmutablePureComponent {
 
   static propTypes = {
     disabled: PropTypes.bool,
@@ -70,5 +72,3 @@ class UploadButton extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(makeMapStateToProps)(injectIntl(UploadButton));
diff --git a/app/javascript/mastodon/features/compose/components/upload_form.js b/app/javascript/mastodon/features/compose/components/upload_form.js
index 7e665683a..78473dab4 100644
--- a/app/javascript/mastodon/features/compose/components/upload_form.js
+++ b/app/javascript/mastodon/features/compose/components/upload_form.js
@@ -11,7 +11,8 @@ const messages = defineMessages({
   undo: { id: 'upload_form.undo', defaultMessage: 'Undo' },
 });
 
-class UploadForm extends React.PureComponent {
+@injectIntl
+export default class UploadForm extends React.PureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
@@ -48,5 +49,3 @@ class UploadForm extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(UploadForm);
diff --git a/app/javascript/mastodon/features/compose/components/upload_progress.js b/app/javascript/mastodon/features/compose/components/upload_progress.js
index 8c8ce3835..3e49098c7 100644
--- a/app/javascript/mastodon/features/compose/components/upload_progress.js
+++ b/app/javascript/mastodon/features/compose/components/upload_progress.js
@@ -4,7 +4,7 @@ import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
 import { FormattedMessage } from 'react-intl';
 
-class UploadProgress extends React.PureComponent {
+export default class UploadProgress extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
@@ -40,5 +40,3 @@ class UploadProgress extends React.PureComponent {
   }
 
 }
-
-export default UploadProgress;
diff --git a/app/javascript/mastodon/features/compose/components/warning.js b/app/javascript/mastodon/features/compose/components/warning.js
index d0e75a5c3..75f36b840 100644
--- a/app/javascript/mastodon/features/compose/components/warning.js
+++ b/app/javascript/mastodon/features/compose/components/warning.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class Warning extends React.PureComponent {
+export default class Warning extends React.PureComponent {
 
   static propTypes = {
     message: PropTypes.node.isRequired,
@@ -18,5 +18,3 @@ class Warning extends React.PureComponent {
   }
 
 }
-
-export default Warning;
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 0452de856..747fe4216 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -23,7 +23,9 @@ const mapStateToProps = state => ({
   showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
 });
 
-class Compose extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class Compose extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -82,5 +84,3 @@ class Compose extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(Compose));
diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index caf0d2ca2..137e55089 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -17,7 +17,9 @@ const mapStateToProps = state => ({
   loaded: state.getIn(['status_lists', 'favourites', 'loaded']),
 });
 
-class Favourites extends ImmutablePureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -53,5 +55,3 @@ class Favourites extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(Favourites));
diff --git a/app/javascript/mastodon/features/favourites/index.js b/app/javascript/mastodon/features/favourites/index.js
index 94f9f268b..dc8109d16 100644
--- a/app/javascript/mastodon/features/favourites/index.js
+++ b/app/javascript/mastodon/features/favourites/index.js
@@ -14,7 +14,8 @@ const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'favourited_by', Number(props.params.statusId)]),
 });
 
-class Favourites extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -57,5 +58,3 @@ class Favourites extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(Favourites);
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
index e41597c17..566953ddd 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js
@@ -14,7 +14,8 @@ const messages = defineMessages({
   reject: { id: 'follow_request.reject', defaultMessage: 'Reject' },
 });
 
-class AccountAuthorize extends ImmutablePureComponent {
+@injectIntl
+export default class AccountAuthorize extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
@@ -47,5 +48,3 @@ class AccountAuthorize extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(AccountAuthorize);
diff --git a/app/javascript/mastodon/features/follow_requests/index.js b/app/javascript/mastodon/features/follow_requests/index.js
index 286f128f4..4c9e514cb 100644
--- a/app/javascript/mastodon/features/follow_requests/index.js
+++ b/app/javascript/mastodon/features/follow_requests/index.js
@@ -19,7 +19,9 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
 });
 
-class FollowRequests extends ImmutablePureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class FollowRequests extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -67,5 +69,3 @@ class FollowRequests extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(FollowRequests));
diff --git a/app/javascript/mastodon/features/followers/index.js b/app/javascript/mastodon/features/followers/index.js
index e9910dce4..2d85b9cc0 100644
--- a/app/javascript/mastodon/features/followers/index.js
+++ b/app/javascript/mastodon/features/followers/index.js
@@ -21,7 +21,8 @@ const mapStateToProps = (state, props) => ({
   hasMore: !!state.getIn(['user_lists', 'followers', Number(props.params.accountId), 'next']),
 });
 
-class Followers extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class Followers extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -90,5 +91,3 @@ class Followers extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(Followers);
diff --git a/app/javascript/mastodon/features/following/index.js b/app/javascript/mastodon/features/following/index.js
index 764f702ff..e4e2a4811 100644
--- a/app/javascript/mastodon/features/following/index.js
+++ b/app/javascript/mastodon/features/following/index.js
@@ -21,7 +21,8 @@ const mapStateToProps = (state, props) => ({
   hasMore: !!state.getIn(['user_lists', 'following', Number(props.params.accountId), 'next']),
 });
 
-class Following extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class Following extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -90,5 +91,3 @@ class Following extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(Following);
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index c1eb06fcb..f8ea01024 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -30,7 +30,9 @@ const mapStateToProps = state => ({
   columns: state.getIn(['settings', 'columns']),
 });
 
-class GettingStarted extends ImmutablePureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class GettingStarted extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
@@ -105,5 +107,3 @@ class GettingStarted extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(GettingStarted));
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.js b/app/javascript/mastodon/features/hashtag_timeline/index.js
index 853434d4b..b17e8e1a5 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.js
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.js
@@ -20,7 +20,8 @@ const mapStateToProps = state => ({
   accessToken: state.getIn(['meta', 'access_token']),
 });
 
-class HashtagTimeline extends React.PureComponent {
+@connect(mapStateToProps)
+export default class HashtagTimeline extends React.PureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -136,5 +137,3 @@ class HashtagTimeline extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(HashtagTimeline);
diff --git a/app/javascript/mastodon/features/home_timeline/components/column_settings.js b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
index 47cd340af..43172bd25 100644
--- a/app/javascript/mastodon/features/home_timeline/components/column_settings.js
+++ b/app/javascript/mastodon/features/home_timeline/components/column_settings.js
@@ -10,7 +10,8 @@ const messages = defineMessages({
   settings: { id: 'home.settings', defaultMessage: 'Column settings' },
 });
 
-class ColumnSettings extends React.PureComponent {
+@injectIntl
+export default class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
@@ -43,5 +44,3 @@ class ColumnSettings extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(ColumnSettings);
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index ddebf2379..6021299d6 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -19,7 +19,9 @@ const mapStateToProps = state => ({
   hasFollows: state.getIn(['accounts_counters', state.getIn(['meta', 'me']), 'following_count']) > 0,
 });
 
-class HomeTimeline extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class HomeTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -96,5 +98,3 @@ class HomeTimeline extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(HomeTimeline));
diff --git a/app/javascript/mastodon/features/mutes/index.js b/app/javascript/mastodon/features/mutes/index.js
index f0d8856be..25ca921ae 100644
--- a/app/javascript/mastodon/features/mutes/index.js
+++ b/app/javascript/mastodon/features/mutes/index.js
@@ -19,7 +19,16 @@ const mapStateToProps = state => ({
   accountIds: state.getIn(['user_lists', 'mutes', 'items']),
 });
 
-class Mutes extends ImmutablePureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class Mutes extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    accountIds: ImmutablePropTypes.list,
+    intl: PropTypes.object.isRequired,
+  };
 
   componentWillMount () {
     this.props.dispatch(fetchMutes());
@@ -59,12 +68,3 @@ class Mutes extends ImmutablePureComponent {
   }
 
 }
-
-Mutes.propTypes = {
-  params: PropTypes.object.isRequired,
-  dispatch: PropTypes.func.isRequired,
-  accountIds: ImmutablePropTypes.list,
-  intl: PropTypes.object.isRequired,
-};
-
-export default connect(mapStateToProps)(injectIntl(Mutes));
diff --git a/app/javascript/mastodon/features/notifications/components/clear_column_button.js b/app/javascript/mastodon/features/notifications/components/clear_column_button.js
index 54beb1c4d..22a10753f 100644
--- a/app/javascript/mastodon/features/notifications/components/clear_column_button.js
+++ b/app/javascript/mastodon/features/notifications/components/clear_column_button.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 
-class ClearColumnButton extends React.Component {
+export default class ClearColumnButton extends React.Component {
 
   static propTypes = {
     onClick: PropTypes.func.isRequired,
@@ -15,5 +15,3 @@ class ClearColumnButton extends React.Component {
   }
 
 }
-
-export default ClearColumnButton;
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 2051e0c86..260594894 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
 import ClearColumnButton from './clear_column_button';
 import SettingToggle from './setting_toggle';
 
-class ColumnSettings extends React.PureComponent {
+export default class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
@@ -63,5 +63,3 @@ class ColumnSettings extends React.PureComponent {
   }
 
 }
-
-export default ColumnSettings;
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index ede37f66a..9d631644a 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -8,7 +8,7 @@ import emojify from '../../../emoji';
 import escapeTextContentForBrowser from 'escape-html';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class Notification extends ImmutablePureComponent {
+export default class Notification extends ImmutablePureComponent {
 
   static propTypes = {
     notification: ImmutablePropTypes.map.isRequired,
@@ -86,5 +86,3 @@ class Notification extends ImmutablePureComponent {
   }
 
 }
-
-export default Notification;
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index 8707a993e..510820358 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Toggle from 'react-toggle';
 
-class SettingToggle extends React.PureComponent {
+export default class SettingToggle extends React.PureComponent {
 
   static propTypes = {
     prefix: PropTypes.string,
@@ -30,5 +30,3 @@ class SettingToggle extends React.PureComponent {
   }
 
 }
-
-export default SettingToggle;
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index b85d6d692..1dd1b9a71 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -30,7 +30,9 @@ const mapStateToProps = state => ({
   hasMore: !!state.getIn(['notifications', 'next']),
 });
 
-class Notifications extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class Notifications extends React.PureComponent {
 
   static propTypes = {
     columnId: PropTypes.string,
@@ -173,5 +175,3 @@ class Notifications extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(Notifications));
diff --git a/app/javascript/mastodon/features/public_timeline/index.js b/app/javascript/mastodon/features/public_timeline/index.js
index 3de54ef8b..c6cad02d6 100644
--- a/app/javascript/mastodon/features/public_timeline/index.js
+++ b/app/javascript/mastodon/features/public_timeline/index.js
@@ -27,7 +27,9 @@ const mapStateToProps = state => ({
   accessToken: state.getIn(['meta', 'access_token']),
 });
 
-class PublicTimeline extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class PublicTimeline extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -141,5 +143,3 @@ class PublicTimeline extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(PublicTimeline));
diff --git a/app/javascript/mastodon/features/reblogs/index.js b/app/javascript/mastodon/features/reblogs/index.js
index 13fd1b20e..dc940ae01 100644
--- a/app/javascript/mastodon/features/reblogs/index.js
+++ b/app/javascript/mastodon/features/reblogs/index.js
@@ -14,7 +14,8 @@ const mapStateToProps = (state, props) => ({
   accountIds: state.getIn(['user_lists', 'reblogged_by', Number(props.params.statusId)]),
 });
 
-class Reblogs extends ImmutablePureComponent {
+@connect(mapStateToProps)
+export default class Reblogs extends ImmutablePureComponent {
 
   static propTypes = {
     params: PropTypes.object.isRequired,
@@ -57,5 +58,3 @@ class Reblogs extends ImmutablePureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(Reblogs);
diff --git a/app/javascript/mastodon/features/report/components/status_check_box.js b/app/javascript/mastodon/features/report/components/status_check_box.js
index a31eabc21..6a1a84c28 100644
--- a/app/javascript/mastodon/features/report/components/status_check_box.js
+++ b/app/javascript/mastodon/features/report/components/status_check_box.js
@@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import emojify from '../../../emoji';
 import Toggle from 'react-toggle';
 
-class StatusCheckBox extends React.PureComponent {
+export default class StatusCheckBox extends React.PureComponent {
 
   static propTypes = {
     status: ImmutablePropTypes.map.isRequired,
@@ -36,5 +36,3 @@ class StatusCheckBox extends React.PureComponent {
   }
 
 }
-
-export default StatusCheckBox;
diff --git a/app/javascript/mastodon/features/report/index.js b/app/javascript/mastodon/features/report/index.js
index 0a5268430..bfb09e193 100644
--- a/app/javascript/mastodon/features/report/index.js
+++ b/app/javascript/mastodon/features/report/index.js
@@ -35,7 +35,9 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-class Report extends React.PureComponent {
+@connect(makeMapStateToProps)
+@injectIntl
+export default class Report extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -121,5 +123,3 @@ class Report extends React.PureComponent {
   }
 
 }
-
-export default connect(makeMapStateToProps)(injectIntl(Report));
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 21c2fd682..29080529d 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -15,7 +15,8 @@ const messages = defineMessages({
   report: { id: 'status.report', defaultMessage: 'Report @{name}' },
 });
 
-class ActionBar extends React.PureComponent {
+@injectIntl
+export default class ActionBar extends React.PureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -91,5 +92,3 @@ class ActionBar extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(ActionBar);
diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 415587d6e..bfb40468b 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -17,7 +17,7 @@ const getHostname = url => {
   return parser.hostname;
 };
 
-class Card extends React.PureComponent {
+export default class Card extends React.PureComponent {
 
   static propTypes = {
     card: ImmutablePropTypes.map,
@@ -97,5 +97,3 @@ class Card extends React.PureComponent {
   }
 
 }
-
-export default Card;
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index a77c4f0bb..619957dbe 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -12,7 +12,7 @@ import { FormattedDate, FormattedNumber } from 'react-intl';
 import CardContainer from '../containers/card_container';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-class DetailedStatus extends ImmutablePureComponent {
+export default class DetailedStatus extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -87,5 +87,3 @@ class DetailedStatus extends ImmutablePureComponent {
   }
 
 }
-
-export default DetailedStatus;
diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js
index afd8a7811..cbabdd5bc 100644
--- a/app/javascript/mastodon/features/status/index.js
+++ b/app/javascript/mastodon/features/status/index.js
@@ -48,7 +48,9 @@ const makeMapStateToProps = () => {
   return mapStateToProps;
 };
 
-class Status extends ImmutablePureComponent {
+@injectIntl
+@connect(makeMapStateToProps)
+export default class Status extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -195,5 +197,3 @@ class Status extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(connect(makeMapStateToProps)(Status));
diff --git a/app/javascript/mastodon/features/ui/components/boost_modal.js b/app/javascript/mastodon/features/ui/components/boost_modal.js
index 9a8b96333..6c80a1084 100644
--- a/app/javascript/mastodon/features/ui/components/boost_modal.js
+++ b/app/javascript/mastodon/features/ui/components/boost_modal.js
@@ -13,7 +13,8 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
 });
 
-class BoostModal extends ImmutablePureComponent {
+@injectIntl
+export default class BoostModal extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object,
@@ -81,5 +82,3 @@ class BoostModal extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(BoostModal);
diff --git a/app/javascript/mastodon/features/ui/components/column.js b/app/javascript/mastodon/features/ui/components/column.js
index 970d625b0..ce1dca171 100644
--- a/app/javascript/mastodon/features/ui/components/column.js
+++ b/app/javascript/mastodon/features/ui/components/column.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import { debounce } from 'lodash';
 import scrollTop from '../../../scroll';
 
-class Column extends React.PureComponent {
+export default class Column extends React.PureComponent {
 
   static propTypes = {
     heading: PropTypes.string,
@@ -59,5 +59,3 @@ class Column extends React.PureComponent {
   }
 
 }
-
-export default Column;
diff --git a/app/javascript/mastodon/features/ui/components/column_header.js b/app/javascript/mastodon/features/ui/components/column_header.js
index 578432fec..dc601d6e1 100644
--- a/app/javascript/mastodon/features/ui/components/column_header.js
+++ b/app/javascript/mastodon/features/ui/components/column_header.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class ColumnHeader extends React.PureComponent {
+export default class ColumnHeader extends React.PureComponent {
 
   static propTypes = {
     icon: PropTypes.string,
@@ -34,5 +34,3 @@ class ColumnHeader extends React.PureComponent {
   }
 
 }
-
-export default ColumnHeader;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 43be34840..3c3e9425d 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -20,7 +20,7 @@ const componentMap = {
   'HASHTAG': HashtagTimeline,
 };
 
-class ColumnsArea extends ImmutablePureComponent {
+export default class ColumnsArea extends ImmutablePureComponent {
 
   static contextTypes = {
     router: PropTypes.object.isRequired,
@@ -73,5 +73,3 @@ class ColumnsArea extends ImmutablePureComponent {
   }
 
 }
-
-export default ColumnsArea;
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modal.js b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
index a45c220fa..86588c46a 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modal.js
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modal.js
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import Button from '../../../components/button';
 
-class ConfirmationModal extends React.PureComponent {
+@injectIntl
+export default class ConfirmationModal extends React.PureComponent {
 
   static propTypes = {
     message: PropTypes.node.isRequired,
@@ -50,5 +51,3 @@ class ConfirmationModal extends React.PureComponent {
   }
 
 }
-
-export default injectIntl(ConfirmationModal);
diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index 94bf55bad..5c3879970 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-class ImageLoader extends React.PureComponent {
+export default class ImageLoader extends React.PureComponent {
 
   static propTypes = {
     alt: PropTypes.string,
@@ -65,5 +65,3 @@ class ImageLoader extends React.PureComponent {
   }
 
 }
-
-export default ImageLoader;
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 0209bc99b..8bb81ca01 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -12,7 +12,8 @@ const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });
 
-class MediaModal extends ImmutablePureComponent {
+@injectIntl
+export default class MediaModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.list.isRequired,
@@ -95,5 +96,3 @@ class MediaModal extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(MediaModal);
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 0f68cfbdf..2e4f9876d 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -16,7 +16,7 @@ const MODAL_COMPONENTS = {
   'CONFIRM': ConfirmationModal,
 };
 
-class ModalRoot extends React.PureComponent {
+export default class ModalRoot extends React.PureComponent {
 
   static propTypes = {
     type: PropTypes.string,
@@ -87,5 +87,3 @@ class ModalRoot extends React.PureComponent {
   }
 
 }
-
-export default ModalRoot;
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index 279599169..d2e02d63b 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -167,7 +167,9 @@ const mapStateToProps = state => ({
   domain: state.getIn(['meta', 'domain']),
 });
 
-class OnboardingModal extends React.PureComponent {
+@connect(mapStateToProps)
+@injectIntl
+export default class OnboardingModal extends React.PureComponent {
 
   static propTypes = {
     onClose: PropTypes.func.isRequired,
@@ -322,5 +324,3 @@ class OnboardingModal extends React.PureComponent {
   }
 
 }
-
-export default connect(mapStateToProps)(injectIntl(OnboardingModal));
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 09acee067..c2e6c88b5 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -33,7 +33,7 @@ export function getNextLink (path) {
   return null;
 };
 
-class TabsBar extends React.Component {
+export default class TabsBar extends React.Component {
 
   render () {
     return (
@@ -44,5 +44,3 @@ class TabsBar extends React.Component {
   }
 
 }
-
-export default TabsBar;
diff --git a/app/javascript/mastodon/features/ui/components/upload_area.js b/app/javascript/mastodon/features/ui/components/upload_area.js
index c40fe1fb9..030c3db2e 100644
--- a/app/javascript/mastodon/features/ui/components/upload_area.js
+++ b/app/javascript/mastodon/features/ui/components/upload_area.js
@@ -4,7 +4,7 @@ import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
 import { FormattedMessage } from 'react-intl';
 
-class UploadArea extends React.PureComponent {
+export default class UploadArea extends React.PureComponent {
 
   static propTypes = {
     active: PropTypes.bool,
@@ -51,5 +51,3 @@ class UploadArea extends React.PureComponent {
   }
 
 }
-
-export default UploadArea;
diff --git a/app/javascript/mastodon/features/ui/components/video_modal.js b/app/javascript/mastodon/features/ui/components/video_modal.js
index 3599ab775..9a9a49dfb 100644
--- a/app/javascript/mastodon/features/ui/components/video_modal.js
+++ b/app/javascript/mastodon/features/ui/components/video_modal.js
@@ -10,7 +10,8 @@ const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
 });
 
-class VideoModal extends ImmutablePureComponent {
+@injectIntl
+export default class VideoModal extends ImmutablePureComponent {
 
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
@@ -35,5 +36,3 @@ class VideoModal extends ImmutablePureComponent {
   }
 
 }
-
-export default injectIntl(VideoModal);
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index e48e9dbe9..8453679b0 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -74,7 +74,8 @@ class WrappedRoute extends React.Component {
 
 }
 
-class UI extends React.PureComponent {
+@connect()
+export default class UI extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
@@ -219,5 +220,3 @@ class UI extends React.PureComponent {
   }
 
 }
-
-export default connect()(UI);
diff --git a/package.json b/package.json
index dc08fc106..2e89b5c0a 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "babel-plugin-react-transform": "^2.0.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-plugin-transform-react-jsx-self": "^6.22.0",
diff --git a/yarn.lock b/yarn.lock
index 85de4b546..00dff65c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -717,7 +717,7 @@ babel-plugin-syntax-class-properties@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
 
-babel-plugin-syntax-decorators@^6.13.0:
+babel-plugin-syntax-decorators@^6.1.18, babel-plugin-syntax-decorators@^6.13.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"
 
@@ -790,6 +790,14 @@ babel-plugin-transform-class-properties@6.24.1, babel-plugin-transform-class-pro
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
+babel-plugin-transform-decorators-legacy@^1.3.4:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz#741b58f6c5bce9e6027e0882d9c994f04f366925"
+  dependencies:
+    babel-plugin-syntax-decorators "^6.1.18"
+    babel-runtime "^6.2.0"
+    babel-template "^6.3.0"
+
 babel-plugin-transform-decorators@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
@@ -1270,7 +1278,7 @@ babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.24.1, babel-template@^6.25.0:
+babel-template@^6.24.1, babel-template@^6.25.0, babel-template@^6.3.0:
   version "6.25.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071"
   dependencies:

From 676f577e7e18ea6a2980205e5502291506fef981 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2017 19:40:51 +0200
Subject: [PATCH 062/382] Fix webpack-dev-server until it's fixed upstream
 (#3916)

---
 package.json |   2 +-
 yarn.lock    | 138 ++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 122 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 2e89b5c0a..8cbcea92b 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.5.4",
     "sinon": "^2.3.4",
-    "webpack-dev-server": "^2.4.5",
+    "webpack-dev-server": "lencioni/webpack-dev-server#patch-1",
     "yargs": "^8.0.1"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 00dff65c8..ef870d7e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -302,6 +302,10 @@ array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
 
+array-flatten@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+
 array-includes@^3.0.2, array-includes@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
@@ -1369,6 +1373,17 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
+bonjour@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+  dependencies:
+    array-flatten "^2.1.0"
+    deep-equal "^1.0.1"
+    dns-equal "^1.0.0"
+    dns-txt "^2.0.2"
+    multicast-dns "^6.0.1"
+    multicast-dns-service-types "^1.1.0"
+
 boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -1471,6 +1486,10 @@ browserslist@^2.1.2, browserslist@^2.1.3:
     caniuse-lite "^1.0.30000670"
     electron-to-chromium "^1.3.11"
 
+buffer-indexof@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.0.tgz#f54f647c4f4e25228baa656a2e57e43d5f270982"
+
 buffer-writer@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-1.0.1.tgz#22a936901e3029afcd7547eb4487ceb697a3bf08"
@@ -2215,6 +2234,17 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -2260,6 +2290,23 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dns-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+
+dns-packet@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.1.1.tgz#2369d45038af045f3898e6fa56862aed3f40296c"
+  dependencies:
+    ip "^1.1.0"
+    safe-buffer "^5.0.1"
+
+dns-txt@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+  dependencies:
+    buffer-indexof "^1.0.0"
+
 doctrine@^1.2.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
@@ -3168,6 +3215,16 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globule@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
@@ -3474,6 +3531,12 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
+internal-ip@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+  dependencies:
+    meow "^3.3.0"
+
 interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
@@ -3520,6 +3583,10 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
+ip@^1.1.0:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+
 ipaddr.js@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
@@ -4227,7 +4294,7 @@ memory-fs@^0.4.0, memory-fs@~0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.7.0:
+meow@^3.3.0, meow@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   dependencies:
@@ -4370,6 +4437,17 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+multicast-dns-service-types@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+
+multicast-dns@^6.0.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.1.1.tgz#6e7de86a570872ab17058adea7160bbeca814dde"
+  dependencies:
+    dns-packet "^1.0.1"
+    thunky "^0.1.0"
+
 mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
@@ -4403,6 +4481,10 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
+node-forge@0.6.33:
+  version "0.6.33"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.6.33.tgz#463811879f573d45155ad6a9f43dc296e8e85ebc"
+
 node-gyp@^3.3.1:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
@@ -4740,6 +4822,10 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-map@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.1.1.tgz#05f5e4ae97a068371bc2a5cc86bfbdbc19c4ae7a"
+
 packet-reader@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-0.3.1.tgz#cd62e60af8d7fea8a705ec4ff990871c46871f27"
@@ -4904,6 +4990,10 @@ pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+
 pinkie-promise@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
@@ -6254,6 +6344,12 @@ select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
 
+selfsigned@^1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.9.1.tgz#cdda4492d70d486570f87c65546023558e1dfa5a"
+  dependencies:
+    node-forge "0.6.33"
+
 "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -6693,7 +6789,7 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.0"
 
-supports-color@3.1.2, supports-color@^3.1.1:
+supports-color@3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
@@ -6703,7 +6799,7 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.2.3:
+supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
@@ -6787,6 +6883,10 @@ through@2, through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
+thunky@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/thunky/-/thunky-0.1.0.tgz#bf30146824e2b6e67b0f2d7a4ac8beb26908684e"
+
 timers-browserify@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
@@ -6882,16 +6982,7 @@ ua-parser-js@^0.7.9:
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
-uglify-js@^2.8.27:
-  version "2.8.28"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.28.tgz#e335032df9bb20dcb918f164589d5af47f38834a"
-  dependencies:
-    source-map "~0.5.1"
-    yargs "~3.10.0"
-  optionalDependencies:
-    uglify-to-browserify "~1.0.0"
-
-uglify-js@^2.8.29:
+uglify-js@^2.8.27, uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7102,26 +7193,39 @@ webpack-dev-middleware@^1.10.2:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-dev-server@^2.4.5:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.5.tgz#31384ce81136be1080b4b4cde0eb9b90e54ee6cf"
+webpack-dev-middleware@^1.11.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.3.4"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+
+webpack-dev-server@lencioni/webpack-dev-server#patch-1:
+  version "2.5.0"
+  resolved "https://codeload.github.com/lencioni/webpack-dev-server/tar.gz/8978059d9b880c6c28908a6ed4608e27d40f2f69"
   dependencies:
     ansi-html "0.0.7"
+    bonjour "^3.5.0"
     chokidar "^1.6.0"
     compression "^1.5.2"
     connect-history-api-fallback "^1.3.0"
+    del "^3.0.0"
     express "^4.13.3"
     html-entities "^1.2.0"
     http-proxy-middleware "~0.17.4"
+    internal-ip "^1.2.0"
     opn "4.0.2"
     portfinder "^1.0.9"
+    selfsigned "^1.9.1"
     serve-index "^1.7.2"
     sockjs "0.3.18"
     sockjs-client "1.1.2"
     spdy "^3.4.1"
     strip-ansi "^3.0.0"
     supports-color "^3.1.1"
-    webpack-dev-middleware "^1.10.2"
+    webpack-dev-middleware "^1.11.0"
     yargs "^6.0.0"
 
 webpack-hot-middleware@^2.18.0:

From c0979381a4dd7541ab1d70647dbb2838e7496100 Mon Sep 17 00:00:00 2001
From: Daniel Hunsaker <danhunsaker@gmail.com>
Date: Fri, 23 Jun 2017 15:13:27 -0600
Subject: [PATCH 063/382] Fix a typo and give CW'd statuses the right cursor
 (#3918)

---
 app/javascript/mastodon/components/status_content.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 0acea033c..19bde01bd 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -135,7 +135,7 @@ export default class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className='status__content status__content--with_action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className='status__content status__content--with-action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}

From 4e6b5e78796c1c1074a3bc6a7fd5e5797dd9987e Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 24 Jun 2017 09:43:26 +0900
Subject: [PATCH 064/382] Use debounce for dispatch scrollTopNotification and
 expandNotifications (#3700)

---
 .../mastodon/features/notifications/index.js  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 1dd1b9a71..ed4b3ad98 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -13,6 +13,7 @@ import ColumnSettingsContainer from './containers/column_settings_container';
 import { createSelector } from 'reselect';
 import Immutable from 'immutable';
 import LoadMore from '../../components/load_more';
+import { debounce } from 'lodash';
 
 const messages = defineMessages({
   title: { id: 'column.notifications', defaultMessage: 'Notifications' },
@@ -50,19 +51,27 @@ export default class Notifications extends React.PureComponent {
     trackScroll: true,
   };
 
+  dispatchExpandNotifications = debounce(() => {
+    this.props.dispatch(expandNotifications());
+  }, 300, { leading: true });
+
+  dispatchScrollToTop = debounce((top) => {
+    this.props.dispatch(scrollTopNotifications(top));
+  }, 100);
+
   handleScroll = (e) => {
     const { scrollTop, scrollHeight, clientHeight } = e.target;
     const offset = scrollHeight - scrollTop - clientHeight;
     this._oldScrollPosition = scrollHeight - scrollTop;
 
-    if (250 > offset && !this.props.isLoading) {
-      if (this.props.hasMore) {
-        this.props.dispatch(expandNotifications());
-      }
-    } else if (scrollTop < 100) {
-      this.props.dispatch(scrollTopNotifications(true));
+    if (250 > offset && this.props.hasMore && !this.props.isLoading) {
+      this.dispatchExpandNotifications();
+    }
+
+    if (scrollTop < 100) {
+      this.dispatchScrollToTop(true);
     } else {
-      this.props.dispatch(scrollTopNotifications(false));
+      this.dispatchScrollToTop(false);
     }
   }
 
@@ -74,7 +83,7 @@ export default class Notifications extends React.PureComponent {
 
   handleLoadMore = (e) => {
     e.preventDefault();
-    this.props.dispatch(expandNotifications());
+    this.dispatchExpandNotifications();
   }
 
   handlePin = () => {

From 79dacea96254d8b01f9896e026b27c572401f2a8 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 24 Jun 2017 19:24:02 +0900
Subject: [PATCH 065/382] Fix #3924 (regression from #3906) (#3925)

---
 .../mastodon/features/favourited_statuses/index.js           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 137e55089..8cef6a1e4 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import LoadingIndicator from '../../components/loading_indicator';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
 import Column from '../ui/components/column';
@@ -14,7 +15,9 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
+  statusIds: state.getIn(['status_lists', 'favourites', 'items']),
   loaded: state.getIn(['status_lists', 'favourites', 'loaded']),
+  me: state.getIn(['meta', 'me']),
 });
 
 @connect(mapStateToProps)
@@ -23,8 +26,10 @@ export default class Favourites extends ImmutablePureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    statusIds: ImmutablePropTypes.list.isRequired,
     loaded: PropTypes.bool,
     intl: PropTypes.object.isRequired,
+    me: PropTypes.number.isRequired,
   };
 
   componentWillMount () {

From 138e5a0b1ebc7d21c1f2a73c9742cef600c5af40 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 24 Jun 2017 21:03:52 +0900
Subject: [PATCH 066/382] Fix webpack config for Windows (#3926)

---
 config/webpack/loaders/babel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index c23aa9375..ae65db9eb 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -1,7 +1,7 @@
 module.exports = {
   test: /\.js$/,
   // include react-intl because transform-react-remove-prop-types needs to apply to it
-  exclude: /node_modules\/(?!react-intl)/,
+  exclude: /node_modules[\/\\](?!react-intl)/,
   loader: 'babel-loader',
   options: {
     forceEnv: process.env.NODE_ENV || 'development',

From d23293c762f703e334607882c66de028fa216ca2 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 24 Jun 2017 23:17:39 +0200
Subject: [PATCH 067/382] feat(components/onboarding_modal): Swipe between
 pages (#3934)

---
 .../mastodon/features/ui/components/onboarding_modal.js      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index d2e02d63b..b056357a2 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import ReactSwipeable from 'react-swipeable';
 import classNames from 'classnames';
 import Permalink from '../../../components/permalink';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
@@ -274,7 +275,7 @@ export default class OnboardingModal extends React.PureComponent {
       <div className='modal-root__modal onboarding-modal'>
         <TransitionMotion styles={styles}>
           {interpolatedStyles => (
-            <div className='onboarding-modal__pager'>
+            <ReactSwipeable onSwipedRight={this.handlePrev} onSwipedLeft={this.handleNext} className='onboarding-modal__pager'>
               {interpolatedStyles.map(({ key, data, style }, i) => {
                 const className = classNames('onboarding-modal__page__wrapper', {
                   'onboarding-modal__page__wrapper--active': i === currentIndex,
@@ -283,7 +284,7 @@ export default class OnboardingModal extends React.PureComponent {
                   <div key={key} style={style} className={className}>{data}</div>
                 );
               })}
-            </div>
+            </ReactSwipeable>
           )}
         </TransitionMotion>
 

From 21c2bc119ca2bd278339799960914a91fdfa30c1 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 25 Jun 2017 06:18:11 +0900
Subject: [PATCH 068/382] Clean column collapsible (#3931)

* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div`  style to independent class
---
 .../mastodon/components/column_collapsable.js | 50 -------------------
 .../mastodon/components/column_header.js      |  2 +-
 app/javascript/styles/components.scss         | 41 ++-------------
 3 files changed, 6 insertions(+), 87 deletions(-)
 delete mode 100644 app/javascript/mastodon/components/column_collapsable.js

diff --git a/app/javascript/mastodon/components/column_collapsable.js b/app/javascript/mastodon/components/column_collapsable.js
deleted file mode 100644
index d6b4edb9f..000000000
--- a/app/javascript/mastodon/components/column_collapsable.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-export default class ColumnCollapsable extends React.PureComponent {
-
-  static propTypes = {
-    icon: PropTypes.string.isRequired,
-    title: PropTypes.string,
-    fullHeight: PropTypes.number.isRequired,
-    children: PropTypes.node,
-    onCollapse: PropTypes.func,
-  };
-
-  state = {
-    collapsed: true,
-    animating: false,
-  };
-
-  handleToggleCollapsed = () => {
-    const currentState = this.state.collapsed;
-
-    this.setState({ collapsed: !currentState, animating: true });
-
-    if (!currentState && this.props.onCollapse) {
-      this.props.onCollapse();
-    }
-  }
-
-  handleTransitionEnd = () => {
-    this.setState({ animating: false });
-  }
-
-  render () {
-    const { icon, title, fullHeight, children } = this.props;
-    const { collapsed, animating } = this.state;
-
-    return (
-      <div className={`column-collapsable ${collapsed ? 'collapsed' : ''}`} onTransitionEnd={this.handleTransitionEnd}>
-        <div role='button' tabIndex='0' title={`${title}`} className='column-collapsable__button column-icon' onClick={this.handleToggleCollapsed}>
-          <i className={`fa fa-${icon}`} />
-        </div>
-
-        <div className='column-collapsable__content' style={{ height: `${fullHeight}px` }}>
-          {(!collapsed || animating) && children}
-        </div>
-      </div>
-    );
-  }
-
-}
diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index a309f74e8..ec9379320 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -132,7 +132,7 @@ export default class ColumnHeader extends React.PureComponent {
         </div>
 
         <div className={collapsibleClassName} onTransitionEnd={this.handleTransitionEnd}>
-          <div>
+          <div className='column-header__collapsible-inner'>
             {(!collapsed || animating) && collapsedContent}
           </div>
         </div>
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index c2062c398..4b4f72cf7 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -58,37 +58,6 @@
   position: relative;
 }
 
-.column-collapsable {
-  position: relative;
-
-  .column-collapsable__content {
-    overflow: auto;
-    transition: 300ms ease;
-    opacity: 1;
-    max-height: 70vh;
-  }
-
-  &.collapsed .column-collapsable__content {
-    height: 0 !important;
-    opacity: 0;
-  }
-
-  .column-collapsable__button {
-    color: $primary-text-color;
-    background: lighten($ui-base-color, 8%);
-
-    &:hover {
-      color: $primary-text-color;
-      background: lighten($ui-base-color, 8%);
-    }
-  }
-
-  &.collapsed .column-collapsable__button {
-    color: $ui-primary-color;
-    background: lighten($ui-base-color, 4%);
-  }
-}
-
 .column-icon {
   background: lighten($ui-base-color, 4%);
   color: $ui-primary-color;
@@ -2110,11 +2079,6 @@ button.icon-button.active i.fa-retweet {
   transition: max-height 150ms ease-in-out, opacity 300ms linear;
   opacity: 1;
 
-  & > div {
-    background: lighten($ui-base-color, 8%);
-    padding: 15px;
-  }
-
   &.collapsed {
     max-height: 0;
     opacity: 0.5;
@@ -2125,6 +2089,11 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.column-header__collapsible-inner {
+  background: lighten($ui-base-color, 8%);
+  padding: 15px;
+}
+
 .column-header__setting-btn {
   &:hover {
     color: lighten($ui-primary-color, 4%);

From 1fc096ec7598e688b1cd804188575a853ac84541 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 25 Jun 2017 06:18:32 +0900
Subject: [PATCH 069/382] Fix elephant in onboarding modal being very small
 sized on small devices (#3932)

---
 app/javascript/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4b4f72cf7..bb9723f5a 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3126,6 +3126,7 @@ button.icon-button.active i.fa-retweet {
 @media screen and (max-width: 400px) {
   .onboarding-modal__page-one {
     flex-direction: column;
+    align-items: normal;
   }
 
   .onboarding-modal__page-one__elephant-friend {

From 68dca26a5d36eacb7d7e691635a14b6562ba7cf1 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 25 Jun 2017 19:49:53 +0900
Subject: [PATCH 070/382] Fix react-intl/locale-data import issue on production
 build (#3937)

Webpack seems to fail to import `react-intl/locale-data/*.js` if those
files has been proceed by babel, and this also breaks applying our translation.

Note that this won't be a problem on English locale, because react-intl
includes it as default and works fine without manually added locale-data.
Also this issue seems to only occurs on production build, but I'm not sure
about reason.
---
 config/webpack/loaders/babel.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/webpack/loaders/babel.js b/config/webpack/loaders/babel.js
index ae65db9eb..a1992a450 100644
--- a/config/webpack/loaders/babel.js
+++ b/config/webpack/loaders/babel.js
@@ -1,7 +1,10 @@
 module.exports = {
   test: /\.js$/,
   // include react-intl because transform-react-remove-prop-types needs to apply to it
-  exclude: /node_modules[\/\\](?!react-intl)/,
+  exclude: {
+    test: /node_modules/,
+    exclude: /react-intl[\/\\](?!locale-data)/,
+  },
   loader: 'babel-loader',
   options: {
     forceEnv: process.env.NODE_ENV || 'development',

From 3d4e21f1ecd001d82e8363eb7d4086c7fc6064ba Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 25 Jun 2017 19:52:42 +0900
Subject: [PATCH 071/382] Don't set ASSET_HOST on build:development (#3936)

Setting ASSET_HOST to `http://0.0.0.0:8080` makes urls in manifest.json to
be invalid, e.g. `http://0.0.0.0:8080/packs/application.js`.

Anyway, we don't need set this on build:development because assets would
be delivered from same origin in development (and w/o dev-server).
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8cbcea92b..d1fd22fb5 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "license": "AGPL-3.0",
   "scripts": {
     "postversion": "git push --tags",
-    "build:development": "cross-env RAILS_ENV=development ASSET_HOST=http://0.0.0.0:8080 ./bin/webpack",
+    "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
     "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",

From 099a3b4eaccc37338eda9f45fc26991ea7115200 Mon Sep 17 00:00:00 2001
From: PFM <info@eyesight.jp>
Date: Sun, 25 Jun 2017 23:02:56 +0900
Subject: [PATCH 072/382] Fix "undefined" in className (#3939)

---
 app/javascript/mastodon/components/permalink.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
index 5d3e4738d..0b7d0a65a 100644
--- a/app/javascript/mastodon/components/permalink.js
+++ b/app/javascript/mastodon/components/permalink.js
@@ -25,7 +25,7 @@ export default class Permalink extends React.PureComponent {
     const { href, children, className, ...other } = this.props;
 
     return (
-      <a href={href} onClick={this.handleClick} {...other} className={'permalink ' + className}>
+      <a href={href} onClick={this.handleClick} {...other} className={`permalink${className ? ' ' + className : ''}`}>
         {children}
       </a>
     );

From f7301bd5b94d3033b5dbb9ff65dd1ed8ac825ce5 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 25 Jun 2017 16:54:30 +0200
Subject: [PATCH 073/382] Add overview of active sessions (#3929)

* Add overview of active sessions

* Better display of browser/platform name

* Improve how browser information is stored and displayed for sessions overview

* Fix test
---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 +
 .../auth/registrations_controller.rb          |  5 ++
 app/helpers/settings_helper.rb                | 12 +++++
 app/javascript/styles/tables.scss             | 12 +++++
 app/models/session_activation.rb              | 48 +++++++++++++------
 app/models/user.rb                            |  6 ++-
 .../auth/registrations/_sessions.html.haml    | 23 +++++++++
 app/views/auth/registrations/edit.html.haml   |  4 ++
 config/initializers/devise.rb                 |  2 +-
 config/locales/en.yml                         | 37 ++++++++++++++
 ..._add_description_to_session_activations.rb |  7 +++
 db/schema.rb                                  |  5 +-
 spec/rails_helper.rb                          |  2 +-
 yarn.lock                                     | 11 +----
 15 files changed, 147 insertions(+), 30 deletions(-)
 create mode 100644 app/views/auth/registrations/_sessions.html.haml
 create mode 100644 db/migrate/20170624134742_add_description_to_session_activations.rb

diff --git a/Gemfile b/Gemfile
index 77fffe7a6..aecd82702 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,6 +20,7 @@ gem 'paperclip-av-transcoder', '~> 0.6'
 
 gem 'addressable', '~> 2.5'
 gem 'bootsnap'
+gem 'browser'
 gem 'cld3', '~> 3.1'
 gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 00ce84556..627a01787 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -70,6 +70,7 @@ GEM
     bootsnap (1.0.0)
       msgpack (~> 1.0)
     brakeman (3.6.2)
+    browser (2.4.0)
     builder (3.2.3)
     bullet (5.5.1)
       activesupport (>= 3.0.0)
@@ -483,6 +484,7 @@ DEPENDENCIES
   binding_of_caller (~> 0.7)
   bootsnap
   brakeman (~> 3.6)
+  browser
   bullet (~> 5.5)
   bundler-audit (~> 0.5)
   capistrano (~> 3.8)
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index d385c08e1..60ace04d7 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -5,6 +5,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
 
   before_action :check_enabled_registrations, only: [:new, :create]
   before_action :configure_sign_up_params, only: [:create]
+  before_action :set_sessions, only: [:edit, :update]
 
   def destroy
     not_found
@@ -41,4 +42,8 @@ class Auth::RegistrationsController < Devise::RegistrationsController
   def determine_layout
     %w(edit update).include?(action_name) ? 'admin' : 'auth'
   end
+
+  def set_sessions
+    @sessions = current_user.session_activations
+  end
 end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 172ef33ca..847eff2e7 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -41,4 +41,16 @@ module SettingsHelper
   def hash_to_object(hash)
     HashObject.new(hash)
   end
+
+  def session_device_icon(session)
+    device = session.detection.device
+
+    if device.mobile?
+      'mobile'
+    elsif device.tablet?
+      'tablet'
+    else
+      'desktop'
+    end
+  end
 end
diff --git a/app/javascript/styles/tables.scss b/app/javascript/styles/tables.scss
index f7def8cf3..6e54c59c0 100644
--- a/app/javascript/styles/tables.scss
+++ b/app/javascript/styles/tables.scss
@@ -42,6 +42,18 @@
   strong {
     font-weight: 500;
   }
+
+  &.inline-table {
+    td,
+    th {
+      padding: 8px 0;
+    }
+
+    & > tbody > tr:nth-child(odd) > td,
+    & > tbody > tr:nth-child(odd) > th {
+      background: transparent;
+    }
+  }
 }
 
 samp {
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 71e9f023c..75339b5f7 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -8,31 +8,49 @@
 #  session_id :string           not null
 #  created_at :datetime         not null
 #  updated_at :datetime         not null
+#  user_agent :string           default(""), not null
+#  ip         :inet
 #
 
 class SessionActivation < ApplicationRecord
-  LIMIT = Rails.configuration.x.max_session_activations
-
-  def self.active?(id)
-    id && where(session_id: id).exists?
+  def detection
+    @detection ||= Browser.new(user_agent)
   end
 
-  def self.activate(id)
-    activation = create!(session_id: id)
-    purge_old
-    activation
+  def browser
+    detection.id
   end
 
-  def self.deactivate(id)
-    return unless id
-    where(session_id: id).destroy_all
+  def platform
+    detection.platform.id
   end
 
-  def self.purge_old
-    order('created_at desc').offset(LIMIT).destroy_all
+  before_save do
+    self.user_agent = '' if user_agent.nil?
   end
 
-  def self.exclusive(id)
-    where('session_id != ?', id).destroy_all
+  class << self
+    def active?(id)
+      id && where(session_id: id).exists?
+    end
+
+    def activate(options = {})
+      activation = create!(options)
+      purge_old
+      activation
+    end
+
+    def deactivate(id)
+      return unless id
+      where(session_id: id).destroy_all
+    end
+
+    def purge_old
+      order('created_at desc').offset(Rails.configuration.x.max_session_activations).destroy_all
+    end
+
+    def exclusive(id)
+      where('session_id != ?', id).destroy_all
+    end
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index fccf1089b..c31a0c644 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -91,8 +91,10 @@ class User < ApplicationRecord
     settings.auto_play_gif
   end
 
-  def activate_session
-    session_activations.activate(SecureRandom.hex).session_id
+  def activate_session(request)
+    session_activations.activate(session_id: SecureRandom.hex,
+                                 user_agent: request.user_agent,
+                                 ip: request.ip).session_id
   end
 
   def exclusive_session(id)
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
new file mode 100644
index 000000000..11c0d4e31
--- /dev/null
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -0,0 +1,23 @@
+%h6= t 'sessions.title'
+%p.muted-hint= t 'sessions.explanation'
+
+%table.table.inline-table
+  %thead
+    %tr
+      %th= t 'sessions.browser'
+      %th= t 'sessions.ip'
+      %th= t 'sessions.activity'
+  %tbody
+    - @sessions.each do |session|
+      %tr
+        %td
+          %span{ title: session.user_agent }= fa_icon session_device_icon(session)
+          = ' '
+          = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}"), platform: t("sessions.platforms.#{session.platform}")
+        %td
+          %samp= session.ip
+        %td
+          - if request.session['auth_id'] == session.session_id
+            = t 'sessions.current_session'
+          - else
+            %time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
diff --git a/app/views/auth/registrations/edit.html.haml b/app/views/auth/registrations/edit.html.haml
index 38d4349cb..fbc8d017b 100644
--- a/app/views/auth/registrations/edit.html.haml
+++ b/app/views/auth/registrations/edit.html.haml
@@ -12,6 +12,10 @@
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
 
+%hr/
+
+= render 'sessions'
+
 - if open_deletion?
   %hr/
 
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 6d3a73ef6..d51471d30 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,6 +1,6 @@
 Warden::Manager.after_set_user except: :fetch do |user, warden|
   SessionActivation.deactivate warden.raw_session['auth_id']
-  warden.raw_session['auth_id'] = user.activate_session
+  warden.raw_session['auth_id'] = user.activate_session(warden.request)
 end
 
 Warden::Manager.after_fetch do |user, warden|
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0d33aae3f..1d8e3f6b0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -320,6 +320,43 @@ en:
     missing_resource: Could not find the required redirect URL for your account
     proceed: Proceed to follow
     prompt: 'You are going to follow:'
+  sessions:
+    activity: Last activity
+    browser: Browser
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: Unknown browser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Current session
+    description: "%{browser} on %{platform}"
+    explanation: These are the web browsers currently logged in to your Mastodon account.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: unknown platform
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Sessions
   settings:
     authorized_apps: Authorized apps
     back: Back to Mastodon
diff --git a/db/migrate/20170624134742_add_description_to_session_activations.rb b/db/migrate/20170624134742_add_description_to_session_activations.rb
new file mode 100644
index 000000000..9dbb15564
--- /dev/null
+++ b/db/migrate/20170624134742_add_description_to_session_activations.rb
@@ -0,0 +1,7 @@
+class AddDescriptionToSessionActivations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :session_activations, :user_agent, :string, null: false, default: ''
+    add_column :session_activations, :ip, :inet
+    add_foreign_key :session_activations, :users, on_delete: :cascade
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b6aceb930..1e7d6c0b3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170623152212) do
+ActiveRecord::Schema.define(version: 20170624134742) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -255,6 +255,8 @@ ActiveRecord::Schema.define(version: 20170623152212) do
     t.string "session_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "user_agent", default: "", null: false
+    t.inet "ip"
     t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
     t.index ["user_id"], name: "index_session_activations_on_user_id"
   end
@@ -404,6 +406,7 @@ ActiveRecord::Schema.define(version: 20170623152212) do
   add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", on_delete: :nullify
   add_foreign_key "reports", "accounts", column: "target_account_id", on_delete: :cascade
   add_foreign_key "reports", "accounts", on_delete: :cascade
+  add_foreign_key "session_activations", "users", on_delete: :cascade
   add_foreign_key "statuses", "accounts", column: "in_reply_to_account_id", on_delete: :nullify
   add_foreign_key "statuses", "accounts", on_delete: :cascade
   add_foreign_key "statuses", "statuses", column: "in_reply_to_id", on_delete: :nullify
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 31c94b1e4..cfc9eec9e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -23,7 +23,7 @@ Devise::Test::ControllerHelpers.module_eval do
     original_sign_in(resource, scope: scope)
 
     SessionActivation.deactivate warden.raw_session["auth_id"]
-    warden.raw_session["auth_id"] = resource.activate_session
+    warden.raw_session["auth_id"] = resource.activate_session(warden.request)
   end
 end
 
diff --git a/yarn.lock b/yarn.lock
index ef870d7e2..d1a1687a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7184,16 +7184,7 @@ webpack-bundle-analyzer@^2.8.2:
     opener "^1.4.3"
     ws "^2.3.1"
 
-webpack-dev-middleware@^1.10.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.2.tgz#2e252ce1dfb020dbda1ccb37df26f30ab014dbd1"
-  dependencies:
-    memory-fs "~0.4.1"
-    mime "^1.3.4"
-    path-is-absolute "^1.0.0"
-    range-parser "^1.0.3"
-
-webpack-dev-middleware@^1.11.0:
+webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.11.0.tgz#09691d0973a30ad1f82ac73a12e2087f0a4754f9"
   dependencies:

From 87efa3872193084468c25f410f5cf9189c0b976e Mon Sep 17 00:00:00 2001
From: amazedkoumei <amazed.koumei@gmail.com>
Date: Mon, 26 Jun 2017 01:13:31 +0900
Subject: [PATCH 074/382] more free pgconfig by .env (#3909)

* more free pgconfig for streaming by .env

* fix wrong default values

* database.yml read ENV as same as streaming server
---
 config/database.yml | 8 ++++++++
 streaming/index.js  | 6 +++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/config/database.yml b/config/database.yml
index 39393e93a..079ea7b4a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -7,6 +7,10 @@ default: &default
 development:
   <<: *default
   database: mastodon_development
+  username: <%= ENV['DB_USER'] %>
+  password: <%= ENV['DB_PASS'] %>
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -14,6 +18,10 @@ development:
 test:
   <<: *default
   database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %>
+  username: <%= ENV['TEST_DB_USER'] %>
+  password: <%= ENV['TEST_DB_PASS'] %>
+  host: <%= ENV['TEST_DB_HOST'] %>
+  port: <%= ENV['TEST_DB_PORT'] %>
 
 production:
   <<: *default
diff --git a/streaming/index.js b/streaming/index.js
index 156e1d4bc..701cb2f55 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -78,7 +78,11 @@ const startWorker = (workerId) => {
 
   const pgConfigs = {
     development: {
-      database: 'mastodon_development',
+      user:     process.env.DB_USER || pg.defaults.user,
+      password: process.env.DB_PASS || pg.defaults.password,
+      database: process.env.DB_NAME || 'mastodon_development',
+      host:     process.env.DB_HOST || pg.defaults.host,
+      port:     process.env.DB_PORT || pg.defaults.port,
       max:      10,
     },
 

From 8f991831b8de01b69d6b0f069aa43d9326c93a1d Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 26 Jun 2017 04:42:36 +0900
Subject: [PATCH 075/382] Cover Admin::DomainBlocksController more (#3329)

Also domain_block fabricator now sets unique domains
---
 .../admin/domain_blocks_controller_spec.rb    | 34 ++++++++++++++++---
 spec/fabricators/domain_block_fabricator.rb   |  2 +-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 0ca41d7d4..b9e73c04b 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -8,17 +8,30 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
   end
 
   describe 'GET #index' do
-    it 'returns http success' do
-      get :index
+    around do |example|
+      default_per_page = DomainBlock.default_per_page
+      DomainBlock.paginates_per 1
+      example.run
+      DomainBlock.paginates_per default_per_page
+    end
 
+    it 'renders domain blocks' do
+      2.times { Fabricate(:domain_block) }
+
+      get :index, params: { page: 2 }
+
+      assigned = assigns(:domain_blocks)
+      expect(assigned.count).to eq 1
+      expect(assigned.klass).to be DomainBlock
       expect(response).to have_http_status(:success)
     end
   end
 
   describe 'GET #new' do
-    it 'returns http success' do
+    it 'assigns a new domain block' do
       get :new
 
+      expect(assigns(:domain_block)).to be_instance_of(DomainBlock)
       expect(response).to have_http_status(:success)
     end
   end
@@ -33,13 +46,25 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
   end
 
   describe 'POST #create' do
-    it 'blocks the domain' do
+    it 'blocks the domain when succeeded to save' do
       allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
+
       post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
 
       expect(DomainBlockWorker).to have_received(:perform_async)
+      expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.created_msg')
       expect(response).to redirect_to(admin_domain_blocks_path)
     end
+
+    it 'renders new when failed to save' do
+      Fabricate(:domain_block, domain: 'example.com')
+      allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
+
+      post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
+
+      expect(DomainBlockWorker).not_to have_received(:perform_async)
+      expect(response).to render_template :new
+    end
   end
 
   describe 'DELETE #destroy' do
@@ -50,6 +75,7 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
       delete :destroy, params: { id: domain_block.id, domain_block: { retroactive: '1' } }
 
       expect(service).to have_received(:call).with(domain_block, true)
+      expect(flash[:notice]).to eq I18n.t('admin.domain_blocks.destroyed_msg')
       expect(response).to redirect_to(admin_domain_blocks_path)
     end
   end
diff --git a/spec/fabricators/domain_block_fabricator.rb b/spec/fabricators/domain_block_fabricator.rb
index 563a0f65b..cc1f928e5 100644
--- a/spec/fabricators/domain_block_fabricator.rb
+++ b/spec/fabricators/domain_block_fabricator.rb
@@ -1,3 +1,3 @@
 Fabricator(:domain_block) do
-  domain "example.com"
+  domain { sequence(:domain) { |i| "#{i}#{Faker::Internet.domain_name}" } }
 end

From 67243bda3157a9046148b41579f0b1e8cf4a7116 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 26 Jun 2017 04:42:55 +0900
Subject: [PATCH 076/382] Cover Auth::RegistrationsController more (#3353)

---
 .../auth/registrations_controller_spec.rb     | 105 +++++++++++++++---
 1 file changed, 89 insertions(+), 16 deletions(-)

diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index df0a3bfa6..97d2c53df 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -3,37 +3,110 @@ require 'rails_helper'
 RSpec.describe Auth::RegistrationsController, type: :controller do
   render_views
 
+  shared_examples 'checks for enabled registrations' do |path|
+    around do |example|
+      open_registrations = Setting.open_registrations
+      example.run
+      Setting.open_registrations = open_registrations
+    end
+
+    it 'redirects if it is in single user mode while it is open for registration' do
+      Fabricate(:account)
+      Setting.open_registrations = true
+      expect(Rails.configuration.x).to receive(:single_user_mode).and_return(true)
+
+      get path
+
+      expect(response).to redirect_to '/'
+    end
+
+    it 'redirects if it is not open for registration while it is not in single user mode' do
+      Setting.open_registrations = false
+      expect(Rails.configuration.x).to receive(:single_user_mode).and_return(false)
+
+      get path
+
+      expect(response).to redirect_to '/'
+    end
+  end
+
+  describe 'GET #edit' do
+    it 'returns http success' do
+      request.env["devise.mapping"] = Devise.mappings[:user]
+      sign_in(Fabricate(:user))
+      get :edit
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe 'GET #update' do
+    it 'returns http success' do
+      request.env["devise.mapping"] = Devise.mappings[:user]
+      sign_in(Fabricate(:user), scope: :user)
+      post :update
+      expect(response).to have_http_status(:success)
+    end
+  end
+
   describe 'GET #new' do
     before do
-      Setting.open_registrations = true
       request.env["devise.mapping"] = Devise.mappings[:user]
     end
 
-    it 'returns http success' do
-      get :new
-      expect(response).to have_http_status(:success)
+    context do
+      around do |example|
+        open_registrations = Setting.open_registrations
+        example.run
+        Setting.open_registrations = open_registrations
+      end
+
+      it 'returns http success' do
+        Setting.open_registrations = true
+        get :new
+        expect(response).to have_http_status(:success)
+      end
     end
+
+    include_examples 'checks for enabled registrations', :new
   end
 
   describe 'POST #create' do
     let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s }
 
-    before do
-      Setting.open_registrations = true
-      request.env["devise.mapping"] = Devise.mappings[:user]
-      request.headers["Accept-Language"] = accept_language
-      post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } }
+    before { request.env["devise.mapping"] = Devise.mappings[:user] }
+
+    context do
+      around do |example|
+        open_registrations = Setting.open_registrations
+        example.run
+        Setting.open_registrations = open_registrations
+      end
+
+      subject do
+        Setting.open_registrations = true
+        request.headers["Accept-Language"] = accept_language
+        post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } }
+      end
+
+      it 'redirects to login page' do
+        subject
+        expect(response).to redirect_to new_user_session_path
+      end
+
+      it 'creates user' do
+        subject
+        user = User.find_by(email: 'test@example.com')
+        expect(user).to_not be_nil
+        expect(user.locale).to eq(accept_language)
+      end
     end
 
-    it 'redirects to login page' do
-      expect(response).to redirect_to new_user_session_path
+    it 'does nothing if user already exists' do
+      Fabricate(:user, account: Fabricate(:account, username: 'test'))
+      subject
     end
 
-    it 'creates user' do
-      user = User.find_by(email: 'test@example.com')
-      expect(user).to_not be_nil
-      expect(user.locale).to eq(accept_language)
-    end
+    include_examples 'checks for enabled registrations', :create
   end
 
   describe 'DELETE #destroy' do

From 4ce154009426038f0bb88d2e89b408ade928b1a2 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 25 Jun 2017 21:43:27 +0200
Subject: [PATCH 077/382] fix(features/compose): Handle external changes to the
 textarea (#3632)

---
 .../mastodon/features/compose/components/compose_form.js    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index c379c1855..f7eeedc69 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -67,6 +67,12 @@ export default class ComposeForm extends ImmutablePureComponent {
   }
 
   handleSubmit = () => {
+    if (this.props.text !== this.autosuggestTextarea.textarea.value) {
+      // Something changed the text inside the textarea (e.g. browser extensions like Grammarly)
+      // Update the state to match the current text
+      this.props.onChange(this.autosuggestTextarea.textarea.value);
+    }
+
     this.props.onSubmit();
   }
 

From d821aba002002f79385abd7f052f68c383d5cd0c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 25 Jun 2017 22:13:02 +0200
Subject: [PATCH 078/382] Rename "Credentials" page to "Security" for clarity
 (#3941)

* Rename "Credentials" page to "Security" for clarity

* Change "security" icon from cog to lock
---
 config/locales/en.yml | 2 +-
 config/navigation.rb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1d8e3f6b0..7238949dc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -200,7 +200,7 @@ en:
   applications:
     invalid_url: The provided URL is invalid
   auth:
-    change_password: Credentials
+    change_password: Security
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
     didnt_get_confirmation: Didn't receive confirmation instructions?
diff --git a/config/navigation.rb b/config/navigation.rb
index d7508f019..535d033f5 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -7,7 +7,7 @@ SimpleNavigation::Configuration.run do |navigation|
     primary.item :settings, safe_join([fa_icon('cog fw'), t('settings.settings')]), settings_profile_url do |settings|
       settings.item :profile, safe_join([fa_icon('user fw'), t('settings.edit_profile')]), settings_profile_url
       settings.item :preferences, safe_join([fa_icon('sliders fw'), t('settings.preferences')]), settings_preferences_url
-      settings.item :password, safe_join([fa_icon('cog fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
+      settings.item :password, safe_join([fa_icon('lock fw'), t('auth.change_password')]), edit_user_registration_url, highlights_on: %r{/auth/edit|/settings/delete}
       settings.item :two_factor_authentication, safe_join([fa_icon('mobile fw'), t('settings.two_factor_authentication')]), settings_two_factor_authentication_url, highlights_on: %r{/settings/two_factor_authentication}
       settings.item :import, safe_join([fa_icon('cloud-upload fw'), t('settings.import')]), settings_import_url
       settings.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url

From 436ce03772c8c87a215cdcd88020edfb8c241d38 Mon Sep 17 00:00:00 2001
From: amazedkoumei <amazed.koumei@gmail.com>
Date: Mon, 26 Jun 2017 06:29:22 +0900
Subject: [PATCH 079/382] fix unnecessary  variable (#3947)

---
 config/database.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/database.yml b/config/database.yml
index 079ea7b4a..f74635a36 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -18,10 +18,10 @@ development:
 test:
   <<: *default
   database: mastodon_test<%= ENV['TEST_ENV_NUMBER'] %>
-  username: <%= ENV['TEST_DB_USER'] %>
-  password: <%= ENV['TEST_DB_PASS'] %>
-  host: <%= ENV['TEST_DB_HOST'] %>
-  port: <%= ENV['TEST_DB_PORT'] %>
+  username: <%= ENV['DB_USER'] %>
+  password: <%= ENV['DB_PASS'] %>
+  host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT'] %>
 
 production:
   <<: *default

From ed7dc1704dc3ce82567d9aac366b095f02ce181f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 25 Jun 2017 23:51:32 +0200
Subject: [PATCH 080/382] Bind web UI access tokens to sessions (#3940)

* Add overview of active sessions

* Better display of browser/platform name

* Improve how browser information is stored and displayed for sessions overview

* Fix test

* Fix #2347 - Bind web UI access token to session

When you logout, session also destroys the access token, so it's no longer
valid. If access token is destroyed some other way, the session is also
destroyed, requiring a re-login.

Fix #1681 - Add scheduler to remove revoked access tokens and grants

* Fix test
---
 app/controllers/application_controller.rb     |  5 +++
 app/controllers/home_controller.rb            | 12 +----
 app/models/session_activation.rb              | 44 ++++++++++++++-----
 .../scheduler/doorkeeper_cleanup_scheduler.rb | 11 +++++
 config/sidekiq.yml                            |  3 ++
 ..._access_token_id_to_session_activations.rb |  6 +++
 db/schema.rb                                  |  4 +-
 7 files changed, 63 insertions(+), 22 deletions(-)
 create mode 100644 app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
 create mode 100644 db/migrate/20170625140443_add_access_token_id_to_session_activations.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9cb397aa8..865fcd125 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -11,6 +11,7 @@ class ApplicationController < ActionController::Base
   include UserTrackingConcern
 
   helper_method :current_account
+  helper_method :current_session
   helper_method :single_user_mode?
 
   rescue_from ActionController::RoutingError, with: :not_found
@@ -68,6 +69,10 @@ class ApplicationController < ActionController::Base
     @current_account ||= current_user.try(:account)
   end
 
+  def current_session
+    @current_session ||= SessionActivation.find_by(session_id: session['auth_id'])
+  end
+
   def cache_collection(raw, klass)
     return raw unless klass.respond_to?(:with_includes)
 
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 1d41892cd..6209a3ae9 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -5,7 +5,7 @@ class HomeController < ApplicationController
 
   def index
     @body_classes           = 'app-body'
-    @token                  = find_or_create_access_token.token
+    @token                  = current_session.token
     @web_settings           = Web::Setting.find_by(user: current_user)&.data || {}
     @admin                  = Account.find_local(Setting.site_contact_username)
     @streaming_api_base_url = Rails.configuration.x.streaming_api_base_url
@@ -16,14 +16,4 @@ class HomeController < ApplicationController
   def authenticate_user!
     redirect_to(single_user_mode? ? account_path(Account.first) : about_path) unless user_signed_in?
   end
-
-  def find_or_create_access_token
-    Doorkeeper::AccessToken.find_or_create_for(
-      Doorkeeper::Application.where(superapp: true).first,
-      current_user.id,
-      Doorkeeper::OAuth::Scopes.from_string('read write follow'),
-      Doorkeeper.configuration.access_token_expires_in,
-      Doorkeeper.configuration.refresh_token_enabled?
-    )
-  end
 end
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 75339b5f7..02a918e8a 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -3,16 +3,23 @@
 #
 # Table name: session_activations
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer          not null
-#  session_id :string           not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  user_agent :string           default(""), not null
-#  ip         :inet
+#  id              :integer          not null, primary key
+#  user_id         :integer          not null
+#  session_id      :string           not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  user_agent      :string           default(""), not null
+#  ip              :inet
+#  access_token_id :integer
 #
 
 class SessionActivation < ApplicationRecord
+  belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy
+
+  delegate :token,
+           to: :access_token,
+           allow_nil: true
+
   def detection
     @detection ||= Browser.new(user_agent)
   end
@@ -25,9 +32,8 @@ class SessionActivation < ApplicationRecord
     detection.platform.id
   end
 
-  before_save do
-    self.user_agent = '' if user_agent.nil?
-  end
+  before_create :assign_access_token
+  before_save   :assign_user_agent
 
   class << self
     def active?(id)
@@ -53,4 +59,22 @@ class SessionActivation < ApplicationRecord
       where('session_id != ?', id).destroy_all
     end
   end
+
+  private
+
+  def assign_user_agent
+    self.user_agent = '' if user_agent.nil?
+  end
+
+  def assign_access_token
+    superapp = Doorkeeper::Application.find_by(superapp: true)
+
+    return if superapp.nil?
+
+    self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp.id,
+                                                        resource_owner_id: user_id,
+                                                        scopes: 'read write follow',
+                                                        expires_in: Doorkeeper.configuration.access_token_expires_in,
+                                                        use_refresh_token: Doorkeeper.configuration.refresh_token_enabled?)
+  end
 end
diff --git a/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
new file mode 100644
index 000000000..6488798cd
--- /dev/null
+++ b/app/workers/scheduler/doorkeeper_cleanup_scheduler.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+require 'sidekiq-scheduler'
+
+class Scheduler::DoorkeeperCleanupScheduler
+  include Sidekiq::Worker
+
+  def perform
+    Doorkeeper::AccessToken.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
+    Doorkeeper::AccessGrant.where('revoked_at IS NOT NULL').where('revoked_at < NOW()').delete_all
+  end
+end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 6ed0aa4b5..78aaa311c 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -15,3 +15,6 @@
   feed_cleanup_scheduler:
     cron: '0 0 * * *'
     class: Scheduler::FeedCleanupScheduler
+  doorkeeper_cleanup_scheduler:
+    cron: '1 1 * * 0'
+    class: Scheduler::DoorkeeperCleanupScheduler
diff --git a/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb b/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb
new file mode 100644
index 000000000..213a77a83
--- /dev/null
+++ b/db/migrate/20170625140443_add_access_token_id_to_session_activations.rb
@@ -0,0 +1,6 @@
+class AddAccessTokenIdToSessionActivations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :session_activations, :access_token_id, :integer
+    add_foreign_key :session_activations, :oauth_access_tokens, column: :access_token_id, on_delete: :cascade
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1e7d6c0b3..159704c6a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170624134742) do
+ActiveRecord::Schema.define(version: 20170625140443) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -257,6 +257,7 @@ ActiveRecord::Schema.define(version: 20170624134742) do
     t.datetime "updated_at", null: false
     t.string "user_agent", default: "", null: false
     t.inet "ip"
+    t.integer "access_token_id"
     t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
     t.index ["user_id"], name: "index_session_activations_on_user_id"
   end
@@ -406,6 +407,7 @@ ActiveRecord::Schema.define(version: 20170624134742) do
   add_foreign_key "reports", "accounts", column: "action_taken_by_account_id", on_delete: :nullify
   add_foreign_key "reports", "accounts", column: "target_account_id", on_delete: :cascade
   add_foreign_key "reports", "accounts", on_delete: :cascade
+  add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", on_delete: :cascade
   add_foreign_key "session_activations", "users", on_delete: :cascade
   add_foreign_key "statuses", "accounts", column: "in_reply_to_account_id", on_delete: :nullify
   add_foreign_key "statuses", "accounts", on_delete: :cascade

From 5e8d037e271bdd230fc7ab1e91bcee16ac87e0e1 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 25 Jun 2017 23:51:46 +0200
Subject: [PATCH 081/382] Fix #3910 - Require OTP authentication to disable 2FA
 (#3935)

* Fix #3910 - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation

* Restore recovery code re-generation

* Improve display of some 2FA elements
---
 .../two_factor_authentications_controller.rb  | 20 +++++++--
 app/javascript/styles/admin.scss              |  5 +++
 app/javascript/styles/forms.scss              |  1 -
 app/javascript/styles/lists.scss              |  1 -
 .../recovery_codes/index.html.haml            |  2 +-
 .../two_factor_authentications/show.html.haml | 44 +++++++++++--------
 config/locales/ca.yml                         |  2 +-
 config/locales/de.yml                         |  2 +-
 config/locales/en.yml                         |  8 +++-
 config/locales/fa.yml                         |  2 +-
 config/locales/fr.yml                         |  2 +-
 config/locales/he.yml                         |  2 +-
 config/locales/id.yml                         |  2 +-
 config/locales/io.yml                         |  2 +-
 config/locales/ja.yml                         |  2 +-
 config/locales/nl.yml                         |  2 +-
 config/locales/no.yml                         |  2 +-
 config/locales/oc.yml                         |  6 +--
 config/locales/pl.yml                         |  2 +-
 config/locales/pt-BR.yml                      |  2 +-
 config/locales/ru.yml                         |  2 +-
 config/locales/th.yml                         |  2 +-
 config/locales/tr.yml                         |  2 +-
 config/locales/uk.yml                         |  2 +-
 config/locales/zh-CN.yml                      |  2 +-
 config/locales/zh-HK.yml                      |  2 +-
 ..._factor_authentications_controller_spec.rb | 40 ++++++++++++++---
 27 files changed, 109 insertions(+), 54 deletions(-)

diff --git a/app/controllers/settings/two_factor_authentications_controller.rb b/app/controllers/settings/two_factor_authentications_controller.rb
index f66c3a908..983483881 100644
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ b/app/controllers/settings/two_factor_authentications_controller.rb
@@ -7,7 +7,9 @@ module Settings
     before_action :authenticate_user!
     before_action :verify_otp_required, only: [:create]
 
-    def show; end
+    def show
+      @confirmation = Form::TwoFactorConfirmation.new
+    end
 
     def create
       current_user.otp_secret = User.generate_otp_secret(32)
@@ -16,13 +18,23 @@ module Settings
     end
 
     def destroy
-      current_user.otp_required_for_login = false
-      current_user.save!
-      redirect_to settings_two_factor_authentication_path
+      if current_user.validate_and_consume_otp!(confirmation_params[:code])
+        current_user.otp_required_for_login = false
+        current_user.save!
+        redirect_to settings_two_factor_authentication_path
+      else
+        flash.now[:alert] = I18n.t('two_factor_authentication.wrong_code')
+        @confirmation = Form::TwoFactorConfirmation.new
+        render :show
+      end
     end
 
     private
 
+    def confirmation_params
+      params.require(:form_two_factor_confirmation).permit(:code)
+    end
+
     def verify_otp_required
       redirect_to settings_two_factor_authentication_path if current_user.otp_required_for_login?
     end
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/admin.scss
index c2bfc10a0..3bc713566 100644
--- a/app/javascript/styles/admin.scss
+++ b/app/javascript/styles/admin.scss
@@ -129,6 +129,11 @@
         color: $ui-primary-color;
       }
     }
+
+    .positive-hint {
+      color: $valid-value-color;
+      font-weight: 500;
+    }
   }
 
   .simple_form {
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index 059c4a7d8..7a181f36b 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -358,7 +358,6 @@ code {
 }
 
 .user_filtered_languages {
-
   & > label {
     font-family: inherit;
     font-size: 16px;
diff --git a/app/javascript/styles/lists.scss b/app/javascript/styles/lists.scss
index 47805663f..6019cd800 100644
--- a/app/javascript/styles/lists.scss
+++ b/app/javascript/styles/lists.scss
@@ -10,7 +10,6 @@
 .recovery-codes {
   list-style: none;
   margin: 0 auto;
-  text-align: center;
 
   li {
     font-size: 125%;
diff --git a/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml b/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
index 7d409826e..d47ee840e 100644
--- a/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
+++ b/app/views/settings/two_factor_authentication/recovery_codes/index.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('settings.two_factor_authentication')
 
-%p.hint= t('two_factor_authentication.recovery_instructions')
+%p.hint= t('two_factor_authentication.recovery_instructions_html')
 
 %ol.recovery-codes
   - @recovery_codes.each do |code|
diff --git a/app/views/settings/two_factor_authentications/show.html.haml b/app/views/settings/two_factor_authentications/show.html.haml
index 88b5bd20e..8ba42a101 100644
--- a/app/views/settings/two_factor_authentications/show.html.haml
+++ b/app/views/settings/two_factor_authentications/show.html.haml
@@ -1,26 +1,34 @@
 - content_for :page_title do
   = t('settings.two_factor_authentication')
 
-.simple_form
-  %p.hint
-    = t('two_factor_authentication.description_html')
+- if current_user.otp_required_for_login
+  %p.positive-hint
+    = fa_icon 'check'
+    = ' '
+    = t 'two_factor_authentication.enabled'
+
+  %hr/
+
+  = simple_form_for @confirmation, url: settings_two_factor_authentication_path, method: :delete do |f|
+    = f.input :code, hint: t('two_factor_authentication.code_hint'), placeholder: t('simple_form.labels.defaults.otp_attempt')
+
+    .actions
+      = f.button :button, t('two_factor_authentication.disable'), type: :submit
+
+  %hr/
+
+  %h6= t('two_factor_authentication.recovery_codes')
+  %p.muted-hint
+    = t('two_factor_authentication.lost_recovery_codes')
+    = link_to t('two_factor_authentication.generate_recovery_codes'),
+      settings_two_factor_authentication_recovery_codes_path,
+      data: { method: :post }
+
+- else
+  .simple_form
+    %p.hint= t('two_factor_authentication.description_html')
 
-  - if current_user.otp_required_for_login
-    = link_to t('two_factor_authentication.disable'),
-      settings_two_factor_authentication_path,
-      data: { method: :delete },
-      class: 'block-button'
-  - else
     = link_to t('two_factor_authentication.setup'),
       settings_two_factor_authentication_path,
       data: { method: :post },
       class: 'block-button'
-
-- if current_user.otp_required_for_login
-  .simple_form
-    %p.hint
-      = t('two_factor_authentication.lost_recovery_codes')
-    = link_to t('two_factor_authentication.generate_recovery_codes'),
-      settings_two_factor_authentication_recovery_codes_path,
-      data: { method: :post },
-      class: 'block-button'
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 24fc5690d..2fbc63ef9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -360,7 +360,7 @@ ca:
     lost_recovery_codes: Els codis de recuperació et permeten recuperar l'accés al teu compte si perds el telèfon. Si has perdut els teus codis de recuperació els pots regenerar aquí. Els codis de recuperació anteriors seran anul·lats.
     manual_instructions: 'Si no pots escanejar el codi QR code i necessites introduir-lo manualment, aquí tens el secret en text plà:'
     recovery_codes_regenerated: Codis de recuperació regenerats amb èxit
-    recovery_instructions: Si alguna vegada perds l'accéss al telèfon pots utilitzar un dels codis de recuperació a continuació per recuperar l'accés al teu compte. Cal mantenir els codis de recuperació en lloc segur, per exemple imprimint-los i guardar-los amb altres documents importants.
+    recovery_instructions_html: Si alguna vegada perds l'accéss al telèfon pots utilitzar un dels codis de recuperació a continuació per recuperar l'accés al teu compte. Cal mantenir els codis de recuperació en lloc segur, per exemple imprimint-los i guardar-los amb altres documents importants.
     setup: Establir
     wrong_code: El codi introduït es invalid! Es correcta la hora del servidor i del dispositiu?
   users:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 72d60d2a0..f2841d0b7 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -304,7 +304,7 @@ de:
     lost_recovery_codes: Wiederherstellungscodes erlauben dir, wieder den Zugang zu deinem Konto zu erlangen, falls du dein Telefon verlierst. Wenn du deine Wiederherstellungscodes verloren hast, kannst du sie hier regenerieren. Deine alten Wiederherstellungscodes werden damit ungültig gemacht.
     manual_instructions: 'Wenn du den QR-Code nicht einlesen kannst und ihn manuell eingeben musst, ist hier das Klartext-Geheimnis:'
     recovery_codes_regenerated: Wiederherstellungscodes erfolgreich regeneriert
-    recovery_instructions: Wenn du jemals den Zugang zu deinem Telefon verlierst, kannst du einen der Wiederherstellungscodes unten benutzen, um wieder auf dein Konto zugreifen zu können. Bewahre die Wiederherstellungscodes sicher auf, indem du sie beispielsweise ausdruckst und sie zusammen mit anderen wichtigen Dokumenten lagerst.
+    recovery_instructions_html: Wenn du jemals den Zugang zu deinem Telefon verlierst, kannst du einen der Wiederherstellungscodes unten benutzen, um wieder auf dein Konto zugreifen zu können. Bewahre die Wiederherstellungscodes sicher auf, indem du sie beispielsweise ausdruckst und sie zusammen mit anderen wichtigen Dokumenten lagerst.
     setup: Einrichten
     wrong_code: Der eingegebene Code war ungültig! Sind die Server- und die Gerätezeit korrekt?
   users:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7238949dc..9daaf53ec 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -391,13 +391,17 @@ en:
     description_html: If you enable <strong>two-factor authentication</strong>, logging in will require you to be in possession of your phone, which will generate tokens for you to enter.
     disable: Disable
     enable: Enable
+    enabled: Two-factor authentication is enabled
     enabled_success: Two-factor authentication successfully enabled
-    generate_recovery_codes: Generate Recovery Codes
+    generate_recovery_codes: Generate recovery codes
     instructions_html: "<strong>Scan this QR code into Google Authenticator or a similiar TOTP app on your phone</strong>. From now on, that app will generate tokens that you will have to enter when logging in."
     lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
     manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
+    recovery_codes: Backup recovery codes
     recovery_codes_regenerated: Recovery codes successfully regenerated
-    recovery_instructions: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe. (For example, you may print them and store them with other important documents.)
+    recovery_instructions_html:
+      If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>.
+      For example, you may print them and store them with other important documents.
     setup: Set up
     wrong_code: The entered code was invalid! Are server time and device time correct?
   users:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index a65de2365..515443608 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -334,7 +334,7 @@ fa:
     lost_recovery_codes: با کدهای بازیابی می‌توانید اگر تلفن خود را گم کردید به حساب خود دسترسی داشته باشید. اگر کدهای بازیابی خود را گم کردید، آن‌ها را این‌جا دوباره بسازید. کدهای بازیابی قبلی شما نامعتبر خواهند شد.
     manual_instructions: 'اگر نمی‌توانید کدها را اسکن کنید و باید آن‌ها را دستی وارد کنید، متن کد امنیتی این‌جاست:'
     recovery_codes_regenerated: کدهای بازیابی با موفقیت ساخته شدند
-    recovery_instructions: اگر تلفن خود را گم کردید، می‌توانید با یکی از کدهای بازیابی زیر کنترل حساب خود را به دست بگیرید. این کدها را در جای امنی نگه دارید، مثلاً آن‌ها را چاپ کنید و کنار سایر مدارک مهم خود قرار دهید
+    recovery_instructions_html: اگر تلفن خود را گم کردید، می‌توانید با یکی از کدهای بازیابی زیر کنترل حساب خود را به دست بگیرید. این کدها را در جای امنی نگه دارید، مثلاً آن‌ها را چاپ کنید و کنار سایر مدارک مهم خود قرار دهید
     setup: راه اندازی
     wrong_code: کدی که وارد کردید نامعتبر بود! آیا ساعت سرور و ساعت دستگاه شما درست تنظیم شده‌اند؟
   users:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7f348986e..0c3f3b1d5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -300,7 +300,7 @@ fr:
     lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre comptre si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés.
     manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l''entrer manuellement, voici le secret en clair :'
     recovery_codes_regenerated: Codes de récupération régénérés avec succès
-    recovery_instructions: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
+    recovery_instructions_html: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
     setup: Installer
     wrong_code: Les codes entrés sont incorrects ! L'heure du serveur et celle de votre appareil sont-elles correctes ?
   users:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 7e3b40b1c..ec7d972ec 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -342,7 +342,7 @@ he:
     lost_recovery_codes: קודי האחזור מאפשרים אחזור גישה לחשבון במידה ומכשירך אבד. במידה וקודי האחזור אבדו, ניתן לייצרם מחדש כאן. תוקף קודי האחזור הישנים יפוג.
     manual_instructions: 'במידה ולא ניתן לסרוק את קוד ה-QR אלא יש צורך להקליד אותו ידנית, להלן סוד כמוס בלתי מוצפן:'
     recovery_codes_regenerated: קודי האחזור יוצרו בהצלחה
-    recovery_instructions: במידה והגישה למכשירך תאבד, ניתן לייצר קודי אחזור למטה על מנת לאחזר גישה לחשבונך בכל עת. נא לשמור על קודי הגישה במקום בטוח )לדוגמא על ידי הדפסתם ושמירתם עם מסמכים חשובים אחרים, או שימוש בתוכנה ייעודית לניהול סיסמאות וסודות(
+    recovery_instructions_html: במידה והגישה למכשירך תאבד, ניתן לייצר קודי אחזור למטה על מנת לאחזר גישה לחשבונך בכל עת. נא לשמור על קודי הגישה במקום בטוח )לדוגמא על ידי הדפסתם ושמירתם עם מסמכים חשובים אחרים, או שימוש בתוכנה ייעודית לניהול סיסמאות וסודות(
     setup: הכנה
     wrong_code: הקוד שהוזן שגוי! האם הזמן בשרת והזמן במכשירך נכונים?
   users:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 300612b31..fc4ffd046 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -331,7 +331,7 @@ id:
     lost_recovery_codes: Kode pemulihan bisa anda gunakan untuk mendapatkan kembali akses pada akun anda jika anda kehilangan handphone anda. Jika anda kehilangan kode pemulihan, anda bisa membuatnya ulang disini. Kode pemulihan anda yang lama tidak akan bisa digunakan lagi.
     manual_instructions: 'Jika anda tidak bisa memindai kode QR dan harus memasukkannya secara manual, ini dia kode yang harus dimasukkan:'
     recovery_codes_regenerated: Kode Pemulihan berhasil dibuat ulang
-    recovery_instructions: Jika anda kehilangan akses pada handphone anda, anda bisa menggunakan kode pemulihan dibawah ini untuk mendapatkan kembali akses pada akun anda. Simpan kode pemulihan anda baik-baik, misalnya dengan mencetaknya atau menyimpannya bersama dokumen penting lainnya.
+    recovery_instructions_html: Jika anda kehilangan akses pada handphone anda, anda bisa menggunakan kode pemulihan dibawah ini untuk mendapatkan kembali akses pada akun anda. Simpan kode pemulihan anda baik-baik, misalnya dengan mencetaknya atau menyimpannya bersama dokumen penting lainnya.
     setup: Persiapan
     wrong_code: Kode yang dimasukkan tidak cocok! Apa waktu server dan waktu di handphone sudah cocok?
   users:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index def5b9524..db430b0fe 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -303,7 +303,7 @@ io:
     lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
     manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
     recovery_codes_regenerated: Recovery codes successfully regenerated
-    recovery_instructions: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
+    recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
     setup: Set up
     wrong_code: The entered code was invalid! Are server time and device time correct?
   users:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 94f02e940..80169339d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -360,7 +360,7 @@ ja:
     lost_recovery_codes: リカバリーコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリーコードは無効になります。
     manual_instructions: 'QRコードがスキャンできず、手動での登録を希望の場合はこのシークレットコードを利用してください。:'
     recovery_codes_regenerated: リカバリーコードが再生成されました。
-    recovery_instructions: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。 リカバリーコードは印刷して安全に保管してください。
+    recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。 リカバリーコードは印刷して安全に保管してください。
     setup: 初期設定
     wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。
   users:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 15d963808..d9b02e09c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -228,7 +228,7 @@ nl:
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
     manual_instructions: 'Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.'
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
-    recovery_instructions: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
+    recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
     setup: Instellen
     wrong_code: De ingevoerde code is ongeldig! Klopt de systeemtijd van de server en die van jouw apparaat?
   users:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 1cd6620b6..f71c08c6a 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -335,7 +335,7 @@
     lost_recovery_codes: Gjenopprettingskoder lar deg gjenoppnå tilgang til din konto hvis du mister din telefon. Hvis du har mistet gjenopprettingskodene, kan du regenerere dem her. Dine gamle gjenopprettingskoder vil bli ugyldige.
     manual_instructions: 'Hvis du ikke får scannet QR-koden må du skrive inn følgende kode manuelt:'
     recovery_codes_regenerated: Generering av gjenopprettingskoder vellykket
-    recovery_instructions: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til å gjenopprette tilgang til din konto. Oppbevar gjenopprettingskodene sikkert, for eksempel ved å skrive dem ut og lagre dem sammen med andre viktige dokumenter.
+    recovery_instructions_html: Hvis du skulle miste tilgang til telefonen din, kan du bruke en av gjenopprettingskodene nedenfor til å gjenopprette tilgang til din konto. Oppbevar gjenopprettingskodene sikkert, for eksempel ved å skrive dem ut og lagre dem sammen med andre viktige dokumenter.
     setup: Sett opp
     wrong_code: Den angitte koden var ugyldig! Stemmer instansens tid overalt med enhetens tid?
   users:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 3770c0671..c882b43a1 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -220,7 +220,7 @@ oc:
     - dv
     - ds
     abbr_month_names:
-    - 
+    -
     - gen
     - feb
     - mar
@@ -246,7 +246,7 @@ oc:
       long: Lo %B %d de %Y
       short: "%b %d"
     month_names:
-    - 
+    -
     - de genièr
     - de febrièr
     - de març
@@ -411,7 +411,7 @@ oc:
     lost_recovery_codes: Los còdi de recuperacion vos permeton d’accedir a vòstre compte se perdètz vòstre mobil. S’avètz perdut vòstres còdis de recuperacion los podètz tornar generar aquí. Los ancians còdis seràn pas mai valides.
     manual_instructions: 'Se podètz pas numerizar lo còdi QR e que vos cal picar lo còdi a la man, vaquí lo còdi en clar :'
     recovery_codes_regenerated: Los còdis de recuperacion son ben estats tornats generar
-    recovery_instructions: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. Gardatz los còdis en seguretat, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
+    recovery_instructions_html: Se vos arriba de perdre vòstre mobil, podètz utilizar un dels còdis de recuperacion cai-jos per poder tornar accedir a vòstre compte. Gardatz los còdis en seguretat, per exemple, imprimissètz los e gardatz los amb vòstres documents importants.
     setup: Paramètres
     wrong_code: Lo còdi picat es invalid ! L’ora es la bona sul servidor e lo mobil ?
   users:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 7376c3e2b..97d20aa41 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -364,7 +364,7 @@ pl:
     lost_recovery_codes: Kody zapasowe pozwolą uzyskać dostęp do portalu, jeżeli utracisz dostęp do telefonu. Jeżeli utracisz dostęp do nich, możesz wygenerować je ponownie tutaj. Poprzednie zostaną unieważnione.
     manual_instructions: 'Jeżeli nie możesz zeskanować kodu QR, musisz wprowadzić ten kod ręcznie:'
     recovery_codes_regenerated: Pomyślnie wygenerowano ponownie kody zapasowe
-    recovery_instructions: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. Trzymaj je w bezpiecznym miejscu. (Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.)
+    recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. Trzymaj je w bezpiecznym miejscu. (Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.)
     setup: Skonfiguruj
     wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urządzenia jest poprawny?
   users:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b6f5497bd..973a8d401 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -333,7 +333,7 @@ pt-BR:
     lost_recovery_codes: Códigos de recuperação permite que você recupere o acesso a sua conta se você perder seu telefone. Se você perder os códigos de recuperação, você pode regera-los aqui. Seus códigos antigos serão invalidados.
     manual_instructions: 'Se você não puder scanear o código QR e precisa digita-los manualmente, aqui está o segredo em texto.:'
     recovery_codes_regenerated: Códigos de recuperação foram gerados com sucesso
-    recovery_instructions: Se algum dia você perder o acesso ao seu telefone, você pode usar um dos códigos de abaixo para recupera o acesso a sua conta. Guarde os códigos de acesso em local seguro, por exemplo imprimindo ou guardados com documentos importantes.
+    recovery_instructions_html: Se algum dia você perder o acesso ao seu telefone, você pode usar um dos códigos de abaixo para recupera o acesso a sua conta. Guarde os códigos de acesso em local seguro, por exemplo imprimindo ou guardados com documentos importantes.
     setup: Configurar
     wrong_code: O código digitado é inválido! Os relógios do servidor e do dispositivo estão corretos?
   users:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index c16ab6869..9cf067d88 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -332,7 +332,7 @@ ru:
     lost_recovery_codes: Коды восстановления позволяют вернуть доступ к аккаунту в случае утери телефона. Если Вы потеряли Ваши коды восстановления, вы можете заново сгенерировать их здесь. Ваши старые коды восстановления будут аннулированы.
     manual_instructions: 'Если Вы не можете отсканировать QR-код и хотите ввести его вручную, секрет представлен здесь открытым текстом:'
     recovery_codes_regenerated: Коды восстановления успешно сгенерированы
-    recovery_instructions: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами.
+    recovery_instructions_html: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами.
     setup: Настроить
     wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства?
   users:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 6ef4b6789..322e5e74b 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -335,7 +335,7 @@ th:
     lost_recovery_codes: Recovery codes allow you to regain access to your account if you lose your phone. If you've lost your recovery codes, you can regenerate them here. Your old recovery codes will be invalidated.
     manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
     recovery_codes_regenerated: Recovery codes successfully regenerated
-    recovery_instructions: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
+    recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. Keep the recovery codes safe, for example by printing them and storing them with other important documents.
     setup: ตั้งค่า
     wrong_code: รหัสที่กรอกไม่ถูกต้อง! Are server time and device time correct?
   users:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a4c870b64..0e33e2efe 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -333,7 +333,7 @@ tr:
     lost_recovery_codes: Kurtarma kodları telefonunuzu kaybettiğiniz durumlarda hesabınıza erişim yapabilmenize olanak tanır. Eğer kurtarma kodlarınızı kaybettiyseniz burada tekrar oluşturabilirsiniz. Eski kurtarma kodlarınız geçersiz hale gelecektir.
     manual_instructions: 'Eğer QR kodunu taratamıyorsanız ve elle giriş yapmanız gerekiyorsa buradaki gizli düz metni girebilirsiniz:'
     recovery_codes_regenerated: Kurtarma kodları başarıyla oluşturuldu
-    recovery_instructions: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. Kurtarma kodlarınızı güvenli halde tutunuz. Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
+    recovery_instructions_html: 'Eğer telefonunuza erişiminizi kaybederseniz, aşağıdaki kurtarma kodlarından birini kullanarak hesabınıza giriş yapabilirsiniz. Kurtarma kodlarınızı güvenli halde tutunuz. Örneğin: kodların çıktısını alıp diğer önemli belgeleriniz ile birlikte saklayabilirsiniz.'
     setup: Kuruluma başla
     wrong_code: Girdiğiniz kod geçersiz! Telefonunuzun saati geri/ileri kalmış olabilir.
   users:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index c1ec61cda..1327c1a7b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -319,7 +319,7 @@ uk:
     lost_recovery_codes: Коди відновлення дозволяють повернути доступ до акаунту у випадку втрати телефону. Якщо Ви втратили Ваші коди відновлення, Ви можете знову згенерувати їх тут. Ваші старі коди відновлення будуть анульовані.
     manual_instructions: 'Якщо Ви не можете відсканувати QR-код та хочете ввести його вручну, секрет представлений тут відкритим текстом:'
     recovery_codes_regenerated: Коди відновлення успішно згенеровані
-    recovery_instructions: У випадку втрати доступу до Вашого телефона Ви можете використати один з кодів відновлення, вказаних нижче, щоб повернути доступ до акаунту. Тримайте коди відновлення у безпеці, наприклад, роздрукувавши їх та тримаючи їх з іншими важливими документами.
+    recovery_instructions_html: У випадку втрати доступу до Вашого телефона Ви можете використати один з кодів відновлення, вказаних нижче, щоб повернути доступ до акаунту. Тримайте коди відновлення у безпеці, наприклад, роздрукувавши їх та тримаючи їх з іншими важливими документами.
     setup: Налаштувати
     wrong_code: Введений код неправильний! Чи правильно встановлені серверний час та час пристрою?
   users:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9bf338ea4..6c8e9fc6d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -339,7 +339,7 @@ zh-CN:
     lost_recovery_codes: 如果你丢了手机，你可以用恢复代码重新访问你的账户。如果你丢了恢复代码，也可以在这里重新生成一个，不过以前的恢复代码就失效了。<del>（废话）</del>
     manual_instructions: 如果你无法扫描 QR 二维码，请手动输入这个文本密码︰
     recovery_codes_regenerated: 已成功重新生成恢复代码
-    recovery_instructions: 如果你的手机无法使用，你可以使用下面的任何恢复代码来恢复你的账号。请保管好你的恢复代码以防泄漏（例如你可以打印好它们并和重要文档一起保存）。
+    recovery_instructions_html: 如果你的手机无法使用，你可以使用下面的任何恢复代码来恢复你的账号。请保管好你的恢复代码以防泄漏（例如你可以打印好它们并和重要文档一起保存）。
     setup: 设置
     wrong_code: 你输入的认证码并不正确！可能服务器时间和你手机不一致，请检查你手机的时钟，或与本站管理员联系。
   users:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 9a110f7da..4d8262c5b 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -334,7 +334,7 @@ zh-HK:
     lost_recovery_codes: 讓你可以在遺失電話時，使用備用驗證碼登入。如果你遺失了備用驗證碼，可以在這裏產生一批新的，舊有的備用驗證碼將會失效。
     manual_instructions: 如果你無法掃描 QR 圖形碼，請手動輸入這個文字密碼︰
     recovery_codes_regenerated: 成功產生新的備用驗證碼
-    recovery_instructions: 如果你遺失了安裝認證器的裝置（如︰你的電話），你可以使用備用驗證碼進行登入。請確保將備用驗證碼收藏穩當，（如列印出來，和你其他重要文件一起存放）
+    recovery_instructions_html: 如果你遺失了安裝認證器的裝置（如︰你的電話），你可以使用備用驗證碼進行登入。請確保將備用驗證碼收藏穩當，（如列印出來，和你其他重要文件一起存放）
     setup: 設定
     wrong_code: 你輸入的認證碼並不正確！可能伺服器時間和你手機不一致，請檢查你手機的時鐘，或與本站管理員聯絡。
   users:
diff --git a/spec/controllers/settings/two_factor_authentications_controller_spec.rb b/spec/controllers/settings/two_factor_authentications_controller_spec.rb
index 4d1a01fcf..6c49f6f0d 100644
--- a/spec/controllers/settings/two_factor_authentications_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentications_controller_spec.rb
@@ -79,13 +79,41 @@ describe Settings::TwoFactorAuthenticationsController do
       user.update(otp_required_for_login: true)
     end
 
-    it 'turns off otp requirement if signed in' do
-      sign_in user, scope: :user
-      post :destroy
+    context 'when signed in' do
+      before do
+        sign_in user, scope: :user
+      end
 
-      expect(response).to redirect_to(settings_two_factor_authentication_path)
-      user.reload
-      expect(user.otp_required_for_login).to eq(false)
+      it 'turns off otp requirement with correct code' do
+        expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
+          expect(value).to eq user
+          expect(arg).to eq '123456'
+          true
+        end
+
+        post :destroy, params: { form_two_factor_confirmation: { code: '123456' } }
+
+        expect(response).to redirect_to(settings_two_factor_authentication_path)
+        user.reload
+        expect(user.otp_required_for_login).to eq(false)
+      end
+
+      it 'does not turn off otp if code is incorrect' do
+        expect_any_instance_of(User).to receive(:validate_and_consume_otp!) do |value, arg|
+          expect(value).to eq user
+          expect(arg).to eq '057772'
+          false
+        end
+
+        post :destroy, params: { form_two_factor_confirmation: { code: '057772' } }
+
+        user.reload
+        expect(user.otp_required_for_login).to eq(true)
+      end
+
+      it 'raises ActionController::ParameterMissing if code is missing' do
+        expect { post :destroy }.to raise_error(ActionController::ParameterMissing)
+      end
     end
 
     it 'redirects if not signed in' do

From c972e1ee1fdc7ebc8bd4ad764cdf189ca4874764 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Mon, 26 Jun 2017 08:45:50 +0900
Subject: [PATCH 082/382] Ignore DB_NAME for development env on streaming as
 well as rails side (#3948)

---
 streaming/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/index.js b/streaming/index.js
index 701cb2f55..d69f8fa19 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -80,7 +80,7 @@ const startWorker = (workerId) => {
     development: {
       user:     process.env.DB_USER || pg.defaults.user,
       password: process.env.DB_PASS || pg.defaults.password,
-      database: process.env.DB_NAME || 'mastodon_development',
+      database: 'mastodon_development',
       host:     process.env.DB_HOST || pg.defaults.host,
       port:     process.env.DB_PORT || pg.defaults.port,
       max:      10,

From e5563843a2c063ab0295f778428183361e0aa326 Mon Sep 17 00:00:00 2001
From: Takuya Yoshida <hawaiianphoto@geekhost.net>
Date: Mon, 26 Jun 2017 08:46:15 +0900
Subject: [PATCH 083/382] Re-fix errorMiddleware (#3922)

---
 streaming/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streaming/index.js b/streaming/index.js
index d69f8fa19..e641c6548 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -246,7 +246,7 @@ const startWorker = (workerId) => {
     accountFromRequest(req, next);
   };
 
-  const errorMiddleware = (err, req, res, next) => {  // eslint-disable-line no-unused-vars
+  const errorMiddleware = (err, req, res, {}) => {
     log.error(req.requestId, err.toString());
     res.writeHead(err.statusCode || 500, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: err.statusCode ? err.toString() : 'An unexpected error occurred' }));

From 285038972b724e646aa1a3aa2096b161524bce09 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 26 Jun 2017 11:49:39 +0900
Subject: [PATCH 084/382] Stop using Babel with streaming server (#3950)

---
 package.json       |  2 +-
 streaming/.babelrc | 15 ---------------
 streaming/index.js | 22 +++++++++++-----------
 3 files changed, 12 insertions(+), 27 deletions(-)
 delete mode 100644 streaming/.babelrc

diff --git a/package.json b/package.json
index d1fd22fb5..4b967bad7 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "build:development": "cross-env RAILS_ENV=development ./bin/webpack",
     "build:production": "cross-env RAILS_ENV=production ./bin/webpack",
     "manage:translations": "node ./config/webpack/translationRunner.js",
-    "start": "rimraf ./tmp/streaming && babel ./streaming/index.js --out-dir ./tmp && node ./tmp/streaming/index.js",
+    "start": "node ./streaming/index.js",
     "storybook": "cross-env NODE_ENV=test start-storybook -s ./public -p 9001 -c storybook",
     "test": "npm run test:lint && npm run test:mocha",
     "test:lint": "eslint -c .eslintrc.yml --ext=js app/javascript/ config/webpack/ spec/javascript/ storybook/ streaming/",
diff --git a/streaming/.babelrc b/streaming/.babelrc
deleted file mode 100644
index dc1ec4303..000000000
--- a/streaming/.babelrc
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "presets": [
-    [
-      "env",
-      {
-        "targets": {
-          "node": "current"
-        }
-      }
-    ]
-  ],
-  "plugins": [
-    "transform-object-rest-spread"
-  ]
-}
diff --git a/streaming/index.js b/streaming/index.js
index e641c6548..400456d24 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -1,14 +1,14 @@
-import os from 'os';
-import throng from 'throng';
-import dotenv from 'dotenv';
-import express from 'express';
-import http from 'http';
-import redis from 'redis';
-import pg from 'pg';
-import log from 'npmlog';
-import url from 'url';
-import WebSocket from 'uws';
-import uuid from 'uuid';
+const os = require('os');
+const throng = require('throng');
+const dotenv = require('dotenv');
+const express = require('express');
+const http = require('http');
+const redis = require('redis');
+const pg = require('pg');
+const log = require('npmlog');
+const url = require('url');
+const WebSocket = require('uws');
+const uuid = require('uuid');
 
 const env = process.env.NODE_ENV || 'development';
 

From f53ed108b0c6218eef118bbd0b77078d36c46a96 Mon Sep 17 00:00:00 2001
From: Alda Marteau-Hardi <github@ltch.fr>
Date: Mon, 26 Jun 2017 13:04:36 +0200
Subject: [PATCH 085/382] Translate pin/unpin and fix some inconsistencies in
 gender neutral strings (#3952)

---
 app/javascript/mastodon/locales/fr.json | 6 +++---
 config/locales/fr.yml                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 52d6b0f87..1a69235c8 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -27,8 +27,8 @@
   "column.notifications": "Notifications",
   "column.public": "Fil public global",
   "column_back_button.label": "Retour",
-  "column_header.pin": "Pin",
-  "column_header.unpin": "Unpin",
+  "column_header.pin": "Épingler",
+  "column_header.unpin": "Retirer",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Paramètres",
   "compose_form.lock_disclaimer": "Votre compte n'est pas {locked}. Tout le monde peut vous suivre et voir vos pouets restreints.",
@@ -101,7 +101,7 @@
   "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
   "notifications.column_settings.alert": "Notifications locales",
   "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.follow": "Nouveaux abonné⋅e⋅s :",
+  "notifications.column_settings.follow": "Nouveaux⋅elles abonn⋅é⋅s :",
   "notifications.column_settings.mention": "Mentions :",
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0c3f3b1d5..dfe5ff990 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -238,7 +238,7 @@ fr:
       mention: "%{name} vous a mentionné⋅e"
       new_followers_summary:
         one: Vous avez un⋅e nouvel⋅le abonné⋅e ! Youpi !
-        other: Vous avez %{count} nouveaux abonné⋅es ! Incroyable !
+        other: Vous avez %{count} nouveaux⋅elles abonné⋅e⋅s ! Incroyable !
       subject:
         one: "Une nouvelle notification depuis votre dernière visite \U0001F418"
         other: "%{count} nouvelles notifications depuis votre dernière visite \U0001F418"

From 7aeb9168b01971e4e2c4c9b757dff09638b171ac Mon Sep 17 00:00:00 2001
From: Daniel Hunsaker <danhunsaker@gmail.com>
Date: Mon, 26 Jun 2017 05:15:24 -0600
Subject: [PATCH 086/382] Add .gitattributes file to avoid unwanted CRLF
 (#3954)

When Windows checks out files, it defaults to changing line endings to CRLF. If these files are then copied to a Linux system to be run, and the endings aren't changed at some point in that process, things break. This file forces git to use LF for all text files on all systems (except the request testing specfiles) to prevent issues everywhere.
---
 .gitattributes | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..e69f2a0ad
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+*                             text=auto eol=lf
+*.eot                         -text
+*.gif                         -text
+*.gz                          -text
+*.ico                         -text
+*.jpg                         -text
+*.mp3                         -text
+*.ogg                         -text
+*.png                         -text
+*.ttf                         -text
+*.webm                        -text
+*.woff                        -text
+*.woff2                       -text
+spec/fixtures/requests/**     -text !eol

From ae2b722f5510cc5ab54cd5e6419136f1a63892df Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 26 Jun 2017 17:10:54 +0200
Subject: [PATCH 087/382] i18n: Warning to look into the spam folder (pl)
 (#3955)

---
 config/locales/devise.pl.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index d4ee1b6ae..792e0d81e 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -3,8 +3,8 @@ pl:
   devise:
     confirmations:
       confirmed: Twój adres e-mail został poprawnie zweryfikowany.
-      send_instructions: W ciągu kilku minut otrzymasz wiadomosć e-mail z instrukcją jak potwierdzić Twój adres e-mail.
-      send_paranoid_instructions: Jeśli Twój adres e-mail już istnieje w naszej bazie danych, w ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją jak potwierdzić Twój adres e-mail.
+      send_instructions: W ciągu kilku minut otrzymasz wiadomosć e-mail z instrukcją jak potwierdzić Twój adres e-mail. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
+      send_paranoid_instructions: Jeśli Twój adres e-mail już istnieje w naszej bazie danych, w ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją jak potwierdzić Twój adres e-mail. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
     failure:
       already_authenticated: Jesteś już zalogowany/zalogowana.
       inactive: Twoje konto nie zostało jeszcze aktywowane.
@@ -29,8 +29,8 @@ pl:
       success: Uwierzytelnienie przez %{kind} powiodło się.
     passwords:
       no_token: Dostęp do tej strony możliwy jest wyłącznie za pomocą odnośnika z e-maila z instrukcjami ustawienia nowego hasła. Jeśli skorzystałeś/aś z takiego odnośnika, upewnij się, że został wykorzystany/skopiowany cały odnośnik.
-      send_instructions: W ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją ustawienia nowego hasła.
-      send_paranoid_instructions: Jeśli Twój adres e-mail już istnieje w naszej bazie danych, w ciągu kilku minut otrzymasz wiadomość e-mail zawierającą odnośnik pozwalający na ustawienie nowego hasła.
+      send_instructions: W ciągu kilku minut otrzymasz wiadomość e-mail z instrukcją ustawienia nowego hasła. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
+      send_paranoid_instructions: Jeśli Twój adres e-mail już istnieje w naszej bazie danych, w ciągu kilku minut otrzymasz wiadomość e-mail zawierającą odnośnik pozwalający na ustawienie nowego hasła. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
       updated: Twoje hasło zostało zmienione. Jesteś zalogowany/a.
       updated_not_active: Twoje hasło zostało zmienione.
     registrations:
@@ -38,16 +38,16 @@ pl:
       signed_up: Twoje konto zostało utworzone. Witamy!
       signed_up_but_inactive: Twoje konto zostało utworzone. Nie mogliśmy Cię jednak zalogować, ponieważ konto nie zostało jeszcze aktywowane.
       signed_up_but_locked: Twoje konto zostało utworzone. Nie mogliśmy Cię jednak zalogować, ponieważ konto jest zablokowane.
-      signed_up_but_unconfirmed: Na Twój adres e-mail została wysłana wiadomosć z odnośnikiem potwierdzającym. Kliknij w odnośnik aby aktywować konto.
-      update_needs_confirmation: Konto zostało zaktualizowane, musimy jednak zweryfikować Twój nowy adres e-mail. Została na niego wysłana wiadomość z odnośnikiem potwierdzającym.
+      signed_up_but_unconfirmed: Na Twój adres e-mail została wysłana wiadomosć z odnośnikiem potwierdzającym. Kliknij w odnośnik aby aktywować konto. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
+      update_needs_confirmation: Konto zostało zaktualizowane, musimy jednak zweryfikować Twój nowy adres e-mail. Została na niego wysłana wiadomość z odnośnikiem potwierdzającym. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
       updated: Konto zostało zaktualizowane.
     sessions:
       already_signed_out: Zostałeś/aś wylogowany/a.
       signed_in: Zostałeś/aś zalogowany/a.
       signed_out: Zostałeś/aś wylogowany/a.
     unlocks:
-      send_instructions: W ciągu kilku minut otrzymasz wiadomość e-mail z instrukcjami odblokowania konta.
-      send_paranoid_instructions: Jeśli Twoje konto istnieje, instrukcje odblokowania go otrzymasz w wiadomości e-mail w ciągu kilku minut.
+      send_instructions: W ciągu kilku minut otrzymasz wiadomość e-mail z instrukcjami odblokowania konta. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
+      send_paranoid_instructions: Jeśli Twoje konto istnieje, instrukcje odblokowania go otrzymasz w wiadomości e-mail w ciągu kilku minut. Jeżeli nie otrzymano wiadomości, sprawdź folder ze spamem.
       unlocked: Twoje konto zostało odblokowane. Zaloguj się aby kontynuować.
   errors:
     messages:

From 646de92781ba9d211255a7eaf7ebca7b365612f6 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 26 Jun 2017 17:18:45 +0200
Subject: [PATCH 088/382] i18n: Updated Polish translation (#3956)

* i18n: Updated Polish translation

* Update pl.yml
---
 config/locales/pl.yml | 47 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 97d20aa41..81eee8dc3 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -200,7 +200,7 @@ pl:
   applications:
     invalid_url: Ten URL jest nieprawidłowy
   auth:
-    change_password: Uwierzytelnienie
+    change_password: Bezpieczeństwo
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli próbowałeś usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
     didnt_get_confirmation: Nie otrzymałeś instrukcji weryfikacji?
@@ -323,7 +323,44 @@ pl:
     acct: Podaj swój adres (nazwa@domena), z którego chcesz śledzić
     missing_resource: Nie udało się znaleźć adresu przekierowania z Twojej domeny
     proceed: Śledź
-    prompt: 'Śledzony będzie:'
+    prompt: 'Zamierzasz śledzić:'
+  sessions:
+    activity: Ostatnia aktywność
+    browser: Przeglądarka
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: nieznana przeglądarka
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Obecna sesja
+    description: "%{browser} na %{platform}"
+    explanation: Przeglądarki z aktywną sesją Twojego konta.
+    ip: Adres IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: macOS
+      other: nieznana platforma
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Sesje
   settings:
     authorized_apps: Uwierzytelnione aplikacje
     back: Powrót do Mastodona
@@ -358,13 +395,17 @@ pl:
     description_html: Jeśli włączysz <strong>uwierzytelnianie dwuetapowe</strong>, logowanie się będzie wymagało podania tokenu wyświetlonego na Twoim telefonie.
     disable: Wyłącz
     enable: Włącz
+    enabled: Uwierzytelnianie dwuetapowe jest włączone
     enabled_success: Pomyślnie aktywowano uwierzytelnianie dwuetapowe
     generate_recovery_codes: Generuj kody zapasowe
     instructions_html: "<strong>Zeskanuj ten kod QR na swoim urządzeniu za pomocą Google Authenticator, FreeOTP lub podobnej aplikacji</strong>. Od teraz będzie ona generowała kody wymagane przy logowaniu."
     lost_recovery_codes: Kody zapasowe pozwolą uzyskać dostęp do portalu, jeżeli utracisz dostęp do telefonu. Jeżeli utracisz dostęp do nich, możesz wygenerować je ponownie tutaj. Poprzednie zostaną unieważnione.
     manual_instructions: 'Jeżeli nie możesz zeskanować kodu QR, musisz wprowadzić ten kod ręcznie:'
+    recovery_codes: Przywróć kody zapasowe
     recovery_codes_regenerated: Pomyślnie wygenerowano ponownie kody zapasowe
-    recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. Trzymaj je w bezpiecznym miejscu. (Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.)
+    recovery_instructions_html:
+      Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>.
+      Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.
     setup: Skonfiguruj
     wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urządzenia jest poprawny?
   users:

From a91d968cab5120ca389fcc7d6788cafca85e69e7 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Mon, 26 Jun 2017 19:39:58 +0200
Subject: [PATCH 089/382] Raise an error if salmon request response is
 unsatisfactory (#3960)

---
 app/services/send_interaction_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/send_interaction_service.rb b/app/services/send_interaction_service.rb
index 504f41c72..34c8f9e34 100644
--- a/app/services/send_interaction_service.rb
+++ b/app/services/send_interaction_service.rb
@@ -13,7 +13,8 @@ class SendInteractionService < BaseService
     return if block_notification?
 
     envelope = salmon.pack(@xml, @source_account.keypair)
-    salmon.post(@target_account.salmon_url, envelope)
+    delivery = salmon.post(@target_account.salmon_url, envelope)
+    raise "Delivery failed for #{target_account.salmon_url}: HTTP #{delivery.code}" unless delivery.code > 199 && delivery.code < 300
   end
 
   private

From 42b82206322c73c4a4d7ac29ca9a781ab11e7b1a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Jun 2017 00:04:00 +0200
Subject: [PATCH 090/382] Fix #1624 - Send e-mail notifications to admins about
 new reports (#3949)

---
 app/controllers/api/v1/reports_controller.rb      |  3 +++
 app/mailers/admin_mailer.rb                       | 13 +++++++++++++
 app/mailers/application_mailer.rb                 |  8 ++++++++
 app/mailers/notification_mailer.rb                |  8 --------
 app/views/admin_mailer/new_report.text.erb        |  5 +++++
 config/locales/en.yml                             |  8 +++++---
 .../controllers/api/v1/reports_controller_spec.rb | 15 ++++++++++++---
 7 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 app/mailers/admin_mailer.rb
 create mode 100644 app/views/admin_mailer/new_report.text.erb

diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 71df76e92..8e7070d07 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -17,6 +17,9 @@ class Api::V1::ReportsController < Api::BaseController
       status_ids: reported_status_ids,
       comment: report_params[:comment]
     )
+
+    User.admins.includes(:account).each { |u| AdminMailer.new_report(u.account, @report).deliver_later }
+
     render :show
   end
 
diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
new file mode 100644
index 000000000..fc19a6d40
--- /dev/null
+++ b/app/mailers/admin_mailer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AdminMailer < ApplicationMailer
+  def new_report(recipient, report)
+    @report   = report
+    @me       = recipient
+    @instance = Rails.configuration.x.local_domain
+
+    locale_for_account(@me) do
+      mail to: @me.user_email, subject: I18n.t('admin_mailer.new_report.subject', instance: @instance, id: @report.id)
+    end
+  end
+end
diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index e5dbfeeda..2e730c19b 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -4,4 +4,12 @@ class ApplicationMailer < ActionMailer::Base
   default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
   helper :instance
+
+  protected
+
+  def locale_for_account(account)
+    I18n.with_locale(account.user_locale || I18n.default_locale) do
+      yield
+    end
+  end
 end
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index a944db137..12b92bf45 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -67,12 +67,4 @@ class NotificationMailer < ApplicationMailer
            )
     end
   end
-
-  private
-
-  def locale_for_account(account)
-    I18n.with_locale(account.user_locale || I18n.default_locale) do
-      yield
-    end
-  end
 end
diff --git a/app/views/admin_mailer/new_report.text.erb b/app/views/admin_mailer/new_report.text.erb
new file mode 100644
index 000000000..6fa744bc3
--- /dev/null
+++ b/app/views/admin_mailer/new_report.text.erb
@@ -0,0 +1,5 @@
+<%= display_name(@me) %>,
+
+<%= raw t('admin_mailer.new_report.body', target: @report.target_account.acct, reporter: @report.account.acct) %>
+
+<%= raw t('application_mailer.view')%> <%= admin_report_url(@report) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9daaf53ec..944c24c60 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -193,6 +193,10 @@ en:
       title: PubSubHubbub
       topic: Topic
     title: Administration
+  admin_mailer:
+    new_report:
+      body: "%{reporter} has reported %{target}"
+      subject: New report for %{instance} (#%{id})
   application_mailer:
     settings: 'Change e-mail preferences: %{link}'
     signature: Mastodon notifications from %{instance}
@@ -399,9 +403,7 @@ en:
     manual_instructions: 'If you can''t scan the QR code and need to enter it manually, here is the plain-text secret:'
     recovery_codes: Backup recovery codes
     recovery_codes_regenerated: Recovery codes successfully regenerated
-    recovery_instructions_html:
-      If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>.
-      For example, you may print them and store them with other important documents.
+    recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
     setup: Set up
     wrong_code: The entered code was invalid! Are server time and device time correct?
   users:
diff --git a/spec/controllers/api/v1/reports_controller_spec.rb b/spec/controllers/api/v1/reports_controller_spec.rb
index 3df6cdfe7..471ea4e0b 100644
--- a/spec/controllers/api/v1/reports_controller_spec.rb
+++ b/spec/controllers/api/v1/reports_controller_spec.rb
@@ -21,12 +21,21 @@ RSpec.describe Api::V1::ReportsController, type: :controller do
   end
 
   describe 'POST #create' do
-    it 'creates a report' do
-      status = Fabricate(:status)
-      post :create, params: { status_ids: [status.id], account_id: status.account.id, comment: 'reasons' }
+    let!(:status) { Fabricate(:status) }
+    let!(:admin)  { Fabricate(:user, admin: true) }
 
+    before do
+      allow(AdminMailer).to receive(:new_report).and_return(double('email', deliver_later: nil))
+      post :create, params: { status_ids: [status.id], account_id: status.account.id, comment: 'reasons' }
+    end
+
+    it 'creates a report' do
       expect(status.reload.account.targeted_reports).not_to be_empty
       expect(response).to have_http_status(:success)
     end
+
+    it 'sends e-mails to admins' do
+      expect(AdminMailer).to have_received(:new_report).with(admin.account, Report)
+    end
   end
 end

From 98eaa2aa27100ac0037cced9d4d4c86bcb9396e7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 27 Jun 2017 20:41:03 +0900
Subject: [PATCH 091/382] Update Rails to v5.1.2 (#3968)

---
 Gemfile.lock | 64 ++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 627a01787..c19f31e01 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,40 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_record_query_trace (1.5.4)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -298,17 +298,17 @@ GEM
     rack-test (0.6.3)
       rack (>= 1.0)
     rack-timeout (0.4.2)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
+    rails (5.1.2)
+      actioncable (= 5.1.2)
+      actionmailer (= 5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
+      activemodel (= 5.1.2)
+      activerecord (= 5.1.2)
+      activesupport (= 5.1.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+      railties (= 5.1.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
@@ -324,9 +324,9 @@ GEM
       railties (~> 5.0)
     rails-settings-cached (0.6.5)
       rails (>= 4.2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)

From 8f2c91568c7ab552a87d02813e6b02be65f8707f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 27 Jun 2017 20:43:53 +0900
Subject: [PATCH 092/382] Maintain aspect ratio for preview image (#3966)

---
 .../features/ui/components/image_loader.js    | 122 ++++++++++++++----
 app/javascript/styles/components.scss         |  30 +++--
 2 files changed, 116 insertions(+), 36 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index 5c3879970..52c3a898b 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import classNames from 'classnames';
 
 export default class ImageLoader extends React.PureComponent {
 
@@ -20,46 +21,121 @@ export default class ImageLoader extends React.PureComponent {
     error: false,
   }
 
-  componentWillMount() {
-    this._loadImage(this.props.src);
+  removers = [];
+
+  get canvasContext() {
+    if (!this.canvas) {
+      return null;
+    }
+    this._canvasContext = this._canvasContext || this.canvas.getContext('2d');
+    return this._canvasContext;
   }
 
-  componentWillReceiveProps(props) {
-    this._loadImage(props.src);
+  componentDidMount () {
+    this.loadImage(this.props);
   }
 
-  _loadImage(src) {
+  componentWillReceiveProps (nextProps) {
+    if (this.props.src !== nextProps.src) {
+      this.loadImage(nextProps);
+    }
+  }
+
+  loadImage (props) {
+    this.removeEventListeners();
+    this.setState({ loading: true, error: false });
+    Promise.all([
+      this.loadPreviewCanvas(props),
+      this.loadOriginalImage(props),
+    ])
+      .then(() => {
+        this.setState({ loading: false, error: false });
+        this.clearPreviewCanvas();
+      })
+      .catch(() => this.setState({ loading: false, error: true }));
+  }
+
+  loadPreviewCanvas = ({ previewSrc, width, height }) => new Promise((resolve, reject) => {
     const image = new Image();
+    const removeEventListeners = () => {
+      image.removeEventListener('error', handleError);
+      image.removeEventListener('load', handleLoad);
+    };
+    const handleError = () => {
+      removeEventListeners();
+      reject();
+    };
+    const handleLoad = () => {
+      removeEventListeners();
+      this.canvasContext.drawImage(image, 0, 0, width, height);
+      resolve();
+    };
+    image.addEventListener('error', handleError);
+    image.addEventListener('load', handleLoad);
+    image.src = previewSrc;
+    this.removers.push(removeEventListeners);
+  })
 
-    image.onerror = () => this.setState({ loading: false, error: true });
-    image.onload  = () => this.setState({ loading: false, error: false });
-
-    image.src = src;
-
-    this.setState({ loading: true });
+  clearPreviewCanvas () {
+    const { width, height } = this.canvas;
+    this.canvasContext.clearRect(0, 0, width, height);
   }
 
-  render() {
-    const { alt, src, previewSrc, width, height } = this.props;
+  loadOriginalImage = ({ src }) => new Promise((resolve, reject) => {
+    const image = new Image();
+    const removeEventListeners = () => {
+      image.removeEventListener('error', handleError);
+      image.removeEventListener('load', handleLoad);
+    };
+    const handleError = () => {
+      removeEventListeners();
+      reject();
+    };
+    const handleLoad = () => {
+      removeEventListeners();
+      resolve();
+    };
+    image.addEventListener('error', handleError);
+    image.addEventListener('load', handleLoad);
+    image.src = src;
+    this.removers.push(removeEventListeners);
+  });
+
+  removeEventListeners () {
+    this.removers.forEach(listeners => listeners());
+    this.removers = [];
+  }
+
+  setCanvasRef = c => {
+    this.canvas = c;
+  }
+
+  render () {
+    const { alt, src, width, height } = this.props;
     const { loading } = this.state;
 
+    const className = classNames('image-loader', {
+      'image-loader--loading': loading,
+    });
+
     return (
-      <div className='image-loader'>
-        <img
-          alt={alt}
-          className='image-loader__img'
-          src={src}
+      <div className={className}>
+        <canvas
+          className='image-loader__preview-canvas'
           width={width}
           height={height}
+          ref={this.setCanvasRef}
         />
 
-        {loading &&
+        {!loading && (
           <img
-            alt=''
-            src={previewSrc}
-            className='image-loader__preview-img'
+            alt={alt}
+            className='image-loader__img'
+            src={src}
+            width={width}
+            height={height}
           />
-        }
+        )}
       </div>
     );
   }
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index bb9723f5a..91ebd91fd 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1099,20 +1099,22 @@
 
 .image-loader {
   position: relative;
-}
 
-.image-loader__preview-img {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  filter: blur(2px);
-}
+  &.image-loader--loading {
+    .image-loader__preview-canvas {
+      filter: blur(2px);
+    }
+  }
 
-.media-modal img.image-loader__preview-img {
-  width: 100%;
-  height: 100%;
+  .image-loader__img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    width: 100%;
+    height: 100%;
+    background-image: none;
+  }
 }
 
 .navigation-bar {
@@ -2933,6 +2935,7 @@ button.icon-button.active i.fa-retweet {
   position: relative;
 
   img,
+  canvas,
   video {
     max-width: 80vw;
     max-height: 80vh;
@@ -2940,7 +2943,8 @@ button.icon-button.active i.fa-retweet {
     height: auto;
   }
 
-  img {
+  img,
+  canvas {
     display: block;
     background: url('../images/void.png') repeat;
   }

From e2dd576a1b20c324c88afadaaa4f23e554b73ec7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 27 Jun 2017 20:46:11 +0900
Subject: [PATCH 093/382] Update dependencies for Node.js (#3967)

* Update @storybook/addon-actions to v3.1.6

* Update @storybook/react to v3.1.6

* Update babel-loader to v7.1.0

* Update babel-plugin-transform-react-remove-prop-types to v0.4.6

* Update enzyme to v2.9.1

* Update fsevents to v1.1.2

* Update intersection-observer to v0.3.2

* Update npmlog to v4.1.2

* Update pg to v6.4.0

* Update postcss-loader to v2.0.6

* Update rails-ujs to v5.1.2

* Update react to v15.6.1

* Update react-addons-shallow-compare to v15.6.0

* Update react-dom to v15.6.0

* Update react-notification to v6.7.1

* Update react-test-renderer to v15.6.1

* Update react-textarea-autosize to v5.0.7

* Update redux to v3.7.1

* Update resolve-url-loader to v2.1.0

* Update sass-loader to v6.0.6

* Update sinon to v2.3.5

* Update stringz to v0.2.2

* Update uuid to v3.1.0

* Update websocket.js to v0.1.12

* Update yargs to v8.0.2

* yarn upgrade
---
 package.json |  48 ++---
 yarn.lock    | 567 +++++++++++++++++++++++++++++----------------------
 2 files changed, 348 insertions(+), 267 deletions(-)

diff --git a/package.json b/package.json
index 4b967bad7..60f9af1e9 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "axios": "^0.16.2",
     "babel-cli": "^6.24.1",
     "babel-core": "^6.25.0",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.0",
     "babel-plugin-lodash": "^3.2.11",
     "babel-plugin-react-intl": "^2.3.1",
     "babel-plugin-react-transform": "^2.0.2",
@@ -35,7 +35,7 @@
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-plugin-transform-react-jsx-self": "^6.22.0",
     "babel-plugin-transform-react-jsx-source": "^6.22.0",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.5",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.6",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.5.2",
     "babel-preset-react": "^6.24.1",
@@ -55,7 +55,7 @@
     "glob": "^7.1.1",
     "http-link-header": "^0.8.0",
     "immutable": "^3.8.1",
-    "intersection-observer": "^0.3.0",
+    "intersection-observer": "^0.3.2",
     "intl": "^1.2.5",
     "intl-relativeformat": "^1.3.0",
     "is-nan": "^1.2.1",
@@ -65,71 +65,71 @@
     "marky": "^1.2.0",
     "mkdirp": "^0.5.1",
     "node-sass": "^4.5.2",
-    "npmlog": "^4.1.0",
+    "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
     "path-complete-extname": "^0.1.0",
-    "pg": "^6.2.4",
-    "postcss-loader": "^2.0.5",
+    "pg": "^6.4.0",
+    "postcss-loader": "^2.0.6",
     "postcss-smart-import": "^0.7.4",
     "precss": "^1.4.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
-    "rails-ujs": "^5.1.1",
-    "react": "^15.6.0",
+    "rails-ujs": "^5.1.2",
+    "react": "^15.6.1",
     "react-addons-perf": "^15.4.2",
-    "react-addons-shallow-compare": "^15.5.2",
-    "react-dom": "^15.6.0",
+    "react-addons-shallow-compare": "^15.6.0",
+    "react-dom": "^15.6.1",
     "react-immutable-proptypes": "^2.1.0",
     "react-immutable-pure-component": "^1.0.0",
     "react-intl": "^2.3.0",
     "react-motion": "^0.5.0",
-    "react-notification": "^6.7.0",
+    "react-notification": "^6.7.1",
     "react-redux": "^5.0.4",
     "react-redux-loading-bar": "^2.9.2",
     "react-router-dom": "^4.1.1",
     "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
     "react-swipeable": "^4.0.1",
-    "react-textarea-autosize": "^5.0.6",
+    "react-textarea-autosize": "^5.0.7",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
-    "redux": "^3.6.0",
+    "redux": "^3.7.1",
     "redux-immutable": "^4.0.0",
     "redux-thunk": "^2.2.0",
     "requestidlecallback": "^0.3.0",
     "reselect": "^3.0.1",
-    "resolve-url-loader": "^2.0.2",
+    "resolve-url-loader": "^2.1.0",
     "rimraf": "^2.6.1",
-    "sass-loader": "^6.0.5",
-    "stringz": "^0.2.1",
+    "sass-loader": "^6.0.6",
+    "stringz": "^0.2.2",
     "style-loader": "^0.18.2",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
-    "uuid": "^3.0.1",
+    "uuid": "^3.1.0",
     "uws": "^0.14.5",
     "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-manifest-plugin": "^1.1.0",
     "webpack-merge": "^4.1.0",
-    "websocket.js": "^0.1.10"
+    "websocket.js": "^0.1.12"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.1.2",
-    "@storybook/react": "^3.1.3",
+    "@storybook/addon-actions": "^3.1.6",
+    "@storybook/react": "^3.1.6",
     "babel-eslint": "^7.2.3",
     "chai": "^4.0.1",
     "chai-enzyme": "^0.7.1",
-    "enzyme": "^2.8.2",
+    "enzyme": "^2.9.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.3",
     "jsdom": "^10.1.0",
     "mocha": "^3.4.1",
     "react-intl-translations-manager": "^5.0.0",
-    "react-test-renderer": "^15.5.4",
-    "sinon": "^2.3.4",
+    "react-test-renderer": "^15.6.1",
+    "sinon": "^2.3.5",
     "webpack-dev-server": "lencioni/webpack-dev-server#patch-1",
-    "yargs": "^8.0.1"
+    "yargs": "^8.0.2"
   },
   "optionalDependencies": {
     "fsevents": "*"
diff --git a/yarn.lock b/yarn.lock
index d1a1687a0..b8af49d62 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,37 +2,38 @@
 # yarn lockfile v1
 
 
-"@storybook/addon-actions@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.1.2.tgz#0f28ae69277964d098fcd5e3f4a74b09a233a48c"
+"@storybook/addon-actions@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.1.6.tgz#0cbf00ede57ff00d1dfe02e554043d6963940064"
   dependencies:
-    "@storybook/addons" "^3.1.2"
+    "@storybook/addons" "^3.1.6"
     deep-equal "^1.0.1"
     json-stringify-safe "^5.0.1"
     prop-types "^15.5.8"
     react-inspector "^2.0.0"
+    uuid "^3.1.0"
 
-"@storybook/addon-links@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.1.2.tgz#43d34eb7ee8c056d13f854ec1fe9d1cd90889706"
+"@storybook/addon-links@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-links/-/addon-links-3.1.6.tgz#62c8a839e54ff0adb04c6023dae467b336ced5d9"
   dependencies:
-    "@storybook/addons" "^3.1.2"
+    "@storybook/addons" "^3.1.6"
 
-"@storybook/addons@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.1.2.tgz#6ea3f1e14e303ff5ad481dd424211f8230df878b"
+"@storybook/addons@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-3.1.6.tgz#29ef2348550f5a74d5e83dd75d04714cac751c39"
 
-"@storybook/channel-postmessage@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.1.2.tgz#a8a6eec904c6d37b938db9f8251ee760b1c3556c"
+"@storybook/channel-postmessage@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channel-postmessage/-/channel-postmessage-3.1.6.tgz#867768a2ca2efbd796432300fe5e9b834d9c2ca5"
   dependencies:
-    "@storybook/channels" "^3.1.2"
+    "@storybook/channels" "^3.1.6"
     global "^4.3.2"
     json-stringify-safe "^5.0.1"
 
-"@storybook/channels@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.1.2.tgz#56f9bb6acf0c2ff58123f1fccadc8498d5372b70"
+"@storybook/channels@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-3.1.6.tgz#81d61591bf7613dd2bcd81d26da40aeaa2899034"
 
 "@storybook/react-fuzzy@^0.4.0":
   version "0.4.0"
@@ -43,15 +44,15 @@
     fuse.js "^3.0.1"
     prop-types "^15.5.9"
 
-"@storybook/react@^3.1.3":
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.1.3.tgz#e2d7d2ecf4d7ff3dfab1d7b324e2c19e04be5934"
+"@storybook/react@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.1.6.tgz#9393bb987ff08ee5f49c4557d12eb84377dee5d2"
   dependencies:
-    "@storybook/addon-actions" "^3.1.2"
-    "@storybook/addon-links" "^3.1.2"
-    "@storybook/addons" "^3.1.2"
-    "@storybook/channel-postmessage" "^3.1.2"
-    "@storybook/ui" "^3.1.3"
+    "@storybook/addon-actions" "^3.1.6"
+    "@storybook/addon-links" "^3.1.6"
+    "@storybook/addons" "^3.1.6"
+    "@storybook/channel-postmessage" "^3.1.6"
+    "@storybook/ui" "^3.1.6"
     airbnb-js-shims "^1.1.1"
     autoprefixer "^7.1.1"
     babel-core "^6.24.1"
@@ -72,6 +73,8 @@
     express "^4.15.3"
     file-loader "^0.11.1"
     find-cache-dir "^1.0.0"
+    glamor "^2.20.25"
+    glamorous "^3.22.1"
     global "^4.3.2"
     json-loader "^0.5.4"
     json-stringify-safe "^5.0.1"
@@ -94,9 +97,9 @@
     webpack-dev-middleware "^1.10.2"
     webpack-hot-middleware "^2.18.0"
 
-"@storybook/ui@^3.1.3":
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.1.3.tgz#806c6bc4474b1437edf305c50b88662869ad5c31"
+"@storybook/ui@^3.1.6":
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/@storybook/ui/-/ui-3.1.6.tgz#5d47c6003a2d78c06ede43861089747d986d918e"
   dependencies:
     "@storybook/react-fuzzy" "^0.4.0"
     babel-runtime "^6.23.0"
@@ -204,10 +207,12 @@ ajv@^4.7.0, ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^5.0.0, ajv@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.1.5.tgz#8734931b601f00d4feef7c65738d77d1b65d1f68"
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
   dependencies:
     co "^4.6.0"
+    fast-deep-equal "^0.1.0"
+    json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
 align-text@^0.1.1, align-text@^0.1.3:
@@ -238,6 +243,10 @@ ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
 
+ansi-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -397,8 +406,8 @@ async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.2, async@^2.1.4, async@^2.1.5:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.4.1.tgz#62a56b279c98a11d0987096a01cc3eeb8eb7bbd7"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
     lodash "^4.14.0"
 
@@ -648,11 +657,11 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
+babel-loader@^7.0.0, babel-loader@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
   dependencies:
-    find-cache-dir "^0.1.1"
+    find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
     mkdirp "^0.5.1"
 
@@ -1057,9 +1066,9 @@ babel-plugin-transform-react-jsx@6.24.1, babel-plugin-transform-react-jsx@^6.24.
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-remove-prop-types@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.5.tgz#79d1958437ae23d4fbc0b11d1a041498ddb23877"
+babel-plugin-transform-react-remove-prop-types@^0.4.6:
+  version "0.4.6"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.6.tgz#c3d20ff4e97fb08fa63e86a97b2daab6ad365a19"
   dependencies:
     babel-traverse "^6.24.1"
 
@@ -1316,8 +1325,8 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     to-fast-properties "^1.0.1"
 
 babylon@^6.17.0, babylon@^6.17.2:
-  version "6.17.3"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.3.tgz#1327d709950b558f204e5352587fd0290f8d8e48"
+  version "6.17.4"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
 babylon@~5.8.3:
   version "5.8.38"
@@ -1337,13 +1346,17 @@ balanced-match@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
 
-balanced-match@^0.4.1, balanced-match@^0.4.2:
+balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
 base64-js@^1.0.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
 
 batch@0.6.1:
   version "0.6.1"
@@ -1370,8 +1383,8 @@ block-stream@*:
     inherits "~2.0.0"
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -1399,10 +1412,10 @@ bowser@^1.6.0:
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-1.7.0.tgz#169de4018711f994242bff9a8009e77a1f35e003"
 
 brace-expansion@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
   dependencies:
-    balanced-match "^0.4.1"
+    balanced-match "^1.0.0"
     concat-map "0.0.1"
 
 braces@^1.8.2:
@@ -1413,6 +1426,10 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
+brcast@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.0.tgz#9e627ab82209895664c1d6c1f45cd8c43422e3f6"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1480,11 +1497,11 @@ browserslist@^1.3.6, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7
     electron-to-chromium "^1.2.7"
 
 browserslist@^2.1.2, browserslist@^2.1.3:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
   dependencies:
-    caniuse-lite "^1.0.30000670"
-    electron-to-chromium "^1.3.11"
+    caniuse-lite "^1.0.30000684"
+    electron-to-chromium "^1.3.14"
 
 buffer-indexof@^1.0.0:
   version "1.1.0"
@@ -1561,12 +1578,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000683"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000683.tgz#58b57ed1e0bb9da54eaf1462985147bbe16679fa"
+  version "1.0.30000696"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000696.tgz#e71f5c61e1f96c7a3af4e791ac5db55e11737604"
 
-caniuse-lite@^1.0.30000670:
-  version "1.0.30000683"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000683.tgz#a7573707cf2acc9217ca6484d1dfbc9f13898364"
+caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
+  version "1.0.30000696"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
 
 case-sensitive-paths-webpack-plugin@^2.0.0:
   version "2.1.1"
@@ -1662,8 +1679,8 @@ circular-json@^0.3.1:
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.1.tgz#be8b36aefccde8b3ca7aa2d6afc07a37242c0d2d"
 
 clap@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.0.tgz#59c90fe3e137104746ff19469a27a634ff68c857"
   dependencies:
     chalk "^1.1.3"
 
@@ -1697,14 +1714,13 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
-clone-deep@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.2.4.tgz#4e73dd09e9fb971cc38670c5dced9c1896481cc6"
+clone-deep@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-0.3.0.tgz#348c61ae9cdbe0edfe053d91ff4cc521d790ede8"
   dependencies:
-    for-own "^0.1.3"
+    for-own "^1.0.0"
     is-plain-object "^2.0.1"
-    kind-of "^3.0.2"
-    lazy-cache "^1.0.3"
+    kind-of "^3.2.2"
     shallow-clone "^0.1.2"
 
 clone@^1.0.2:
@@ -1726,8 +1742,8 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 collapse-white-space@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.2.tgz#9c463fb9c6d190d2dcae21a356a01bcae9eeef6d"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c"
 
 color-convert@^1.3.0:
   version "1.9.0"
@@ -1771,12 +1787,18 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.9.0, commander@^2.8.1, commander@^2.9.0:
+commander@2.9.0:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@^2.8.1, commander@^2.9.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.10.0.tgz#e1f5d3245de246d1a5ca04702fa1ad1bd7e405fe"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
 common-tags@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.4.0.tgz#1187be4f3d4cf0c0427d43f74eef1f73501614c0"
@@ -1937,9 +1959,9 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-create-react-class@^15.5.2, create-react-class@^15.5.3:
-  version "15.5.3"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.3.tgz#fb0f7cae79339e9a179e194ef466efa3923820fe"
+create-react-class@^15.5.2, create-react-class@^15.5.3, create-react-class@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.0.tgz#ab448497c26566e1e29413e883207d57cfe7bed4"
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
@@ -2397,7 +2419,7 @@ ejs@^2.5.6:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.11:
+electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
   version "1.3.14"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
 
@@ -2464,20 +2486,20 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
-enzyme@^2.8.2:
-  version "2.8.2"
-  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.8.2.tgz#6c8bcb05012abc4aa4bc3213fb23780b9b5b1714"
+enzyme@^2.9.1:
+  version "2.9.1"
+  resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-2.9.1.tgz#07d5ce691241240fb817bf2c4b18d6e530240df6"
   dependencies:
     cheerio "^0.22.0"
     function.prototype.name "^1.0.0"
     is-subset "^0.1.1"
-    lodash "^4.17.2"
+    lodash "^4.17.4"
     object-is "^1.0.1"
     object.assign "^4.0.4"
-    object.entries "^1.0.3"
-    object.values "^1.0.3"
-    prop-types "^15.5.4"
-    uuid "^2.0.3"
+    object.entries "^1.0.4"
+    object.values "^1.0.4"
+    prop-types "^15.5.10"
+    uuid "^3.0.1"
 
 errno@^0.1.3:
   version "0.1.4"
@@ -2679,24 +2701,20 @@ esquery@^1.0.0:
     estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.1.0.tgz#4713b6536adf7f2ac4f327d559e7756bff648220"
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.0.tgz#fa9568d98d3823f9a41d91e902dcab9ea6e5b163"
   dependencies:
-    estraverse "~4.1.0"
+    estraverse "^4.1.0"
     object-assign "^4.0.1"
 
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
-estraverse@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
-
 esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -2820,10 +2838,18 @@ extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
+fast-deep-equal@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+
 fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+fast-memoize@^2.2.7:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.2.7.tgz#f145c5c22039cedf0a1d4ff6ca592ad0268470ca"
+
 fastparse@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
@@ -2840,7 +2866,7 @@ faye-websocket@~0.11.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fbjs@^0.8.4, fbjs@^0.8.9:
+fbjs@^0.8.4, fbjs@^0.8.8, fbjs@^0.8.9:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
   dependencies:
@@ -2902,14 +2928,6 @@ finalhandler@~1.0.3:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-find-cache-dir@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
-  dependencies:
-    commondir "^1.0.1"
-    mkdirp "^0.5.1"
-    pkg-dir "^1.0.0"
-
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -2945,8 +2963,8 @@ flatten@^1.0.2:
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
 follow-redirects@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.3.tgz#01abaeca85e3609837d9fcda3167a7e42fdaca21"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.4.tgz#355e8f4d16876b43f577b0d5ce2668b9723214ea"
   dependencies:
     debug "^2.4.5"
 
@@ -2962,12 +2980,18 @@ for-in@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
-for-own@^0.1.3, for-own@^0.1.4:
+for-own@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
     for-in "^1.0.1"
 
+for-own@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  dependencies:
+    for-in "^1.0.1"
+
 foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
@@ -3036,11 +3060,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@*, fsevents@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4"
   dependencies:
     nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
+    node-pre-gyp "^0.6.36"
 
 fstream-ignore@^1.0.5:
   version "1.0.5"
@@ -3072,8 +3096,8 @@ function.prototype.name@^1.0.0:
     is-callable "^1.1.2"
 
 fuse.js@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.0.4.tgz#cd4e2ec63ac324e28f5d17fcc3d01584379d3717"
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.0.5.tgz#b58d85878802321de94461654947b93af1086727"
 
 fuzzysearch@^1.0.3:
   version "1.0.3"
@@ -3137,6 +3161,25 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glamor@^2.20.25:
+  version "2.20.25"
+  resolved "https://registry.yarnpkg.com/glamor/-/glamor-2.20.25.tgz#71b84b82b67a9327771ac59de53ee915d148a4a3"
+  dependencies:
+    babel-runtime "^6.18.0"
+    fbjs "^0.8.8"
+    object-assign "^4.1.0"
+    prop-types "^15.5.8"
+
+glamorous@^3.22.1:
+  version "3.23.4"
+  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-3.23.4.tgz#a1e5f8045c332850105777dea4d3b21c5bdc4796"
+  dependencies:
+    brcast "^2.0.0"
+    fast-memoize "^2.2.7"
+    html-tag-names "^1.1.1"
+    react-html-attributes "^1.3.0"
+    svg-tag-names "^1.1.0"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -3282,6 +3325,10 @@ has-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
 
+has-flag@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+
 has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -3299,10 +3346,11 @@ hash-base@^2.0.0:
     inherits "^2.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.2.tgz#bf5c887825cfe40b9efde7bf11bd2db26e6bf01b"
   dependencies:
-    inherits "^2.0.1"
+    inherits "^2.0.3"
+    minimalistic-assert "^1.0.0"
 
 hawk@~3.1.3:
   version "3.1.3"
@@ -3314,8 +3362,8 @@ hawk@~3.1.3:
     sntp "1.x.x"
 
 history@^4.5.1, history@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/history/-/history-4.6.1.tgz#911cf8eb65728555a94f2b12780a0c531a14d2fd"
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/history/-/history-4.6.3.tgz#6d723a8712c581d6bef37e8c26f4aedc6eb86967"
   dependencies:
     invariant "^2.2.1"
     loose-envify "^1.2.0"
@@ -3347,8 +3395,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.5.0.tgz#6d60e34b3abbc8313062c3b798ef8d901a07af3c"
 
 hpack.js@^2.1.6:
   version "2.1.6"
@@ -3363,6 +3411,10 @@ html-comment-regex@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
 
+html-element-attributes@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/html-element-attributes/-/html-element-attributes-1.3.0.tgz#f06ebdfce22de979db82020265cac541fb17d4fc"
+
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
@@ -3373,6 +3425,10 @@ html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
 
+html-tag-names@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-tag-names/-/html-tag-names-1.1.2.tgz#f65168964c5a9c82675efda882875dcb2a875c22"
+
 html@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61"
@@ -3494,7 +3550,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3507,8 +3563,8 @@ ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
 inline-style-prefixer@^3.0.2:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.5.tgz#0092881b3a2eadf1bd619dc43726557316f76042"
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.6.tgz#b27fe309b4168a31eaf38c8e8c60ab9e7c11731f"
   dependencies:
     bowser "^1.6.0"
     css-in-js-utils "^1.0.3"
@@ -3541,9 +3597,9 @@ interpret@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
-intersection-observer@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.3.0.tgz#80d581c5507de1114d43a8591952927bb23480a7"
+intersection-observer@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.3.2.tgz#9ed30021c08b29e9e8565c8d512ed84515727433"
 
 intl-format-cache@^2.0.5:
   version "2.0.5"
@@ -3893,6 +3949,10 @@ json-loader@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
 
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+
 json-schema@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
@@ -3952,7 +4012,7 @@ kind-of@^2.0.1:
   dependencies:
     is-buffer "^1.0.2"
 
-kind-of@^3.0.2:
+kind-of@^3.0.2, kind-of@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   dependencies:
@@ -4023,7 +4083,7 @@ loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.x:
+loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   dependencies:
@@ -4531,7 +4591,7 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
-node-pre-gyp@^0.6.29, node-pre-gyp@^0.6.4:
+node-pre-gyp@^0.6.36, node-pre-gyp@^0.6.4:
   version "0.6.36"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.36.tgz#db604112cb74e0d477554e9b505b17abddfab786"
   dependencies:
@@ -4591,8 +4651,8 @@ nopt@^4.0.1:
     osenv "^0.1.4"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -4624,9 +4684,9 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.0.tgz#dc59bee85f64f00ed424efb2af0783df25d1c0b5"
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2, npmlog@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   dependencies:
     are-we-there-yet "~1.1.2"
     console-control-strings "~1.1.0"
@@ -4648,8 +4708,8 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
 "nwmatcher@>= 1.3.9 < 2.0.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.0.tgz#b4389362170e7ef9798c3c7716d80ebc0106fccf"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
 oauth-sign@~0.8.1:
   version "0.8.2"
@@ -4683,7 +4743,7 @@ object.assign@^4.0.4:
     function-bind "^1.1.0"
     object-keys "^1.0.10"
 
-object.entries@^1.0.3:
+object.entries@^1.0.3, object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
   dependencies:
@@ -4706,7 +4766,7 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-object.values@^1.0.3:
+object.values@^1.0.3, object.values@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
   dependencies:
@@ -4952,8 +5012,8 @@ pg-connection-string@0.1.3:
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-0.1.3.tgz#da1847b20940e42ee1492beaf65d49d91b245df7"
 
 pg-pool@1.*:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.7.1.tgz#421105cb7469979dcc48d6fc4fe3fe4659437437"
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-1.8.0.tgz#f7ec73824c37a03f076f51bfdf70e340147c4f37"
   dependencies:
     generic-pool "2.4.3"
     object-assign "4.1.0"
@@ -4968,9 +5028,9 @@ pg-types@1.*:
     postgres-date "~1.0.0"
     postgres-interval "^1.1.0"
 
-pg@^6.2.4:
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-6.2.4.tgz#4f7ede70241e97506627d5d6078360701a647c45"
+pg@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-6.4.0.tgz#cb76ba2e7c2eab89fc64bf7a9fe648ced72436dc"
   dependencies:
     buffer-writer "1.0.1"
     packet-reader "0.3.1"
@@ -5014,12 +5074,6 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
-pkg-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
-  dependencies:
-    find-up "^1.0.0"
-
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -5164,7 +5218,7 @@ postcss-flexbugs-fixes@^3.0.0:
   dependencies:
     postcss "^6.0.1"
 
-postcss-load-config@^1.x:
+postcss-load-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
@@ -5187,14 +5241,14 @@ postcss-load-plugins@^2.3.0:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
-postcss-loader@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.5.tgz#c19d3e8b83eb1ac316f5621ef4c0ef5b3d1b8b3a"
+postcss-loader@^2.0.5, postcss-loader@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.0.6.tgz#8c7e0055a3df1889abc6bad52dd45b2f41bbc6fc"
   dependencies:
-    loader-utils "^1.x"
-    postcss "^6.x"
-    postcss-load-config "^1.x"
-    schema-utils "^0.x"
+    loader-utils "^1.1.0"
+    postcss "^6.0.2"
+    postcss-load-config "^1.2.0"
+    schema-utils "^0.3.0"
 
 postcss-media-minmax@^2.1.0:
   version "2.1.2"
@@ -5380,10 +5434,10 @@ postcss-sass@^0.1.0:
     postcss "^5.2.6"
 
 postcss-scss@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.1.tgz#71e6baa2bc5688ffc5bca6abc4a8199badea8fb6"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94"
   dependencies:
-    postcss "^6.0.1"
+    postcss "^6.0.3"
 
 postcss-selector-matches@^2.0.0:
   version "2.0.5"
@@ -5467,13 +5521,13 @@ postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.x:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b"
   dependencies:
     chalk "^1.1.3"
     source-map "^0.5.6"
-    supports-color "^3.2.3"
+    supports-color "^4.0.0"
 
 postgres-array@~1.0.0:
   version "1.0.2"
@@ -5557,12 +5611,12 @@ promise-each@^2.2.0:
     any-promise "^0.1.0"
 
 promise@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@~15.5.7:
+prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9:
   version "15.5.10"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
   dependencies:
@@ -5643,9 +5697,9 @@ raf@^3.1.0:
   dependencies:
     performance-now "^2.1.0"
 
-rails-ujs@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.1.1.tgz#0d6e660533141f1ac352830b31c5bfe1b58f79aa"
+rails-ujs@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/rails-ujs/-/rails-ujs-5.1.2.tgz#94919e35e7fa07467223e9c81444704593559ef5"
 
 randomatic@^1.1.3:
   version "1.1.7"
@@ -5680,16 +5734,16 @@ react-addons-perf@^15.4.2:
     fbjs "^0.8.4"
     object-assign "^4.1.0"
 
-react-addons-shallow-compare@>=0.14.0, react-addons-shallow-compare@^15.5.2:
-  version "15.5.2"
-  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.5.2.tgz#7cb0ee7acc8d7c93fcc202df0bf47ba916a7bdad"
+react-addons-shallow-compare@>=0.14.0, react-addons-shallow-compare@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.0.tgz#b7a4e5ff9f2704c20cf686dd8a05dd08b26de252"
   dependencies:
     fbjs "^0.8.4"
     object-assign "^4.1.0"
 
 react-docgen@^2.15.0:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.15.0.tgz#11aced462256e4862b14e6af6e46bdcefacb28bb"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/react-docgen/-/react-docgen-2.16.0.tgz#03c9eba935de8031d791ab62657b7b6606ec5da6"
   dependencies:
     async "^2.1.4"
     babel-runtime "^6.9.2"
@@ -5699,14 +5753,18 @@ react-docgen@^2.15.0:
     node-dir "^0.1.10"
     recast "^0.11.5"
 
-react-dom@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.0.tgz#8bc23cb0c80e706355b76ca9f8ce47cf7bdfb6d1"
+react-dom-factories@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.0.tgz#f43c05e5051b304f33251618d5bc859b29e46b6d"
+
+react-dom@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.1.tgz#2cb0ed4191038e53c209eb3a79a23e2a4cf99470"
   dependencies:
     fbjs "^0.8.9"
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
-    prop-types "~15.5.7"
+    prop-types "^15.5.10"
 
 react-element-to-jsx-string@^5.0.0:
   version "5.0.7"
@@ -5719,6 +5777,12 @@ react-element-to-jsx-string@^5.0.0:
     stringify-object "2.4.0"
     traverse "^0.6.6"
 
+react-html-attributes@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/react-html-attributes/-/react-html-attributes-1.3.0.tgz#c97896e9cac47ad9c4e6618b835029a826f5d28c"
+  dependencies:
+    html-element-attributes "^1.0.0"
+
 react-immutable-proptypes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4"
@@ -5773,14 +5837,15 @@ react-komposer@^2.0.0:
     shallowequal "^0.2.2"
 
 react-modal@^1.7.6, react-modal@^1.7.7:
-  version "1.7.12"
-  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-1.7.12.tgz#d3e29c07ddff8cd44c723a92dcd15e66a51a95bc"
+  version "1.9.7"
+  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-1.9.7.tgz#07ef56790b953e3b98ef1e2989e347983c72871d"
   dependencies:
     create-react-class "^15.5.2"
     element-class "^0.2.0"
     exenv "1.2.0"
     lodash.assign "^4.2.0"
     prop-types "^15.5.7"
+    react-dom-factories "^1.0.0"
 
 react-motion@^0.5.0:
   version "0.5.0"
@@ -5790,11 +5855,11 @@ react-motion@^0.5.0:
     prop-types "^15.5.8"
     raf "^3.1.0"
 
-react-notification@^6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/react-notification/-/react-notification-6.7.0.tgz#58f16976b0850d6a6c70e078796b82032d5301e2"
+react-notification@^6.7.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/react-notification/-/react-notification-6.7.1.tgz#fec45cc6d369f4bbf7b4072fe58ddb3bc262c898"
   dependencies:
-    prop-types "^15.5.8"
+    prop-types "^15.5.10"
 
 react-redux-loading-bar@^2.9.2:
   version "2.9.2"
@@ -5882,16 +5947,16 @@ react-swipeable@^4.0.1:
   dependencies:
     prop-types "^15.5.8"
 
-react-test-renderer@^15.5.4:
-  version "15.5.4"
-  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc"
+react-test-renderer@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.1.tgz#026f4a5bb5552661fd2cc4bbcd0d4bc8a35ebf7e"
   dependencies:
     fbjs "^0.8.9"
     object-assign "^4.1.0"
 
-react-textarea-autosize@^5.0.6:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.0.6.tgz#a3742e0a319484021b4dbfa1519df287768f2133"
+react-textarea-autosize@^5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.0.7.tgz#cad511cf1111ab1482fbc8bd679d5d41e8e52b1f"
   dependencies:
     prop-types "^15.5.8"
 
@@ -5902,8 +5967,8 @@ react-toggle@^4.0.1:
     classnames "^2.2.5"
 
 react-virtualized@^9.7.4:
-  version "9.7.6"
-  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.7.6.tgz#6be9e7ae8b214a848116f1ebd48ff1aac26fcc2f"
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.8.0.tgz#7c1fe9b723ce39a1c4916cabe1c4f1bda5dbc04b"
   dependencies:
     babel-runtime "^6.11.6"
     classnames "^2.2.3"
@@ -5911,15 +5976,15 @@ react-virtualized@^9.7.4:
     loose-envify "^1.3.0"
     prop-types "^15.5.4"
 
-react@>=0.14.0, react@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.6.0.tgz#c23299b48e30ed302508ce89e1a02c919f826bce"
+react@>=0.14.0, react@^15.6.1:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"
   dependencies:
-    create-react-class "^15.5.2"
+    create-react-class "^15.6.0"
     fbjs "^0.8.9"
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
-    prop-types "^15.5.7"
+    prop-types "^15.5.10"
 
 read-cache@^1.0.0:
   version "1.0.0"
@@ -5958,14 +6023,14 @@ read-pkg@^2.0.0:
     path-type "^2.0.0"
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
-  version "2.2.11"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.11.tgz#0796b31f8d7688007ff0b93a8088d34aa17c0f72"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d"
   dependencies:
     core-util-is "~1.0.0"
-    inherits "~2.0.1"
+    inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    safe-buffer "~5.0.1"
+    safe-buffer "~5.1.0"
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
@@ -6046,14 +6111,14 @@ redux-thunk@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
 
-redux@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-3.6.0.tgz#887c2b3d0b9bd86eca2be70571c27654c19e188d"
+redux@^3.6.0, redux@^3.7.1:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.1.tgz#bfc535c757d3849562ead0af18ac52122cd7268e"
   dependencies:
     lodash "^4.2.1"
     lodash-es "^4.2.1"
     loose-envify "^1.1.0"
-    symbol-observable "^1.0.2"
+    symbol-observable "^1.0.3"
 
 regenerate@^1.2.1:
   version "1.3.2"
@@ -6206,9 +6271,9 @@ resolve-pathname@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.1.0.tgz#e8358801b86b83b17560d4e3c382d7aef2100944"
 
-resolve-url-loader@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.3.tgz#f54cd1b040e8f0ab72b2cb32c9fbb8544152d9e9"
+resolve-url-loader@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.1.0.tgz#27c95cc16a4353923fdbdc2dbaf5eef22232c477"
   dependencies:
     adjust-sourcemap-loader "^1.1.0"
     camelcase "^4.0.0"
@@ -6285,9 +6350,9 @@ safe-buffer@5.0.1, safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.0.tgz#fe4c8460397f9eaaaa58e73be46273408a45e223"
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
 samsam@1.x, samsam@^1.1.3:
   version "1.2.1"
@@ -6302,21 +6367,21 @@ sass-graph@^2.1.1:
     scss-tokenizer "^0.2.3"
     yargs "^7.0.0"
 
-sass-loader@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.5.tgz#a847910f36442aa56c5985879d54eb519e24a328"
+sass-loader@^6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-6.0.6.tgz#e9d5e6c1f155faa32a4b26d7a9b7107c225e40f9"
   dependencies:
     async "^2.1.5"
-    clone-deep "^0.2.4"
+    clone-deep "^0.3.0"
     loader-utils "^1.0.1"
     lodash.tail "^4.1.1"
-    pify "^2.3.0"
+    pify "^3.0.0"
 
 sax@^1.2.1, sax@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-schema-utils@^0.3.0, schema-utils@^0.x:
+schema-utils@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
   dependencies:
@@ -6466,9 +6531,9 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon@^2.3.4:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.4.tgz#466ad8d1bae86d6db51aa218b92e997bc3e5db88"
+sinon@^2.3.5:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.5.tgz#9a2fc0ff8d526da716f30953aa2c65d518917f6c"
   dependencies:
     diff "^3.1.0"
     formatio "1.2.0"
@@ -6667,8 +6732,8 @@ stream-browserify@^2.0.1:
     readable-stream "^2.0.2"
 
 stream-http@^2.3.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.1.tgz#546a51741ad5a6b07e9e31b0b10441a917df528a"
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
@@ -6693,11 +6758,11 @@ string-width@^1.0.1, string-width@^1.0.2:
     strip-ansi "^3.0.0"
 
 string-width@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.0.0.tgz#635c5436cc72a6e0c387ceca278d4e2eec52687e"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.0.tgz#030664561fc146c9423ec7d978fe2457437fe6d0"
   dependencies:
     is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^3.0.0"
+    strip-ansi "^4.0.0"
 
 string.prototype.padend@^3.0.0:
   version "3.0.0"
@@ -6720,10 +6785,10 @@ string_decoder@^0.10.25:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
 string_decoder@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.2.tgz#b29e1f4e1125fa97a10382b8a533737b7491e179"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
-    safe-buffer "~5.0.1"
+    safe-buffer "~5.1.0"
 
 stringify-object@2.4.0:
   version "2.4.0"
@@ -6736,9 +6801,9 @@ stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
 
-stringz@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/stringz/-/stringz-0.2.1.tgz#9f134564e086b4a35f99b6efc1dd88a8d9cb7e4e"
+stringz@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stringz/-/stringz-0.2.2.tgz#0c23c48c4933928be4fee8e2c83f71c3b1e077ba"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
@@ -6746,6 +6811,12 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
+strip-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+  dependencies:
+    ansi-regex "^3.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -6805,6 +6876,16 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.0.0.tgz#33a7c680aa512c9d03ef929cacbb974d203d2790"
+  dependencies:
+    has-flag "^2.0.0"
+
+svg-tag-names@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/svg-tag-names/-/svg-tag-names-1.1.1.tgz#9641b29ef71025ee094c7043f7cdde7d99fbd50a"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -6817,7 +6898,7 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
-symbol-observable@^1.0.2:
+symbol-observable@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
 
@@ -6979,8 +7060,8 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 ua-parser-js@^0.7.9:
-  version "0.7.12"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+  version "0.7.13"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.13.tgz#cd9dd2f86493b3f44dbeeef3780fda74c5ee14be"
 
 uglify-js@^2.8.27, uglify-js@^2.8.29:
   version "2.8.29"
@@ -7040,8 +7121,8 @@ urix@^0.1.0, urix@~0.1.0:
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
 url-loader@^0.5.8:
-  version "0.5.8"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.8.tgz#b9183b1801e0f847718673673040bc9dc1c715c5"
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-0.5.9.tgz#cc8fea82c7b906e7777019250869e569e995c295"
   dependencies:
     loader-utils "^1.0.2"
     mime "1.3.x"
@@ -7091,13 +7172,13 @@ utils-merge@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.0.tgz#0294fb922bb9375153541c4f7096231f287c8af8"
 
-uuid@^2.0.2, uuid@^2.0.3:
+uuid@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
 
-uuid@^3.0.0, uuid@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
 uws@^0.14.5:
   version "0.14.5"
@@ -7325,9 +7406,9 @@ websocket-extensions@>=0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.1.tgz#76899499c184b6ef754377c2dbb0cd6cb55d29e7"
 
-websocket.js@^0.1.10:
-  version "0.1.10"
-  resolved "https://registry.yarnpkg.com/websocket.js/-/websocket.js-0.1.10.tgz#6bad57a24d0210561018294b49234d21fa9fd7ee"
+websocket.js@^0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/websocket.js/-/websocket.js-0.1.12.tgz#46c980787c57ebc8edcf44a0263e5d639367b85b"
   dependencies:
     backoff "^2.4.1"
 
@@ -7490,9 +7571,9 @@ yargs@^7.0.0:
     y18n "^3.2.1"
     yargs-parser "^5.0.0"
 
-yargs@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.1.tgz#420ef75e840c1457a80adcca9bc6fa3849de51aa"
+yargs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
   dependencies:
     camelcase "^4.1.0"
     cliui "^3.2.0"

From be92babd008a7356738dec1aa7f36500638d00e5 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 27 Jun 2017 13:46:37 +0200
Subject: [PATCH 094/382] Responsive images in media gallery (#3963)

* feat(components/media_gallery): Responsive images

* fix(components/media_gallery): Link to image URL
---
 .../mastodon/components/media_gallery.js       | 18 ++++++++++++++----
 app/javascript/styles/components.scss          | 11 ++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 78ff35130..2cb1ce51c 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -85,14 +85,24 @@ class Item extends React.PureComponent {
     let thumbnail = '';
 
     if (attachment.get('type') === 'image') {
+      const previewUrl = attachment.get('preview_url');
+      const previewWidth = attachment.getIn(['meta', 'small', 'width']);
+
+      const originalUrl = attachment.get('url');
+      const originalWidth = attachment.getIn(['meta', 'original', 'width']);
+
+      const srcSet = `${originalUrl} ${originalWidth}w, ${previewUrl} ${previewWidth}w`;
+      const sizes = `(min-width: 1025px) ${320 * (width / 100)}px, ${width}vw`;
+
       thumbnail = (
-        <a // eslint-disable-line jsx-a11y/anchor-has-content
+        <a
           className='media-gallery__item-thumbnail'
-          href={attachment.get('remote_url') || attachment.get('url')}
+          href={attachment.get('remote_url') || originalUrl}
           onClick={this.handleClick}
           target='_blank'
-          style={{ backgroundImage: `url(${attachment.get('preview_url')})` }}
-        />
+        >
+          <img src={previewUrl} srcSet={srcSet} sizes={sizes} alt='' />
+        </a>
       );
     } else if (attachment.get('type') === 'gifv') {
       const autoPlay = !isIOS() && this.props.autoPlayGif;
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 91ebd91fd..84732ed4a 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3453,10 +3453,15 @@ button.icon-button.active i.fa-retweet {
   background-repeat: no-repeat;
   background-size: cover;
   cursor: zoom-in;
-  display: block;
-  height: 100%;
+  display: flex;
+  align-items: center;
   text-decoration: none;
-  width: 100%;
+  height: 100%;
+
+  &,
+  img {
+    width: 100%;
+  }
 }
 
 .media-gallery__gifv {

From da9317fa56d2b38e74781aa3a8dc6920298f824d Mon Sep 17 00:00:00 2001
From: Debanshu Kundu <debanshu.kundu@joshtechnologygroup.com>
Date: Tue, 27 Jun 2017 17:48:53 +0530
Subject: [PATCH 095/382]  #1456 Added rake task to add a user. (#1482)

---
 lib/tasks/mastodon.rake | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 6c7326b74..0e182c755 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -42,6 +42,37 @@ namespace :mastodon do
     end
   end
 
+  desc 'Add a user by providing their email, username and initial password.' \
+       'The user will receive a confirmation email, then they must reset their password before logging in.'
+  task add_user: :environment do
+    print 'Enter email: '
+    email = STDIN.gets.chomp
+
+    print 'Enter username: '
+    username = STDIN.gets.chomp
+
+    print 'Create user and send them confirmation mail [y/N]: '
+    confirm = STDIN.gets.chomp
+    puts
+
+    if confirm.casecmp?('y')
+      password = SecureRandom.hex
+      user = User.new(email: email, password: password, account_attributes: { username: username })
+      if user.save
+        puts 'User added and confirmation mail sent to user\'s email address.'
+        puts "Here is the random password generated for the user: #{password}"
+      else
+        puts 'Following errors occured while creating new user:'
+        user.errors.each do |key, val|
+          puts "#{key}: #{val}"
+        end
+      end
+    else
+      puts 'Aborted by user.'
+    end
+    puts
+  end
+
   namespace :media do
     desc 'Removes media attachments that have not been assigned to any status for longer than a day'
     task clear: :environment do

From 16d0aed403485e5a98afd9cbf7e35bb929443731 Mon Sep 17 00:00:00 2001
From: Midgard <M1dgard@users.noreply.github.com>
Date: Tue, 27 Jun 2017 14:22:36 +0200
Subject: [PATCH 096/382] Use instance name in email notifications instead of
 "Mastodon" (#3763)

* Use instance name in "password changed" mail

instead of "Mastodon".

Fixes tootsuite#2620.

* Use instance name in password reset mail

instead of "Mastodon".
---
 app/views/user_mailer/password_change.en.html.erb             | 2 +-
 app/views/user_mailer/password_change.en.text.erb             | 2 +-
 app/views/user_mailer/reset_password_instructions.en.html.erb | 2 +-
 app/views/user_mailer/reset_password_instructions.en.text.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/user_mailer/password_change.en.html.erb b/app/views/user_mailer/password_change.en.html.erb
index a1bc77463..414e05a29 100644
--- a/app/views/user_mailer/password_change.en.html.erb
+++ b/app/views/user_mailer/password_change.en.html.erb
@@ -1,3 +1,3 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>We're contacting you to notify you that your password on Mastodon has been changed.</p>
+<p>We're contacting you to notify you that your password on <%= @instance %> has been changed.</p>
diff --git a/app/views/user_mailer/password_change.en.text.erb b/app/views/user_mailer/password_change.en.text.erb
index 27581e604..3ae461c97 100644
--- a/app/views/user_mailer/password_change.en.text.erb
+++ b/app/views/user_mailer/password_change.en.text.erb
@@ -1,3 +1,3 @@
 Hello <%= @resource.email %>!
 
-We're contacting you to notify you that your password on Mastodon has been changed.
+We're contacting you to notify you that your password on <%= @instance %> has been changed.
diff --git a/app/views/user_mailer/reset_password_instructions.en.html.erb b/app/views/user_mailer/reset_password_instructions.en.html.erb
index 643b43319..cfb129e22 100644
--- a/app/views/user_mailer/reset_password_instructions.en.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.en.html.erb
@@ -1,6 +1,6 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Someone has requested a link to change your password on Mastodon. You can do this through the link below.</p>
+<p>Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.</p>
 
 <p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
 
diff --git a/app/views/user_mailer/reset_password_instructions.en.text.erb b/app/views/user_mailer/reset_password_instructions.en.text.erb
index fe73b0165..7ed22dc2c 100644
--- a/app/views/user_mailer/reset_password_instructions.en.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.en.text.erb
@@ -1,6 +1,6 @@
 Hello <%= @resource.email %>!
 
-Someone has requested a link to change your password on Mastodon. You can do this through the link below.
+Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.
 
 <%= edit_password_url(@resource, reset_password_token: @token) %>
 

From 12e7c81dd8739a0f83513054c0fda22e098e2458 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Jun 2017 18:07:21 +0200
Subject: [PATCH 097/382] Turn report screen into a modal (#3965)

---
 app/javascript/mastodon/actions/reports.js    |  18 ++-
 .../mastodon/components/status_action_bar.js  |   1 -
 .../account_timeline/components/header.js     |   1 -
 .../features/status/components/action_bar.js  |   1 -
 .../features/ui/components/modal_root.js      |   2 +
 .../components/report_modal.js}               |  72 +++++-------
 app/javascript/mastodon/features/ui/index.js  |   3 -
 .../mastodon/locales/defaultMessages.json     |  17 +++
 app/javascript/mastodon/locales/en.json       |   4 +-
 app/javascript/styles/components.scss         | 104 +++++++-----------
 10 files changed, 98 insertions(+), 125 deletions(-)
 rename app/javascript/mastodon/features/{report/index.js => ui/components/report_modal.js} (60%)

diff --git a/app/javascript/mastodon/actions/reports.js b/app/javascript/mastodon/actions/reports.js
index 9b632be74..b19a07285 100644
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@@ -1,4 +1,5 @@
 import api from '../api';
+import { openModal, closeModal } from './modal';
 
 export const REPORT_INIT   = 'REPORT_INIT';
 export const REPORT_CANCEL = 'REPORT_CANCEL';
@@ -11,10 +12,14 @@ export const REPORT_STATUS_TOGGLE  = 'REPORT_STATUS_TOGGLE';
 export const REPORT_COMMENT_CHANGE = 'REPORT_COMMENT_CHANGE';
 
 export function initReport(account, status) {
-  return {
-    type: REPORT_INIT,
-    account,
-    status,
+  return dispatch => {
+    dispatch({
+      type: REPORT_INIT,
+      account,
+      status,
+    });
+
+    dispatch(openModal('REPORT'));
   };
 };
 
@@ -40,7 +45,10 @@ export function submitReport() {
       account_id: getState().getIn(['reports', 'new', 'account_id']),
       status_ids: getState().getIn(['reports', 'new', 'status_ids']),
       comment: getState().getIn(['reports', 'new', 'comment']),
-    }).then(response => dispatch(submitReportSuccess(response.data))).catch(error => dispatch(submitReportFail(error)));
+    }).then(response => {
+      dispatch(closeModal());
+      dispatch(submitReportSuccess(response.data));
+    }).catch(error => dispatch(submitReportFail(error)));
   };
 };
 
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index edb2d6eb0..fd7c99054 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -87,7 +87,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
 
   handleReport = () => {
     this.props.onReport(this.props.status);
-    this.context.router.history.push('/report');
   }
 
   handleConversationMuteClick = () => {
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index 7f80e39e8..167a2097e 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -38,7 +38,6 @@ export default class Header extends ImmutablePureComponent {
 
   handleReport = () => {
     this.props.onReport(this.props.account);
-    this.context.router.history.push('/report');
   }
 
   handleMute = () => {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index 29080529d..5e150842e 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -56,7 +56,6 @@ export default class ActionBar extends React.PureComponent {
 
   handleReport = () => {
     this.props.onReport(this.props.status);
-    this.context.router.history.push('/report');
   }
 
   render () {
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 2e4f9876d..48b048eb7 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -5,6 +5,7 @@ import OnboardingModal from './onboarding_modal';
 import VideoModal from './video_modal';
 import BoostModal from './boost_modal';
 import ConfirmationModal from './confirmation_modal';
+import ReportModal from './report_modal';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
 
@@ -14,6 +15,7 @@ const MODAL_COMPONENTS = {
   'VIDEO': VideoModal,
   'BOOST': BoostModal,
   'CONFIRM': ConfirmationModal,
+  'REPORT': ReportModal,
 };
 
 export default class ModalRoot extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/report/index.js b/app/javascript/mastodon/features/ui/components/report_modal.js
similarity index 60%
rename from app/javascript/mastodon/features/report/index.js
rename to app/javascript/mastodon/features/ui/components/report_modal.js
index bfb09e193..c989d2c9b 100644
--- a/app/javascript/mastodon/features/report/index.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@@ -1,19 +1,17 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { changeReportComment, submitReport } from '../../actions/reports';
-import { refreshAccountTimeline } from '../../actions/timelines';
+import { changeReportComment, submitReport } from '../../../actions/reports';
+import { refreshAccountTimeline } from '../../../actions/timelines';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import Column from '../ui/components/column';
-import Button from '../../components/button';
-import { makeGetAccount } from '../../selectors';
+import { makeGetAccount } from '../../../selectors';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
-import StatusCheckBox from './containers/status_check_box_container';
+import StatusCheckBox from '../../report/containers/status_check_box_container';
 import Immutable from 'immutable';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import Button from '../../../components/button';
 
 const messages = defineMessages({
-  heading: { id: 'report.heading', defaultMessage: 'New report' },
   placeholder: { id: 'report.placeholder', defaultMessage: 'Additional comments' },
   submit: { id: 'report.submit', defaultMessage: 'Submit' },
 });
@@ -37,11 +35,7 @@ const makeMapStateToProps = () => {
 
 @connect(makeMapStateToProps)
 @injectIntl
-export default class Report extends React.PureComponent {
-
-  static contextTypes = {
-    router: PropTypes.object,
-  };
+export default class ReportModal extends ImmutablePureComponent {
 
   static propTypes = {
     isSubmitting: PropTypes.bool,
@@ -52,17 +46,15 @@ export default class Report extends React.PureComponent {
     intl: PropTypes.object.isRequired,
   };
 
-  componentWillMount () {
-    if (!this.props.account) {
-      this.context.router.history.replace('/');
-    }
+  handleCommentChange = (e) => {
+    this.props.dispatch(changeReportComment(e.target.value));
+  }
+
+  handleSubmit = () => {
+    this.props.dispatch(submitReport());
   }
 
   componentDidMount () {
-    if (!this.props.account) {
-      return;
-    }
-
     this.props.dispatch(refreshAccountTimeline(this.props.account.get('id')));
   }
 
@@ -72,15 +64,6 @@ export default class Report extends React.PureComponent {
     }
   }
 
-  handleCommentChange = (e) => {
-    this.props.dispatch(changeReportComment(e.target.value));
-  }
-
-  handleSubmit = () => {
-    this.props.dispatch(submitReport());
-    this.context.router.history.replace('/');
-  }
-
   render () {
     const { account, comment, intl, statusIds, isSubmitting } = this.props;
 
@@ -89,36 +72,33 @@ export default class Report extends React.PureComponent {
     }
 
     return (
-      <Column heading={intl.formatMessage(messages.heading)} icon='flag'>
-        <ColumnBackButtonSlim />
+      <div className='modal-root__modal report-modal'>
+        <div className='report-modal__target'>
+          <FormattedMessage id='report.target' defaultMessage='Report {target}' values={{ target: <strong>{account.get('acct')}</strong> }} />
+        </div>
 
-        <div className='report scrollable'>
-          <div className='report__target'>
-            <FormattedMessage id='report.target' defaultMessage='Reporting' />
-            <strong>{account.get('acct')}</strong>
-          </div>
-
-          <div className='scrollable report__statuses'>
+        <div className='report-modal__container'>
+          <div className='report-modal__statuses'>
             <div>
               {statusIds.map(statusId => <StatusCheckBox id={statusId} key={statusId} disabled={isSubmitting} />)}
             </div>
           </div>
 
-          <div className='report__textarea-wrapper'>
+          <div className='report-modal__comment'>
             <textarea
-              className='report__textarea'
+              className='setting-text light'
               placeholder={intl.formatMessage(messages.placeholder)}
               value={comment}
               onChange={this.handleCommentChange}
               disabled={isSubmitting}
             />
-
-            <div className='report__submit'>
-              <div className='report__submit-button'><Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} /></div>
-            </div>
           </div>
         </div>
-      </Column>
+
+        <div className='report-modal__action-bar'>
+          <Button disabled={isSubmitting} text={intl.formatMessage(messages.submit)} onClick={this.handleSubmit} />
+        </div>
+      </div>
     );
   }
 
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 8453679b0..08d087da1 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -15,7 +15,6 @@ import { refreshHomeTimeline } from '../../actions/timelines';
 import { refreshNotifications } from '../../actions/notifications';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
-
 import Status from '../../features/status';
 import GettingStarted from '../../features/getting_started';
 import PublicTimeline from '../../features/public_timeline';
@@ -35,7 +34,6 @@ import GenericNotFound from '../../features/generic_not_found';
 import FavouritedStatuses from '../../features/favourited_statuses';
 import Blocks from '../../features/blocks';
 import Mutes from '../../features/mutes';
-import Report from '../../features/report';
 
 // Small wrapper to pass multiColumn to the route components
 const WrappedSwitch = ({ multiColumn, children }) => (
@@ -206,7 +204,6 @@ export default class UI extends React.PureComponent {
             <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
             <WrappedRoute path='/blocks' component={Blocks} content={children} />
             <WrappedRoute path='/mutes' component={Mutes} content={children} />
-            <WrappedRoute path='/report' component={Report} content={children} />
 
             <WrappedRoute component={GenericNotFound} content={children} />
           </WrappedSwitch>
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 09cc7e1d3..ccf2e6303 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -1127,6 +1127,23 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/onboarding_modal.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Additional comments",
+        "id": "report.placeholder"
+      },
+      {
+        "defaultMessage": "Submit",
+        "id": "report.submit"
+      },
+      {
+        "defaultMessage": "Report {target}",
+        "id": "report.target"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/report_modal.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 608d911e9..253db7110 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -136,10 +136,10 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
+  "report.heading": "Report {target}",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
-  "report.target": "Reporting",
+  "report.target": "Reporting {target}",
   "search.placeholder": "Search",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
   "status.cannot_reblog": "This post cannot be boosted",
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 84732ed4a..88431fc69 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -600,13 +600,15 @@
 }
 
 .status-check-box {
-  border-bottom: 1px solid lighten($ui-base-color, 8%);
+  border-bottom: 1px solid $ui-secondary-color;
   display: flex;
 
   .status__content {
-    background: lighten($ui-base-color, 4%);
     flex: 1 1 auto;
     padding: 10px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 }
 
@@ -1830,6 +1832,17 @@
   @media screen and (max-width: 600px) {
     font-size: 16px;
   }
+
+  &.light {
+    color: $ui-base-color;
+    border-bottom: 2px solid lighten($ui-base-color, 27%);
+
+    &:focus,
+    &:active {
+      color: $ui-base-color;
+      border-bottom-color: $ui-highlight-color;
+    }
+  }
 }
 
 @import 'boost';
@@ -2287,67 +2300,6 @@ button.icon-button.active i.fa-retweet {
   vertical-align: middle;
 }
 
-.report.scrollable {
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  max-height: 100%;
-}
-
-.report__target {
-  border-bottom: 1px solid lighten($ui-base-color, 4%);
-  color: $ui-secondary-color;
-  flex: 0 0 auto;
-  padding: 10px;
-
-  strong {
-    display: block;
-    color: $primary-text-color;
-    font-weight: 500;
-  }
-}
-
-.report__statuses {
-  flex: 1 1 auto;
-}
-
-.report__textarea-wrapper {
-  flex: 0 0 100px;
-  padding: 10px;
-}
-
-.report__textarea {
-  background: transparent;
-  box-sizing: border-box;
-  border: 0;
-  border-bottom: 2px solid $ui-primary-color;
-  border-radius: 2px 2px 0 0;
-  color: $primary-text-color;
-  display: block;
-  font-family: inherit;
-  font-size: 14px;
-  margin-bottom: 10px;
-  outline: 0;
-  padding: 7px 4px;
-  resize: vertical;
-  width: 100%;
-
-  &:active,
-  &:focus {
-    border-bottom-color: $ui-highlight-color;
-    background: rgba($base-overlay-background, 0.1);
-  }
-}
-
-.report__submit {
-  margin-top: 10px;
-  overflow: hidden;
-}
-
-.report__submit-button {
-  float: right;
-}
-
 .empty-column-indicator {
   color: lighten($ui-base-color, 20%);
   background: $ui-base-color;
@@ -3245,7 +3197,8 @@ button.icon-button.active i.fa-retweet {
 }
 
 .boost-modal,
-.confirmation-modal {
+.confirmation-modal,
+.report-modal {
   background: lighten($ui-secondary-color, 8%);
   color: $ui-base-color;
   border-radius: 8px;
@@ -3281,7 +3234,8 @@ button.icon-button.active i.fa-retweet {
 }
 
 .boost-modal__action-bar,
-.confirmation-modal__action-bar {
+.confirmation-modal__action-bar,
+.report-modal__action-bar {
   display: flex;
   justify-content: space-between;
   background: $ui-secondary-color;
@@ -3317,6 +3271,23 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.report-modal__statuses,
+.report-modal__comment {
+  padding: 10px;
+}
+
+.report-modal__statuses {
+  min-height: 20vh;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+
+.report-modal__comment {
+  .setting-text {
+    margin-top: 10px;
+  }
+}
+
 .confirmation-modal__action-bar {
   .confirmation-modal__cancel-button {
     background-color: transparent;
@@ -3332,7 +3303,8 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
-.confirmation-modal__container {
+.confirmation-modal__container,
+.report-modal__target {
   padding: 30px;
   font-size: 16px;
   text-align: center;

From 64d9c016bde538bc2f77350d160a387cc2c62ff8 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 27 Jun 2017 18:43:53 +0200
Subject: [PATCH 098/382] fix(components/status): Up & down jump due to content
 being added to the DOM (#3972)

---
 app/javascript/mastodon/components/status.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 81196c82a..a837659c2 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -124,7 +124,7 @@ export default class Status extends ImmutablePureComponent {
 
   saveHeight = () => {
     if (this.node && this.node.children.length !== 0) {
-      this.height = this.node.clientHeight;
+      this.height = this.node.getBoundingClientRect().height;
     }
   }
 

From 6ad72728f67bd41d9828055ce602af22db54855b Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 27 Jun 2017 22:14:31 +0200
Subject: [PATCH 099/382] i18n: Turn report screen into a modal (pl) (#3974)

---
 app/javascript/mastodon/locales/pl.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 6dcb872df..bf425501f 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -136,10 +136,10 @@
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
-  "report.heading": "Nowe zgłoszenie",
+  "report.heading": "Zgłoś {target}",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
-  "report.target": "Zgłaszanie",
+  "report.target": "Zgłaszanie {target}",
   "search.placeholder": "Szukaj",
   "search_results.total": "{count, number} {count, plural, one {wynik} more {wyniki}}",
   "status.cannot_reblog": "Ten post nie może zostać podbity",

From da42bfadb58888e3a18afd66395f0f3edc2fa622 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 27 Jun 2017 22:21:35 +0200
Subject: [PATCH 100/382] i18n: E-mail notifications to admins about new
 reports (pl) (#3975)

---
 config/locales/pl.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 81eee8dc3..113d7f235 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -193,9 +193,13 @@ pl:
       title: PubSubHubbub
       topic: Temat
     title: Administracja
+  admin_mailer:
+    new_report:
+      body: "Użytkownik %{reporter} zgłosił %{target}"
+      subject: Nowe zgłoszenie na %{instance} (#%{id})
   application_mailer:
     settings: 'Zmień ustawienia powiadamiania: %{link}'
-    signature: Powiadomienie Mastodona, wysłane przez %{instance}
+    signature: Powiadomienie Mastodona z instancji %{instance}
     view: 'Zobacz:'
   applications:
     invalid_url: Ten URL jest nieprawidłowy
@@ -403,9 +407,7 @@ pl:
     manual_instructions: 'Jeżeli nie możesz zeskanować kodu QR, musisz wprowadzić ten kod ręcznie:'
     recovery_codes: Przywróć kody zapasowe
     recovery_codes_regenerated: Pomyślnie wygenerowano ponownie kody zapasowe
-    recovery_instructions_html:
-      Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>.
-      Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.
+    recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>. Na przykład, wydrukuj je i przechowuj z ważnymu dokumentami.
     setup: Skonfiguruj
     wrong_code: Wprowadzony kod jest niepoprawny! Czy czas serwera i urządzenia jest poprawny?
   users:

From 126f929c3961b3f897ba9fa35890af27d0421961 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 27 Jun 2017 23:10:43 +0200
Subject: [PATCH 101/382] i18n: Use instance name in email notifications
 instead of Mastodon (pl) (#3976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 app/views/user_mailer/password_change.pl.html.erb             | 2 +-
 app/views/user_mailer/password_change.pl.text.erb             | 2 +-
 app/views/user_mailer/reset_password_instructions.pl.html.erb | 3 ++-
 app/views/user_mailer/reset_password_instructions.pl.text.erb | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/user_mailer/password_change.pl.html.erb b/app/views/user_mailer/password_change.pl.html.erb
index 46423483a..a7cb15a05 100644
--- a/app/views/user_mailer/password_change.pl.html.erb
+++ b/app/views/user_mailer/password_change.pl.html.erb
@@ -1,3 +1,3 @@
 <p>Witaj, <%= @resource.email %>!</p>
 
-<p>Informujemy, że ostatnio zmieniono Twoje hasło Mastodona.</p>
+<p>Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>.</p>
diff --git a/app/views/user_mailer/password_change.pl.text.erb b/app/views/user_mailer/password_change.pl.text.erb
index 85d5e1175..bd2efee0f 100644
--- a/app/views/user_mailer/password_change.pl.text.erb
+++ b/app/views/user_mailer/password_change.pl.text.erb
@@ -1,3 +1,3 @@
 Witaj, <%= @resource.email %>!
 
-Informujemy, że ostatnio zmieniono Twoje hasło Mastodona.
+Informujemy, że ostatnio zmieniono Twoje hasło na <%= @instance %>.
diff --git a/app/views/user_mailer/reset_password_instructions.pl.html.erb b/app/views/user_mailer/reset_password_instructions.pl.html.erb
index f4d67c724..2a9913a1d 100644
--- a/app/views/user_mailer/reset_password_instructions.pl.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.pl.html.erb
@@ -1,6 +1,7 @@
 <p>Witaj, <%= @resource.email %>!</p>
 
-<p>Ktoś próbował zmienić Twoje hasło na Mastodonie. Możesz zrobić to klikając w poniższy link.</p>
+<p>Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w 
+poniższy link.</p>
 
 <p><%= link_to 'Zmień moje hasło', edit_password_url(@resource, reset_password_token: @token) %></p>
 
diff --git a/app/views/user_mailer/reset_password_instructions.pl.text.erb b/app/views/user_mailer/reset_password_instructions.pl.text.erb
index 78d1cab0b..2b34afc48 100644
--- a/app/views/user_mailer/reset_password_instructions.pl.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.pl.text.erb
@@ -1,6 +1,7 @@
 Witaj, <%= @resource.email %>!
 
-Ktoś próbował zmienić Twoje hasło na Mastodonie. Możesz zrobić to klikając w poniższy link.
+Ktoś próbował zmienić Twoje hasło na <%= @instance %>. Możesz zrobić to klikając w 
+poniższy link.
 
 <%= edit_password_url(@resource, reset_password_token: @token) %>
 

From 2a9805b987537d0327ab4623049e2a4d3180f8e4 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 27 Jun 2017 23:14:02 +0200
Subject: [PATCH 102/382] i18n: Minor fix in devise.pl.yml (#3978)

---
 config/locales/devise.pl.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/devise.pl.yml b/config/locales/devise.pl.yml
index 792e0d81e..1c692f7a8 100644
--- a/config/locales/devise.pl.yml
+++ b/config/locales/devise.pl.yml
@@ -8,10 +8,10 @@ pl:
     failure:
       already_authenticated: Jesteś już zalogowany/zalogowana.
       inactive: Twoje konto nie zostało jeszcze aktywowane.
-      invalid: Błędne %{authentication_keys} lub hasło.
+      invalid: Nieprawidłowy %{authentication_keys} lub hasło.
       last_attempt: Masz jeszcze jedną próbę; Twoje konto zostanie zablokowane jeśli się nie powiedzie.
       locked: Twoje konto zostało zablokowane.
-      not_found_in_database: Błędne %{authentication_keys} lub hasło.
+      not_found_in_database: Nieprawidłowy %{authentication_keys} lub hasło.
       timeout: Twoja sesja wygasła. Zaloguj się ponownie aby kontynuować..
       unauthenticated: Zapisz się lub zaloguj aby kontynuować.
       unconfirmed: Zweryfikuj adres e-mail aby kontynuować.

From fb421a1f46d956e62d27d0227e6853c709f2c88e Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 28 Jun 2017 14:07:53 +0200
Subject: [PATCH 103/382] i18n: added email to activerecord.pl.yml (#3981)

---
 config/locales/activerecord.pl.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index 627f612bb..f82e1b875 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -1,5 +1,8 @@
 pl:
   activerecord:
+    attributes:
+      user:
+        email: adres e-mail
     errors:
       models:
         account:

From 7d8e3721aea71315b0ef8e66cdc2ede0fe6ffc2a Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 28 Jun 2017 21:50:23 +0900
Subject: [PATCH 104/382] Overwrite old statuses with reblogs in
 PrecomputeFeedService (#3984)

---
 app/services/precompute_feed_service.rb               | 2 +-
 spec/models/feed_spec.rb                              | 6 +++---
 spec/rails_helper.rb                                  | 6 ++++++
 spec/services/precompute_feed_service_spec.rb         | 8 ++++----
 spec/workers/scheduler/feed_cleanup_scheduler_spec.rb | 7 +++++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 83765bb05..4c24567c8 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -14,7 +14,7 @@ class PrecomputeFeedService < BaseService
 
   def populate_feed
     redis.pipelined do
-      statuses.each do |status|
+      statuses.reverse_each do |status|
         process_status(status)
       end
 
diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
index 15033e9eb..1cdb3a783 100644
--- a/spec/models/feed_spec.rb
+++ b/spec/models/feed_spec.rb
@@ -8,13 +8,13 @@ RSpec.describe Feed, type: :model do
       Fabricate(:status, account: account, id: 2)
       Fabricate(:status, account: account, id: 3)
       Fabricate(:status, account: account, id: 10)
-      redis = double(zrevrangebyscore: [['val2', 2.0], ['val1', 1.0], ['val3', 3.0], ['deleted', 4.0]], exists: false)
-      allow(Redis).to receive(:current).and_return(redis)
+      Redis.current.zadd(FeedManager.instance.key(:home, account.id),
+                        [[4, 'deleted'], [3, 'val3'], [2, 'val2'], [1, 'val1']])
 
       feed = Feed.new(:home, account)
       results = feed.get(3)
 
-      expect(results.map(&:id)).to eq [2, 1, 3]
+      expect(results.map(&:id)).to eq [3, 2]
       expect(results.first.attributes.keys).to eq %w(id updated_at)
     end
   end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index cfc9eec9e..9a4c8fd3c 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -13,6 +13,7 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 WebMock.disable_net_connect!
+Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current)
 Sidekiq::Testing.inline!
 Sidekiq::Logging.logger = nil
 
@@ -43,6 +44,11 @@ RSpec.configure do |config|
     https = ENV['LOCAL_HTTPS'] == 'true'
     Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}"
   end
+
+  config.after :each do
+    keys = Redis.current.keys
+    Redis.current.del(keys) if keys.any?
+  end
 end
 
 RSpec::Sidekiq.configure do |config|
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 9f56b0256..72235a966 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -11,12 +11,12 @@ RSpec.describe PrecomputeFeedService do
       account = Fabricate(:account)
       followed_account = Fabricate(:account)
       Fabricate(:follow, account: account, target_account: followed_account)
-      status = Fabricate(:status, account: followed_account)
-
-      expected_redis_args = FeedManager.instance.key(:home, account.id), status.id, status.id
-      expect_any_instance_of(Redis).to receive(:zadd).with(*expected_redis_args)
+      reblog = Fabricate(:status, account: followed_account)
+      status = Fabricate(:status, account: account, reblog: reblog)
 
       subject.call(account)
+
+      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq status.id
     end
   end
 end
diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
index 4c709a2c9..b8487b03f 100644
--- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb
@@ -7,10 +7,13 @@ describe Scheduler::FeedCleanupScheduler do
   let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) }
 
   it 'clears feeds of inactives' do
-    expect_any_instance_of(Redis).to receive(:del).with(feed_key_for(inactive_user))
-    expect_any_instance_of(Redis).not_to receive(:del).with(feed_key_for(active_user))
+    Redis.current.zadd(feed_key_for(inactive_user), 1, 1)
+    Redis.current.zadd(feed_key_for(active_user), 1, 1)
 
     subject.perform
+
+    expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0
+    expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1
   end
 
   def feed_key_for(user)

From e4fee6c138b7fdab3820e9cf6406b1d5195269e8 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 28 Jun 2017 23:45:21 +0900
Subject: [PATCH 105/382] Add Japanese translations (#3985)

ref #3929, #3935, #3949, #3981
---
 config/locales/activerecord.ja.yml |  3 ++
 config/locales/ja.yml              | 45 +++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
index 6e6b48496..975912f0f 100644
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@@ -1,5 +1,8 @@
 ja:
   activerecord:
+    attributes:
+      user:
+        email: メールアドレス
     errors:
       models:
         account:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 80169339d..a60811e50 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -193,6 +193,10 @@ ja:
       title: PubSubHubbub
       topic: トピック
     title: 管理
+  admin_mailer:
+    new_report:
+      body: "%{reporter} が %{target} を通報しました"
+      subject: "%{instance} の新しい通報 (#%{id})"
   application_mailer:
     settings: 'メール設定の変更: %{link}'
     signature: Mastodon %{instance} インスタンスからの通知
@@ -320,6 +324,43 @@ ja:
     missing_resource: リダイレクト先が見つかりませんでした
     proceed: フォローする
     prompt: 'フォローしようとしています:'
+  sessions:
+    activity: 最後のアクティビティ
+    browser: ブラウザ
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: 不明なブラウザ
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: 現在のセッション
+    description: "%{browser} on %{platform}"
+    explanation: あなたのMastodonアカウントに現在ログインしているウェブブラウザの一覧です。
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: 不明なプラットフォーム
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: セッション
   settings:
     authorized_apps: 認証済みアプリ
     back: 戻る
@@ -354,13 +395,15 @@ ja:
     description_html: "<strong>二段階認証</strong>を有効にするとログイン時、電話でコードを受け取る必要があります。"
     disable: 無効
     enable: 有効
+    enabled: 二段階認証は有効になっています
     enabled_success: 二段階認証が有効になりました
     generate_recovery_codes: リカバリーコードを生成
     instructions_html: "<strong>Google Authenticatorか、もしくはほかのTOTPアプリでこのQRコードをスキャンしてください。</strong>これ以降、ログインするときはそのアプリで生成されるコードが必要になります。"
     lost_recovery_codes: リカバリーコードを使用すると携帯電話を紛失した場合でもアカウントにアクセスできるようになります。 リカバリーコードを紛失した場合もここで再生成することができますが、古いリカバリーコードは無効になります。
     manual_instructions: 'QRコードがスキャンできず、手動での登録を希望の場合はこのシークレットコードを利用してください。:'
+    recovery_codes: リカバリーコード
     recovery_codes_regenerated: リカバリーコードが再生成されました。
-    recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。 リカバリーコードは印刷して安全に保管してください。
+    recovery_instructions_html: 携帯電話を紛失した場合、以下の内どれかのリカバリーコードを使用してアカウントへアクセスすることができます。<strong>リカバリーコードは大切に保全してください。</strong>たとえば印刷してほかの重要な書類と一緒に保管することができます。
     setup: 初期設定
     wrong_code: コードが間違っています。サーバー上の時間とデバイス上の時間が一致していることを確認してください。
   users:

From 71bc75e6ac00050ff98609b3cbeb38a0db157e1f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 28 Jun 2017 17:43:48 +0200
Subject: [PATCH 106/382] Do not fail to create access token if superapp was
 never created (#3986)

---
 app/models/session_activation.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 02a918e8a..887e3e3bd 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -69,9 +69,7 @@ class SessionActivation < ApplicationRecord
   def assign_access_token
     superapp = Doorkeeper::Application.find_by(superapp: true)
 
-    return if superapp.nil?
-
-    self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp.id,
+    self.access_token = Doorkeeper::AccessToken.create!(application_id: superapp&.id,
                                                         resource_owner_id: user_id,
                                                         scopes: 'read write follow',
                                                         expires_in: Doorkeeper.configuration.access_token_expires_in,

From b6a19e7b89fb4b32f35e810580a5aea7ff87addd Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 28 Jun 2017 17:44:17 +0200
Subject: [PATCH 107/382] Bump version to 1.4.7

---
 lib/mastodon/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 44f3e4390..3c92ce417 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      6
+      7
     end
 
     def pre

From 60b2b56d380c7cd3dc0ba54f4650cfdba568e38e Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Thu, 29 Jun 2017 08:17:26 +0900
Subject: [PATCH 108/382] Reduce number of commands in FeedManager#trim (#3989)

---
 app/lib/feed_manager.rb       |  4 +---
 spec/lib/feed_manager_spec.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 90a1441f2..c507f2636 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -38,9 +38,7 @@ class FeedManager
   end
 
   def trim(type, account_id)
-    return unless redis.zcard(key(type, account_id)) > FeedManager::MAX_ITEMS
-    last = redis.zrevrange(key(type, account_id), FeedManager::MAX_ITEMS - 1, FeedManager::MAX_ITEMS - 1)
-    redis.zremrangebyscore(key(type, account_id), '-inf', "(#{last.last}")
+    redis.zremrangebyrank(key(type, account_id), '0', (-(FeedManager::MAX_ITEMS + 1)).to_s)
   end
 
   def push_update_required?(timeline_type, account_id)
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index bf474c354..4bdc96866 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -131,4 +131,17 @@ RSpec.describe FeedManager do
       end
     end
   end
+
+  describe '#push' do
+    it 'trims timelines if they will have more than FeedManager::MAX_ITEMS' do
+      account = Fabricate(:account)
+      status = Fabricate(:status)
+      members = FeedManager::MAX_ITEMS.times.map { |count| [count, count] }
+      Redis.current.zadd("feed:type:#{account.id}", members)
+
+      FeedManager.instance.push('type', account, status)
+
+      expect(Redis.current.zcard("feed:type:#{account.id}")).to eq FeedManager::MAX_ITEMS
+    end
+  end
 end

From f79c10162e51689f6759dfa39251c8ba8e7e11e8 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Thu, 29 Jun 2017 08:25:31 +0900
Subject: [PATCH 109/382] Use multiple pairs for zadd in PrecomputeFeedService
 (#3990)

---
 app/services/precompute_feed_service.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index 4c24567c8..e2f6ff0cb 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -13,21 +13,16 @@ class PrecomputeFeedService < BaseService
   attr_reader :account
 
   def populate_feed
-    redis.pipelined do
-      statuses.reverse_each do |status|
-        process_status(status)
-      end
+    pairs = statuses.reverse_each.map(&method(:process_status))
 
+    redis.pipelined do
+      redis.zadd(account_home_key, pairs)
       redis.del("account:#{@account.id}:regeneration")
     end
   end
 
   def process_status(status)
-    add_status_to_feed(status) unless status_filtered?(status)
-  end
-
-  def add_status_to_feed(status)
-    redis.zadd(account_home_key, status.id, status.reblog? ? status.reblog_of_id : status.id)
+    [status.id, status.reblog? ? status.reblog_of_id : status.id] unless status_filtered?(status)
   end
 
   def status_filtered?(status)

From 0a53ca444a4bd4b28eddf2064133c38a65d41f2c Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Thu, 29 Jun 2017 08:43:10 +0900
Subject: [PATCH 110/382] Cover Admin::AccountsController more (#3327)

---
 .../admin/accounts_controller_spec.rb         | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 305260475..8be27d866 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -3,11 +3,64 @@ require 'rails_helper'
 RSpec.describe Admin::AccountsController, type: :controller do
   render_views
 
+  let(:user) { Fabricate(:user, admin: true) }
+
   before do
-    sign_in Fabricate(:user, admin: true), scope: :user
+    sign_in user, scope: :user
   end
 
   describe 'GET #index' do
+    around do |example|
+      default_per_page = Account.default_per_page
+      Account.paginates_per 1
+      example.run
+      Account.paginates_per default_per_page
+    end
+
+    it 'filters with parameters' do
+      new = AccountFilter.method(:new)
+
+      expect(AccountFilter).to receive(:new) do |params|
+        h = params.to_h
+
+        expect(h[:local]).to eq '1'
+        expect(h[:remote]).to eq '1'
+        expect(h[:by_domain]).to eq 'domain'
+        expect(h[:silenced]).to eq '1'
+        expect(h[:recent]).to eq '1'
+        expect(h[:suspended]).to eq '1'
+        expect(h[:username]).to eq 'username'
+        expect(h[:display_name]).to eq 'display name'
+        expect(h[:email]).to eq 'local-part@domain'
+        expect(h[:ip]).to eq '0.0.0.42'
+
+        new.call({})
+      end
+
+      get :index, params: {
+        local: '1',
+        remote: '1',
+        by_domain: 'domain',
+        silenced: '1',
+        recent: '1',
+        suspended: '1',
+        username: 'username',
+        display_name: 'display name',
+        email: 'local-part@domain',
+        ip: '0.0.0.42'
+      }
+    end
+
+    it 'paginates accounts' do
+      Fabricate(:account)
+
+      get :index, params: { page: 2 }
+
+      accounts = assigns(:accounts)
+      expect(accounts.count).to eq 1
+      expect(accounts.klass).to be Account
+    end
+
     it 'returns http success' do
       get :index
       expect(response).to have_http_status(:success)

From ead14f5bf0ae43524f055320f373a6e2ce947476 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 29 Jun 2017 20:03:03 +0900
Subject: [PATCH 111/382] Upgrade jsdom to version 11.0.0 (#3994)

---
 package.json             |  2 +-
 spec/javascript/setup.js | 18 ++++++------------
 yarn.lock                | 20 +++++++++++++-------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 60f9af1e9..feb59dc90 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "eslint": "^3.19.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.3",
-    "jsdom": "^10.1.0",
+    "jsdom": "^11.0.0",
     "mocha": "^3.4.1",
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.6.1",
diff --git a/spec/javascript/setup.js b/spec/javascript/setup.js
index 7d4b2866e..c9c8aed07 100644
--- a/spec/javascript/setup.js
+++ b/spec/javascript/setup.js
@@ -1,19 +1,13 @@
-import { jsdom } from 'jsdom/lib/old-api';
+import { JSDOM } from 'jsdom';
 import chai from 'chai';
 import chaiEnzyme from 'chai-enzyme';
 chai.use(chaiEnzyme());
 
-var exposedProperties = ['window', 'navigator', 'document'];
-
-global.document = jsdom('');
-global.window = document.defaultView;
-Object.keys(document.defaultView).forEach((property) => {
+const { window } = new JSDOM('', {
+  userAgent: 'node.js',
+});
+Object.keys(window).forEach(property => {
   if (typeof global[property] === 'undefined') {
-    exposedProperties.push(property);
-    global[property] = document.defaultView[property];
+    global[property] = window[property];
   }
 });
-
-global.navigator = {
-  userAgent: 'node.js',
-};
diff --git a/yarn.lock b/yarn.lock
index b8af49d62..4b5e3ae17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -121,6 +121,10 @@
     react-split-pane "^0.1.63"
     redux "^3.6.0"
 
+"@types/node@^6.0.46":
+  version "6.0.78"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
+
 abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
@@ -3911,9 +3915,9 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-10.1.0.tgz#7765e00fd5c3567f34985a1c86ff466a61dacc6a"
+jsdom@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3925,7 +3929,7 @@ jsdom@^10.1.0:
     escodegen "^1.6.1"
     html-encoding-sniffer "^1.0.1"
     nwmatcher ">= 1.3.9 < 2.0.0"
-    parse5 "^1.5.1"
+    parse5 "^3.0.2"
     pn "^1.0.0"
     request "^2.79.0"
     request-promise-native "^1.0.3"
@@ -4919,9 +4923,11 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse5@^1.5.1:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
+parse5@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.2.tgz#05eff57f0ef4577fb144a79f8b9a967a6cc44510"
+  dependencies:
+    "@types/node" "^6.0.46"
 
 parseurl@~1.3.1:
   version "1.3.1"

From b342c81c17cc8cf4af2ac3b1c57f4f250e0fefc1 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Thu, 29 Jun 2017 20:04:07 +0900
Subject: [PATCH 112/382] rescue HTTP::ConnectionError (#3992)

---
 app/services/fetch_atom_service.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index 8f42db0aa..d430b22e9 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -20,6 +20,10 @@ class FetchAtomService < BaseService
     process_html(fetch(url))
   rescue OpenSSL::SSL::SSLError => e
     Rails.logger.debug "SSL error: #{e}"
+    nil
+  rescue HTTP::ConnectionError => e
+    Rails.logger.debug "HTTP ConnectionError: #{e}"
+    nil
   end
 
   private

From 049cea30b0f3900484d45b0d88a0f073ad0c6cc6 Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <n.k@mail.yukimochi.net>
Date: Fri, 30 Jun 2017 12:37:17 +0900
Subject: [PATCH 113/382] Fix media-gallery, overflow is hidden. (#4008)

---
 app/javascript/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 88431fc69..4df4b0685 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3433,6 +3433,7 @@ button.icon-button.active i.fa-retweet {
   &,
   img {
     width: 100%;
+    overflow: hidden;
   }
 }
 

From a27879c0cf89d99fb79e2ffbe7ecfdf72733a1c4 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 30 Jun 2017 12:37:41 +0900
Subject: [PATCH 114/382] Replace state to /web when root path (#4009)

---
 app/javascript/mastodon/main.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 02e0f56f9..aca64c075 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -20,6 +20,14 @@ function main() {
 
   require.context('../images/', true);
 
+  if (window.history && history.replaceState) {
+    const { pathname, search, hash } = window.location;
+    const path = pathname + search + hash;
+    if (!(/^\/web[$/]/).test(path)) {
+      history.replaceState(null, document.title, `/web${path}`);
+    }
+  }
+
   onDomContentLoaded(() => {
     const mountNode = document.getElementById('mastodon');
     const props = JSON.parse(mountNode.getAttribute('data-props'));

From 1273fbf86ea3bd906e687a33e1f62c99f100ecca Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Fri, 30 Jun 2017 20:38:36 +0900
Subject: [PATCH 115/382] Rescue Addressable::URI::InvalidURIError at Remotable
 (#4017)

---
 app/models/concerns/remotable.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index 4a412ee3d..b0077ce96 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -26,8 +26,9 @@ module Remotable
           send("#{attachment_name}_file_name=", filename)
 
           self[attribute_name] = url if has_attribute?(attribute_name)
-        rescue HTTP::TimeoutError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError => e
+        rescue HTTP::TimeoutError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
+          nil
         end
       end
     end

From 7362469d8956d5f972283aadd4157631aa66b085 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 30 Jun 2017 20:39:42 +0900
Subject: [PATCH 116/382] Do not raise an error if PrecomputeFeed could not
 find any status (#4015)

---
 app/services/precompute_feed_service.rb       | 2 +-
 spec/services/precompute_feed_service_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index e2f6ff0cb..a32ba1dae 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -16,7 +16,7 @@ class PrecomputeFeedService < BaseService
     pairs = statuses.reverse_each.map(&method(:process_status))
 
     redis.pipelined do
-      redis.zadd(account_home_key, pairs)
+      redis.zadd(account_home_key, pairs) if pairs.any?
       redis.del("account:#{@account.id}:regeneration")
     end
   end
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index 72235a966..e2294469c 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -18,5 +18,10 @@ RSpec.describe PrecomputeFeedService do
 
       expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq status.id
     end
+
+    it 'does not raise an error even if it could not find any status' do
+      account = Fabricate(:account)
+      subject.call(account)
+    end
   end
 end

From 0e09048537fee9906ab582bc0704e1a3395c04ed Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 30 Jun 2017 20:40:00 +0900
Subject: [PATCH 117/382] Fix broken style in media gallery (regression from
 #3963) (#4014)

---
 app/javascript/styles/components.scss | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4df4b0685..28cb9ec65 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3421,19 +3421,16 @@ button.icon-button.active i.fa-retweet {
 }
 
 .media-gallery__item-thumbnail {
-  background-position: center;
-  background-repeat: no-repeat;
-  background-size: cover;
   cursor: zoom-in;
-  display: flex;
-  align-items: center;
+  display: block;
   text-decoration: none;
   height: 100%;
 
   &,
   img {
     width: 100%;
-    overflow: hidden;
+    height: 100%;
+    object-fit: cover;
   }
 }
 

From 5c7a4f0b324129777fa81e0bd7128a3711543c0e Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 30 Jun 2017 20:40:14 +0900
Subject: [PATCH 118/382] Remove babel-cli (#4011)

---
 package.json |  1 -
 yarn.lock    | 55 ++--------------------------------------------------
 2 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/package.json b/package.json
index feb59dc90..7fa80a0c2 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "array-includes": "^3.0.3",
     "autoprefixer": "^7.1.0",
     "axios": "^0.16.2",
-    "babel-cli": "^6.24.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.0",
     "babel-plugin-lodash": "^3.2.11",
diff --git a/yarn.lock b/yarn.lock
index 4b5e3ae17..adabca08d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -460,27 +460,6 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
-babel-cli@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.1.tgz#207cd705bba61489b2ea41b5312341cf6aca2283"
-  dependencies:
-    babel-core "^6.24.1"
-    babel-polyfill "^6.23.0"
-    babel-register "^6.24.1"
-    babel-runtime "^6.22.0"
-    commander "^2.8.1"
-    convert-source-map "^1.1.0"
-    fs-readdir-recursive "^1.0.0"
-    glob "^7.0.0"
-    lodash "^4.2.0"
-    output-file-sync "^1.1.0"
-    path-is-absolute "^1.0.0"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-    v8flags "^2.0.10"
-  optionalDependencies:
-    chokidar "^1.6.1"
-
 babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
@@ -1095,14 +1074,6 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-polyfill@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
-    regenerator-runtime "^0.10.0"
-
 babel-preset-env@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a"
@@ -1657,7 +1628,7 @@ cheerio@^0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.6.1:
+chokidar@^1.4.3, chokidar@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -3055,10 +3026,6 @@ fs-promise@^0.3.1:
   dependencies:
     any-promise "~0.1.0"
 
-fs-readdir-recursive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -3286,7 +3253,7 @@ gonzales-pe@^4.0.3:
   dependencies:
     minimist "1.1.x"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -4864,14 +4831,6 @@ osenv@0, osenv@^0.1.4:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
-output-file-sync@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
-  dependencies:
-    graceful-fs "^4.1.4"
-    mkdirp "^0.5.1"
-    object-assign "^4.1.0"
-
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
@@ -7154,10 +7113,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-user-home@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
-
 user-home@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
@@ -7190,12 +7145,6 @@ uws@^0.14.5:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
 
-v8flags@^2.0.10:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
-  dependencies:
-    user-home "^1.1.1"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"

From 3a7106f05ae0bc39b084916076ec6ee3733c32c1 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 30 Jun 2017 20:40:43 +0900
Subject: [PATCH 119/382] Fix that AdminMailer does not send (#4012)

---
 app/mailers/admin_mailer.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb
index fc19a6d40..fd9223533 100644
--- a/app/mailers/admin_mailer.rb
+++ b/app/mailers/admin_mailer.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class AdminMailer < ApplicationMailer
+  helper StreamEntriesHelper
+
   def new_report(recipient, report)
     @report   = report
     @me       = recipient

From 59ddf81a4533044452bd7e6a25dd4469cc660ffb Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Fri, 30 Jun 2017 07:42:04 -0400
Subject: [PATCH 120/382] Version bumps for gems (#4002)

* Update aws-sdk to version 2.10.4

* Update bootsnap to version 1.1.1

* Update capistrano to version 3.8.2

* Update capybara to version 2.14.4

* Update cld3 to version 3.1.3

* Update http_accept_language to version 2.1.1

* Update sidekiq to version 5.0.3

* Update rspec-sidekiq to version 3.0.3

* Update sidekiq-scheduler to version 2.1.7

* Update oj to version 3.2.0

* Update openssl to version 2.0.4

* Update pg to version 0.21.0

* Update twitter-text to version 1.14.6

* Update unicode-display_width to version 1.3.0

* Update scss_lint to version 0.54.0

* Update hamlit to version 2.8.4

* Update erubi to version 1.6.1

* Update httplog to version 0.99.4

* Update aws-sdk to version 2.10.6
---
 Gemfile.lock | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c19f31e01..dac6169d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    airbrussh (1.2.0)
+    airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
     annotate (2.7.2)
       activerecord (>= 3.2, < 6.0)
@@ -52,13 +52,13 @@ GEM
       encryptor (~> 3.0.0)
     av (0.9.0)
       cocaine (~> 0.5.3)
-    aws-sdk (2.9.37)
-      aws-sdk-resources (= 2.9.37)
-    aws-sdk-core (2.9.37)
+    aws-sdk (2.10.6)
+      aws-sdk-resources (= 2.10.6)
+    aws-sdk-core (2.10.6)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.37)
-      aws-sdk-core (= 2.9.37)
+    aws-sdk-resources (2.10.6)
+      aws-sdk-core (= 2.10.6)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     better_errors (2.1.1)
@@ -67,7 +67,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.0.0)
+    bootsnap (1.1.1)
       msgpack (~> 1.0)
     brakeman (3.6.2)
     browser (2.4.0)
@@ -78,7 +78,7 @@ GEM
     bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
-    capistrano (3.8.1)
+    capistrano (3.8.2)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -94,7 +94,7 @@ GEM
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (2.14.2)
+    capybara (2.14.4)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -102,7 +102,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     chunky_png (1.3.8)
-    cld3 (3.1.2)
+    cld3 (3.1.3)
       ffi (>= 1.1.0, < 1.10.0)
     climate_control (0.2.0)
     cocaine (0.5.8)
@@ -142,9 +142,9 @@ GEM
       thread
       thread_safe
     encryptor (3.0.0)
-    erubi (1.6.0)
+    erubi (1.6.1)
     erubis (2.7.0)
-    et-orbi (1.0.4)
+    et-orbi (1.0.5)
       tzinfo
     execjs (2.7.0)
     fabrication (2.16.1)
@@ -161,7 +161,7 @@ GEM
       addressable (~> 2.4)
       http (~> 2.0)
       nokogiri (~> 1.6)
-    hamlit (2.8.1)
+    hamlit (2.8.4)
       temple (>= 0.8.0)
       thor
       tilt
@@ -182,9 +182,9 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (1.0.3)
-    http_accept_language (2.1.0)
+    http_accept_language (2.1.1)
     http_parser.rb (0.6.0)
-    httplog (0.99.3)
+    httplog (0.99.4)
       colorize
       rack
     i18n (0.8.4)
@@ -249,8 +249,8 @@ GEM
       mini_portile2 (~> 2.2.0)
     nokogumbo (1.4.13)
       nokogiri
-    oj (3.1.0)
-    openssl (2.0.3)
+    oj (3.2.0)
+    openssl (2.0.4)
     orm_adapter (0.5.0)
     ostatus2 (2.0.1)
       addressable (~> 2.4)
@@ -272,7 +272,7 @@ GEM
       parallel
     parser (2.4.0.0)
       ast (~> 2.2)
-    pg (0.20.0)
+    pg (0.21.0)
     pghero (1.7.0)
       activerecord
     pkg-config (1.2.3)
@@ -374,7 +374,7 @@ GEM
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
-    rspec-sidekiq (3.0.1)
+    rspec-sidekiq (3.0.3)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.6.0)
@@ -395,10 +395,10 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.24)
-    scss_lint (0.53.0)
+    scss_lint (0.54.0)
       rake (>= 0.9, < 13)
       sass (~> 3.4.20)
-    sidekiq (5.0.2)
+    sidekiq (5.0.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -406,7 +406,7 @@ GEM
     sidekiq-bulk (0.1.1)
       activesupport
       sidekiq
-    sidekiq-scheduler (2.1.5)
+    sidekiq-scheduler (2.1.7)
       redis (~> 3)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 3)
@@ -443,7 +443,7 @@ GEM
     thread (0.2.2)
     thread_safe (0.3.6)
     tilt (2.0.7)
-    twitter-text (1.14.5)
+    twitter-text (1.14.6)
       unf (~> 0.1.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
@@ -454,7 +454,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.4)
-    unicode-display_width (1.2.1)
+    unicode-display_width (1.3.0)
     uniform_notifier (1.10.0)
     warden (1.2.7)
       rack (>= 1.0)

From 968354923ec5063946d561e41194870ce37ec43a Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 30 Jun 2017 04:43:26 -0700
Subject: [PATCH 121/382] Fix webpack-dev-server on Windows (#4000)

* Fix webpack-dev-server on Windows

* Serve webpack from 0.0.0.0, access at 127.0.0.1
---
 bin/webpack-dev-server | 2 +-
 config/webpacker.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/webpack-dev-server b/bin/webpack-dev-server
index a867f2c01..0beec3175 100755
--- a/bin/webpack-dev-server
+++ b/bin/webpack-dev-server
@@ -23,7 +23,7 @@ end
 begin
   dev_server = YAML.load_file(CONFIG_FILE)["development"]["dev_server"]
 
-  DEV_SERVER_HOST = "http#{"s" if args('--https') || dev_server["https"]}://#{args('--host') || dev_server["host"]}:#{args('--port') || dev_server["port"]}"
+  DEV_SERVER_HOST = "http#{"s" if args('--https') || dev_server["https"]}://#{dev_server["host"]}:#{args('--port') || dev_server["port"]}"
 
 rescue Errno::ENOENT, NoMethodError
   puts "Webpack dev_server configuration not found in #{CONFIG_FILE}."
diff --git a/config/webpacker.yml b/config/webpacker.yml
index c1cd6e93b..aa429a1dd 100644
--- a/config/webpacker.yml
+++ b/config/webpacker.yml
@@ -19,7 +19,7 @@ development:
   <<: *default
 
   dev_server:
-    host: 0.0.0.0
+    host: 127.0.0.1
     port: 8080
     https: false
 

From 6dd5eac7fc81f2283525f954db812d937153bcfc Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Fri, 30 Jun 2017 07:43:34 -0400
Subject: [PATCH 122/382] Add controller spec for manifests controller (#4003)

---
 spec/controllers/manifests_controller_spec.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 spec/controllers/manifests_controller_spec.rb

diff --git a/spec/controllers/manifests_controller_spec.rb b/spec/controllers/manifests_controller_spec.rb
new file mode 100644
index 000000000..6f188fa35
--- /dev/null
+++ b/spec/controllers/manifests_controller_spec.rb
@@ -0,0 +1,19 @@
+require 'rails_helper'
+
+describe ManifestsController do
+  render_views
+
+  describe 'GET #show' do
+    before do
+      get :show, format: :json
+    end
+
+    it 'assigns @instance_presenter' do
+      expect(assigns(:instance_presenter)).to be_kind_of InstancePresenter
+    end
+
+    it 'returns http success' do
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

From a978b88997169782ac35f416bf88d6afd60edd1e Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 30 Jun 2017 08:29:22 -0700
Subject: [PATCH 123/382] Faster emojify() algorithm, avoid regex replace
 (#4019)

* Faster emojify() algorithm, avoid regex replace

* add semicolon
---
 app/javascript/mastodon/emoji.js           | 43 +++++++++++++++----
 spec/javascript/components/emojify.test.js | 49 ++++++++++++++++++++++
 2 files changed, 83 insertions(+), 9 deletions(-)
 create mode 100644 spec/javascript/components/emojify.test.js

diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index 01d01fb72..d0df71ea3 100644
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -19,16 +19,41 @@ const unicodeToImage = str => {
   });
 };
 
-const shortnameToImage = str => str.replace(emojione.regShortNames, shortname => {
-  if (typeof shortname === 'undefined' || shortname === '' || !(shortname in emojione.emojioneList)) {
-    return shortname;
+const shortnameToImage = str => {
+  // This walks through the string from end to start, ignoring any tags (<p>, <br>, etc.)
+  // and replacing valid shortnames like :smile: and :wink: that _aren't_ within
+  // tags with an <img> version.
+  // The goal is to be the same as an emojione.regShortNames replacement, but faster.
+  // The reason we go backwards is because then we can replace substrings as we go.
+  let i = str.length;
+  let insideTag = false;
+  let insideShortname = false;
+  let shortnameEndIndex = -1;
+  while (i--) {
+    const char = str.charAt(i);
+    if (insideShortname && char === ':') {
+      const shortname = str.substring(i, shortnameEndIndex + 1);
+      if (shortname in emojione.emojioneList) {
+        const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
+        const alt = emojione.convert(unicode.toUpperCase());
+        const replacement = `<img draggable="false" class="emojione" alt="${alt}" title="${shortname}" src="/emoji/${unicode}.svg" />`;
+        str = str.substring(0, i) + replacement + str.substring(shortnameEndIndex + 1);
+      } else {
+        i++; // stray colon, try again
+      }
+      insideShortname = false;
+    } else if (insideTag && char === '<') {
+      insideTag = false;
+    } else if (char === '>') {
+      insideTag = true;
+      insideShortname = false;
+    } else if (!insideTag && char === ':') {
+      insideShortname = true;
+      shortnameEndIndex = i;
+    }
   }
-
-  const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
-  const alt     = emojione.convert(unicode.toUpperCase());
-
-  return `<img draggable="false" class="emojione" alt="${alt}" title="${shortname}" src="/emoji/${unicode}.svg" />`;
-});
+  return str;
+};
 
 export default function emojify(text) {
   return toImage(text);
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
new file mode 100644
index 000000000..7a496623e
--- /dev/null
+++ b/spec/javascript/components/emojify.test.js
@@ -0,0 +1,49 @@
+import { expect } from 'chai';
+import emojify from '../../../app/javascript/mastodon/emoji';
+
+describe('emojify', () => {
+  it('does a basic emojify', () => {
+    expect(emojify(':smile:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />');
+  });
+
+  it('does a double emojify', () => {
+    expect(emojify(':smile: and :wink:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /> and <img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
+  });
+
+  it('works with random colons', () => {
+    expect(emojify(':smile: : :wink:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /> : <img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
+    expect(emojify(':smile::::wink:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />::<img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
+    expect(emojify(':smile:::::wink:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />:::<img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
+  });
+
+  it('works with tags', () => {
+    expect(emojify('<p>:smile:</p>')).to.equal(
+      '<p><img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /></p>');
+    expect(emojify('<p>:smile:</p> and <p>:wink:</p>')).to.equal(
+      '<p><img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /></p> and <p><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" /></p>');
+  });
+
+  it('ignores unknown shortcodes', () => {
+    expect(emojify(':foobarbazfake:')).to.equal(':foobarbazfake:');
+  });
+
+  it('ignores shortcodes inside of tags', () => {
+    expect(emojify('<p data-foo=":smile:"></p>')).to.equal('<p data-foo=":smile:"></p>');
+  });
+
+  it('works with unclosed tags', () => {
+    expect(emojify('hello>')).to.equal('hello>');
+    expect(emojify('<hello')).to.equal('<hello');
+  });
+
+  it('works with unclosed shortcodes', () => {
+    expect(emojify('smile:')).to.equal('smile:');
+    expect(emojify(':smile')).to.equal(':smile');
+  });
+
+});

From bf50e3e5aefc88f7a6d9ab4aafe5beab4360292b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 1 Jul 2017 14:50:10 +0200
Subject: [PATCH 124/382] Fix height issue in report modal

---
 app/javascript/styles/components.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 28cb9ec65..a87aa5d79 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3278,6 +3278,7 @@ button.icon-button.active i.fa-retweet {
 
 .report-modal__statuses {
   min-height: 20vh;
+  max-height: 40vh;
   overflow-y: auto;
   overflow-x: hidden;
 }

From d1d94216d1534243180e99245232f769542639d3 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 2 Jul 2017 04:18:38 +0900
Subject: [PATCH 125/382] Update Japanese translation (Credentials -> Security)
 (#4025)

---
 config/locales/ja.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index a60811e50..52752e7d1 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -204,7 +204,7 @@ ja:
   applications:
     invalid_url: URLが無効です
   auth:
-    change_password: ログイン情報
+    change_password: セキュリティ
     delete_account: アカウントの削除
     delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a>から手続きが行えます。削除前には確認画面があります。
     didnt_get_confirmation: 確認メールを受信できませんか？

From 60da49f8562b970e514ba4403cac1944229a5768 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 2 Jul 2017 15:55:50 +0200
Subject: [PATCH 126/382] fix(components/columns_area): Increase delta for
 swipe detection (#4037)

---
 app/javascript/mastodon/features/ui/components/columns_area.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 3c3e9425d..01167b6e5 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -53,7 +53,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
 
     if (singleColumn) {
       return (
-        <ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} className='columns-area'>
+        <ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} delta={30} className='columns-area'>
           {children}
         </ReactSwipeable>
       );

From 133b892e0d95c27de28c22e3d0efe284c75f7700 Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien.erambert@me.com>
Date: Sun, 2 Jul 2017 09:36:35 -0700
Subject: [PATCH 127/382] Update French locales (#4034)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add missing locales for French translation

* accent "Media" in the front-end locales

* images => médias

* Change 'rapport' to 'signalement' in French locales to be more coherent

* fix typo

* remove duplicate EN locale

* translate missing locales

* update missing locale

* fix typo

* unify with "utilisateur⋅ice⋅s"

* address PR comments
---
 app/javascript/mastodon/locales/fr.json |  16 ++--
 config/locales/fr.yml                   | 122 ++++++++++++++++++++++--
 2 files changed, 123 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 1a69235c8..fd2b30444 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -7,7 +7,7 @@
   "account.followers": "Abonné⋅e⋅s",
   "account.follows": "Abonnements",
   "account.follows_you": "Vous suit",
-  "account.media": "Media",
+  "account.media": "Média",
   "account.mention": "Mentionner",
   "account.mute": "Masquer",
   "account.posts": "Statuts",
@@ -61,11 +61,11 @@
   "emoji_button.travel": "Lieux et voyages",
   "empty_column.community": "Le fil public local est vide. Écrivez-donc quelque chose pour le remplir !",
   "empty_column.hashtag": "Il n’y a encore aucun contenu relatif à ce hashtag",
-  "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres utilisateurs⋅trices.",
+  "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres utilisateur⋅ice⋅s.",
   "empty_column.home.inactivity": "Votre accueil est vide. Si vous ne vous êtes pas connecté⋅e depuis un moment, il se remplira automatiquement très bientôt.",
   "empty_column.home.public_timeline": "le fil public",
-  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres utilisateurs⋅trices pour débuter la conversation.",
-  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateurs⋅trices d’autres instances pour remplir le fil public.",
+  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres utilisateur⋅ice⋅s pour débuter la conversation.",
+  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice⋅s d’autres instances pour remplir le fil public.",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Rejeter",
   "getting_started.appsshort": "Applications",
@@ -108,11 +108,11 @@
   "notifications.column_settings.sound": "Émettre un son",
   "onboarding.done": "Effectué",
   "onboarding.next": "Suivant",
-  "onboarding.page_five.public_timelines": "Le fil public global affiche les posts de tou⋅te⋅s les utilisateurs⋅trices suivi⋅es par les membres de {domain}. Le fil public local est identique mais se limite aux utilisateurs⋅trices de {domain}.",
-  "onboarding.page_four.home": "L’Accueil affiche les posts de tou⋅te⋅s les utilisateurs⋅trices que vous suivez",
+  "onboarding.page_five.public_timelines": "Le fil public global affiche les posts de tou⋅te⋅s les utilisateur⋅ice⋅s suivi⋅es par les membres de {domain}. Le fil public local est identique mais se limite aux utilisateur⋅ice⋅s de {domain}.",
+  "onboarding.page_four.home": "L’Accueil affiche les posts de tou⋅te⋅s les utilisateur⋅ice⋅s que vous suivez",
   "onboarding.page_four.notifications": "Les Notifications vous informent lorsque quelqu’un interagit avec vous",
   "onboarding.page_one.federation": "Mastodon est un réseau social qui appartient à tou⋅te⋅s.",
-  "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d’utilisateur⋅trice complet est {handle}",
+  "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d'utilisateur⋅ice complet est {handle}",
   "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
   "onboarding.page_six.admin": "L’administrateur⋅trice de votre instance est {admin}",
   "onboarding.page_six.almost_done": "Nous y sommes presque…",
@@ -123,7 +123,7 @@
   "onboarding.page_six.read_guidelines": "S’il vous plaît, n’oubliez pas de lire les {guidelines} !",
   "onboarding.page_six.various_app": "applications mobiles",
   "onboarding.page_three.profile": "Modifiez votre profil pour changer votre avatar, votre description ainsi que votre nom. Vous y trouverez également d’autres préférences.",
-  "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateurs⋅trices et regarder des hashtags tels que {illustration} et {introductions}. Pour trouver quelqu’un qui n’est pas sur cette instance, utilisez son nom d’utilisateur⋅trice complet.",
+  "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateur⋅ice⋅s et regarder des hashtags tels que {illustration} et {introductions}. Pour trouver quelqu’un qui n’est pas sur cette instance, utilisez son nom d'utilisateur⋅ice complet.",
   "onboarding.page_two.compose": "Écrivez depuis la colonne de composition. Vous pouvez ajouter des images, changer les réglages de confidentialité, et ajouter des avertissements de contenu (Content Warning) grâce aux icônes en dessous.",
   "onboarding.skip": "Passer",
   "privacy.change": "Ajuster la confidentialité du message",
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index dfe5ff990..5a3e0c552 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -27,8 +27,9 @@ fr:
     status_count_after: posts
     status_count_before: Ayant publié
     terms: Conditions d’utilisation
-    user_count_after: utilisateurs⋅trices
+    user_count_after: utilisateur⋅ice⋅s
     user_count_before: Abrite
+    version: Version
   accounts:
     follow: Suivre
     followers: Abonné⋅es
@@ -38,10 +39,23 @@ fr:
     people_who_follow: Personnes qui suivent %{name}
     posts: Statuts
     remote_follow: Suivre à distance
+    reserved_username: Ce nom d'utilisateur⋅ice est réservé
     unfollow: Ne plus suivre
+  activitypub:
+    activity:
+      announce:
+        name: "%{account_name} a partagé une activité."
+      create:
+        name: "%{account_name} a créé une note."
+    outbox:
+      name: "Boîte d'envoi de %{account_name}"
+      summary: Liste d'activités de %{account_name}
   admin:
     accounts:
-      are_you_sure: Êtes-vous certain ?
+      are_you_sure: Êtes-vous certain⋅e ?
+      confirm: Confirmer
+      confirmed: Confirmé
+      disable_two_factor_authentication: Désactiver l'authentification à deux facteurs
       display_name: Nom affiché
       domain: Domaine
       edit: Éditer
@@ -49,6 +63,7 @@ fr:
       feed_url: URL du flux
       followers: Abonné⋅es
       follows: Abonnements
+      ip: Adresse IP
       location:
         all: Tous
         local: Local
@@ -71,14 +86,24 @@ fr:
       profile_url: URL du profil
       public: Public
       push_subscription_expires: Expiration de l'abonnement PuSH
+      redownload: Rafraîchir les avatars
+      reset: Réinitialiser
       reset_password: Réinitialiser le mot de passe
+      resubscribe: Se réabonner
       salmon_url: URL Salmon
+      search: Rechercher
+      show:
+        created_reports: Signalements créés par ce compte
+        report: signalement
+        targeted_reports: Signalements créés visant ce compte
       silence: Rendre muet
       statuses: Statuts
+      subscribe: S'abonner
       title: Comptes
       undo_silenced: Annuler le silence
       undo_suspension: Annuler la suspension
-      username: Nom d'utilisateur
+      unsubscribe: Se désabonner
+      username: Nom d'utilisateur⋅ice
       web: Web
     domain_blocks:
       add_new: Ajouter
@@ -110,14 +135,24 @@ fr:
         undo: Annuler
       title: Blocage de domaines
       undo: Annuler
+    instances:
+      account_count: Comptes connus
+      domain_name: Domaine
+      title: Instances connues
     reports:
+      action_taken_by: Intervention de
+      are_you_sure: Êtes vous certain⋅e?
       comment:
         label: Commentaire
         none: Aucun
       delete: Supprimer
       id: ID
       mark_as_resolved: Marquer comme résolu
+      nsfw:
+        'false': Ré-afficher les médias
+        'true': Masquer les médias
       report: 'Signalement #%{id}'
+      report_contents: Contenu
       reported_account: Compte signalé
       reported_by: Signalé par
       resolved: Résolus
@@ -132,7 +167,7 @@ fr:
       contact_information:
         email: Entrez une adresse courriel publique
         label: Informations de contact
-        username: Entrez un nom d'utilisateur
+        username: Entrez un nom d'utilisateur⋅ice
       registrations:
         closed_message:
           desc_html: Affiché sur la page d'accueil lorsque les inscriptions sont fermées<br>Vous pouvez utiliser des balises HTML
@@ -158,6 +193,10 @@ fr:
       title: PubSubHubbub
       topic: Sujet
     title: Administration
+  admin_mailer:
+    new_report:
+      body: "%{reporter} a signalé %{target}"
+      subject: Nouveau signalement sur %{instance} (#%{id})
   application_mailer:
     settings: 'Changer les préférences courriel : %{link}'
     signature: Notifications de Mastodon depuis %{instance}
@@ -166,6 +205,8 @@ fr:
     invalid_url: L'URL fournie est invalide
   auth:
     change_password: Changer de mot de passe
+    delete_account: Supprimer le compte
+    delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.
     didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
     forgot_password: Mot de passe oublié ?
     login: Se connecter
@@ -199,18 +240,41 @@ fr:
       x_minutes: "%{count}min"
       x_months: "%{count}mois"
       x_seconds: "%{count}s"
+  deletes:
+    bad_password_msg: Bien essayé ! Mot de passe incorrect
+    confirm_password: Entrez votre mot de passe pour vérifier votre identité
+    description_html: Cela va supprimer votre compte et le désactiver de manière <strong>permanente et irréversible</strong>. Votre nom d'utilisateur⋅ice restera réservé afin d'éviter la confusion
+    proceed: Supprimer compte
+    success_msg: Votre compte a été supprimé avec succès
+    warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a été partagé est susceptible de laisser des traces. Les serveurs hors-lignes ainsi que ceux n'étant plus abonnés à vos publications ne mettront pas leur base de données à jour.
+    warning_title: Disponibilité du contenu disséminé
   errors:
+    '403': Vous n'avez pas accès à cette page.
     '404': La page que vous recherchez n'existe pas.
     '410': La page que vous recherchez n'existe plus.
     '422':
       content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
       title: Vérification de sécurité échouée
+    '429': Trop de requêtes émises dans un délai donné.
+    noscript: Pour utiliser Mastodon, veuillez activer JavaScript
   exports:
     blocks: Vous bloquez
     csv: CSV
     follows: Vous suivez
     mutes: Vous faites taire
     storage: Médias stockés
+  followers:
+    domain: Domaine
+    explanation_html: Si vous voulez être sûr⋅e que vos status restent privés, vous devez savoir qui vous suit. <strong>Vos status privés seront diffusés à toutes les instances des utilisateur⋅ice⋅s qui vous suivent</strong>. Vous voudrez peut-être les passer en revue et les supprimer si vous n'êtes pas sûr⋅e que votre vie privée sera respectée par l'administration ou le logiciel de ces instances.
+    followers_count: Nombre d'abonné⋅es
+    lock_link: Rendez votre compte privé
+    purge: Retirer de la liste d'abonné⋅es
+    success:
+      one: Suppression des abonné⋅es venant d'un domaine en cours...
+      other: Suppression des abonné⋅es venant de %{count} domaines en cours...
+    true_privacy_html: Soyez conscient⋅es <strong>qu'une vraie confidentialité ne peut être atteinte que par un chiffrement de bout-en-bout</strong>.
+    unlocked_warning_html: N'importe qui peut vous suivre et voir vos status privés. %{lock_link} afin de pouvoir vérifier et rejeter des abonné⋅es.
+    unlocked_warning_title: Votre compte n'est pas privé
   generic:
     changes_saved_msg: Les modifications ont été enregistrées avec succès !
     powered_by: propulsé par %{link}
@@ -222,9 +286,9 @@ fr:
     preface: Vous pouvez importer certaines données comme les personnes que vous suivez ou bloquez sur votre compte sur cette instance à partir de fichiers créés sur une autre instance.
     success: Vos données ont été importées avec succès et seront traitées en temps et en heure
     types:
-      blocking: Liste d'utilisateurs⋅trices bloqué⋅es
-      following: Liste d'utilisateurs⋅trices suivi⋅es
-      muting: Liste d'utilisateurs⋅trices que vous faites taire
+      blocking: Liste d'utilisateur⋅ice⋅s bloqué⋅es
+      following: Liste d'utilisateur⋅ice⋅s suivi⋅es
+      muting: Liste d'utilisateur⋅ice⋅s que vous faites taire
     upload: Importer
   landing_strip_html: <strong>%{name}</strong> utilise %{link_to_root_path}. Vous pouvez le/la suivre et interagir si vous possédez un compte quelque part dans le "fediverse".
   landing_strip_signup_html: Si ce n'est pas le cas, vous pouvez <a href="%{sign_up_path}">en créer un ici</a>.
@@ -265,11 +329,50 @@ fr:
     missing_resource: L'URL de redirection n'a pas pu être trouvée
     proceed: Continuez pour suivre
     prompt: 'Vous allez suivre :'
+  sessions:
+    activity: Dernière activité
+    browser: Navigateur
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: Navigateur inconnu
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Session courante
+    description: "%{browser} sur %{platform}"
+    explanation: Ceci est la liste des navigateurs actuellement connectés à votre compte Mastodon.
+    ip: Adresse IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: système inconnu
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Sessions
   settings:
     authorized_apps: Applications autorisées
     back: Retour vers Mastodon
+    delete: Suppression de compte
     edit_profile: Modifier le profil
     export: Export de données
+    followers: Abonné⋅es autorisé⋅es
     import: Import de données
     preferences: Préférences
     settings: Réglages
@@ -280,8 +383,11 @@ fr:
     show_more: Afficher plus
     visibilities:
       private: Abonné⋅es uniquement
+      private_long: Seul⋅es vos abonné⋅es verront vos status
       public: Public
+      public_long: Tout le monde peut voir vos status
       unlisted: Public sans être affiché sur le fil public
+      unlisted_long: Tout le monde peut voir vos status mais ils ne seront pas sur listés sur les fils publics
   stream_entries:
     click_to_show: Cliquer pour afficher
     reblogged: partagé
@@ -294,11 +400,13 @@ fr:
     description_html: Si vous activez <strong>l'identification à deux facteurs</strong>, vous devrez être en possession de votre téléphone afin de générer un code de connexion.
     disable: Désactiver
     enable: Activer
+    enabled: L'authentification à deux facteurs est activée
     enabled_success: Identification à deux facteurs activée avec succès
     generate_recovery_codes: Générer les codes de récupération
     instructions_html: "<strong>Scannez ce QR code grâce à Google Authenticator, Authy ou une application similaire sur votre téléphone</strong>. Désormais, cette application générera des jetons que vous devrez saisir à chaque connexion."
     lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre comptre si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés.
     manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l''entrer manuellement, voici le secret en clair :'
+    recovery_codes: Codes de récupération
     recovery_codes_regenerated: Codes de récupération régénérés avec succès
     recovery_instructions_html: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
     setup: Installer

From 331f0953e9c1855b8195af756e83fee98600d1b8 Mon Sep 17 00:00:00 2001
From: Ratmir Karabut <rkarabut@users.noreply.github.com>
Date: Mon, 3 Jul 2017 02:30:22 +0300
Subject: [PATCH 128/382] Update Russian translation (sessions) (#4041)

* Add Russian translation (ru)

* Fix a missing comma

* Fix the wording for better consistency

* Update Russian translation

* Arrange Russian setting alphabetically

* Fix syntax error

* Update Russian translation

* Fix formatting error

* Update Russian translation

* Update Russian translation

* Update ru.jsx

* Fix syntax error

* Remove two_factor_auth.warning (appears obsolete)

* Add missing strings in ru.yml

A lot of new strings translated, especially for the newly added admin section

* Fix translation consistency

* Update Russian translation

* Update Russian translation (pluralizations)

* Update Russian translation

* Update Russian translation

* Update Russian translation (pin)

* Update Russian translation (account deletion)

* Fix extra line

* Update Russian translation (sessions)
---
 config/locales/ru.yml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9cf067d88..6321e96eb 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -292,6 +292,43 @@ ru:
     missing_resource: Поиск требуемого перенаправления URL для Вашего аккаунта завершился неудачей
     proceed: Продолжить подписку
     prompt: 'Вы хотите подписаться на:'
+  sessions:
+    activity: Последняя активность
+    browser: Браузер
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: Неизвестный браузер
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Текущая сессия
+    description: "%{browser} на %{platform}"
+    explanation: Это веб-браузеры, в которых на данный момент выполнен вход в Ваш аккаунт Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: неизвестной платформе
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Сессии
   settings:
     authorized_apps: Авторизованные приложения
     back: Назад в Mastodon

From e28258010182b56f27cfbd3f9f9a58fd9cd8870d Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Mon, 3 Jul 2017 02:02:36 -0700
Subject: [PATCH 129/382] Faster emojify() by avoiding str.replace() entirely
 (#4049)

---
 app/javascript/mastodon/emoji.js           | 69 ++++++++++------------
 package.json                               |  1 +
 spec/javascript/components/emojify.test.js | 34 +++++++++++
 yarn.lock                                  |  4 ++
 4 files changed, 71 insertions(+), 37 deletions(-)

diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index d0df71ea3..7043d5f3a 100644
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -1,60 +1,55 @@
 import emojione from 'emojione';
+import Trie from 'substring-trie';
 
-const toImage = str => shortnameToImage(unicodeToImage(str));
+const mappedUnicode = emojione.mapUnicodeToShort();
+const trie = new Trie(Object.keys(emojione.jsEscapeMap));
 
-const unicodeToImage = str => {
-  const mappedUnicode = emojione.mapUnicodeToShort();
-
-  return str.replace(emojione.regUnicode, unicodeChar => {
-    if (typeof unicodeChar === 'undefined' || unicodeChar === '' || !(unicodeChar in emojione.jsEscapeMap)) {
-      return unicodeChar;
-    }
-
-    const unicode  = emojione.jsEscapeMap[unicodeChar];
-    const short    = mappedUnicode[unicode];
-    const filename = emojione.emojioneList[short].fname;
-    const alt      = emojione.convert(unicode.toUpperCase());
-
-    return `<img draggable="false" class="emojione" alt="${alt}" title="${short}" src="/emoji/${filename}.svg" />`;
-  });
-};
-
-const shortnameToImage = str => {
-  // This walks through the string from end to start, ignoring any tags (<p>, <br>, etc.)
-  // and replacing valid shortnames like :smile: and :wink: that _aren't_ within
-  // tags with an <img> version.
-  // The goal is to be the same as an emojione.regShortNames replacement, but faster.
-  // The reason we go backwards is because then we can replace substrings as we go.
-  let i = str.length;
+function emojify(str) {
+  // This walks through the string from start to end, ignoring any tags (<p>, <br>, etc.)
+  // and replacing valid shortnames like :smile: and :wink: as well as unicode strings
+  // that _aren't_ within tags with an <img> version.
+  // The goal is to be the same as an emojione.regShortNames/regUnicode replacement, but faster.
+  let i = -1;
   let insideTag = false;
   let insideShortname = false;
-  let shortnameEndIndex = -1;
-  while (i--) {
+  let shortnameStartIndex = -1;
+  let match;
+  while (++i < str.length) {
     const char = str.charAt(i);
     if (insideShortname && char === ':') {
-      const shortname = str.substring(i, shortnameEndIndex + 1);
+      const shortname = str.substring(shortnameStartIndex, i + 1);
       if (shortname in emojione.emojioneList) {
         const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
         const alt = emojione.convert(unicode.toUpperCase());
         const replacement = `<img draggable="false" class="emojione" alt="${alt}" title="${shortname}" src="/emoji/${unicode}.svg" />`;
-        str = str.substring(0, i) + replacement + str.substring(shortnameEndIndex + 1);
+        str = str.substring(0, shortnameStartIndex) + replacement + str.substring(i + 1);
+        i += (replacement.length - shortname.length - 1); // jump ahead the length we've added to the string
       } else {
-        i++; // stray colon, try again
+        i--; // stray colon, try again
       }
       insideShortname = false;
-    } else if (insideTag && char === '<') {
+    } else if (insideTag && char === '>') {
       insideTag = false;
-    } else if (char === '>') {
+    } else if (char === '<') {
       insideTag = true;
       insideShortname = false;
     } else if (!insideTag && char === ':') {
       insideShortname = true;
-      shortnameEndIndex = i;
+      shortnameStartIndex = i;
+    } else if (!insideTag && (match = trie.search(str.substring(i)))) {
+      const unicodeStr = match;
+      if (unicodeStr in emojione.jsEscapeMap) {
+        const unicode  = emojione.jsEscapeMap[unicodeStr];
+        const short    = mappedUnicode[unicode];
+        const filename = emojione.emojioneList[short].fname;
+        const alt      = emojione.convert(unicode.toUpperCase());
+        const replacement =  `<img draggable="false" class="emojione" alt="${alt}" title="${short}" src="/emoji/${filename}.svg" />`;
+        str = str.substring(0, i) + replacement + str.substring(i + unicodeStr.length);
+        i += (replacement.length - unicodeStr.length); // jump ahead the length we've added to the string
+      }
     }
   }
   return str;
-};
+}
 
-export default function emojify(text) {
-  return toImage(text);
-};
+export default emojify;
diff --git a/package.json b/package.json
index 7fa80a0c2..d5c05dae3 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
     "sass-loader": "^6.0.6",
     "stringz": "^0.2.2",
     "style-loader": "^0.18.2",
+    "substring-trie": "^1.0.0",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
index 7a496623e..3e8b25af9 100644
--- a/spec/javascript/components/emojify.test.js
+++ b/spec/javascript/components/emojify.test.js
@@ -46,4 +46,38 @@ describe('emojify', () => {
     expect(emojify(':smile')).to.equal(':smile');
   });
 
+  it('does two emoji next to each other', () => {
+    expect(emojify(':smile::wink:')).to.equal(
+      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
+  });
+
+  it('does unicode', () => {
+    expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
+      '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":family_wwbb:" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
+    expect(emojify('\uD83D\uDC68\uD83D\uDC69\uD83D\uDC67\uD83D\uDC67')).to.equal(
+      '<img draggable="false" class="emojione" alt="👨👩👧👧" title=":family_mwgg:" src="/emoji/1f468-1f469-1f467-1f467.svg" />');
+    expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('<img draggable="false" class="emojione" alt="👩👩👦" title=":family_wwb:" src="/emoji/1f469-1f469-1f466.svg" />');
+    expect(emojify('\u2757')).to.equal(
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+  });
+
+  it('does multiple unicode', () => {
+    expect(emojify('\u2757 #\uFE0F\u20E3')).to.equal(
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
+    expect(emojify('\u2757#\uFE0F\u20E3')).to.equal(
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
+    expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).to.equal(
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+    expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).to.equal(
+      'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> bar');
+  });
+
+  it('does mixed unicode and shortnames', () => {
+    expect(emojify(':smile:#\uFE0F\u20E3:wink:\u2757')).to.equal('<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" /><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+  });
+
+  it('ignores unicode inside of tags', () => {
+    expect(emojify('<p data-foo="\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66"></p>')).to.equal('<p data-foo="\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66"></p>');
+  });
+
 });
diff --git a/yarn.lock b/yarn.lock
index adabca08d..609f256c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6819,6 +6819,10 @@ style-loader@^0.18.2:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
+substring-trie@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.0.tgz#5a7ecb83aefcca7b3720f7897cf69e97023be143"
+
 sugarss@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.0.tgz#65e51b3958432fb70d5451a68bb33e32d0cf1ef7"

From be94f9e35d4fbb1558fa772a618276562039fd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=82=89?= <noraworld@users.noreply.github.com>
Date: Mon, 3 Jul 2017 18:02:59 +0900
Subject: [PATCH 130/382] Update Japanese translation (#4051)

---
 config/locales/ja.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 52752e7d1..b45e06d3a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -385,7 +385,7 @@ ja:
       unlisted_long: 誰でも見ることができますが、公開タイムラインには表示されません
   stream_entries:
     click_to_show: クリックして表示
-    reblogged: ブーストされました
+    reblogged: さんにブーストされました
     sensitive_content: 閲覧注意
   time:
     formats:

From a6d02cff368d96178b0843ef021232d2187abbcd Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Mon, 3 Jul 2017 18:03:34 +0900
Subject: [PATCH 131/382] Rescue exceptions caused by FetchLinkCardService
 (#4045)

---
 app/models/concerns/remotable.rb        | 8 ++++++--
 app/services/fetch_link_card_service.rb | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index b0077ce96..08d4fc59c 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -10,7 +10,11 @@ module Remotable
       method_name = "#{attribute_name}=".to_sym
 
       define_method method_name do |url|
-        parsed_url = Addressable::URI.parse(url).normalize
+        begin
+          parsed_url = Addressable::URI.parse(url).normalize
+        rescue Addressable::URI::InvalidURIError
+          return
+        end
 
         return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[attribute_name] == url
 
@@ -26,7 +30,7 @@ module Remotable
           send("#{attachment_name}_file_name=", filename)
 
           self[attribute_name] = url if has_attribute?(attribute_name)
-        rescue HTTP::TimeoutError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e
+        rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e
           Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
           nil
         end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index c2df7b2f0..4ce221267 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -18,6 +18,8 @@ class FetchLinkCardService < BaseService
     return if res.code != 200 || res.mime_type != 'text/html'
 
     attempt_opengraph(card, url) unless attempt_oembed(card, url)
+  rescue HTTP::ConnectionError, OpenSSL::SSL::SSLError
+    nil
   end
 
   private

From 92f1c474f305de2383a4d2b3dffbcc20800cfb6f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 3 Jul 2017 18:04:35 +0900
Subject: [PATCH 132/382] Add fa-fw class to user agent icon (#4047)

---
 app/helpers/application_helper.rb                | 8 ++++++--
 app/views/auth/registrations/_sessions.html.haml | 7 ++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 36c37fae0..9f50d8bdb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,7 +31,11 @@ module ApplicationHelper
     Rails.env.production? ? site_title : "#{site_title} (Dev)"
   end
 
-  def fa_icon(icon)
-    content_tag(:i, nil, class: 'fa ' + icon.split(' ').map { |cl| "fa-#{cl}" }.join(' '))
+  def fa_icon(icon, attributes = {})
+    class_names = attributes[:class]&.split(' ') || []
+    class_names << 'fa'
+    class_names += icon.split(' ').map { |cl| "fa-#{cl}" }
+
+    content_tag(:i, nil, attributes.merge(class: class_names.join(' ')))
   end
 end
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 11c0d4e31..4521aad0a 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -11,9 +11,10 @@
     - @sessions.each do |session|
       %tr
         %td
-          %span{ title: session.user_agent }= fa_icon session_device_icon(session)
-          = ' '
-          = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}"), platform: t("sessions.platforms.#{session.platform}")
+          %span{ title: session.user_agent }<
+            = fa_icon "#{session_device_icon(session)} fw", 'aria-label' => session_device_icon(session)
+            = ' '
+            = t 'sessions.description', browser: t("sessions.browsers.#{session.browser}"), platform: t("sessions.platforms.#{session.platform}")
         %td
           %samp= session.ip
         %td

From a9c326b200247c1dc943c3e2467381772d37bfc8 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 3 Jul 2017 18:56:58 +0900
Subject: [PATCH 133/382] Upgrade chai-enzyme, precss and uws (#4010)

* Update chai-enzyme to v0.8.0

* Upgrade precss to v2.0.0

* Upgrade uws to v8.14.0
---
 package.json |   6 +-
 yarn.lock    | 257 ++++++++++++++++++++++-----------------------------
 2 files changed, 116 insertions(+), 147 deletions(-)

diff --git a/package.json b/package.json
index d5c05dae3..0845e83db 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "pg": "^6.4.0",
     "postcss-loader": "^2.0.6",
     "postcss-smart-import": "^0.7.4",
-    "precss": "^1.4.0",
+    "precss": "^2.0.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
     "rails-ujs": "^5.1.2",
@@ -106,7 +106,7 @@
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
-    "uws": "^0.14.5",
+    "uws": "^8.14.0",
     "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-manifest-plugin": "^1.1.0",
@@ -118,7 +118,7 @@
     "@storybook/react": "^3.1.6",
     "babel-eslint": "^7.2.3",
     "chai": "^4.0.1",
-    "chai-enzyme": "^0.7.1",
+    "chai-enzyme": "^0.8.0",
     "enzyme": "^2.9.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 609f256c9..a44f4ef7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -255,7 +255,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-any-promise@^0.1.0, any-promise@~0.1.0:
+any-promise@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
 
@@ -1317,10 +1317,6 @@ balanced-match@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.1.0.tgz#b504bd05869b39259dd0c5efc35d843176dccc4a"
 
-balanced-match@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.2.1.tgz#7bc658b4bed61eee424ad74f75f5c3e2c4df3cc7"
-
 balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1520,6 +1516,10 @@ callsites@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
 
+camelcase-css@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-1.0.1.tgz#157c4238265f5cf94a1dffde86446552cbf3f705"
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -1575,9 +1575,9 @@ center-align@^0.1.1:
     align-text "^0.1.3"
     lazy-cache "^1.0.3"
 
-chai-enzyme@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.7.1.tgz#a945c81989bcc4fd96af6263f9c0a9c668f29b66"
+chai-enzyme@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/chai-enzyme/-/chai-enzyme-0.8.0.tgz#609c552a1dcdb091f435e1e281cc4f2149a33be1"
   dependencies:
     html "^1.0.0"
     react-element-to-jsx-string "^5.0.0"
@@ -1996,7 +1996,7 @@ crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
-css-color-function@^1.2.0:
+css-color-function@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/css-color-function/-/css-color-function-1.3.0.tgz#72c767baf978f01b8a8a94f42f17ba5d22a776fc"
   dependencies:
@@ -3001,15 +3001,6 @@ fresh@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.0.tgz#f474ca5e6a9246d6fd8e0953cfa9b9c805afa78e"
 
-fs-extra@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952"
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    path-is-absolute "^1.0.0"
-    rimraf "^2.2.8"
-
 fs-extra@^0.30.0:
   version "0.30.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0"
@@ -3020,11 +3011,9 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-promise@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/fs-promise/-/fs-promise-0.3.1.tgz#bf34050368f24d6dc9dfc6688ab5cead8f86842a"
-  dependencies:
-    any-promise "~0.1.0"
+fs-readdir-recursive@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -3175,16 +3164,6 @@ glob@7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -3207,17 +3186,6 @@ globals@^9.0.0, globals@^9.14.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
-globby@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-3.0.1.tgz#2094af8421e19152150d5893eb6416b312d9a22f"
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^5.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^1.0.0"
-
 globby@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
@@ -4405,7 +4373,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -5019,22 +4987,12 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
-pinkie-promise@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-1.0.0.tgz#d1da67f5482563bb7cf57f286ae2822ecfbf3670"
-  dependencies:
-    pinkie "^1.0.0"
-
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
   dependencies:
     pinkie "^2.0.0"
 
-pinkie@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-1.0.0.tgz#5a47f28ba1015d0201bda7bf0f358e47bec8c7e4"
-
 pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
@@ -5074,7 +5032,7 @@ postcss-advanced-variables@1.2.2:
   dependencies:
     postcss "^5.0.10"
 
-postcss-atroot@^0.1.2:
+postcss-atroot@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/postcss-atroot/-/postcss-atroot-0.1.3.tgz#6752c0230c745140549345b2b0e30ebeda01a405"
   dependencies:
@@ -5088,12 +5046,12 @@ postcss-calc@^5.2.0:
     postcss-message-helpers "^2.0.0"
     reduce-css-calc "^1.2.6"
 
-postcss-color-function@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-2.0.1.tgz#9ad226f550e8a7c7f8b8a77860545b6dd7f55241"
+postcss-color-function@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-function/-/postcss-color-function-4.0.0.tgz#7e0106f4f6a1ecb1ad5b3a8553ace5e828aae187"
   dependencies:
-    css-color-function "^1.2.0"
-    postcss "^5.0.4"
+    css-color-function "^1.3.0"
+    postcss "^6.0.1"
     postcss-message-helpers "^2.0.0"
     postcss-value-parser "^3.3.0"
 
@@ -5112,26 +5070,25 @@ postcss-convert-values@^2.3.4:
     postcss "^5.0.11"
     postcss-value-parser "^3.1.2"
 
-postcss-custom-media@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz#138d25a184bf2eb54de12d55a6c01c30a9d8bd81"
+postcss-custom-media@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-6.0.0.tgz#be532784110ecb295044fb5395a18006eb21a737"
   dependencies:
-    postcss "^5.0.0"
+    postcss "^6.0.1"
 
-postcss-custom-properties@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-5.0.2.tgz#9719d78f2da9cf9f53810aebc23d4656130aceb1"
+postcss-custom-properties@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-6.1.0.tgz#9caf1151ac41b1e9e64d3a2ff9ece996ca18977d"
   dependencies:
-    balanced-match "^0.4.2"
-    postcss "^5.0.0"
+    balanced-match "^1.0.0"
+    postcss "^6.0.3"
 
-postcss-custom-selectors@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-3.0.0.tgz#8f81249f5ed07a8d0917cf6a39fe5b056b7f96ac"
+postcss-custom-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-4.0.1.tgz#781382f94c52e727ef5ca4776ea2adf49a611382"
   dependencies:
-    balanced-match "^0.2.0"
-    postcss "^5.0.0"
-    postcss-selector-matches "^2.0.0"
+    postcss "^6.0.1"
+    postcss-selector-matches "^3.0.0"
 
 postcss-discard-comments@^2.0.4:
   version "2.0.4"
@@ -5164,7 +5121,7 @@ postcss-discard-unused@^2.2.1:
     postcss "^5.0.14"
     uniqs "^2.0.0"
 
-postcss-extend@^1.0.1:
+postcss-extend@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/postcss-extend/-/postcss-extend-1.0.5.tgz#5ea98bf787ba3cacf4df4609743f80a833b1d0e7"
   dependencies:
@@ -5183,6 +5140,23 @@ postcss-flexbugs-fixes@^3.0.0:
   dependencies:
     postcss "^6.0.1"
 
+postcss-import@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-10.0.0.tgz#4c85c97b099136cc5ea0240dc1dfdbfde4e2ebbe"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^6.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
+postcss-js@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-1.0.0.tgz#ccee5aa3b1970dd457008e79438165f66919ba30"
+  dependencies:
+    camelcase-css "^1.0.1"
+    postcss "^6.0.1"
+
 postcss-load-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -5215,11 +5189,11 @@ postcss-loader@^2.0.5, postcss-loader@^2.0.6:
     postcss-load-config "^1.2.0"
     schema-utils "^0.3.0"
 
-postcss-media-minmax@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-2.1.2.tgz#444c5cf8926ab5e4fd8a2509e9297e751649cdf8"
+postcss-media-minmax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-3.0.0.tgz#675256037a43ef40bc4f0760bfd06d4dc69d48d2"
   dependencies:
-    postcss "^5.0.4"
+    postcss "^6.0.1"
 
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
@@ -5282,13 +5256,15 @@ postcss-minify-selectors@^2.0.4:
     postcss "^5.0.14"
     postcss-selector-parser "^2.0.0"
 
-postcss-mixins@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-2.1.1.tgz#b141a0803efa8e2d744867f8d91596890cf9241b"
+postcss-mixins@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-6.0.1.tgz#f5c9726259a6103733b43daa6a8b67dd0ed7aa47"
   dependencies:
-    globby "^3.0.1"
-    postcss "^5.0.10"
-    postcss-simple-vars "^1.0.1"
+    globby "^6.1.0"
+    postcss "^6.0.3"
+    postcss-js "^1.0.0"
+    postcss-simple-vars "^4.0.0"
+    sugarss "^1.0.0"
 
 postcss-modules-extract-imports@^1.0.0:
   version "1.2.0"
@@ -5317,17 +5293,17 @@ postcss-modules-values@^1.1.0:
     icss-replace-symbols "^1.1.0"
     postcss "^6.0.1"
 
-postcss-nested@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-1.0.1.tgz#91f28f4e6e23d567241ac154558a0cfab4cc0d8f"
+postcss-nested@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-2.0.2.tgz#f38fad547f5c3747160aec3bb34745819252974a"
   dependencies:
-    postcss "^5.2.17"
+    postcss "^6.0.1"
 
-postcss-nesting@^2.0.6:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-2.3.1.tgz#94a6b6a4ef707fbec20a87fee5c957759b4e01cf"
+postcss-nesting@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-4.0.1.tgz#8fc2ce40cbfcfab7ee24e7b68fb6ebe84b641469"
   dependencies:
-    postcss "^5.0.19"
+    postcss "^6.0.1"
 
 postcss-normalize-charset@^1.1.0:
   version "1.1.1"
@@ -5351,17 +5327,14 @@ postcss-ordered-values@^2.1.0:
     postcss "^5.0.4"
     postcss-value-parser "^3.0.1"
 
-postcss-partial-import@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-partial-import/-/postcss-partial-import-1.3.0.tgz#2f4b773a76c7b0a69b389dcf475c4d362d0d2576"
+postcss-partial-import@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-partial-import/-/postcss-partial-import-4.1.0.tgz#f6c3e78e7bbeda4d9dab96d360367b90b353f9a4"
   dependencies:
-    fs-extra "^0.24.0"
-    fs-promise "^0.3.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.5"
-    string-hash "^1.1.0"
+    glob "^7.1.1"
+    postcss-import "^10.0.0"
 
-postcss-property-lookup@^1.1.3:
+postcss-property-lookup@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/postcss-property-lookup/-/postcss-property-lookup-1.2.1.tgz#30450a1361b7aae758bbedd5201fbe057bb8270b"
   dependencies:
@@ -5404,19 +5377,19 @@ postcss-scss@^1.0.0:
   dependencies:
     postcss "^6.0.3"
 
-postcss-selector-matches@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-2.0.5.tgz#fa0f43be57b68e77aa4cd11807023492a131027f"
+postcss-selector-matches@^3.0.0, postcss-selector-matches@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-3.0.1.tgz#e5634011e13950881861bbdd58c2d0111ffc96ab"
   dependencies:
     balanced-match "^0.4.2"
-    postcss "^5.0.0"
+    postcss "^6.0.1"
 
-postcss-selector-not@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-2.0.0.tgz#c73ad21a3f75234bee7fee269e154fd6a869798d"
+postcss-selector-not@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-3.0.1.tgz#2e4db2f0965336c01e7cec7db6c60dff767335d9"
   dependencies:
-    balanced-match "^0.2.0"
-    postcss "^5.0.0"
+    balanced-match "^0.4.2"
+    postcss "^6.0.1"
 
 postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
   version "2.2.3"
@@ -5426,11 +5399,11 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-simple-vars@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-1.2.0.tgz#2e6689921144b74114e765353275a3c32143f150"
+postcss-simple-vars@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-4.0.0.tgz#d49e082897d9a4824f2268fa91d969d943e2ea76"
   dependencies:
-    postcss "^5.0.13"
+    postcss "^6.0.1"
 
 postcss-smart-import@^0.7.4:
   version "0.7.4"
@@ -5477,7 +5450,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.19, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.6:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16, postcss@^5.2.6:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -5516,26 +5489,26 @@ precond@0.2:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac"
 
-precss@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/precss/-/precss-1.4.0.tgz#8d7c3ae70f10a00a3955287f85a66e0f8b31cda3"
+precss@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/precss/-/precss-2.0.0.tgz#7f567e3318e06d44c8fdbf9e58452e8358bf4b71"
   dependencies:
-    postcss "^5.0.10"
+    postcss "^6.0.3"
     postcss-advanced-variables "1.2.2"
-    postcss-atroot "^0.1.2"
-    postcss-color-function "^2.0.0"
-    postcss-custom-media "^5.0.0"
-    postcss-custom-properties "^5.0.0"
-    postcss-custom-selectors "^3.0.0"
-    postcss-extend "^1.0.1"
-    postcss-media-minmax "^2.1.0"
-    postcss-mixins "^2.1.0"
-    postcss-nested "^1.0.0"
-    postcss-nesting "^2.0.6"
-    postcss-partial-import "^1.3.0"
-    postcss-property-lookup "^1.1.3"
-    postcss-selector-matches "^2.0.0"
-    postcss-selector-not "^2.0.0"
+    postcss-atroot "^0.1.3"
+    postcss-color-function "^4.0.0"
+    postcss-custom-media "^6.0.0"
+    postcss-custom-properties "^6.1.0"
+    postcss-custom-selectors "^4.0.1"
+    postcss-extend "^1.0.5"
+    postcss-media-minmax "^3.0.0"
+    postcss-mixins "^6.0.1"
+    postcss-nested "^2.0.2"
+    postcss-nesting "^4.0.1"
+    postcss-partial-import "^4.1.0"
+    postcss-property-lookup "^1.2.1"
+    postcss-selector-matches "^3.0.1"
+    postcss-selector-not "^3.0.1"
 
 prelude-ls@~1.1.2:
   version "1.1.2"
@@ -6254,7 +6227,7 @@ resolve-url@~0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
-resolve@^1.1.6, resolve@^1.3.3:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.3.tgz#655907c3469a8680dc2de3a275a8fdd69691f0e5"
   dependencies:
@@ -6710,10 +6683,6 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
-string-hash@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -7145,9 +7114,9 @@ uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04"
 
-uws@^0.14.5:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/uws/-/uws-0.14.5.tgz#67aaf33c46b2a587a5f6666d00f7691328f149dc"
+uws@^8.14.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/uws/-/uws-8.14.0.tgz#acc1488d13ecb23fe2f942a7eafb06681fa91431"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.1"

From f85dbe83c8e982f9685fbc802031b74c7c319bc7 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 3 Jul 2017 20:17:27 +0900
Subject: [PATCH 134/382] Remove sort in Feed (#4050)

In from_redis method, statuses retrieved from the database was mapped to
the IDs retrieved from Redis. It was equivalent to order from high to low
because those IDs are sorted in the same order.
Statuses are ordered with the ID by default, so we do not have to reorder.
Sorting statuses in the database is even faster since the IDs are indexed
with B-tree.
---
 app/models/feed.rb       | 3 +--
 spec/models/feed_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/feed.rb b/app/models/feed.rb
index 5125e51ff..beb4a8de3 100644
--- a/app/models/feed.rb
+++ b/app/models/feed.rb
@@ -20,8 +20,7 @@ class Feed
     max_id     = '+inf' if max_id.blank?
     since_id   = '-inf' if since_id.blank?
     unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:last).map(&:to_i)
-    status_map = Status.where(id: unhydrated).cache_ids.map { |s| [s.id, s] }.to_h
-    unhydrated.map { |id| status_map[id] }.compact
+    Status.where(id: unhydrated).cache_ids
   end
 
   def from_database(limit, max_id, since_id)
diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
index 1cdb3a783..1c377c17f 100644
--- a/spec/models/feed_spec.rb
+++ b/spec/models/feed_spec.rb
@@ -2,7 +2,7 @@ require 'rails_helper'
 
 RSpec.describe Feed, type: :model do
   describe '#get' do
-    it 'gets statuses with ids in the range, maintining the order from Redis' do
+    it 'gets statuses with ids in the range' do
       account = Fabricate(:account)
       Fabricate(:status, account: account, id: 1)
       Fabricate(:status, account: account, id: 2)

From 275c5b51ed7e22734d18db6acb2b87ba26bd435f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 4 Jul 2017 22:19:24 +0900
Subject: [PATCH 135/382] Customizable privacy policy from admin interface
 (#4062)

---
 app/controllers/about_controller.rb          |  2 +-
 app/controllers/admin/settings_controller.rb |  1 +
 app/presenters/instance_presenter.rb         |  1 +
 app/views/about/terms.en.html.haml           | 76 --------------------
 app/views/about/terms.html.haml              |  8 +++
 app/views/about/terms.ja.html.haml           | 76 --------------------
 app/views/about/terms.no.html.haml           | 76 --------------------
 app/views/admin/settings/edit.html.haml      |  7 ++
 config/locales/en.yml                        | 73 +++++++++++++++++++
 config/locales/ja.yml                        | 70 ++++++++++++++++++
 config/locales/no.yml                        | 70 ++++++++++++++++++
 config/settings.yml                          |  1 +
 12 files changed, 232 insertions(+), 229 deletions(-)
 delete mode 100644 app/views/about/terms.en.html.haml
 create mode 100644 app/views/about/terms.html.haml
 delete mode 100644 app/views/about/terms.ja.html.haml
 delete mode 100644 app/views/about/terms.no.html.haml

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 04e7ddacf..c0addbecc 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -2,7 +2,7 @@
 
 class AboutController < ApplicationController
   before_action :set_body_classes
-  before_action :set_instance_presenter, only: [:show, :more]
+  before_action :set_instance_presenter, only: [:show, :more, :terms]
 
   def show; end
 
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index fcd42c79c..7542f55e8 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -8,6 +8,7 @@ module Admin
       site_title
       site_description
       site_extended_description
+      site_terms
       open_registrations
       closed_registrations_message
     ).freeze
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 9a69809d0..63ef23d5d 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -7,6 +7,7 @@ class InstancePresenter
     :open_registrations,
     :site_description,
     :site_extended_description,
+    :site_terms,
     to: Setting
   )
 
diff --git a/app/views/about/terms.en.html.haml b/app/views/about/terms.en.html.haml
deleted file mode 100644
index 7e0fb94c2..000000000
--- a/app/views/about/terms.en.html.haml
+++ /dev/null
@@ -1,76 +0,0 @@
-- content_for :page_title do
-  #{site_hostname} Terms of Service and Privacy Policy
-
-.wrapper
-  %h2 Privacy Policy
-
-  %h3#collect What information do we collect?
-
-  %p We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.
-
-  %p When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.
-
-  %p When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.
-
-  %h3#use What do we use your information for?
-
-  %p Any of the information we collect from you may be used in one of the following ways:
-
-  %ul
-    %li To personalize your experience &mdash; your information helps us to better respond to your individual needs.
-    %li To improve our site &mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.
-    %li To improve customer service &mdash; your information helps us to more effectively respond to your customer service requests and support needs.
-    %li To send periodic emails &mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.
-
-  %h3#protect How do we protect your information?
-
-  %p We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.
-
-  %h3#data-retention What is your data retention policy?
-
-  %p We will make a good faith effort to:
-
-  %ul
-    %li Retain server logs containing the IP address of all requests to this server no more than 90 days.
-    %li Retain the IP addresses associated with registered users and their posts no more than 5 years.
-
-  %h3#cookies Do we use cookies?
-
-  %p Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.
-
-  %p We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.
-
-  %h3#disclose Do we disclose any information to outside parties?
-
-  %p We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.
-
-  %h3#third-party Third party links
-
-  %p Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.
-
-  %h3#coppa Children's Online Privacy Protection Act Compliance
-
-  %p
-    Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA
-    = surround '(', '),' do
-      = link_to 'Children\'s Online Privacy Protection Act', 'https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act'
-    do not use this site.
-
-  %h3#online Online Privacy Policy Only
-
-  %p This online privacy policy applies only to information collected through our site and not to information collected offline.
-
-  %h3#consent Your Consent
-
-  %p By using our site, you consent to our web site privacy policy.
-
-  %h3#changes Changes to our Privacy Policy
-
-  %p If we decide to change our privacy policy, we will post those changes on this page.
-
-  %p This document is CC-BY-SA. It was last updated May 31, 2013.
-
-  %p
-    Originally adapted from the
-    = succeed '.' do
-      = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse'
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
new file mode 100644
index 000000000..58064f0be
--- /dev/null
+++ b/app/views/about/terms.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  = t('terms.title', instance: site_hostname)
+
+.wrapper
+  - if @instance_presenter.site_terms.present?
+    = raw @instance_presenter.site_terms
+  - else
+    = t('terms.body_html')
diff --git a/app/views/about/terms.ja.html.haml b/app/views/about/terms.ja.html.haml
deleted file mode 100644
index 5c546b3e0..000000000
--- a/app/views/about/terms.ja.html.haml
+++ /dev/null
@@ -1,76 +0,0 @@
-- content_for :page_title do
-  #{site_hostname} 利用規約・プライバシーポリシー
-
-.wrapper
-  %h2 プライバシーポリシー
-
-  %h3#collect どのような情報を収集するのですか？
-
-  %p あなたがこのサイトに登録すると、ここで共有された情報を読んだり、書いたり、評価したりして、フォーラムでの情報を集める事ができます。
-
-  %p このサイトに登録する際には、名前とメールアドレスの入力を求めることがあります。ただし、登録をすることなくこのサイトを利用することも可能です。あなたのメールアドレスは、固有のリンクを含んだメールで確認されます。そのリンクにアクセスした場合にメールアドレスを制御することとなります。
-
-  %p アカウントを登録し、投稿を行った際にはその投稿が行われたIPアドレスを記録します。また、このサーバーに対する全てのリクエストはIPアドレスを含むサーバーログとして保管されます。
-
-  %h3#use 自分の情報を何に使うのですか？
-
-  %p このサイトで収集された情報は、次のいくつかの方法で使用されます:
-
-  %ul
-    %li パーソナライズ・エクスペリエンス &mdash; あなたの情報は、あなたや他のユーザーのニーズに対応するために役立ちます。
-    %li サイトの改善・最適化 &mdash; このサービスはあなたから受け取った情報やフィードバックに基づいて提供されるサイトの改善を行いつづけます。
-    %li サービスの向上 &mdash; あなたの情報は、ユーザーからの要求やサポートへより効果的に対応するために役立ちます。
-    %li 定期メールの送信 &mdash; メールアドレスは、情報の送信、トピックの変更やユーザー名に関係するお知らせ、お問い合わせに関する返答、その他のリクエストや質問に関してお知らせするために使用されます。
-
-  %h3#protect 自分の情報はどのように保護されるのですか？
-
-  %p このサービスはあなたの個人情報の入力、送信、またはアクセスに際してあなたの個人情報の安全性を維持するために様々なセキュリティ手段をとっています。
-
-  %h3#data-retention データ保持のポリシーはどのようになっていますか？
-
-  %p このサービスはデータ保持に関して次のことを行うよう努めます。:
-
-  %ul
-    %li このサーバーへのすべての要求に対して、IPアドレスを含むサーバーログを90日以内に渡って保持します。
-    %li 登録されたユーザーとその投稿に関連付けされたIPアドレスを5年以内に渡って保持します。
-
-  %h3#cookies クッキーを使用していますか？
-
-  %p はい。クッキーはあなたがウェブブラウザ上で許可した場合にコンピュータのストレージに転送される小さなファイルです。これらのクッキーを使用すると、サイトでブラウザが識別され、登録済みのアカウントを持っている場合は登録済みのアカウントに関連付けがされます。
-
-  %p クッキーを使用して、今後再度閲覧された場合に前回のデータから設定を呼び出したり、今後の改善のためにサイトのトラフィックやサイトの相互作用に関する集計データを作成します。このサービスは、サイトを訪れた方との理解を深めるために、第三者のサービス提供者と契約することがあります。これらのサービス提供者というものは、このサービスでの業務を行ったり、改善するためにこのサービスの代わって収集された情報を使用することはできません。
-
-  %h3#disclose このサイトは外部に何らかの情報を開示していますか？
-
-  %p 私たちは、個人を特定出来る情報を外部へ販売、取引、または他の方法で渡すことはありません。これには、このサイトを操作したり、業務を行ったり、サービスを提供するのに役立つ信頼できる第三者は含まれません。法令遵守、サイトポリシーの施行、このサービスや他の人の権利、財産または安全の保護のために適切であると判断した場合に、あなたの情報を公開する場合があります。ただし、マーケティングや広告、その他の目的で匿名での訪問者情報を他者へ提供することができます。
-
-  %h3#third-party サードパーティのリンク
-
-  %p 必要に応じて、このサービスの方針にもとづいてこのサイトや第三者のサービスを提供することがあります。これらの第三者のサイトには、個別の独立したプライバシーポリシーがあります。従って、これらのリンク先のサイトに関するコンテンツや活動にかんしては一切責任を負いません。ですが、サイトの完全性やこれらのサイトに関するフィードバックは非常に重要なものであると認識しております。
-
-  %h3#coppa 子供のオンライン・プライバシー保護法
-
-  %p
-    このサイト、製品、サービスはすべて13歳以上の人を対象としております。このサーバーが米国にあり、13歳未満の場合はCOPPA
-    = surround '(', '),' do
-      = link_to 'Children\'s Online Privacy Protection Act', 'https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act'
-    にもとづいてこのサイトを使用しないでください。
-
-  %h3#online オンライン限定のプライバシーポリシー
-
-  %p このオンライン・プライバシーポリシーは、このサイトを通じて収集された情報のみに適用され、オフラインで収集される情報には適用されません。
-
-  %h3#consent あなたの同意
-
-  %p このサービスを使用することにより、このサイトのプライバシーポリシーに同意するものとします。
-
-  %h3#changes プライバシーポリシーの変更
-
-  %p プライバシーポリシーを変更する場合は、このページへ変更内容を掲載します。
-
-  %p この文章のライセンスはCC-BY-SAです。このページは2017年5月6日が最終更新です。
-
-  %p
-    オリジナルの出典
-    = succeed '.' do
-      = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse'
diff --git a/app/views/about/terms.no.html.haml b/app/views/about/terms.no.html.haml
deleted file mode 100644
index 46f62950d..000000000
--- a/app/views/about/terms.no.html.haml
+++ /dev/null
@@ -1,76 +0,0 @@
-- content_for :page_title do
-  #{site_hostname} Personvern og villkår for bruk av nettstedet
-
-.wrapper
-  %h2 Personvernserklæring
-
-  %h3#collect Hvilke opplysninger samler vi?
-
-  %p Vi samler opplysninger fra deg når du registrerer deg på nettstedet vårt, og vi samler data når du deltar på forumet ved å lese, skrive og evaluere innholdet som deles her.
-
-  %p Når du registrerer deg på nettstedet vårt, kan du bli bedt om å oppgi navnet og e-postadressen din. Imidlertid kan du besøke nettstedet vårt uten å registrere deg. E-postadressen din vil bli bekreftet med en e-post som inneholder en unik lenke. Hvis siden den lenker til, blir besøkt, vet vi at du har kontroll over e-postadressen.
-
-  %p Når du registrerer deg og skriver innlegg, registrerer vi IP-adressen som innlegget stammer fra. Vi kan også oppbevare logger som inkluderer IP-adressen til alle forespørslene sendt til tjeneren vår.
-
-  %h3#use Hva bruker vi opplysningene dine til?
-
-  %p Alle opplysningene vi samler fra deg, kan bli brukt på en av følgende måter:
-
-  %ul
-    %li For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov.
-    %li For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg.
-    %li For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte.
-    %li For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.
-
-  %h3#protect Hvordan sikrer vi opplysningene?
-
-  %p Vi gjennomfører flere sikkerhetstiltak for å holde personopplysningene dine sikre når du skriver inn, lagrer eller henter dem.
-
-  %h3#data-retention Hva er retningslinjene deres for lagring av data?
-
-  %p Vi vil forsøke i god tro å:
-
-  %ul
-    %li Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forespørslene til denne tjeneren i lenger enn i 90 dager.
-    %li Ikke oppbevare IP-adressene forbundet med registrerte brukere og deres innlegg lenger enn i 5 år.
-
-  %h3#cookies Bruker vi informasjonskapsler?
-
-  %p Ja. Informasjonskapsler er små filer som et nettsted eller dets tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater det). Disse informasjonskapslene gjør det mulig for nettstedet å gjenkjenne nettleseren din og, dersom du har en konto, knytte nettleseren til den.
-
-  %p Vi bruker informasjonskapsler for å forstå og lagre preferansene dine for fremtidige besøk og for å samle aggregatdata om trafikk på og samhandling med nettstedet slik at vi kan tilby bedre opplevelser og verktøy på nettstedet i fremtiden. Vi kan inngå avtaler med tredjeparts tjenesteleverandører for å bistå oss i å forstå besøkerne våres bedre. Disse tjenesteleverandørene har ikke lov til å bruke opplysningene samlet på våres vegne unntatt til å hjelpe oss å gjennomføre og forbedre anliggendet vårt.
-
-  %h3#disclose Gir vi noen opplysninger videre til andre parter?
-
-  %p Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for markedsføring, reklame eller annet bruk.
-
-  %h3#third-party Tredjeparts lenker
-
-  %p Av og til, etter skjønn, kan vil inkludere eller tilby tredjeparts produkter eller tjenester på nettstedet vårt. Disse tredjeparts nettstedene har separate og selvstendige personvernerklæringer. Vi bærer derfor intet ansvar eller forpliktelser for innholdet eller aktivitetene til disse nettstedene det lenkes til. Ikke mindre prøver vi å bevare vår eget nettsteds integritet og ønsker enhver tilbakemelding om disse nettstedene velkomne.
-
-  %h3#coppa Overensstemmelse med Children's Online Privacy Protection Act
-
-  %p
-    Nettstedet er rettet mot folk som er minst 13 år gamle. Dersom denne tjeneren er i USA, og du er under 13 år i henhold til kravene i  COPPA
-    = surround '(', '),' do
-      = link_to 'Children\'s Online Privacy Protection Act', 'https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act'
-    ikke bruk dette nettstedet.
-
-  %h3#online Personvernerklæring bare for nettet
-
-  %p Denne nett-personvernerklæringen gjelder bare for informasjon samlet gjennom nettstedet vårt og ikke for opplysninger samlet når en er frakoblet.
-
-  %h3#consent Ditt samtykke
-
-  %p Ved å bruke dette nettstedet samtykker du til nettstedets personvernerklæring.
-
-  %h3#changes Endringer i vår personvernerklæring
-
-  %p Dersom vi beslutter å endre personvernerklæringen vår, vil vi publisere disse endringene på denne siden.
-
-  %p Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017.
-
-  %p
-    Dokumentet er en adoptert og endret versjon fra
-    = succeed '.' do
-      = link_to 'Discourse privacy policy', 'https://github.com/discourse/discourse'
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index edb69e360..3096a958d 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -40,6 +40,13 @@
         %td= text_area_tag :site_extended_description,
           @settings['site_extended_description'].value,
           rows: 8
+      %tr
+        %td
+          %strong= t('admin.settings.site_terms.title')
+          %p= t('admin.settings.site_terms.desc_html')
+        %td= text_area_tag :site_terms,
+          @settings['site_terms'].value,
+          rows: 8
       %tr
         %td
           %strong= t('admin.settings.registrations.open.title')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 944c24c60..60e192491 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -183,6 +183,9 @@ en:
       site_description_extended:
         desc_html: Displayed on extended information page<br>You can use HTML tags
         title: Extended site description
+      site_terms:
+        desc_html: Displayed on terms page<br>You can use HTML tags
+        title: Site Privacy Policy
       site_title: Site title
       title: Site Settings
     subscriptions:
@@ -387,6 +390,76 @@ en:
     click_to_show: Click to show
     reblogged: boosted
     sensitive_content: Sensitive content
+  terms:
+    body_html: |
+      <h2>Privacy Policy</h2>
+
+      <h3 id="collect">What information do we collect?</h3>
+
+      <p>We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.</p>
+
+      <p>When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.</p>
+
+      <p>When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.</p>
+
+      <h3 id="use">What do we use your information for?</h3>
+
+      <p>Any of the information we collect from you may be used in one of the following ways:</p>
+
+      <ul>
+        <li>To personalize your experience &mdash; your information helps us to better respond to your individual needs.</li>
+        <li>To improve our site &mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.</li>
+        <li>To improve customer service &mdash; your information helps us to more effectively respond to your customer service requests and support needs.</li>
+        <li>To send periodic emails &mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.</li>
+      </ul>
+
+      <h3 id="protect">How do we protect your information?</h3>
+
+      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.</p>
+
+      <h3 id="data-retention">What is your data retention policy?</h3>
+
+      <p>We will make a good faith effort to:</p>
+
+      <ul>
+        <li>Retain server logs containing the IP address of all requests to this server no more than 90 days.</li>
+        <li>Retain the IP addresses associated with registered users and their posts no more than 5 years.</li>
+      </ul>
+
+      <h3 id="cookies">Do we use cookies?</h3>
+
+      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
+
+      <p>We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.</p>
+
+      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
+
+      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.</p>
+
+      <h3 id="third-party">Third party links</h3>
+
+      <p>Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.</p>
+
+      <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3>
+
+      <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
+
+      <h3 id="online">Online Privacy Policy Only</h3>
+
+      <p>This online privacy policy applies only to information collected through our site and not to information collected offline.</p>
+
+      <h3 id="consent">Your Consent</h3>
+
+      <p>By using our site, you consent to our web site privacy policy.</p>
+
+      <h3 id="changes">Changes to our Privacy Policy</h3>
+
+      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
+
+      <p>This document is CC-BY-SA. It was last updated May 31, 2013.</p>
+
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.
+    title: "%{instance} Terms of Service and Privacy Policy"
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index b45e06d3a..347270af2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -387,6 +387,76 @@ ja:
     click_to_show: クリックして表示
     reblogged: さんにブーストされました
     sensitive_content: 閲覧注意
+  terms:
+    body_html: |
+      <h2>プライバシーポリシー</h2>
+
+      <h3 id="collect">どのような情報を収集するのですか？</h3>
+ 
+      <p>あなたがこのサイトに登録すると、ここで共有された情報を読んだり、書いたり、評価したりして、フォーラムでの情報を集める事ができます。</p>
+
+      <p>このサイトに登録する際には、名前とメールアドレスの入力を求めることがあります。ただし、登録をすることなくこのサイトを利用することも可能です。あなたのメールアドレスは、固有のリンクを含んだメールで確認されます。そのリンクにアクセスした場合にメールアドレスを制御することとなります。</p>
+
+      <p>アカウントを登録し、投稿を行った際にはその投稿が行われたIPアドレスを記録します。また、このサーバーに対する全てのリクエストはIPアドレスを含むサーバーログとして保管されます。</p>
+
+      <h3 id="use">自分の情報を何に使うのですか？</h3>
+
+      <p>このサイトで収集された情報は、次のいくつかの方法で使用されます:</p>
+
+      <ul>
+        <li>パーソナライズ・エクスペリエンス &mdash; あなたの情報は、あなたや他のユーザーのニーズに対応するために役立ちます。</li>
+        <li>サイトの改善・最適化 &mdash; このサービスはあなたから受け取った情報やフィードバックに基づいて提供されるサイトの改善を行いつづけます。</li>
+        <li>サービスの向上 &mdash; あなたの情報は、ユーザーからの要求やサポートへより効果的に対応するために役立ちます。</li>
+        <li>定期メールの送信 &mdash; メールアドレスは、情報の送信、トピックの変更やユーザー名に関係するお知らせ、お問い合わせに関する返答、その他のリクエストや質問に関してお知らせするために使用されます。</li>
+      </ul>
+
+      <h3 id="protect">自分の情報はどのように保護されるのですか？</h3>
+
+      <p>このサービスはあなたの個人情報の入力、送信、またはアクセスに際してあなたの個人情報の安全性を維持するために様々なセキュリティ手段をとっています。</p>
+
+      <h3 id="data-retention>データ保持のポリシーはどのようになっていますか？</h3>
+
+      <p>このサービスはデータ保持に関して次のことを行うよう努めます。:</p>
+
+      <ul>
+        <li>このサーバーへのすべての要求に対して、IPアドレスを含むサーバーログを90日以内に渡って保持します。</li>
+        <li>登録されたユーザーとその投稿に関連付けされたIPアドレスを5年以内に渡って保持します。</li>
+      </ul>
+
+      <h3 id="cookies">クッキーを使用していますか？</h3>
+
+      <p>はい。クッキーはあなたがウェブブラウザ上で許可した場合にコンピュータのストレージに転送される小さなファイルです。これらのクッキーを使用すると、サイトでブラウザが識別され、登録済みのアカウントを持っている場合は登録済みのアカウントに関連付けがされます。</p>
+
+      <p>クッキーを使用して、今後再度閲覧された場合に前回のデータから設定を呼び出したり、今後の改善のためにサイトのトラフィックやサイトの相互作用に関する集計データを作成します。このサービスは、サイトを訪れた方との理解を深めるために、第三者のサービス提供者と契約することがあります。これらのサービス提供者というものは、このサービスでの業務を行ったり、改善するためにこのサービスの代わって収集された情報を使用することはできません。</p>
+
+      <h3 id="disclose">このサイトは外部に何らかの情報を開示していますか？</h3>
+
+      <p>私たちは、個人を特定出来る情報を外部へ販売、取引、または他の方法で渡すことはありません。これには、このサイトを操作したり、業務を行ったり、サービスを提供するのに役立つ信頼できる第三者は含まれません。法令遵守、サイトポリシーの施行、このサービスや他の人の権利、財産または安全の保護のために適切であると判断した場合に、あなたの情報を公開する場合があります。ただし、マーケティングや広告、その他の目的で匿名での訪問者情報を他者へ提供することができます。</p>
+
+      <h3 id="third-party">サードパーティのリンク</h3>
+
+      <p>必要に応じて、このサービスの方針にもとづいてこのサイトや第三者のサービスを提供することがあります。これらの第三者のサイトには、個別の独立したプライバシーポリシーがあります。従って、これらのリンク先のサイトに関するコンテンツや活動にかんしては一切責任を負いません。ですが、サイトの完全性やこれらのサイトに関するフィードバックは非常に重要なものであると認識しております。</p>
+
+      <h3 id="coppa">子供のオンライン・プライバシー保護法</h3>
+
+      <p>このサイト、製品、サービスはすべて13歳以上の人を対象としております。このサーバーが米国にあり、13歳未満の場合はCOPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) にもとづいてこのサイトを使用しないでください。</p>
+
+      <h3 id="online">オンライン限定のプライバシーポリシー</h3>
+
+      <p>このオンライン・プライバシーポリシーは、このサイトを通じて収集された情報のみに適用され、オフラインで収集される情報には適用されません。</p>
+
+      <h3 id="consent">あなたの同意</h3>
+
+      <p>このサービスを使用することにより、このサイトのプライバシーポリシーに同意するものとします。</p>
+
+      <h3 id="changes">プライバシーポリシーの変更</h3>
+
+      <p>プライバシーポリシーを変更する場合は、このページへ変更内容を掲載します。</p>
+
+      <p>この文章のライセンスはCC-BY-SAです。このページは2017年5月6日が最終更新です。</p>
+
+      <p>オリジナルの出典 <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.
+    title: "%{instance} 利用規約・プライバシーポリシー"
   time:
     formats:
       default: "%Y年%m月%d日 %H:%M"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f71c08c6a..5fd63f121 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -321,6 +321,76 @@
     click_to_show: Klikk for å vise
     reblogged: fremhevde
     sensitive_content: Følsomt innhold
+  terms:
+    body_html: |
+      <h2>Personvernserklæring</h2>
+
+      <h3 id='collect'>Hvilke opplysninger samler vi?</h3>
+
+      <p>Vi samler opplysninger fra deg når du registrerer deg på nettstedet vårt, og vi samler data når du deltar på forumet ved å lese, skrive og evaluere innholdet som deles her.</p>
+
+      <p>Når du registrerer deg på nettstedet vårt, kan du bli bedt om å oppgi navnet og e-postadressen din. Imidlertid kan du besøke nettstedet vårt uten å registrere deg. E-postadressen din vil bli bekreftet med en e-post som inneholder en unik lenke. Hvis siden den lenker til, blir besøkt, vet vi at du har kontroll over e-postadressen.</p>
+
+      <p>Når du registrerer deg og skriver innlegg, registrerer vi IP-adressen som innlegget stammer fra. Vi kan også oppbevare logger som inkluderer IP-adressen til alle forespørslene sendt til tjeneren vår.</p>
+
+      <h3 id='use'>Hva bruker vi opplysningene dine til?</h3>
+
+      <p>Alle opplysningene vi samler fra deg, kan bli brukt på en av følgende måter:</p>
+
+      <ul>
+        <li>For å gjøre opplevelsen din mer personlig. Opplysningene dine hjelper oss å svare bedre på dine individuelle behov.</li>
+        <li>For å forbedre nettstedet vårt. Vi jobber konstant for å forbedre nettstedets tilbud basert på opplysningene og tilbakemeldingene vi mottar fra deg.</li>
+        <li>For å forbedre vår kundeservice. Dine opplysninger hjelper oss å svare mer effektivt på dine forespørsler sendt til kundeservice eller behov om støtte.</li>
+        <li>For å sende periodiske e-poster. E-postadressen du oppgir, kan bli brukt til å sende deg informasjon, påminnelser som du ber om ved endringer av emner eller ved svar til brukernavnet ditt, til henvendelser, og/eller andre forspørsler eller andre spørsmål.</li>
+      </ul>
+
+      <h3 id='protect'>Hvordan sikrer vi opplysningene?</h3>
+
+      <p>Vi gjennomfører flere sikkerhetstiltak for å holde personopplysningene dine sikre når du skriver inn, lagrer eller henter dem.</p>
+
+      <h3 id='data-retention'>Hva er retningslinjene deres for lagring av data?</h3>
+
+      <p>Vi vil forsøke i god tro å:</p>
+
+      <ul>
+        <li>Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forespørslene til denne tjeneren i lenger enn i 90 dager.</li>
+        <li>Ikke oppbevare IP-adressene forbundet med registrerte brukere og deres innlegg lenger enn i 5 år.</li>
+      </ul>
+
+      <h3 id='cookies'>Bruker vi informasjonskapsler?</h3>
+
+      <p>Ja. Informasjonskapsler er små filer som et nettsted eller dets tjenesteleverandør overfører til harddisken på datamaskinen din gjennom nettleseren din (dersom du tillater det). Disse informasjonskapslene gjør det mulig for nettstedet å gjenkjenne nettleseren din og, dersom du har en konto, knytte nettleseren til den.</p>
+
+      <p>Vi bruker informasjonskapsler for å forstå og lagre preferansene dine for fremtidige besøk og for å samle aggregatdata om trafikk på og samhandling med nettstedet slik at vi kan tilby bedre opplevelser og verktøy på nettstedet i fremtiden. Vi kan inngå avtaler med tredjeparts tjenesteleverandører for å bistå oss i å forstå besøkerne våres bedre. Disse tjenesteleverandørene har ikke lov til å bruke opplysningene samlet på våres vegne unntatt til å hjelpe oss å gjennomføre og forbedre anliggendet vårt.</p>
+
+      <h3 id='disclose'>Gir vi noen opplysninger videre til andre parter?</h3>
+
+      <p>Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for markedsføring, reklame eller annet bruk.</p>
+
+      <h3 id='third-party'>Tredjeparts lenker</h3>
+
+      <p>Av og til, etter skjønn, kan vil inkludere eller tilby tredjeparts produkter eller tjenester på nettstedet vårt. Disse tredjeparts nettstedene har separate og selvstendige personvernerklæringer. Vi bærer derfor intet ansvar eller forpliktelser for innholdet eller aktivitetene til disse nettstedene det lenkes til. Ikke mindre prøver vi å bevare vår eget nettsteds integritet og ønsker enhver tilbakemelding om disse nettstedene velkomne.</p>
+
+      <h3 id='coppa'>Overensstemmelse med Children's Online Privacy Protection Act</h3>
+
+      <p>Nettstedet er rettet mot folk som er minst 13 år gamle. Dersom denne tjeneren er i USA, og du er under 13 år i henhold til kravene i  COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children&#39;s Online Privacy Protection Act</a>), ikke bruk dette nettstedet.</p>
+
+      <h3 id='online'>Personvernerklæring bare for nettet</h3>
+
+      <p>Denne nett-personvernerklæringen gjelder bare for informasjon samlet gjennom nettstedet vårt og ikke for opplysninger samlet når en er frakoblet.</p>
+
+      <h3 id='consent'>Ditt samtykke</h3>
+
+      <p>Ved å bruke dette nettstedet samtykker du til nettstedets personvernerklæring.</p>
+
+      <h3 id='changes'>Endringer i vår personvernerklæring</h3>
+
+      <p>Dersom vi beslutter å endre personvernerklæringen vår, vil vi publisere disse endringene på denne siden.</p>
+
+      <p>Dette dokumentet er lisensiert under CC-BY-SA. De ble sist oppdatert 12. april 2017.</p>
+
+      <p>Dokumentet er en adoptert og endret versjon fra <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
+    title: "%{instance} Personvern og villkår for bruk av nettstedet"
   time:
     formats:
       default: "%-d. %b %Y, %H:%M"
diff --git a/config/settings.yml b/config/settings.yml
index 7b78b6cdb..5aea232e7 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -10,6 +10,7 @@ defaults: &defaults
   site_title: Mastodon
   site_description: ''
   site_extended_description: ''
+  site_terms: ''
   site_contact_username: ''
   site_contact_email: ''
   open_registrations: true

From cbe94b88e283554ff27a6ca4ff9a16dbada5e229 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 4 Jul 2017 22:19:54 +0900
Subject: [PATCH 136/382] Change webpack-dev-server repository (#4061)

---
 package.json | 2 +-
 yarn.lock    | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 0845e83db..49d9f0fdb 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.6.1",
     "sinon": "^2.3.5",
-    "webpack-dev-server": "lencioni/webpack-dev-server#patch-1",
+    "webpack-dev-server": "webpack/webpack-dev-server#047a5954398e67b0a17e6be7d5877d9f55f40cba",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a44f4ef7f..4a909d134 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3011,10 +3011,6 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
-fs-readdir-recursive@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
@@ -7202,9 +7198,9 @@ webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.11.0:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-dev-server@lencioni/webpack-dev-server#patch-1:
+webpack-dev-server@webpack/webpack-dev-server#047a5954398e67b0a17e6be7d5877d9f55f40cba:
   version "2.5.0"
-  resolved "https://codeload.github.com/lencioni/webpack-dev-server/tar.gz/8978059d9b880c6c28908a6ed4608e27d40f2f69"
+  resolved "https://codeload.github.com/webpack/webpack-dev-server/tar.gz/047a5954398e67b0a17e6be7d5877d9f55f40cba"
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"

From 4cddef1cea3b7c44c5c951b2cd6a118edd0332c5 Mon Sep 17 00:00:00 2001
From: Gyuhwan Park <doping.cheese@gmail.com>
Date: Tue, 4 Jul 2017 23:11:23 +0900
Subject: [PATCH 137/382] i18n: Add korean translation (#4064)

* Added Korean Translation (based on japanese)

* Update korean translation

* Update korean translation: fix syntax error

* Updated korean translation

* Update korean translation

* Update ko.json

Translate non-translated parts

* Update ko.yml

Translated missed parts - and fixed some typos

* Create simple_form.ko.yml

* Updated korean translation

* i18n: fix test fails
---
 app/helpers/settings_helper.rb                |   1 +
 app/javascript/mastodon/locales/ko.json       | 176 ++++++++
 .../mastodon/locales/whitelist_ko.json        |   2 +
 config/application.rb                         |   1 +
 config/locales/ko.yml                         | 411 ++++++++++++++++++
 config/locales/simple_form.ko.yml             |  58 +++
 6 files changed, 649 insertions(+)
 create mode 100644 app/javascript/mastodon/locales/ko.json
 create mode 100644 app/javascript/mastodon/locales/whitelist_ko.json
 create mode 100644 config/locales/ko.yml
 create mode 100644 config/locales/simple_form.ko.yml

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 847eff2e7..af950aa63 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -19,6 +19,7 @@ module SettingsHelper
     io: 'Ido',
     it: 'Italiano',
     ja: '日本語',
+    ko: '한국어',
     nl: 'Nederlands',
     no: 'Norsk',
     oc: 'Occitan',
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
new file mode 100644
index 000000000..0a2d76d3a
--- /dev/null
+++ b/app/javascript/mastodon/locales/ko.json
@@ -0,0 +1,176 @@
+{
+  "account.block": "차단",
+  "account.block_domain": "{domain} 전체를 숨김",
+  "account.disclaimer": "이 사용자는 다른 인스턴스에 소속되어 있으므로, 수치가 정확하지 않을 수도 있습니다.",
+  "account.edit_profile": "프로필 편집",
+  "account.follow": "팔로우",
+  "account.followers": "팔로워",
+  "account.follows": "팔로우",
+  "account.follows_you": "날 팔로우합니다",
+  "account.media": "미디어",
+  "account.mention": "답장",
+  "account.mute": "뮤트",
+  "account.posts": "포스트",
+  "account.report": "신고",
+  "account.requested": "승인 대기 중",
+  "account.unblock": "차단 해제",
+  "account.unblock_domain": "{domain} 숨김 해제",
+  "account.unfollow": "팔로우 해제",
+  "account.unmute": "뮤트 해제",
+  "boost_modal.combo": "다음부터 {combo}를 누르면 이 과정을 건너뛸 수 있습니다.",
+  "column.blocks": "차단 중인 사용자",
+  "column.community": "로컬 타임라인",
+  "column.favourites": "즐겨찾기",
+  "column.follow_requests": "팔로우 요청",
+  "column.home": "홈",
+  "column.mutes": "뮤트 중인 사용자",
+  "column.notifications": "알림",
+  "column.public": "연합 타임라인",
+  "column_back_button.label": "돌아가기",
+  "column_header.pin": "고정하기",
+  "column_header.unpin": "고정 해제",
+  "column_subheading.navigation": "내비게이션",
+  "column_subheading.settings": "설정",
+  "compose_form.lock_disclaimer": "이 계정은 {locked}로 설정 되어 있지 않습니다. 누구나 이 계정을 팔로우 할 수 있으며, 팔로워 공개의 포스팅을 볼 수 있습니다.",
+  "compose_form.lock_disclaimer.lock": "비공개",
+  "compose_form.placeholder": "지금 무엇을 하고 있나요?",
+  "compose_form.privacy_disclaimer": "이 계정의 비공개 포스트는 멘션된 사용자가 소속된 {domains}으로 전송됩니다. {domainsCount, plural, one {이 서버를} other {이 서버들을}} 신뢰할 수 있습니까? 포스팅의 프라이버시 보호는 Mastodon 서버에서만 유효합니다. {domains}가 Mastodon 인스턴스가 아닐 경우, 이 투고가 사적인 것으로 취급되지 않은 채 부스트 되거나 원하지 않는 사용자에게 보여질 가능성이 있습니다.",
+  "compose_form.publish": "Toot",
+  "compose_form.publish_loud": "{publish}!",
+  "compose_form.sensitive": "이 미디어를 민감한 미디어로 취급",
+  "compose_form.spoiler": "텍스트 숨기기",
+  "compose_form.spoiler_placeholder": "경고",
+  "confirmation_modal.cancel": "취소",
+  "confirmations.block.confirm": "차단",
+  "confirmations.block.message": "정말로 {name}를 차단하시겠습니까?",
+  "confirmations.delete.confirm": "삭제",
+  "confirmations.delete.message": "정말로 삭제하시겠습니까?",
+  "confirmations.domain_block.confirm": "도메인 전체를 숨김",
+  "confirmations.domain_block.message": "정말로 {domain} 전체를 숨기시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다.",
+  "confirmations.mute.confirm": "뮤트",
+  "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?",
+  "emoji_button.activity": "활동",
+  "emoji_button.flags": "국기",
+  "emoji_button.food": "음식",
+  "emoji_button.label": "emoji를 추가",
+  "emoji_button.nature": "자연",
+  "emoji_button.objects": "물건",
+  "emoji_button.people": "사람들",
+  "emoji_button.search": "검색...",
+  "emoji_button.symbols": "기호",
+  "emoji_button.travel": "여행과 장소",
+  "empty_column.community": "로컬 타임라인에 아무 것도 없습니다. 아무거나 적어 보세요!",
+  "empty_column.hashtag": "이 해시태그는 아직 사용되지 않았습니다.",
+  "empty_column.home": "아직 아무도 팔로우 하고 있지 않습니다. {public}를 보러 가거나, 검색하여 다른 사용자를 찾아 보세요.",
+  "empty_column.home.inactivity": "홈 피드에 아무 것도 없습니다. 한동안 활동하지 않은 경우 곧 원래대로 돌아올 것입니다.",
+  "empty_column.home.public_timeline": "연합 타임라인",
+  "empty_column.notifications": "아직 알림이 없습니다. 다른 사람과 대화를 시작해 보세요!",
+  "empty_column.public": "여기엔 아직 아무 것도 없습니다! 공개적으로 무언가 포스팅하거나, 다른 인스턴스 유저를 팔로우 해서 가득 채워보세요!",
+  "follow_request.authorize": "허가",
+  "follow_request.reject": "거부",
+  "getting_started.appsshort": "어플리케이션",
+  "getting_started.faq": "자주 있는 질문",
+  "getting_started.heading": "시작",
+  "getting_started.open_source_notice": "Mastodon은 오픈 소스 소프트웨어입니다. 누구나 GitHub({github})에서 개발에 참여하거나, 문제를 보고할 수 있습니다.",
+  "getting_started.userguide": "사용자 가이드",
+  "home.column_settings.advanced": "고급 사용자용",
+  "home.column_settings.basic": "기본 설정",
+  "home.column_settings.filter_regex": "정규 표현식으로 필터링",
+  "home.column_settings.show_reblogs": "부스트 표시",
+  "home.column_settings.show_replies": "답글 표시",
+  "home.settings": "컬럼 설정",
+  "lightbox.close": "닫기",
+  "loading_indicator.label": "불러오는 중...",
+  "media_gallery.toggle_visible": "표시 전환",
+  "missing_indicator.label": "찾을 수 없습니다",
+  "navigation_bar.blocks": "차단한 사용자",
+  "navigation_bar.community_timeline": "로컬 타임라인",
+  "navigation_bar.edit_profile": "프로필 편집",
+  "navigation_bar.favourites": "즐겨찾기",
+  "navigation_bar.follow_requests": "팔로우 요청",
+  "navigation_bar.info": "이 인스턴스에 대해서",
+  "navigation_bar.logout": "로그아웃",
+  "navigation_bar.mutes": "뮤트 중인 사용자",
+  "navigation_bar.preferences": "사용자 설정",
+  "navigation_bar.public_timeline": "연합 타임라인",
+  "notification.favourite": "{name}님이 즐겨찾기 했습니다",
+  "notification.follow": "{name}님이 나를 팔로우 했습니다",
+  "notification.mention": "{name}님이 답글을 보냈습니다",
+  "notification.reblog": "{name}님이 부스트 했습니다",
+  "notifications.clear": "알림 지우기",
+  "notifications.clear_confirmation": "정말로 알림을 삭제하시겠습니까?",
+  "notifications.column_settings.alert": "데스크탑 알림",
+  "notifications.column_settings.favourite": "즐겨찾기",
+  "notifications.column_settings.follow": "새 팔로워",
+  "notifications.column_settings.mention": "답글",
+  "notifications.column_settings.reblog": "부스트",
+  "notifications.column_settings.show": "컬럼에 표시",
+  "notifications.column_settings.sound": "효과음 재생",
+  "onboarding.done": "완료",
+  "onboarding.next": "다음",
+  "onboarding.page_five.public_timelines": "연합 타임라인에서는 {domain}의 사람들이 팔로우 중인 Mastodon 전체 인스턴스의 공개 포스트를 표시합니다. 로컬 타임라인에서는 {domain} 만의 공개 포스트를 표시합니다.",
+  "onboarding.page_four.home": "홈 타임라인에서는 내가 팔로우 중인 사람들의 포스트를 표시합니다.",
+  "onboarding.page_four.notifications": "알림에서는 다른 사람들과의 연결을 표시합니다.",
+  "onboarding.page_one.federation": "Mastodon은 누구나 참가할 수 있는 SNS입니다.",
+  "onboarding.page_one.handle": "여러분은 지금 수많은 Mastodon 인스턴스 중 하나인 {domain}에 있습니다. あなたのフルハンドルは{handle}です。",
+  "onboarding.page_one.welcome": "Mastodon에 어서 오세요!",
+  "onboarding.page_six.admin": "이 인스턴스의 관리자는 {admin}입니다.",
+  "onboarding.page_six.almost_done": "이상입니다.",
+  "onboarding.page_six.appetoot": "Bon Appetoot!",
+  "onboarding.page_six.apps_available": "iOS、Android 또는 다른 플랫폼에서 사용할 수 있는 {apps}이 있습니다.",
+  "onboarding.page_six.github": "Mastodon는 오픈 소스 소프트웨어입니다. 버그 보고나 기능 추가 요청, 기여는 {github}에서 할 수 있습니다.",
+  "onboarding.page_six.guidelines": "커뮤니티 가이드라인",
+  "onboarding.page_six.read_guidelines": "{guidelines}을 확인하는 것을 잊지 마세요.",
+  "onboarding.page_six.various_app": "다양한 모바일 어플리케이션",
+  "onboarding.page_three.profile": "[프로필 편집] 에서 자기 소개나 이름을 변경할 수 있습니다. 또한 다른 설정도 변경할 수 있습니다.",
+  "onboarding.page_three.search": "검색 바에서 {illustration} 나 {introductions} 와 같이 특정 해시태그가 달린 포스트를 보거나, 사용자를 찾을 수 있습니다.",
+  "onboarding.page_two.compose": "이 폼에서 포스팅 할 수 있습니다. 이미지나 공개 범위 설정, 스포일러 경고 설정은 아래 아이콘으로 설정할 수 있습니다.",
+  "onboarding.skip": "건너뛰기",
+  "privacy.change": "포스트의 프라이버시 설정을 변경",
+  "privacy.direct.long": "멘션한 사용자에게만 공개",
+  "privacy.direct.short": "다이렉트",
+  "privacy.private.long": "팔로워에게만 공개",
+  "privacy.private.short": "비공개",
+  "privacy.public.long": "공개 타임라인에 표시",
+  "privacy.public.short": "공개",
+  "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
+  "privacy.unlisted.short": "Unlisted",
+  "reply_indicator.cancel": "취소",
+  "report.heading": "신고",
+  "report.placeholder": "코멘트",
+  "report.submit": "신고하기",
+  "report.target": "문제가 된 사용자",
+  "search.placeholder": "검색",
+  "search_results.total": "{count, number}건의 결과",
+  "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
+  "status.delete": "삭제",
+  "status.favourite": "즐겨찾기",
+  "status.load_more": "더 보기",
+  "status.media_hidden": "미디어 숨겨짐",
+  "status.mention": "답장",
+  "status.mute_conversation": "이 대화를 뮤트",
+  "status.open": "상세 정보 표시",
+  "status.reblog": "부스트",
+  "status.reblogged_by": "{name}님이 부스트 했습니다",
+  "status.reply": "답장",
+  "status.replyAll": "전원에게 답장",
+  "status.report": "신고",
+  "status.sensitive_toggle": "클릭해서 표시하기",
+  "status.sensitive_warning": "민감한 미디어",
+  "status.show_less": "숨기기",
+  "status.show_more": "더 보기",
+  "status.unmute_conversation": "이 대화의 뮤트 해제하기",
+  "tabs_bar.compose": "포스트",
+  "tabs_bar.federated_timeline": "연합",
+  "tabs_bar.home": "홈",
+  "tabs_bar.local_timeline": "로컬",
+  "tabs_bar.notifications": "알림",
+  "upload_area.title": "드래그 & 드롭으로 업로드",
+  "upload_button.label": "미디어 추가",
+  "upload_form.undo": "재시도",
+  "upload_progress.label": "업로드 중...",
+  "video_player.expand": "동영상 자세히 보기",
+  "video_player.toggle_sound": "소리 토글하기",
+  "video_player.toggle_visible": "표시 전환",
+  "video_player.video_error": "동영상 재생에 실패했습니다"
+}
diff --git a/app/javascript/mastodon/locales/whitelist_ko.json b/app/javascript/mastodon/locales/whitelist_ko.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ko.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/config/application.rb b/config/application.rb
index 6b121009e..6bd47cd6c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -45,6 +45,7 @@ module Mastodon
       :io,
       :it,
       :ja,
+      :ko,
       :nl,
       :no,
       :oc,
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
new file mode 100644
index 000000000..7f238ab73
--- /dev/null
+++ b/config/locales/ko.yml
@@ -0,0 +1,411 @@
+---
+ko:
+  about:
+    about_mastodon: Mastodon 은<em>자유로운 오픈 소스</em>소셜 네트워크입니다. 상용 플랫폼의 대체로써 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
+    about_this: 이 인스턴스에 대해서
+    apps: 어플리케이션
+    business_email: '비즈니스 메일 주소:'
+    closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다.
+    contact: 연락처
+    description_headline: "%{domain} 는 무엇인가요?"
+    domain_count_after: 개의 인스턴스
+    domain_count_before: 연결됨
+    features:
+      api: 어플리케이션이나 그 외 서비스에 API를 공개
+      blocks: 강력한 차단 및 뮤트 기능
+      characters: 한번에 500자까지 포스팅 가능
+      chronology: 시간 순서의 타임라인
+      ethics: 광고도 트래킹도 없습니다
+      gifv: GIFV나 짧은 동영상도 지원
+      privacy: 각 포스팅마다 공개 범위를 상세히 설정 가능
+      public: 공개 타임라인
+    features_headline: Mastodon 의 특징
+    get_started: 참가하기
+    links: 링크
+    other_instances: 다른 인스턴스
+    source_code: 소스 코드
+    status_count_after: Toot
+    status_count_before: Toot 수
+    terms: 개인 정보 보호 정책
+    user_count_after: 명
+    user_count_before: 사용자 수
+    version: 버전
+  accounts:
+    follow: 팔로우
+    followers: 팔로워
+    following: 팔로잉
+    nothing_here: 아무 것도 없습니다.
+    people_followed_by: "%{name} 님이 팔로우 중인 계정"
+    people_who_follow: "%{name} 님을 팔로우 중인 계정"
+    posts: 포스트
+    remote_follow: 리모트 팔로우
+    reserved_username: 이 사용자 명은 예약되어 있습니다.
+    unfollow: 팔로우 해제
+  activitypub:
+    activity:
+      announce:
+        name: "%{account_name} 님이 액티비티를 공유했습니다"
+      create:
+        name: "%{account_name} 님이 노트를 작성했습니다"
+    outbox:
+      name: "%{account_name} 님의 송신함"
+      summary: "%{account_name} 님의 액티비티 모음"
+  admin:
+    accounts:
+      are_you_sure: 정말로 실행하시겠습니까?
+      confirm: 확인
+      confirmed: 확인됨
+      disable_two_factor_authentication: 2단계 인증을 비활성화
+      display_name: 계정명
+      domain: 도메인
+      edit: 편집
+      email: E-mail
+      feed_url: 피드 URL
+      followers: 팔로워 수
+      follows: 팔로잉 수
+      ip: IP
+      location:
+        all: 전체
+        local: 로컬
+        remote: 리모트
+        title: 위치
+      media_attachments: 첨부된 미디어
+      moderation:
+        all: 전체
+        silenced: 침묵 중
+        suspended: 정지 중
+        title: 모더레이션
+      most_recent_activity: 최근 활동
+      most_recent_ip: 최근 IP
+      not_subscribed: 구독하지 않음
+      order:
+        alphabetic: 알파벳 순
+        most_recent: 최근 활동 순
+        title: 순서
+      perform_full_suspension: 완전히 정지시키기
+      profile_url: 프로필 URL
+      public: 전체 공개
+      push_subscription_expires: PuSH 구독 기간 만료
+      redownload: 아바타 업데이트
+      reset: 초기화
+      reset_password: 비밀번호 초기화
+      resubscribe: 다시 구독
+      salmon_url: Salmon URL
+      search: 검색
+      show:
+        created_reports: 이 계정에서 제출된 신고
+        report: 신고
+        targeted_reports: 이 계정에 대한 신고
+      silence: 침묵
+      statuses: Toot 수
+      subscribe: 구독하기
+      title: 계정
+      undo_silenced: 침묵 해제
+      undo_suspension: 정지 해제
+      unsubscribe: 구독 해제
+      username: 사용자명
+      web: Web
+    domain_blocks:
+      add_new: 추가하기
+      created_msg: 도메인 차단 처리를 완료했습니다.
+      destroyed_msg: 도메인 차단을 해제했습니다.
+      domain: 도메인
+      new:
+        create: 차단 추가
+        hint: 도메인 차단은 내부 데이터베이스에 계정이 생성되는 것까지는 막을 수 없지만, 그 도메인에서 생성된 계정에 자동적으로 특정한 모더레이션을 적용하게 할 수 있습니다.
+        severity:
+          desc_html: "<strong>침묵</strong>은 계정을 팔로우 하지 않고 있는 사람들에겐 계정의 Toot을 보이지 않게 합니다. <strong>정지</strong>는 계정의 컨텐츠, 미디어, 프로필 데이터를 삭제합니다."
+          silence: 침묵
+          suspend: 정지
+        title: 새로운 도메인 차단
+      reject_media: 미디어 파일 거부하기
+      reject_media_hint: 로컬에 저장된 미디어 파일을 삭제하고, 이후로도 다운로드를 거부합니다. 정지하고는 관계 없습니다.
+      severities:
+        silence: 침묵
+        suspend: 정지
+      severity: 심각도
+      show:
+        affected_accounts:
+          one: 데이터베이스 중 1개의 계정에 영향을 끼칩니다
+          other: 데이터베이스 중 %{count}개의 계정에 영향을 끼칩니다
+        retroactive:
+          silence: 이 도메인에 존재하는 모든 계정의 침묵를 해제
+          suspend: 이 도메인에 존재하는 모든 계정의 계정 정지를 해제
+        title: "%{domain}의 도메인 차단을 해제"
+        undo: 실행 취소
+      title: 도메인 차단
+      undo: 실행 취소
+    instances:
+      account_count: 알려진 계정의 수
+      domain_name: 도메인 이름
+      title: 알려진 인스턴스들
+    reports:
+      action_taken_by: 신고 처리자
+      are_you_sure: 정말로 실행하시겠습니까?
+      comment:
+        label: 코멘트
+        none: 없음
+      delete: 삭제
+      id: ID
+      mark_as_resolved: 해결 완료 처리
+      nsfw:
+        'false': NSFW 꺼짐
+        'true': NSFW 켜짐
+      report: "신고 #%{id}"
+      report_contents: 내용
+      reported_account: 신고 대상 계정
+      reported_by: 신고자
+      resolved: 해결됨
+      silence_account: 계정을 침묵 처리
+      status: 상태
+      suspend_account: 계정을 정지
+      target: 대상
+      title: 신고
+      unresolved: 미해결
+      view: 표시
+    settings:
+      contact_information:
+        email: 공개할 메일 주소를 입력
+        label: 연락처 정보
+        username: 사용자명을 입력
+      registrations:
+        closed_message:
+          desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. <br>HTML 태그를 사용할 수 있습니다.
+          title: 신규 등록 정지 시 메시지
+        open:
+          disabled: 꺼짐
+          enabled: 켜짐
+          title: 신규 등록을 받음
+      setting: 설정
+      site_description:
+        desc_html: 탑 페이지와 meta 태그에 사용됩니다.<br>HTML 태그, 예를 들어<code>&lt;a&gt;</code> 태그와 <code>&lt;em&gt;</code> 태그를 사용할 수 있습니다.
+        title: 사이트 설명
+      site_description_extended:
+        desc_html: 인스턴스 정보 페이지에 표시됩니다.<br>HTML 태그를 사용할 수 있습니다.
+        title: 사이트 상세 설명
+      site_title: 사이트 이름
+      title: 사이트 설정
+    subscriptions:
+      callback_url: 콜백 URL
+      confirmed: 확인됨
+      expires_in: 기한
+      last_delivery: 최종 발송
+      title: PubSubHubbub
+      topic: 토픽
+    title: 관리
+  admin_mailer:
+    new_report:
+      body: "%{reporter} 가 %{target} 를 신고했습니다"
+      subject: "%{instance} 에 새 신고 등록됨 (#%{id})"
+  application_mailer:
+    settings: '메일 설정을 변경: %{link}'
+    signature: Mastodon %{instance} 인스턴스로에서 알림
+    view: 'View:'
+  applications:
+    invalid_url: 올바르지 않은 URL입니다
+  auth:
+    change_password: 보안
+    delete_account: 계정 삭제
+    delete_account_html: 계정을 삭제하고 싶은 경우, <a href="%{path}">여기서</a> 삭제할 수 있습니다. 삭제 전 확인 화면이 표시됩니다.
+    didnt_get_confirmation: 확인 메일을 받지 못하셨습니까?
+    forgot_password: 비밀번호를 잊어버리셨습니까?
+    login: 로그인
+    logout: 로그아웃
+    register: 등록하기
+    resend_confirmation: 확인 메일을 다시 보내기
+    reset_password: 비밀번호 재설정
+    set_new_password: 새 비밀번호
+  authorize_follow:
+    error: 리모트 팔로우 도중 오류가 발생했습니다.
+    follow: 팔로우
+    prompt_html: '나(<strong>%{self}</strong>) 는 아래 계정의 팔로우를 요청했습니다:'
+    title: "%{acct} 를 팔로우"
+  datetime:
+    distance_in_words:
+      about_x_hours: "%{count}시간"
+      about_x_months: "%{count}월"
+      about_x_years: "%{count}년"
+      almost_x_years: "%{count}년"
+      half_a_minute: 지금
+      less_than_x_minutes: "%{count}분"
+      less_than_x_seconds: 지금
+      over_x_years: "%{count}년"
+      x_days: "%{count}일"
+      x_minutes: "%{count}분"
+      x_months: "%{count}월"
+      x_seconds: "%{count}초"
+  deletes:
+    bad_password_msg: 비밀번호가 올바르지 않습니다
+    confirm_password: 본인 확인을 위해, 현재 사용 중인 비밀번호를 입력해 주십시오.
+    description_html: 계정에 업로드된 모든 컨텐츠가 삭제되며, 계정은 비활성화 됩니다. 이것은 영구적으로 이루어지는 것이므로 <strong>되돌릴 수 없습니다</strong>. 사칭 행위를 방지하기 위해 같은 계정명으로 다시 등록하는 것은 불가능합니다.
+    proceed: 계정 삭제
+    success_msg: 계정이 정상적으로 삭제되었습니다.
+    warning_html: 삭제가 보장되는 것은 이 인스턴스 상에서의 컨텐츠에 한합니다. 타 인스턴스 등, 외부에 멀리 공유된 컨텐츠는 흔적이 남아 삭제되지 않는 경우도 있습니다. 그리고 현재 접속이 불가능한 서버나, 업데이트를 받지 않게 된 서버에 대해서는 삭제가 반영되지 않을 수도 있습니다.
+    warning_title: 공유된 컨텐츠에 대해서
+  errors:
+    '403': 이 페이지를 표시할 권한이 없습니다
+    '404': 페이지를 찾을 수 없습니다
+    '410': 이 페이지는 더 이상 존재하지 않습니다
+    '422':
+      content: 보안 인증에 실패했습니다. Cookie를 차단하고 있진 않습니까?
+      title: 보안 인증 실패
+    '429': 요청 횟수 제한에 도달했습니다.
+    noscript: Mastodon을 사용하기 위해서는 JavaScript를 켜 주십시오.
+  exports:
+    blocks: 차단
+    csv: CSV
+    follows: 팔로우
+    mutes: 뮤트
+    storage: 미디어
+  followers:
+    domain: 도메인
+    explanation_html: 프라이버시를 확보하고 싶은 경우, 누가 여러분을 팔로우 하고 있는지 파악해둘 필요가 있습니다. <strong>프라이빗 포스팅은 여러분의 팔로워가 소속하는 모든 인스턴스로 배달됩니다</strong>. 팔로워가 소속된 인스턴스 관리자나 소프트웨어가 여러분의 프라이버시를 존중하고 있는지 잘 모를 경우, 그 팔로워를 삭제하는 것이 좋을 수도 있습니다.
+    followers_count: 팔로워 수
+    lock_link: 비공개 계정
+    purge: 팔로워에서 삭제
+    success:
+      one: 1개 도메인에서 팔로워를 soft-block 처리 중...
+      other: "%{count}개 도메인에서 팔로워를 soft-block 처리 중..."
+    true_privacy_html: "<strong>프라이버시 보호는 End-to-End 암호화로만 이루어 질 수 있다는 것에 유의</strong>해 주십시오."
+    unlocked_warning_html: 누구든 여러분을 팔로우 할 수 있으며, 여러분의 프라이빗 투고를 볼 수 있습니다. 팔로우 할 수 있는 사람을 제한하고 싶은 경우 %{lock_link}에서 설정해 주십시오.
+    unlocked_warning_title: 이 계정은 비공개로 설정되어 있지 않습니다.
+  generic:
+    changes_saved_msg: 정상적으로 변경되었습니다.
+    powered_by: powered by %{link}
+    save_changes: 변경 사항을 저장
+    validation_errors:
+      one: 오류가 발생했습니다. 아래 오류를 확인해 주십시오
+      other: 오류가 발생했습니다. 아래 %{count}개 오류를 확인해 주십시오
+  imports:
+    preface: 다른 인스턴스에서 내보내기 한 파일에서 팔로우 / 차단 정보를 이 인스턴스 계정으로 불러올 수 있습니다.
+    success: 파일이 정상적으로 업로드 되었으며, 현재 처리 중입니다. 잠시 후 다시 확인해 주십시오.
+    types:
+      blocking: 차단한 계정 목록
+      following: 팔로우 중인 계정 목록
+      muting: 뮤트 중인 계정 목록
+    upload: 업로드
+  landing_strip_html: "<strong>%{name}</strong> 님은 %{link_to_root_path} 인스턴스의 사용자입니다. 계정을 가지고 있다면 팔로우 하거나 대화할 수 있습니다."
+  landing_strip_signup_html: 아직 계정이 없다면 <a href="%{sign_up_path}">여기서</a> 등록할 수 있습니다.
+  media_attachments:
+    validations:
+      images_and_video: 이미 사진이 첨부되어 있으므로 동영상을 첨부할 수 없습니다.
+      too_many: 최대 4개까지 첨부할 수 있습니다.
+  notification_mailer:
+    digest:
+      body: "%{instance} 에서 마지막 로그인 뒤로 일어난 일:"
+      mention: "%{name} 님이 답장했습니다:"
+      new_followers_summary:
+        one: 새 팔로워를 획득했습니다
+        other: "%{count} 명의 새 팔로워를 획득했습니다!"
+      subject:
+        one: "1건의 새로운 알림 \U0001F418"
+        other: "%{count}건의 새로운 알림 \U0001F418"
+    favourite:
+      body: '%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다.'
+      subject: "%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다"
+    follow:
+      body: "%{name} 님이 나를 팔로우 했습니다"
+      subject: "%{name} 님이 나를 팔로우 했습니다"
+    follow_request:
+      body: "%{name} 님이 내게 팔로우 요청을 보냈습니다."
+      subject: "%{name} 님으로터의 팔로우 요청"
+    mention:
+      body: "%{name} 님이 답장을 보냈습니다:"
+      subject: "%{name} 님이 답장을 보냈습니다"
+    reblog:
+      body: "%{name} 님이 내 Toot을 부스트 했습니다:"
+      subject: "%{name} 님이 내 Toot을 부스트 했습니다"
+  pagination:
+    next: 다음
+    prev: 이전
+    truncate: "&hellip;"
+  remote_follow:
+    acct: 사용자명@도메인을 입력해 주십시오
+    missing_resource: 리디렉션 대상을 찾을 수 없습니다
+    proceed: 팔로우 하기
+    prompt: '팔로우 하려 하고 있습니다'
+  sessions:
+    activity: 마지막 활동
+    browser: 브라우저
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: 알 수 없는 브라우저
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: 현재 세션
+    description: "%{browser} on %{platform}"
+    explanation: 내 Mastodon 계정에 현재 로그인 중인 웹 브라우저 목록입니다.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: 알 수 없는 플랫폼
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: 세션
+  settings:
+    authorized_apps: 인증된 어플리케이션
+    back: 돌아가기
+    delete: 계정 삭제
+    edit_profile: 프로필 편집
+    export: 데이터 내보내기
+    followers: 신뢰 중인 인스턴스
+    import: 데이터 가져오기
+    preferences: 사용자 설정
+    settings: 설정
+    two_factor_authentication: 2단계 인증
+  statuses:
+    open_in_web: Web으로 열기
+    over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
+    show_more: 더 보기
+    visibilities:
+      private: 비공개
+      private_long: 팔로워에게만 표시됩니다
+      public: 공개
+      public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
+      unlisted: Unlisted
+      unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
+  stream_entries:
+    click_to_show: 클릭해서 표시
+    reblogged: 님이 부스트 했습니다
+    sensitive_content: 민감한 컨텐츠
+  time:
+    formats:
+      default: "%Y년 %m월 %d일 %H:%M"
+  two_factor_authentication:
+    code_hint: 확인하기 위해서 인증 어플리케이션에서 표시된 코드를 입력해 주십시오
+    description_html: "<strong>2단계 인증</strong>을 활성화 하면 로그인 시 전화로 인증 코드를 받을 필요가 있습니다."
+    disable: 비활성화
+    enable: 활성화
+    enabled: 2단계 인증이 활성화 되어 있습니다
+    enabled_success: 2단계 인증이 활성화 되었습니다
+    generate_recovery_codes: 복구 코드 생성
+    instructions_html: "<strong>Google Authenticator, 또는 타 TOTP 어플리케이션에서 이 QR 코드를 스캔해 주십시오.</strong> 이후 로그인 시에는 이 어플리케이션에서 생성되는 코드가 필요합니다."
+    lost_recovery_codes: 복구 코드를 사용하면 휴대전화를 분실한 경우에도 계정에 접근할 수 있게 됩니다. 복구 코드를 분실한 경우에도 여기서 다시 생성할 수 있지만, 예전 복구 코드는 비활성화 됩니다.
+    manual_instructions: 'QR 코드를 스캔할 수 없어 수동으로 등록을 원하시는 경우 이 비밀 코드를 사용해 주십시오: '
+    recovery_codes: 복구 코드
+    recovery_codes_regenerated: 복구 코드가 다시 생성되었습니다.
+    recovery_instructions_html: 휴대전화를 분실한 경우, 아래 복구 코드 중 하나를 사용해 계정에 접근할 수 있습니다. <strong>복구 코드는 안전하게 보관해 주십시오.</strong> 이 코드를 인쇄해 중요한 서류와 함께 보관하는 것도 좋습니다.
+    setup: 초기 설정
+    wrong_code: 코드가 올바르지 않습니다. 서버와 휴대전화 간 시간이 일치하는지 확인해 주십시오.
+  users:
+    invalid_email: 메일 주소가 올바르지 않습니다
+    invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
new file mode 100644
index 000000000..85abddcf3
--- /dev/null
+++ b/config/locales/simple_form.ko.yml
@@ -0,0 +1,58 @@
+---
+ko:
+  simple_form:
+    hints:
+      defaults:
+        avatar: PNG, GIF 혹은 JPG. 최대 2MB. 120x120px로 다운스케일 됨
+        display_name:
+          one: <span class="name-counter">1</span> 글자 남음
+          other: <span class="name-counter">%{count}</span> 글자 남음
+        header: PNG, GIF 혹은 JPG. 최대 2MB. 700x335px로 다운스케일 됨
+        locked: 수동으로 팔로워를 승인하고, 기본 Toot 프라이버시 설정을 팔로워 전용으로 변경
+        note:
+          one: <span class="note-counter">1</span> 글자 남음
+          other: <span class="note-counter">%{count}</span> 글자 남음
+      imports:
+        data: 다른 마스토돈 인스턴스에서 추출된 CSV 파일
+      sessions:
+        otp: 2단계 인증 코드를 휴대전화를 보고 입력하거나, 복구 코드 중 하나를 사용
+      user:
+        filtered_languages: 선택된 언어가 공개 타임라인에서 제외 될 것입니다.
+    labels:
+      defaults:
+        avatar: 아바타
+        confirm_new_password: 새로운 비밀번호를 입력
+        confirm_password: 현재 비밀번호를 다시 입력
+        current_password: 현재 비밀번호를 입력
+        data: 데이터
+        display_name: 표시되는 이름
+        email: 이메일 주소
+        header: 헤더
+        locale: 언어
+        locked: 계정 잠금
+        new_password: 새로운 비밀번호
+        note: 자기소개
+        otp_attempt: 2단계 인증 코드
+        password: 비밀번호
+        setting_auto_play_gif: 애니메이션 GIF를 자동 재생
+        setting_boost_modal: 부스트 전 확인 창을 보여주기
+        setting_default_privacy: Toot 프라이버시
+        setting_delete_modal: Toot 삭제 전 확인 창을 보여주기
+        severity: 심각도
+        type: 불러오기 종류
+        username: 유저 이름
+      interactions:
+        must_be_follower: 나를 팔로우 하지 않는 사람에게서 온 알림을 차단
+        must_be_following: 내가 팔로우 하지 않는 사람에게서 온 알림을 차단
+      notification_emails:
+        digest: 요약 이메일 보내기
+        favourite: 누군가 내 상태를 즐겨찾기로 등록했을 때 이메일 보내기
+        follow: 누군가 나를 팔로우 했을 때 이메일 보내기
+        follow_request: 누군가 나를 팔로우 하길 원할 때 이메일 보내기
+        mention: 누군가 나에게 답장했을 때 이메일 보내기
+        reblog: 누군가 내 Toot을 부스트 했을 때 이메일 보내기
+    'no': '아니오'
+    required:
+      mark: "*"
+      text: 필수 항목
+    'yes': '네'

From 976c18aa5f159d91b26c8aa0d410a519b7b2e3fd Mon Sep 17 00:00:00 2001
From: Minori Hiraoka <Mnkai@users.noreply.github.com>
Date: Tue, 4 Jul 2017 23:48:22 +0900
Subject: [PATCH 138/382] Fix Korean translation (#4065)

* Added Korean Translation (based on japanese)

* Update korean translation

* Update korean translation: fix syntax error

* Updated korean translation

* Update korean translation

* Update ko.json

Translate non-translated parts

* Update ko.yml

Translated missed parts - and fixed some typos

* Create simple_form.ko.yml

* Update simple_form.ko.yml

Translation error fix - password change form

* Update simple_form.ko.yml

* Update ko.json

Missing translation
---
 app/javascript/mastodon/locales/ko.json | 2 +-
 config/locales/simple_form.ko.yml       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 0a2d76d3a..e88d4a531 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -112,7 +112,7 @@
   "onboarding.page_four.home": "홈 타임라인에서는 내가 팔로우 중인 사람들의 포스트를 표시합니다.",
   "onboarding.page_four.notifications": "알림에서는 다른 사람들과의 연결을 표시합니다.",
   "onboarding.page_one.federation": "Mastodon은 누구나 참가할 수 있는 SNS입니다.",
-  "onboarding.page_one.handle": "여러분은 지금 수많은 Mastodon 인스턴스 중 하나인 {domain}에 있습니다. あなたのフルハンドルは{handle}です。",
+  "onboarding.page_one.handle": "여러분은 지금 수많은 Mastodon 인스턴스 중 하나인 {domain}에 있습니다. 당신의 유저 이름은 {handle} 입니다.",
   "onboarding.page_one.welcome": "Mastodon에 어서 오세요!",
   "onboarding.page_six.admin": "이 인스턴스의 관리자는 {admin}입니다.",
   "onboarding.page_six.almost_done": "이상입니다.",
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 85abddcf3..b7dbc8bef 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -21,16 +21,16 @@ ko:
     labels:
       defaults:
         avatar: 아바타
-        confirm_new_password: 새로운 비밀번호를 입력
-        confirm_password: 현재 비밀번호를 다시 입력
-        current_password: 현재 비밀번호를 입력
+        confirm_new_password: 새로운 비밀번호 다시 입력
+        confirm_password: 현재 비밀번호 다시 입력
+        current_password: 현재 비밀번호 입력
         data: 데이터
         display_name: 표시되는 이름
         email: 이메일 주소
         header: 헤더
         locale: 언어
         locked: 계정 잠금
-        new_password: 새로운 비밀번호
+        new_password: 새로운 비밀번호 입력
         note: 자기소개
         otp_attempt: 2단계 인증 코드
         password: 비밀번호

From 1921ab40ea93c5c082cd53abd6f94da3947a9f73 Mon Sep 17 00:00:00 2001
From: Gyuhwan Park <doping.cheese@gmail.com>
Date: Wed, 5 Jul 2017 00:09:17 +0900
Subject: [PATCH 139/382] i18n: Update korean translation (#4066)

* Added Korean Translation (based on japanese)

* Update korean translation

* Update korean translation: fix syntax error

* Updated korean translation

* Update korean translation

* Update ko.json

Translate non-translated parts

* Update ko.yml

Translated missed parts - and fixed some typos

* Create simple_form.ko.yml

* Updated korean translation

* i18n: fix test fails

* Updated korean translation
---
 config/locales/ko.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 7f238ab73..844e78908 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -39,7 +39,7 @@ ko:
     people_who_follow: "%{name} 님을 팔로우 중인 계정"
     posts: 포스트
     remote_follow: 리모트 팔로우
-    reserved_username: 이 사용자 명은 예약되어 있습니다.
+    reserved_username: 이 아이디는 예약되어 있습니다.
     unfollow: 팔로우 해제
   activitypub:
     activity:
@@ -56,7 +56,7 @@ ko:
       confirm: 확인
       confirmed: 확인됨
       disable_two_factor_authentication: 2단계 인증을 비활성화
-      display_name: 계정명
+      display_name: 이름
       domain: 도메인
       edit: 편집
       email: E-mail
@@ -103,7 +103,7 @@ ko:
       undo_silenced: 침묵 해제
       undo_suspension: 정지 해제
       unsubscribe: 구독 해제
-      username: 사용자명
+      username: 아이디
       web: Web
     domain_blocks:
       add_new: 추가하기
@@ -167,7 +167,7 @@ ko:
       contact_information:
         email: 공개할 메일 주소를 입력
         label: 연락처 정보
-        username: 사용자명을 입력
+        username: 아이디를 입력
       registrations:
         closed_message:
           desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. <br>HTML 태그를 사용할 수 있습니다.
@@ -237,7 +237,7 @@ ko:
   deletes:
     bad_password_msg: 비밀번호가 올바르지 않습니다
     confirm_password: 본인 확인을 위해, 현재 사용 중인 비밀번호를 입력해 주십시오.
-    description_html: 계정에 업로드된 모든 컨텐츠가 삭제되며, 계정은 비활성화 됩니다. 이것은 영구적으로 이루어지는 것이므로 <strong>되돌릴 수 없습니다</strong>. 사칭 행위를 방지하기 위해 같은 계정명으로 다시 등록하는 것은 불가능합니다.
+    description_html: 계정에 업로드된 모든 컨텐츠가 삭제되며, 계정은 비활성화 됩니다. 이것은 영구적으로 이루어지는 것이므로 <strong>되돌릴 수 없습니다</strong>. 사칭 행위를 방지하기 위해 같은 아이디로 다시 등록하는 것은 불가능합니다.
     proceed: 계정 삭제
     success_msg: 계정이 정상적으로 삭제되었습니다.
     warning_html: 삭제가 보장되는 것은 이 인스턴스 상에서의 컨텐츠에 한합니다. 타 인스턴스 등, 외부에 멀리 공유된 컨텐츠는 흔적이 남아 삭제되지 않는 경우도 있습니다. 그리고 현재 접속이 불가능한 서버나, 업데이트를 받지 않게 된 서버에 대해서는 삭제가 반영되지 않을 수도 있습니다.
@@ -295,8 +295,8 @@ ko:
       body: "%{instance} 에서 마지막 로그인 뒤로 일어난 일:"
       mention: "%{name} 님이 답장했습니다:"
       new_followers_summary:
-        one: 새 팔로워를 획득했습니다
-        other: "%{count} 명의 새 팔로워를 획득했습니다!"
+        one: 새 팔로워가 생겼습니다!
+        other: "%{count} 명의 팔로워가 생겼습니다!"
       subject:
         one: "1건의 새로운 알림 \U0001F418"
         other: "%{count}건의 새로운 알림 \U0001F418"
@@ -308,7 +308,7 @@ ko:
       subject: "%{name} 님이 나를 팔로우 했습니다"
     follow_request:
       body: "%{name} 님이 내게 팔로우 요청을 보냈습니다."
-      subject: "%{name} 님으로터의 팔로우 요청"
+      subject: "%{name} 님이 보낸 팔로우 요청"
     mention:
       body: "%{name} 님이 답장을 보냈습니다:"
       subject: "%{name} 님이 답장을 보냈습니다"
@@ -320,7 +320,7 @@ ko:
     prev: 이전
     truncate: "&hellip;"
   remote_follow:
-    acct: 사용자명@도메인을 입력해 주십시오
+    acct: 아이디@도메인을 입력해 주십시오
     missing_resource: 리디렉션 대상을 찾을 수 없습니다
     proceed: 팔로우 하기
     prompt: '팔로우 하려 하고 있습니다'
@@ -405,7 +405,7 @@ ko:
     recovery_codes_regenerated: 복구 코드가 다시 생성되었습니다.
     recovery_instructions_html: 휴대전화를 분실한 경우, 아래 복구 코드 중 하나를 사용해 계정에 접근할 수 있습니다. <strong>복구 코드는 안전하게 보관해 주십시오.</strong> 이 코드를 인쇄해 중요한 서류와 함께 보관하는 것도 좋습니다.
     setup: 초기 설정
-    wrong_code: 코드가 올바르지 않습니다. 서버와 휴대전화 간 시간이 일치하는지 확인해 주십시오.
+    wrong_code: 코드가 올바르지 않습니다. 서버와 휴대전화 간의 시간이 일치하는지 확인해 주십시오.
   users:
     invalid_email: 메일 주소가 올바르지 않습니다
     invalid_otp_token: 2단계 인증 코드가 올바르지 않습니다

From a38b34c37a7c87c205f3d0b327649166c9f4f3f8 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 4 Jul 2017 23:34:00 +0200
Subject: [PATCH 140/382] i18n: Updated Polish translation (#4068)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* i18n: Updated Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* fuggin nano
---
 config/locales/pl.yml | 75 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 113d7f235..1bf3d9724 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -48,7 +48,7 @@ pl:
       create:
         name: "%{account_name} utworzył(a) wpis."
     outbox:
-      name: Skrzynka %{account_name}
+      name: "Skrzynka %{account_name}"
       summary: Zbiór aktywności użytkownika %{account_name}.
   admin:
     accounts:
@@ -183,6 +183,9 @@ pl:
       site_description_extended:
         desc_html: Wyświetlany w rozszerzonych informacjach o stronie<br>Możesz korzystać z tagów HTML
         title: Extended site description
+      site_terms:
+        desc_html: Wyświetlana na stronie zasad użytkowania<br>Możesz używać tagów HTML
+        title: Polityka prywatności strony
       site_title: Tytuł strony
       title: Ustawienia strony
     subscriptions:
@@ -391,6 +394,76 @@ pl:
     click_to_show: Naciśnij aby wyświetlić
     reblogged: podbito
     sensitive_content: Wrażliwa zawartość
+  terms:
+    body_html: |
+      <h2>Polityka prywatności</h2>
+
+      <h3 id="collect">Jakie informacje zbieramy?</h3>
+
+      <p>Zbieramy informacje podane przy rejestracji i treści utworzone w trakcie korzystania z serwisu.</p>
+
+      <p>Podczas rejestracji, możesz otrzymać prośbę o podanie adresu e-mail. Możesz jednak odwiedzać stronę bez rejestracji. Adres zostanie zweryfikowany przez kliknięcie w link wysłany w wiadomości. Dzięki temu wiemy, że jesteś właścicielem tego adresu.</p>
+
+      <p>Podczas rejestracji i tworzenia postów, Twój adres IP jest zapisywany na naszych serwerach. Możemy też przechowywać adres IP użyty przy każdej operacji w serwisie.</p>
+
+      <h3 id="use">Jak wykorzystujemy zebrane informacje?</h3>
+
+      <p>Zebrane informacje mogą zostać w jednym z następujących celach:</p>
+
+      <ul>
+        <li>Aby poprawić wrażenia &mdash; informacje o Tobie pomagają w dostosowywaniu serwisu do Twoich potrzeb.</li>
+        <li>Aby usprawnić stronę &mdash; nieustannie staramy się ulepszyć stronę na podstawie informacji o Tobie i Twoich opinii.</li>
+        <li>Aby usprawnić obsługę klienta &mdash; informacje pomogą obsłudze klienta utrzymywać kontakt z Tobą.</li>
+        <li>Aby okazjonalnie wysyłać wiadomości e-mail &mdash; Na podany adres e-mail mogą zostać wysłane wiadomości o wspomnieniu o Tobie we wpisach, przejrzeniu Twojego zgłoszenia i innych interakcji z Tobą.</li>
+      </ul>
+
+      <h3 id="protect">Jak zabezpieczamy dane?</h3>
+
+      <p>Korzystamy z wielu zabezpieczeń, aby utrudnić osobom niepowołanym dostęp do danych, które wprowadzasz, publikujesz i czytasz.</p>
+
+      <h3 id="data-retention">Jak długo przechowujecie dane?</h3>
+
+      <p>Dołożymy wszelkich starań, aby przechowywać:</p>
+
+      <ul>
+        <li>dzienniki serwera zawierające adresy IP przypisane do każdych operacji nie dłużej niż 90 dni.</li>
+        <li>adresy IP przypisane do użytkowników i ich wpisów nie dłużej niż 5 lat.</li>
+      </ul>
+
+      <h3 id="cookies">Czy używamy plików cookies?</h3>
+
+      <p>Tak. Pliki cookies (zwane często ciasteczkami) są małymi zbiorami danych przechowywanych na Twoim dysku przez stronę internetową, aby rozpoznawać przeglądarkę i powiązać ją (jeżeli jesteś zarejestrowany/a) z Twoim kontem, jeżeli na to pozwolisz.</p>
+
+      <p>Możemy używać ciasteczek, aby skonfigurować stronę na podstawie zapisanych preferencji, oraz dostosować ją do potrzeb innych użytkowników. Możemy korzystać z usług firm trzecich pomagających w zrozumieniu potrzeb użytkownika. Te usługi nie mogą korzystać ze zdobytych danych w celach innych niż analiza pomagająca ulepszać ten serwis.</p>
+
+      <h3 id="disclose">Czy przekazujecie dane podmiotów trzecim?</h3>
+
+      <p>Nie dokonujemy transakcji danych pozwalających na identyfikację Twojej osoby umieszczonych na tym serwisie. Nie oznacza to, że nie przekazujemy ich zaufanym podmiotom, które korzystają z nich poufnie. Możemy jednak udostępniać dane, jeżeli jest to wymagane prawnie, lub dla utrzymania bezpieczeństwa strony i innych użytkowników. W celach marketingowych (i podobnych) mogą zostać użyte jedynie dane niepozwalające na identyfikację osoby.</p>
+
+      <h3 id="third-party">Odnośniki do treści stron trzecich</h3>
+
+      <p>Czasem na stronie mogą pojawić się odnośniki do stron trzecich. Mają one odrębne regulaminy i politykę prywatności. Nie odpowiadamy więc za zawartość tych stron. Dokładamy jednak wszelkich starań, aby nie stanowiły one zagrożenia, prosimy jednak o opinie na temat ich wykorzystania.</p>
+
+      <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3>
+
+      <p>Ta strona i usługa jest przeznaczona dla osób, które ukończyły 13 lat. Jeżeli serwer znajduje się na terenie USA i nie masz ukończonych 13 lat, zgodnie z amerykańską ustawą COPPA (<a href="https://pl.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) nie możesz korzystać z tego serwisu.</p>
+
+      <h3 id="online">Polityka prywatności dotyczy tylko Internetu</h3>
+
+      <p>Ta polityka prywatności dotyczy jedynie danych zbieranych w Internecie, nie tych, które przechowywane są na Twoim kompurerze, np. pliki cookies.</p>
+
+      <h3 id="consent">Wyrażenie zgody</h3>
+
+      <p>Korzystanie ze strony jest równoznaczne z akceptacją naszej polityki prywatności.</p>
+
+      <h3 id="changes">Zmiany w naszej polityce prywatności</h3>
+
+      <p>Jeżeli zdecydujemy się na zmiany w polityce prywatności, zmiany pojawią się na tej stronie.</p>
+
+      <p>Dokument jest dostępny na licencji CC-BY-SA. Ostatnio modyfikowany 31 maja 2013, przetłumaczony 4 lipca 2017. Tłumaczenie (mimo dołożenia wszelkich starań) może nie być w pełni poprawne.</p>
+
+      <p>Tekst bazuje na <a href="https://github.com/discourse/discourse">polityce prywatności Discourse</a>.
+    title: "Zasady korzystania i polityka prywatności %{instance}"
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

From bb194ddb3c65394c256c381834ba3bce4d2988cc Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 5 Jul 2017 21:51:28 +0900
Subject: [PATCH 141/382] Format datetime of subscriptions on admin UI (#4078)

---
 app/views/admin/subscriptions/_subscription.html.haml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/subscriptions/_subscription.html.haml b/app/views/admin/subscriptions/_subscription.html.haml
index 024788e13..1dec8e396 100644
--- a/app/views/admin/subscriptions/_subscription.html.haml
+++ b/app/views/admin/subscriptions/_subscription.html.haml
@@ -7,10 +7,12 @@
     - if subscription.confirmed?
       %i.fa.fa-check
   %td{ style: "color: #{subscription.expired? ? 'red' : 'inherit'};" }
-    = precede subscription.expired? ? '-' : '' do
-      = time_ago_in_words(subscription.expires_at)
+    %time.time-ago{ datetime: subscription.expires_at.iso8601, title: l(subscription.expires_at) }
+      = precede subscription.expired? ? '-' : '' do
+        = time_ago_in_words(subscription.expires_at)
   %td
     - if subscription.last_successful_delivery_at?
-      = l subscription.last_successful_delivery_at
+      %time.formatted{ datetime: subscription.last_successful_delivery_at.iso8601, title: l(subscription.last_successful_delivery_at) }
+        = l subscription.last_successful_delivery_at
     - else
       %i.fa.fa-times

From b52a5e6bd60be3f9548cf59eb313b1e6c2f5920e Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Wed, 5 Jul 2017 21:51:53 +0900
Subject: [PATCH 142/382] Show LoadMore button on Notifications even if all
 items are filtered (#4077)

---
 app/javascript/mastodon/features/notifications/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index ed4b3ad98..2f545fa4a 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -122,7 +122,7 @@ export default class Notifications extends React.PureComponent {
     let unread         = '';
     let scrollContainer = '';
 
-    if (!isLoading && notifications.size > 0 && hasMore) {
+    if (!isLoading && hasMore) {
       loadMore = <LoadMore onClick={this.handleLoadMore} />;
     }
 
@@ -132,7 +132,7 @@ export default class Notifications extends React.PureComponent {
 
     if (isLoading && this.scrollableArea) {
       scrollableArea = this.scrollableArea;
-    } else if (notifications.size > 0) {
+    } else if (notifications.size > 0 || hasMore) {
       scrollableArea = (
         <div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
           {unread}

From 5e6acf960183aea9440ce0d9e28c86f043e88c54 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Wed, 5 Jul 2017 21:54:21 +0900
Subject: [PATCH 143/382] Fix Nokogiri::HTML at FetchLinkCardService (#4072)

---
 app/services/fetch_link_card_service.rb       |  4 +++-
 spec/fixtures/requests/sjis.txt               | 20 +++++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb | 10 ++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/requests/sjis.txt

diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 4ce221267..8ddaa2bf4 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'nkf'
 
 class FetchLinkCardService < BaseService
   include HttpHelper
@@ -84,7 +85,8 @@ class FetchLinkCardService < BaseService
 
     return if response.code != 200 || response.mime_type != 'text/html'
 
-    page = Nokogiri::HTML(response.to_s)
+    html = response.to_s
+    page = Nokogiri::HTML(html, nil, NKF.guess(html).to_s)
 
     card.type             = :link
     card.title            = meta_property(page, 'og:title') || page.at_xpath('//title')&.content
diff --git a/spec/fixtures/requests/sjis.txt b/spec/fixtures/requests/sjis.txt
new file mode 100644
index 000000000..9041aa25d
--- /dev/null
+++ b/spec/fixtures/requests/sjis.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+<HTML>
+<HEAD>
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=x-sjis">
+  <TITLE>JSIS�̃y�[�W</TITLE>
+</HEAD>
+<BODY>
+<P><CENTER><B><FONT SIZE="+2">SJIS�̃y�[�W</FONT></B><BR>
+<HR><BR>
+</BODY>
+</HTML>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 9df41cf55..7d7f8e748 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -6,6 +6,8 @@ RSpec.describe FetchLinkCardService do
   before do
     stub_request(:head, 'http://example.xn--fiqs8s/').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
     stub_request(:get, 'http://example.xn--fiqs8s/').to_return(request_fixture('idn.txt'))
+    stub_request(:head, 'http://example.com/sjis').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/sjis').to_return(request_fixture('sjis.txt'))
     stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404)
 
     subject.call(status)
@@ -19,6 +21,14 @@ RSpec.describe FetchLinkCardService do
         expect(a_request(:get, 'http://example.xn--fiqs8s/')).to have_been_made.at_least_once
       end
     end
+
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis') }
+
+      it 'works with SJIS' do
+        expect(a_request(:get, 'http://example.com/sjis')).to have_been_made.at_least_once
+      end
+    end
   end
 
   context 'in a remote status' do

From a37cf9548c2772f5b8b7a976e4f90c0ed78a8722 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Thu, 6 Jul 2017 06:58:03 +0900
Subject: [PATCH 144/382] Explicitly require MIME::Types (#4083)

---
 Gemfile                        | 1 +
 Gemfile.lock                   | 1 +
 app/models/media_attachment.rb | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index aecd82702..6ee884a17 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 0.99'
 gem 'kaminari', '~> 1.0'
 gem 'link_header', '~> 0.0'
+gem 'mime-types', '~> 3.1'
 gem 'nokogiri', '~> 1.7'
 gem 'oj', '~> 3.0'
 gem 'ostatus2', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index dac6169d5..f0156529c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -516,6 +516,7 @@ DEPENDENCIES
   link_header (~> 0.0)
   lograge (~> 0.5)
   microformats2 (~> 3.0)
+  mime-types (~> 3.1)
   nokogiri (~> 1.7)
   oj (~> 3.0)
   ostatus2 (~> 2.0)
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 340109ab6..1e8c6d00a 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -18,6 +18,8 @@
 #  file_meta         :json
 #
 
+require 'mime/types'
+
 class MediaAttachment < ApplicationRecord
   self.inheritance_column = nil
 

From 6d106d3943f47cc48fb4799712bc6dd673b2506b Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Thu, 6 Jul 2017 15:25:27 +0200
Subject: [PATCH 145/382] i18n: minor changes in Polish translation (#4087)

* i18n: minor changes in Polish translation

* Update pl.json
---
 app/javascript/mastodon/locales/pl.json | 2 +-
 config/locales/pl.yml                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index bf425501f..2a69824ee 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -6,7 +6,7 @@
   "account.follow": "Obserwuj",
   "account.followers": "Obserwujący",
   "account.follows": "Obserwacje",
-  "account.follows_you": "Obserwują cię",
+  "account.follows_you": "Obserwuje cię",
   "account.media": "Media",
   "account.mention": "Wspomnij o @{name}",
   "account.mute": "Wycisz @{name}",
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 1bf3d9724..f0546dd0c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -209,9 +209,9 @@ pl:
   auth:
     change_password: Bezpieczeństwo
     delete_account: Usunięcie konta
-    delete_account_html: Jeżeli próbowałeś usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
+    delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
     didnt_get_confirmation: Nie otrzymałeś instrukcji weryfikacji?
-    forgot_password: Zapomniane hasło
+    forgot_password: Nie pamiętasz hasła?
     login: Zaloguj się
     logout: Wyloguj się
     register: Rejestracja

From e7c0d87d984108a5c56c08285e8496a23fca28b8 Mon Sep 17 00:00:00 2001
From: Shin Kojima <shin@kojima.org>
Date: Thu, 6 Jul 2017 22:27:02 +0900
Subject: [PATCH 146/382] Fix embedded SVG fill attribute (#4086)

* Fix embedded SVG fill attribute

SCSS darken/lighten functions may not return a color value, but a color
name like "white".  See following example:

https://www.sassmeister.com/gist/c41da93b87d536890ddf30a1f42e7816

This patch will normalize $color argument to FFFFFF style.

I also changed the function name from "url-friendly-colour" to
"hex-color", Because...

1. The name "url-friendly" is not meaningful enough to describe what it
   does.

2. It is familier to me using "color" rather than "colour"

    kojima:kojiMac mastodon[master]$ git grep -l colour
    app/javascript/styles/boost.scss
    spec/fixtures/files/attachment.jpg

    kojima:kojiMac mastodon[master]$ git grep -l color
    .rspec
    .scss-lint.yml
    Gemfile.lock
    app/javascript/mastodon/features/status/components/action_bar.js
    app/javascript/styles/about.scss
    app/javascript/styles/accounts.scss
    app/javascript/styles/admin.scss
    app/javascript/styles/basics.scss
    app/javascript/styles/boost.scss
    app/javascript/styles/compact_header.scss
    app/javascript/styles/components.scss
    app/javascript/styles/containers.scss
    app/javascript/styles/footer.scss
    app/javascript/styles/forms.scss
    app/javascript/styles/landing_strip.scss
    app/javascript/styles/reset.scss
    app/javascript/styles/stream_entries.scss
    app/javascript/styles/tables.scss
    app/javascript/styles/variables.scss
    app/views/admin/subscriptions/_subscription.html.haml
    app/views/layouts/application.html.haml
    app/views/layouts/error.html.haml
    app/views/manifests/show.json.rabl
    bin/webpack-dev-server
    config/initializers/httplog.rb
    public/500.html
    public/emoji/1f1e6-1f1e8.svg
    public/emoji/1f1ec-1f1f8.svg
    public/emoji/1f1f3-1f1ee.svg
    public/emoji/1f1fb-1f1ec.svg
    spec/fixtures/requests/idn.txt
    yarn.lock

* Add semicolon
---
 app/javascript/styles/boost.scss | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/boost.scss
index 7589828c6..8d6478e10 100644
--- a/app/javascript/styles/boost.scss
+++ b/app/javascript/styles/boost.scss
@@ -1,11 +1,14 @@
-@function url-friendly-colour($colour) {
-  @return '%23' + str-slice('#{$colour}', 2, -1)
+@function hex-color($color) {
+  @if type-of($color) == 'color' {
+    $color: str-slice(ie-hex-str($color), 4);
+  }
+  @return '%23' + unquote($color)
 }
 
 button.icon-button i.fa-retweet {
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{url-friendly-colour(lighten($ui-base-color, 26%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{url-friendly-colour($ui-highlight-color)}' stroke-width='0'/></svg>");
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 26%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
 
   &:hover {
-    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{url-friendly-colour(lighten($ui-base-color, 33%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{url-friendly-colour($ui-highlight-color)}' stroke-width='0'/></svg>");
+    background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 33%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
   }
 }

From 26949607d25872d4549f96ecf38c317c2774c225 Mon Sep 17 00:00:00 2001
From: Quent-in <pages_quentin@hotmail.com>
Date: Thu, 6 Jul 2017 21:10:12 +0200
Subject: [PATCH 147/382] l10n Occitan locale (#4089)

* Small adjustments

About the report part.

* Update time format
---
 app/javascript/mastodon/locales/oc.json | 10 +++++-----
 config/locales/oc.yml                   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index a2a82ae9f..5f226bc70 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -34,7 +34,7 @@
   "compose_form.lock_disclaimer": "Vòstre compte es pas {locked}. Tot lo mond pòt vos sègre e veire los estatuts reservats als seguidors.",
   "compose_form.lock_disclaimer.lock": "clavat",
   "compose_form.placeholder": "A de qué pensatz ?",
-  "compose_form.privacy_disclaimer": "Vòstre estatut privat serà enviat a las personas mencionadas sus {domains}. Vos fisatz d’aqueste{domainsCount, plural, one { servidor} other {s servidors}} per divulgar pas vòstre estatut ? Los estatuts privats foncionan pas que sus las instàncias a Mastodons. Se {domains} {domainsCount, plural, one {es pas una instància a Mastodon} other {son pas d'instàncias a Mastodon}}, i aurà pas d’indicacion disent que vòstre estatut es privat e poirà èsser partejat o èsser visible a de mond pas prevists",
+  "compose_form.privacy_disclaimer": "Vòstre estatut privat serà enviat a las personas mencionadas sus {domains}. Vos fisatz d’aqueste {domainsCount, plural, one { servidor} other {s servidors}} per divulgar pas vòstre estatut ? Los estatuts privats foncionan pas que sus las instàncias de Mastodon. Se {domains} {domainsCount, plural, one {es pas una instància a Mastodon} other {son pas d'instàncias a Mastodon}}, i aurà pas d’indicacion disent que vòstre estatut es privat e poirà èsser partejat o èsser visible a de mond pas prevists",
   "compose_form.publish": "Tut",
   "compose_form.publish_loud": "{publish} !",
   "compose_form.sensitive": "Marcar lo mèdia coma sensible",
@@ -51,7 +51,7 @@
   "confirmations.mute.message": "Sètz segur de voler metre en silenci {name} ?",
   "emoji_button.activity": "Activitat",
   "emoji_button.flags": "Drapèus",
-  "emoji_button.food": "Manjar e beure",
+  "emoji_button.food": "Beure e manjar",
   "emoji_button.label": "Inserir un emoji",
   "emoji_button.nature": "Natura",
   "emoji_button.objects": "Objèctes",
@@ -136,10 +136,10 @@
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
   "reply_indicator.cancel": "Anullar",
-  "report.heading": "Nòu senhalament",
+  "report.heading": "Senhalar {target}",
   "report.placeholder": "Comentaris addicionals",
-  "report.submit": "Mandat",
-  "report.target": "Senhalament",
+  "report.submit": "Mandar",
+  "report.target": "Senhalar {target}",
   "search.placeholder": "Recercar",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index c882b43a1..631133f74 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -242,9 +242,9 @@ oc:
     - divendres
     - dissabte
     formats:
-      default: "%d/%m/%Y"
-      long: Lo %B %d de %Y
-      short: "%b %d"
+      default: "%e/%m/%Y"
+      long: Lo %e %B de %Y
+      short: "%e %b"
     month_names:
     -
     - de genièr

From 34c8a46d7de2b7e0b495b5c4a51c95c6a6b047b7 Mon Sep 17 00:00:00 2001
From: Mantas <mistermantas@users.noreply.github.com>
Date: Thu, 6 Jul 2017 22:26:07 +0300
Subject: [PATCH 148/382] Remove ugly blue highlight on Android browsers
 (#4031)

---
 app/javascript/styles/basics.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/basics.scss
index 70a5be367..0cb271ddd 100644
--- a/app/javascript/styles/basics.scss
+++ b/app/javascript/styles/basics.scss
@@ -11,6 +11,8 @@ body {
   text-rendering: optimizelegibility;
   font-feature-settings: "kern";
   text-size-adjust: none;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+  -webkit-tap-highlight-color: transparent;
 
   &.app-body {
     position: fixed;

From 9c03fd9caef575792f08fd4e5c396d8d72bad09f Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Fri, 7 Jul 2017 04:26:21 +0900
Subject: [PATCH 149/382] Unobserve status on unmount (#4013)

This fixes a warning on status unmounting (e.g. deletion).

This also resets IntersectionObserverWrapper on disconnect to avoid `unobserve()` calls
which has bug in Edge.
---
 app/javascript/mastodon/components/status.js             | 4 ++++
 .../features/ui/util/intersection_observer_wrapper.js    | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index a837659c2..ff574ab3d 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -90,6 +90,10 @@ export default class Status extends ImmutablePureComponent {
   }
 
   componentWillUnmount () {
+    if (this.props.intersectionObserverWrapper) {
+      this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
+    }
+
     this.componentMounted = false;
   }
 
diff --git a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
index 0e959f9ae..2b24c6583 100644
--- a/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
+++ b/app/javascript/mastodon/features/ui/util/intersection_observer_wrapper.js
@@ -37,9 +37,18 @@ class IntersectionObserverWrapper {
     }
   }
 
+  unobserve (id, node) {
+    if (this.observer) {
+      delete this.callbacks[id];
+      this.observer.unobserve(node);
+    }
+  }
+
   disconnect () {
     if (this.observer) {
+      this.callbacks = {};
       this.observer.disconnect();
+      this.observer = null;
     }
   }
 

From 6bf6d35637abc691cf85b1c96a54c74af8b8bc2e Mon Sep 17 00:00:00 2001
From: STJrInuyasha <MattWCSTRFAN@gmail.com>
Date: Thu, 6 Jul 2017 12:30:37 -0700
Subject: [PATCH 150/382] Parse links in status content on update as well as
 mount (#4042)

* Update links in status content on update as well as mount
Fixes occasional bugs with mentions and hashtags not being set to open in a new column like they should, and instead opening in a new page

* use classList instead of raw className
---
 .../mastodon/components/status_content.js          | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 19bde01bd..78656571d 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -25,12 +25,17 @@ export default class StatusContent extends React.PureComponent {
     hidden: true,
   };
 
-  componentDidMount () {
+  _updateStatusLinks () {
     const node  = this.node;
     const links = node.querySelectorAll('a');
 
     for (var i = 0; i < links.length; ++i) {
-      let link    = links[i];
+      let link = links[i];
+      if (link.classList.contains('status-link')) {
+        continue;
+      }
+      link.classList.add('status-link');
+
       let mention = this.props.status.get('mentions').find(item => link.href === item.get('url'));
 
       if (mention) {
@@ -46,10 +51,15 @@ export default class StatusContent extends React.PureComponent {
     }
   }
 
+  componentDidMount () {
+    this._updateStatusLinks();
+  }
+
   componentDidUpdate () {
     if (this.props.onHeightUpdate) {
       this.props.onHeightUpdate();
     }
+    this._updateStatusLinks();
   }
 
   onMentionClick = (mention, e) => {

From f76e71825da3b185e549cd3267813fd12cee4050 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Fri, 7 Jul 2017 04:31:03 +0900
Subject: [PATCH 151/382] Improve Activity stream spoiler (#4088)

---
 app/javascript/packs/public.js                      |  8 ++++++--
 app/javascript/styles/stream_entries.scss           | 12 ++++++++++++
 app/views/stream_entries/_content_spoiler.html.haml | 10 +++++++---
 app/views/stream_entries/_detailed_status.html.haml |  6 ++----
 app/views/stream_entries/_simple_status.html.haml   |  3 +--
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index a0e511b0a..254250a3b 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -53,8 +53,12 @@ function main() {
     }
   });
 
-  delegate(document, '.media-spoiler', 'click', ({ target }) => {
-    target.style.display = 'none';
+  delegate(document, '.activity-stream .media-spoiler-wrapper .media-spoiler', 'click', function() {
+    this.parentNode.classList.add('media-spoiler-wrapper__visible');
+  });
+
+  delegate(document, '.activity-stream .media-spoiler-wrapper .spoiler-button', 'click', function() {
+    this.parentNode.classList.remove('media-spoiler-wrapper__visible');
   });
 
   delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/stream_entries.scss
index fcec32d44..e89cc3f09 100644
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/stream_entries.scss
@@ -330,6 +330,18 @@
     }
   }
 
+  .media-spoiler-wrapper {
+    &.media-spoiler-wrapper__visible {
+      .media-spoiler {
+        display: none;
+      }
+
+      .spoiler-button {
+        display: block;
+      }
+    }
+  }
+
   .pre-header {
     padding: 14px 0;
     padding-left: (48px + 14px * 2);
diff --git a/app/views/stream_entries/_content_spoiler.html.haml b/app/views/stream_entries/_content_spoiler.html.haml
index d80ea46a0..798dfce67 100644
--- a/app/views/stream_entries/_content_spoiler.html.haml
+++ b/app/views/stream_entries/_content_spoiler.html.haml
@@ -1,3 +1,7 @@
-.media-spoiler
-  %span= t('stream_entries.sensitive_content')
-  %span= t('stream_entries.click_to_show')
+.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }
+  .spoiler-button
+    .icon-button.overlayed
+      %i.fa.fa-fw.fa-eye
+  .media-spoiler
+    %span= t('stream_entries.sensitive_content')
+    %span= t('stream_entries.click_to_show')
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index ef60b9925..193cc6470 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -17,13 +17,11 @@
   - unless status.media_attachments.empty?
     - if status.media_attachments.first.video?
       .video-player
-        - if status.sensitive?
-          = render partial: 'stream_entries/content_spoiler'
+        = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
         %video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true }
     - else
       .detailed-status__attachments
-        - if status.sensitive?
-          = render partial: 'stream_entries/content_spoiler'
+        = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
         .status__attachments__inner
           - status.media_attachments.each do |media|
             = render partial: 'stream_entries/media', locals: { media: media }
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index db4e30fda..2df0cc850 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -22,8 +22,7 @@
 
   - unless status.media_attachments.empty?
     .status__attachments
-      - if status.sensitive?
-        = render partial: 'stream_entries/content_spoiler'
+      = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
       - if status.media_attachments.first.video?
         .status__attachments__inner
           .video-item

From 18d3fa953b5af8ab17cc93c33cb95cec37127712 Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien.erambert@me.com>
Date: Thu, 6 Jul 2017 13:39:56 -0700
Subject: [PATCH 152/382] Add a setting allowing the use of system's default
 font in Web UI (#4033)

* add a system_font_ui setting on the server

* Plug the system_font_ui on the front-end

* add EN/FR locales for the new setting

* put Roboto after all other fonts

* remove trailing whitespace so CodeClimate is happy

* fix user_spec.rb

* correctly write user_spect this time

* slightly better way of adding the classes

* add comments to the system-font stack for clarification

* use .system-font for the class instead

* don't use multiple lines for comments

* remove trailing whitespace

* use the classnames module for consistency

* use `mastodon-font-sans-serif` instead of Roboto directly
---
 .../settings/preferences_controller.rb            |  1 +
 app/javascript/mastodon/features/ui/index.js      | 14 ++++++++++++--
 app/javascript/styles/basics.scss                 | 15 +++++++++++++++
 app/lib/user_settings_decorator.rb                |  5 +++++
 app/models/user.rb                                |  4 ++++
 app/views/home/initial_state.json.rabl            |  1 +
 app/views/settings/preferences/show.html.haml     |  1 +
 config/locales/simple_form.en.yml                 |  1 +
 config/locales/simple_form.fr.yml                 |  1 +
 config/settings.yml                               |  1 +
 spec/lib/user_settings_decorator_spec.rb          |  7 +++++++
 spec/models/user_spec.rb                          |  8 ++++++++
 12 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 71f5a7c04..a15c26031 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -37,6 +37,7 @@ class Settings::PreferencesController < ApplicationController
       :setting_boost_modal,
       :setting_delete_modal,
       :setting_auto_play_gif,
+      :setting_system_font_ui,
       notification_emails: %i(follow follow_request reblog favourite mention digest),
       interactions: %i(must_be_follower must_be_following)
     )
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 08d087da1..54e623d99 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 import Switch from 'react-router-dom/Switch';
 import Route from 'react-router-dom/Route';
 import Redirect from 'react-router-dom/Redirect';
@@ -72,12 +73,17 @@ class WrappedRoute extends React.Component {
 
 }
 
-@connect()
+const mapStateToProps = state => ({
+  systemFontUi: state.getIn(['meta', 'system_font_ui']),
+});
+
+@connect(mapStateToProps)
 export default class UI extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     children: PropTypes.node,
+    systemFontUi: PropTypes.bool,
   };
 
   state = {
@@ -176,8 +182,12 @@ export default class UI extends React.PureComponent {
     const { width, draggingOver } = this.state;
     const { children } = this.props;
 
+    const className = classNames('ui', {
+      'system-font': this.props.systemFontUi,
+    });
+
     return (
-      <div className='ui' ref={this.setRef}>
+      <div className={className} ref={this.setRef}>
         <TabsBar />
         <ColumnsAreaContainer singleColumn={isMobile(width)}>
           <WrappedSwitch>
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/basics.scss
index 0cb271ddd..4da698e81 100644
--- a/app/javascript/styles/basics.scss
+++ b/app/javascript/styles/basics.scss
@@ -63,3 +63,18 @@ button {
   align-items: center;
   justify-content: center;
 }
+
+.system-font {
+  // system-ui => standard property (Chrome/Android WebView 56+, Opera 43+, Safari 11+)
+  // -apple-system => Safari <11 specific
+  // BlinkMacSystemFont => Chrome <56 on macOS specific
+  // Segoe UI => Windows 7/8/10
+  // Oxygen => KDE
+  // Ubuntu => Unity/Ubuntu
+  // Cantarell => GNOME
+  // Fira Sans => Firefox OS
+  // Droid Sans => Older Androids (<4.0)
+  // Helvetica Neue => Older macOS <10.11
+  // mastodon-font-sans-serif => web-font (Roboto) fallback and newer Androids (>=4.0)
+  font-family: system-ui, -apple-system,BlinkMacSystemFont, "Segoe UI","Oxygen", "Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue",mastodon-font-sans-serif, sans-serif;
+}
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index af264bbd5..9c0cb4545 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -21,6 +21,7 @@ class UserSettingsDecorator
     user.settings['boost_modal'] = boost_modal_preference
     user.settings['delete_modal'] = delete_modal_preference
     user.settings['auto_play_gif'] = auto_play_gif_preference
+    user.settings['system_font_ui'] = system_font_ui_preference
   end
 
   def merged_notification_emails
@@ -43,6 +44,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_delete_modal'
   end
 
+  def system_font_ui_preference
+    boolean_cast_setting 'setting_system_font_ui'
+  end
+
   def auto_play_gif_preference
     boolean_cast_setting 'setting_auto_play_gif'
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index c31a0c644..e2bb3d0ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -91,6 +91,10 @@ class User < ApplicationRecord
     settings.auto_play_gif
   end
 
+  def setting_system_font_ui
+    settings.system_font_ui
+  end
+
   def activate_session(request)
     session_activations.activate(session_id: SecureRandom.hex,
                                  user_agent: request.user_agent,
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl
index e305f8e7a..291ff806b 100644
--- a/app/views/home/initial_state.json.rabl
+++ b/app/views/home/initial_state.json.rabl
@@ -11,6 +11,7 @@ node(:meta) do
     boost_modal: current_account.user.setting_boost_modal,
     delete_modal: current_account.user.setting_delete_modal,
     auto_play_gif: current_account.user.setting_auto_play_gif,
+    system_font_ui: current_account.user.setting_system_font_ui,
   }
 end
 
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 721ce6a21..26fbfdf82 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -44,6 +44,7 @@
 
   .fields-group
     = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
+    = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 3e769fb96..d8d3b8a6f 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -38,6 +38,7 @@ en:
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_privacy: Post privacy
         setting_delete_modal: Show confirmation dialog before deleting a toot
+        setting_system_font_ui: Use system's default font
         severity: Severity
         type: Import type
         username: Username
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index ae4975143..446c56947 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -28,6 +28,7 @@ fr:
         password: Mot de passe
         setting_boost_modal: Afficher un dialogue de confirmation avant de partager
         setting_default_privacy: Confidentialité des statuts
+        setting_system_font_ui: Utiliser la police par défaut du système
         severity: Séverité
         type: Type d'import
         username: Identifiant
diff --git a/config/settings.yml b/config/settings.yml
index 5aea232e7..18b70b51f 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -19,6 +19,7 @@ defaults: &defaults
   boost_modal: false
   auto_play_gif: true
   delete_modal: true
+  system_font_ui: false
   notification_emails:
     follow: false
     reblog: false
diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb
index 66e42fa0e..e1ba56d97 100644
--- a/spec/lib/user_settings_decorator_spec.rb
+++ b/spec/lib/user_settings_decorator_spec.rb
@@ -48,5 +48,12 @@ describe UserSettingsDecorator do
       settings.update(values)
       expect(user.settings['auto_play_gif']).to eq false
     end
+    
+    it 'updates the user settings value for system font in UI' do
+      values = { 'setting_system_font_ui' => '0' }
+
+      settings.update(values)
+      expect(user.settings['system_font_ui']).to eq false
+    end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a6df3fb26..2019ec0f6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -184,6 +184,14 @@ RSpec.describe User, type: :model do
       expect(user.setting_auto_play_gif).to eq false
     end
   end
+  
+  describe '#setting_system_font_ui' do
+    it 'returns system font ui setting' do
+      user = Fabricate(:user)
+      user.settings[:system_font_ui] = false
+      expect(user.setting_system_font_ui).to eq false
+    end
+  end
 
   describe '#setting_boost_modal' do
     it 'returns boost modal setting' do

From 2083000027451249836c369eb961300d7faf5f99 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Fri, 7 Jul 2017 07:12:12 +0900
Subject: [PATCH 153/382] Set default From address in config (#3756)

The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.

In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.

After appling this change,

In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
---
 app/mailers/application_mailer.rb  | 1 -
 app/mailers/user_mailer.rb         | 1 -
 config/environments/development.rb | 2 ++
 config/environments/production.rb  | 2 ++
 config/environments/test.rb        | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
index 2e730c19b..95b770ff1 100644
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class ApplicationMailer < ActionMailer::Base
-  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
   helper :instance
 
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 6abf9c9ca..1517c027e 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class UserMailer < Devise::Mailer
-  default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
   layout 'mailer'
 
   helper :instance
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c81cf7bbe..406fa970b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -62,6 +62,8 @@ Rails.application.configure do
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
+  config.action_mailer.default_options = { from: 'notifications@localhost' }
+
   # If using a Heroku, Vagrant or generic remote development environment,
   # use letter_opener_web, accessible at  /letter_opener.
   # Otherwise, use letter_opener, which launches a browser window to view sent mail.
diff --git a/config/environments/production.rb b/config/environments/production.rb
index bd87d79a7..d9c9da684 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -73,6 +73,8 @@ Rails.application.configure do
   config.action_mailer.perform_caching = false
 
   # E-mails
+  config.action_mailer.default_options = { from: ENV.fetch('SMTP_FROM_ADDRESS') }
+
   config.action_mailer.smtp_settings = {
     :port                 => ENV['SMTP_PORT'],
     :address              => ENV['SMTP_SERVER'],
diff --git a/config/environments/test.rb b/config/environments/test.rb
index db98263a6..bde69eba1 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -30,6 +30,8 @@ Rails.application.configure do
   config.action_controller.allow_forgery_protection = false
   config.action_mailer.perform_caching = false
 
+  config.action_mailer.default_options = { from: 'notifications@localhost' }
+
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.

From 185b41beb4adea5f0b55f56c0898bef74fd35435 Mon Sep 17 00:00:00 2001
From: Daniel Hunsaker <danhunsaker@gmail.com>
Date: Thu, 6 Jul 2017 16:46:45 -0600
Subject: [PATCH 154/382] [nanobox] Add Automated Backups (#4023)

This PR adds automatic backups to Nanobox instances. The database, Redis, and user files are backed up every day at 03:00 (server time) to the data warehouse component which comes with every Nanobox app. Old backups are automatically cleared out, but the number of backups that are left untouched can be configured by setting the `BACKUP_COUNT` environment variable to any integer value greater than 0 (the default is 1).

Also updated `.env.nanobox` to reflect the current `.env.production.sample`.
---
 .env.nanobox |  2 +-
 boxfile.yml  | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/.env.nanobox b/.env.nanobox
index 73abefdc6..7920c47b9 100644
--- a/.env.nanobox
+++ b/.env.nanobox
@@ -69,7 +69,7 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
 # PAPERCLIP_ROOT_URL=/system
 
 # Optional asset host for multi-server setups
-# CDN_HOST=assets.example.com
+# CDN_HOST=https://assets.example.com
 
 # S3 (optional)
 # S3_ENABLED=true
diff --git a/boxfile.yml b/boxfile.yml
index ef847d4a0..330223110 100644
--- a/boxfile.yml
+++ b/boxfile.yml
@@ -153,8 +153,59 @@ worker.sidekiq:
 data.db:
   image: nanobox/postgresql:9.5
 
+  cron:
+    - id: backup
+      schedule: '0 3 * * *'
+      command: |
+        PGPASSWORD=${DATA_POSTGRES_PASS} pg_dump -U ${DATA_POSTGRES_USER} -w -Fc -O gonano |
+        gzip |
+        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz --data-binary @- &&
+        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
+        json_pp |
+        grep ${HOSTNAME} |
+        sort |
+        head -n-${BACKUP_COUNT:-1} |
+        sed 's/.*: "\(.*\)".*/\1/' |
+        while read file
+        do
+          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
+        done
+
 data.redis:
   image: nanobox/redis:3.0
 
+  cron:
+    - id: backup
+      schedule: '0 3 * * *'
+      command: |
+        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).rdb --data-binary @/data/var/db/redis/dump.rdb &&
+        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
+        json_pp |
+        grep ${HOSTNAME} |
+        sort |
+        head -n-${BACKUP_COUNT:-1} |
+        sed 's/.*: "\(.*\)".*/\1/' |
+        while read file
+        do
+          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
+        done
+
 data.storage:
   image: nanobox/unfs:0.9
+
+  cron:
+    - id: backup
+      schedule: '0 3 * * *'
+      command: |
+        tar cz -C /data/var/db/unfs/ |
+        curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).tgz --data-binary @- &&
+        curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ |
+        json_pp |
+        grep ${HOSTNAME} |
+        sort |
+        head -n-${BACKUP_COUNT:-1} |
+        sed 's/.*: "\(.*\)".*/\1/' |
+        while read file
+        do
+          curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/${file} -X DELETE
+        done

From 2d6128672fcadeb29c99551a33648b4880969d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=82=89?= <noraworld@users.noreply.github.com>
Date: Fri, 7 Jul 2017 07:48:09 +0900
Subject: [PATCH 155/382] Togglable filter links (#4021)

* Togglable filter links

* Rename is_selected to selected?
---
 app/helpers/admin/filter_helper.rb       | 12 +++++++++---
 app/views/admin/accounts/index.html.haml | 24 ++++++++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb
index 0dfa30e56..6a57b3d63 100644
--- a/app/helpers/admin/filter_helper.rb
+++ b/app/helpers/admin/filter_helper.rb
@@ -6,15 +6,21 @@ module Admin::FilterHelper
 
   FILTERS = ACCOUNT_FILTERS + REPORT_FILTERS
 
-  def filter_link_to(text, more_params)
-    new_url = filtered_url_for(more_params)
-    link_to text, new_url, class: filter_link_class(new_url)
+  def filter_link_to(text, link_to_params, link_class_params = link_to_params)
+    new_url = filtered_url_for(link_to_params)
+    new_class = filtered_url_for(link_class_params)
+    link_to text, new_url, class: filter_link_class(new_class)
   end
 
   def table_link_to(icon, text, path, options = {})
     link_to safe_join([fa_icon(icon), text]), path, options.merge(class: 'table-action-link')
   end
 
+  def selected?(more_params)
+    new_url = filtered_url_for(more_params)
+    filter_link_class(new_url) == 'selected' ? true : false
+  end
+
   private
 
   def filter_params(more_params)
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index 6d2849c32..07c8d1632 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -6,14 +6,30 @@
     %strong= t('admin.accounts.location.title')
     %ul
       %li= filter_link_to t('admin.accounts.location.all'), local: nil, remote: nil
-      %li= filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil
-      %li= filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
+      %li
+        - if selected? local: '1', remote: nil
+          = filter_link_to t('admin.accounts.location.local'), {local: nil, remote: nil}, {local: '1', remote: nil}
+        - else
+          = filter_link_to t('admin.accounts.location.local'), local: '1', remote: nil
+      %li
+        - if selected? remote: '1', local: nil
+          = filter_link_to t('admin.accounts.location.remote'), {remote: nil, local: nil}, {remote: '1', local: nil}
+        - else
+          = filter_link_to t('admin.accounts.location.remote'), remote: '1', local: nil
   .filter-subset
     %strong= t('admin.accounts.moderation.title')
     %ul
       %li= filter_link_to t('admin.accounts.moderation.all'), silenced: nil, suspended: nil
-      %li= filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1'
-      %li= filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1'
+      %li
+        - if selected? silenced: '1'
+          = filter_link_to t('admin.accounts.moderation.silenced'), {silenced: nil}, {silenced: '1'}
+        - else
+          = filter_link_to t('admin.accounts.moderation.silenced'), silenced: '1'
+      %li
+        - if selected? suspended: '1'
+          = filter_link_to t('admin.accounts.moderation.suspended'), {suspended: nil}, {suspended: '1'}
+        - else
+          = filter_link_to t('admin.accounts.moderation.suspended'), suspended: '1'
   .filter-subset
     %strong= t('admin.accounts.order.title')
     %ul

From 8b2cad56374b2dbb6e7a445e7917810935c45536 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jul 2017 04:02:06 +0200
Subject: [PATCH 156/382] Refactor JSON templates to be generated with
 ActiveModelSerializers instead of Rabl (#4090)

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  9 ++
 .../api/v1/accounts/credentials_controller.rb |  4 +-
 .../accounts/follower_accounts_controller.rb  |  2 +-
 .../accounts/following_accounts_controller.rb |  2 +-
 .../v1/accounts/relationships_controller.rb   | 11 +--
 .../api/v1/accounts/search_controller.rb      |  3 +-
 .../api/v1/accounts/statuses_controller.rb    |  5 +-
 app/controllers/api/v1/accounts_controller.rb | 38 +++-----
 app/controllers/api/v1/apps_controller.rb     |  1 +
 app/controllers/api/v1/blocks_controller.rb   |  1 +
 .../api/v1/favourites_controller.rb           |  5 +-
 .../api/v1/follow_requests_controller.rb      |  1 +
 app/controllers/api/v1/follows_controller.rb  |  2 +-
 .../api/v1/instances_controller.rb            |  4 +-
 app/controllers/api/v1/media_controller.rb    |  1 +
 app/controllers/api/v1/mutes_controller.rb    |  1 +
 .../api/v1/notifications_controller.rb        |  7 +-
 app/controllers/api/v1/reports_controller.rb  |  3 +-
 app/controllers/api/v1/search_controller.rb   |  3 +-
 .../favourited_by_accounts_controller.rb      |  2 +-
 .../api/v1/statuses/favourites_controller.rb  |  4 +-
 .../api/v1/statuses/mutes_controller.rb       |  4 +-
 .../reblogged_by_accounts_controller.rb       |  2 +-
 .../api/v1/statuses/reblogs_controller.rb     |  4 +-
 app/controllers/api/v1/statuses_controller.rb | 16 +++-
 .../api/v1/timelines/home_controller.rb       |  6 +-
 .../api/v1/timelines/public_controller.rb     |  6 +-
 .../api/v1/timelines/tag_controller.rb        |  6 +-
 app/lib/inline_rabl_scope.rb                  | 17 ----
 app/lib/inline_renderer.rb                    | 36 +++++--
 app/models/context.rb                         |  5 +
 app/models/search.rb                          |  5 +
 .../account_relationships_presenter.rb        | 15 +++
 .../status_relationships_presenter.rb         | 19 ++++
 app/serializers/rest/account_serializer.rb    | 33 +++++++
 .../rest/application_serializer.rb            | 14 +++
 app/serializers/rest/context_serializer.rb    |  6 ++
 app/serializers/rest/instance_serializer.rb   | 30 ++++++
 .../rest/media_attachment_serializer.rb       | 24 +++++
 .../rest/notification_serializer.rb           | 12 +++
 .../rest/preview_card_serializer.rb           | 14 +++
 .../rest/relationship_serializer.rb           | 30 ++++++
 app/serializers/rest/report_serializer.rb     |  5 +
 app/serializers/rest/search_serializer.rb     | 12 +++
 app/serializers/rest/status_serializer.rb     | 93 +++++++++++++++++++
 app/services/fan_out_on_write_service.rb      |  2 +-
 app/services/notify_service.rb                |  2 +-
 app/views/api/v1/accounts/index.rabl          |  2 -
 app/views/api/v1/accounts/relationship.rabl   |  9 --
 .../api/v1/accounts/relationships/index.rabl  |  2 -
 app/views/api/v1/accounts/show.rabl           | 12 ---
 app/views/api/v1/accounts/statuses/index.rabl |  2 -
 app/views/api/v1/apps/create.rabl             |  4 -
 app/views/api/v1/apps/show.rabl               |  3 -
 app/views/api/v1/blocks/index.rabl            |  2 -
 app/views/api/v1/favourites/index.rabl        |  2 -
 app/views/api/v1/follow_requests/index.rabl   |  2 -
 app/views/api/v1/follows/show.rabl            |  2 -
 app/views/api/v1/instances/show.rabl          | 10 --
 app/views/api/v1/media/create.rabl            |  7 --
 app/views/api/v1/mutes/index.rabl             |  2 -
 app/views/api/v1/notifications/index.rabl     |  2 -
 app/views/api/v1/notifications/show.rabl      | 11 ---
 app/views/api/v1/reports/index.rabl           |  2 -
 app/views/api/v1/reports/show.rabl            |  2 -
 app/views/api/v1/search/index.rabl            | 13 ---
 app/views/api/v1/statuses/_media.rabl         |  6 --
 app/views/api/v1/statuses/_mention.rabl       |  4 -
 app/views/api/v1/statuses/_show.rabl          | 29 ------
 app/views/api/v1/statuses/_tags.rabl          |  2 -
 app/views/api/v1/statuses/accounts.rabl       |  2 -
 app/views/api/v1/statuses/card.rabl           |  7 --
 app/views/api/v1/statuses/context.rabl        |  9 --
 app/views/api/v1/statuses/index.rabl          |  2 -
 app/views/api/v1/statuses/show.rabl           | 15 ---
 app/views/api/v1/timelines/show.rabl          |  2 -
 app/views/home/initial_state.json.rabl        |  4 +-
 app/workers/push_update_worker.rb             |  2 +-
 spec/lib/inline_rabl_scope_spec.rb            | 23 -----
 80 files changed, 425 insertions(+), 301 deletions(-)
 delete mode 100644 app/lib/inline_rabl_scope.rb
 create mode 100644 app/models/context.rb
 create mode 100644 app/models/search.rb
 create mode 100644 app/presenters/account_relationships_presenter.rb
 create mode 100644 app/presenters/status_relationships_presenter.rb
 create mode 100644 app/serializers/rest/account_serializer.rb
 create mode 100644 app/serializers/rest/application_serializer.rb
 create mode 100644 app/serializers/rest/context_serializer.rb
 create mode 100644 app/serializers/rest/instance_serializer.rb
 create mode 100644 app/serializers/rest/media_attachment_serializer.rb
 create mode 100644 app/serializers/rest/notification_serializer.rb
 create mode 100644 app/serializers/rest/preview_card_serializer.rb
 create mode 100644 app/serializers/rest/relationship_serializer.rb
 create mode 100644 app/serializers/rest/report_serializer.rb
 create mode 100644 app/serializers/rest/search_serializer.rb
 create mode 100644 app/serializers/rest/status_serializer.rb
 delete mode 100644 app/views/api/v1/accounts/index.rabl
 delete mode 100644 app/views/api/v1/accounts/relationship.rabl
 delete mode 100644 app/views/api/v1/accounts/relationships/index.rabl
 delete mode 100644 app/views/api/v1/accounts/show.rabl
 delete mode 100644 app/views/api/v1/accounts/statuses/index.rabl
 delete mode 100644 app/views/api/v1/apps/create.rabl
 delete mode 100644 app/views/api/v1/apps/show.rabl
 delete mode 100644 app/views/api/v1/blocks/index.rabl
 delete mode 100644 app/views/api/v1/favourites/index.rabl
 delete mode 100644 app/views/api/v1/follow_requests/index.rabl
 delete mode 100644 app/views/api/v1/follows/show.rabl
 delete mode 100644 app/views/api/v1/instances/show.rabl
 delete mode 100644 app/views/api/v1/media/create.rabl
 delete mode 100644 app/views/api/v1/mutes/index.rabl
 delete mode 100644 app/views/api/v1/notifications/index.rabl
 delete mode 100644 app/views/api/v1/notifications/show.rabl
 delete mode 100644 app/views/api/v1/reports/index.rabl
 delete mode 100644 app/views/api/v1/reports/show.rabl
 delete mode 100644 app/views/api/v1/search/index.rabl
 delete mode 100644 app/views/api/v1/statuses/_media.rabl
 delete mode 100644 app/views/api/v1/statuses/_mention.rabl
 delete mode 100644 app/views/api/v1/statuses/_show.rabl
 delete mode 100644 app/views/api/v1/statuses/_tags.rabl
 delete mode 100644 app/views/api/v1/statuses/accounts.rabl
 delete mode 100644 app/views/api/v1/statuses/card.rabl
 delete mode 100644 app/views/api/v1/statuses/context.rabl
 delete mode 100644 app/views/api/v1/statuses/index.rabl
 delete mode 100644 app/views/api/v1/statuses/show.rabl
 delete mode 100644 app/views/api/v1/timelines/show.rabl
 delete mode 100644 spec/lib/inline_rabl_scope_spec.rb

diff --git a/Gemfile b/Gemfile
index 6ee884a17..95c74eef9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,7 @@ gem 'aws-sdk', '~> 2.9'
 gem 'paperclip', '~> 5.1'
 gem 'paperclip-av-transcoder', '~> 0.6'
 
+gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.5'
 gem 'bootsnap'
 gem 'browser'
diff --git a/Gemfile.lock b/Gemfile.lock
index f0156529c..71f83f736 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,6 +24,11 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    active_model_serializers (0.10.6)
+      actionpack (>= 4.1, < 6)
+      activemodel (>= 4.1, < 6)
+      case_transform (>= 0.2)
+      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
     active_record_query_trace (1.5.4)
     activejob (5.1.2)
       activesupport (= 5.1.2)
@@ -101,6 +106,8 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    case_transform (0.2)
+      activesupport
     chunky_png (1.3.8)
     cld3 (3.1.3)
       ffi (>= 1.1.0, < 1.10.0)
@@ -200,6 +207,7 @@ GEM
       terminal-table (>= 1.5.1)
     jmespath (1.3.1)
     json (2.1.0)
+    jsonapi-renderer (0.1.2)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -476,6 +484,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  active_model_serializers (~> 0.10)
   active_record_query_trace (~> 1.5)
   addressable (~> 2.5)
   annotate (~> 2.7)
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 1cf52ff10..8ee9a2416 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -6,13 +6,13 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
 
   def show
     @account = current_account
-    render 'api/v1/accounts/show'
+    render json: @account, serializer: REST::AccountSerializer
   end
 
   def update
     current_account.update!(account_params)
     @account = current_account
-    render 'api/v1/accounts/show'
+    render json: @account, serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/follower_accounts_controller.rb b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
index 81aae56d3..80b0bef40 100644
--- a/app/controllers/api/v1/accounts/follower_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/follower_accounts_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Accounts::FollowerAccountsController < Api::BaseController
 
   def index
     @accounts = load_accounts
-    render 'api/v1/accounts/index'
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/following_accounts_controller.rb b/app/controllers/api/v1/accounts/following_accounts_controller.rb
index 63c6d54b2..55cffdf37 100644
--- a/app/controllers/api/v1/accounts/following_accounts_controller.rb
+++ b/app/controllers/api/v1/accounts/following_accounts_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Accounts::FollowingAccountsController < Api::BaseController
 
   def index
     @accounts = load_accounts
-    render 'api/v1/accounts/index'
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/relationships_controller.rb b/app/controllers/api/v1/accounts/relationships_controller.rb
index cb923ab91..a88cf2021 100644
--- a/app/controllers/api/v1/accounts/relationships_controller.rb
+++ b/app/controllers/api/v1/accounts/relationships_controller.rb
@@ -8,16 +8,15 @@ class Api::V1::Accounts::RelationshipsController < Api::BaseController
 
   def index
     @accounts = Account.where(id: account_ids).select('id')
-    @following = Account.following_map(account_ids, current_user.account_id)
-    @followed_by = Account.followed_by_map(account_ids, current_user.account_id)
-    @blocking = Account.blocking_map(account_ids, current_user.account_id)
-    @muting = Account.muting_map(account_ids, current_user.account_id)
-    @requested = Account.requested_map(account_ids, current_user.account_id)
-    @domain_blocking = Account.domain_blocking_map(account_ids, current_user.account_id)
+    render json: @accounts, each_serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   private
 
+  def relationships
+    AccountRelationshipsPresenter.new(@accounts, current_user.account_id)
+  end
+
   def account_ids
     @_account_ids ||= Array(params[:id]).map(&:to_i)
   end
diff --git a/app/controllers/api/v1/accounts/search_controller.rb b/app/controllers/api/v1/accounts/search_controller.rb
index c4a8f97f2..2a5cac547 100644
--- a/app/controllers/api/v1/accounts/search_controller.rb
+++ b/app/controllers/api/v1/accounts/search_controller.rb
@@ -8,8 +8,7 @@ class Api::V1::Accounts::SearchController < Api::BaseController
 
   def show
     @accounts = account_search
-
-    render 'api/v1/accounts/index'
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
index 504ed8c07..d9ae5c089 100644
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -9,6 +9,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
 
   def index
     @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
@@ -18,9 +19,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   end
 
   def load_statuses
-    cached_account_statuses.tap do |statuses|
-      set_maps(statuses)
-    end
+    cached_account_statuses
   end
 
   def cached_account_statuses
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index 8fc0dd36f..f621aa245 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -8,49 +8,38 @@ class Api::V1::AccountsController < Api::BaseController
 
   respond_to :json
 
-  def show; end
+  def show
+    render json: @account, serializer: REST::AccountSerializer
+  end
 
   def follow
     FollowService.new.call(current_user.account, @account.acct)
-    set_relationship
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   def block
     BlockService.new.call(current_user.account, @account)
-
-    @following       = { @account.id => false }
-    @followed_by     = { @account.id => false }
-    @blocking        = { @account.id => true }
-    @requested       = { @account.id => false }
-    @muting          = { @account.id => current_account.muting?(@account.id) }
-    @domain_blocking = { @account.id => current_account.domain_blocking?(@account.domain) }
-
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   def mute
     MuteService.new.call(current_user.account, @account)
-    set_relationship
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   def unfollow
     UnfollowService.new.call(current_user.account, @account)
-    set_relationship
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   def unblock
     UnblockService.new.call(current_user.account, @account)
-    set_relationship
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   def unmute
     UnmuteService.new.call(current_user.account, @account)
-    set_relationship
-    render :relationship
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
   end
 
   private
@@ -59,12 +48,7 @@ class Api::V1::AccountsController < Api::BaseController
     @account = Account.find(params[:id])
   end
 
-  def set_relationship
-    @following       = Account.following_map([@account.id], current_user.account_id)
-    @followed_by     = Account.followed_by_map([@account.id], current_user.account_id)
-    @blocking        = Account.blocking_map([@account.id], current_user.account_id)
-    @muting          = Account.muting_map([@account.id], current_user.account_id)
-    @requested       = Account.requested_map([@account.id], current_user.account_id)
-    @domain_blocking = Account.domain_blocking_map([@account.id], current_user.account_id)
+  def relationships
+    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
   end
 end
diff --git a/app/controllers/api/v1/apps_controller.rb b/app/controllers/api/v1/apps_controller.rb
index 98e908948..44a27b20a 100644
--- a/app/controllers/api/v1/apps_controller.rb
+++ b/app/controllers/api/v1/apps_controller.rb
@@ -5,6 +5,7 @@ class Api::V1::AppsController < Api::BaseController
 
   def create
     @app = Doorkeeper::Application.create!(application_options)
+    render json: @app, serializer: REST::ApplicationSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/blocks_controller.rb b/app/controllers/api/v1/blocks_controller.rb
index 1702953cf..a412e4341 100644
--- a/app/controllers/api/v1/blocks_controller.rb
+++ b/app/controllers/api/v1/blocks_controller.rb
@@ -9,6 +9,7 @@ class Api::V1::BlocksController < Api::BaseController
 
   def index
     @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index fe0819a3f..92c0a62a9 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -9,14 +9,13 @@ class Api::V1::FavouritesController < Api::BaseController
 
   def index
     @statuses = load_statuses
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
 
   def load_statuses
-    cached_favourites.tap do |statuses|
-      set_maps(statuses)
-    end
+    cached_favourites
   end
 
   def cached_favourites
diff --git a/app/controllers/api/v1/follow_requests_controller.rb b/app/controllers/api/v1/follow_requests_controller.rb
index eed22ef4f..b9f50d784 100644
--- a/app/controllers/api/v1/follow_requests_controller.rb
+++ b/app/controllers/api/v1/follow_requests_controller.rb
@@ -7,6 +7,7 @@ class Api::V1::FollowRequestsController < Api::BaseController
 
   def index
     @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   def authorize
diff --git a/app/controllers/api/v1/follows_controller.rb b/app/controllers/api/v1/follows_controller.rb
index bcdb4e177..e01ae5c01 100644
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::FollowsController < Api::BaseController
     raise ActiveRecord::RecordNotFound if follow_params[:uri].blank?
 
     @account = FollowService.new.call(current_user.account, target_uri).try(:target_account)
-    render :show
+    render json: @account, serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index ce2181879..1c6971c18 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -3,5 +3,7 @@
 class Api::V1::InstancesController < Api::BaseController
   respond_to :json
 
-  def show; end
+  def show
+    render json: {}, serializer: REST::InstanceSerializer
+  end
 end
diff --git a/app/controllers/api/v1/media_controller.rb b/app/controllers/api/v1/media_controller.rb
index 25a331319..8a1992fca 100644
--- a/app/controllers/api/v1/media_controller.rb
+++ b/app/controllers/api/v1/media_controller.rb
@@ -11,6 +11,7 @@ class Api::V1::MediaController < Api::BaseController
 
   def create
     @media = current_account.media_attachments.create!(file: media_params[:file])
+    render json: @media, serializer: REST::MediaAttachmentSerializer
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
     render json: file_type_error, status: 422
   rescue Paperclip::Error
diff --git a/app/controllers/api/v1/mutes_controller.rb b/app/controllers/api/v1/mutes_controller.rb
index 2a353df03..0c43cb943 100644
--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -9,6 +9,7 @@ class Api::V1::MutesController < Api::BaseController
 
   def index
     @accounts = load_accounts
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb
index a28e99f2f..8910b77e9 100644
--- a/app/controllers/api/v1/notifications_controller.rb
+++ b/app/controllers/api/v1/notifications_controller.rb
@@ -11,11 +11,12 @@ class Api::V1::NotificationsController < Api::BaseController
 
   def index
     @notifications = load_notifications
-    set_maps_for_notification_target_statuses
+    render json: @notifications, each_serializer: REST::NotificationSerializer, relationships: StatusRelationshipsPresenter.new(target_statuses_from_notifications, current_user&.account_id)
   end
 
   def show
     @notification = current_account.notifications.find(params[:id])
+    render json: @notification, serializer: REST::NotificationSerializer
   end
 
   def clear
@@ -46,10 +47,6 @@ class Api::V1::NotificationsController < Api::BaseController
     current_account.notifications.browserable(exclude_types)
   end
 
-  def set_maps_for_notification_target_statuses
-    set_maps target_statuses_from_notifications
-  end
-
   def target_statuses_from_notifications
     @notifications.reject { |notification| notification.target_status.nil? }.map(&:target_status)
   end
diff --git a/app/controllers/api/v1/reports_controller.rb b/app/controllers/api/v1/reports_controller.rb
index 8e7070d07..9592cd4bd 100644
--- a/app/controllers/api/v1/reports_controller.rb
+++ b/app/controllers/api/v1/reports_controller.rb
@@ -9,6 +9,7 @@ class Api::V1::ReportsController < Api::BaseController
 
   def index
     @reports = current_account.reports
+    render json: @reports, each_serializer: REST::ReportSerializer
   end
 
   def create
@@ -20,7 +21,7 @@ class Api::V1::ReportsController < Api::BaseController
 
     User.admins.includes(:account).each { |u| AdminMailer.new_report(u.account, @report).deliver_later }
 
-    render :show
+    render json: @report, serializer: REST::ReportSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb
index 8b832148c..1353682ea 100644
--- a/app/controllers/api/v1/search_controller.rb
+++ b/app/controllers/api/v1/search_controller.rb
@@ -6,7 +6,8 @@ class Api::V1::SearchController < Api::BaseController
   respond_to :json
 
   def index
-    @search = OpenStruct.new(search_results)
+    @search = Search.new(search_results)
+    render json: @search, serializer: REST::SearchSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
index e58184939..f95cf9457 100644
--- a/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/favourited_by_accounts_controller.rb
@@ -11,7 +11,7 @@ class Api::V1::Statuses::FavouritedByAccountsController < Api::BaseController
 
   def index
     @accounts = load_accounts
-    render 'api/v1/statuses/accounts'
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb
index b6fb13cc0..4c4b0c160 100644
--- a/app/controllers/api/v1/statuses/favourites_controller.rb
+++ b/app/controllers/api/v1/statuses/favourites_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
 
   def create
     @status = favourited_status
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   def destroy
@@ -19,7 +19,7 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
 
     UnfavouriteWorker.perform_async(current_user.account_id, @status.id)
 
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/mutes_controller.rb b/app/controllers/api/v1/statuses/mutes_controller.rb
index eab88f2ef..a4bf0acdd 100644
--- a/app/controllers/api/v1/statuses/mutes_controller.rb
+++ b/app/controllers/api/v1/statuses/mutes_controller.rb
@@ -14,14 +14,14 @@ class Api::V1::Statuses::MutesController < Api::BaseController
     current_account.mute_conversation!(@conversation)
     @mutes_map = { @conversation.id => true }
 
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   def destroy
     current_account.unmute_conversation!(@conversation)
     @mutes_map = { @conversation.id => false }
 
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
index 43593d3c5..175217e6e 100644
--- a/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb
@@ -11,7 +11,7 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
 
   def index
     @accounts = load_accounts
-    render 'api/v1/statuses/accounts'
+    render json: @accounts, each_serializer: REST::AccountSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/reblogs_controller.rb b/app/controllers/api/v1/statuses/reblogs_controller.rb
index ee9c5b3a6..f7f4b5a5c 100644
--- a/app/controllers/api/v1/statuses/reblogs_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogs_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
 
   def create
     @status = ReblogService.new.call(current_user.account, status_for_reblog)
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   def destroy
@@ -20,7 +20,7 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
     authorize status_for_destroy, :unreblog?
     RemovalWorker.perform_async(status_for_destroy.id)
 
-    render 'api/v1/statuses/show'
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   private
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 9aa1cbc4d..9c7124d0f 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -13,6 +13,7 @@ class Api::V1::StatusesController < Api::BaseController
   def show
     cached  = Rails.cache.read(@status.cache_key)
     @status = cached unless cached.nil?
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   def context
@@ -21,15 +22,20 @@ class Api::V1::StatusesController < Api::BaseController
     loaded_ancestors    = cache_collection(ancestors_results, Status)
     loaded_descendants  = cache_collection(descendants_results, Status)
 
-    @context = OpenStruct.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
-    statuses = [@status] + @context[:ancestors] + @context[:descendants]
+    @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
+    statuses = [@status] + @context.ancestors + @context.descendants
 
-    set_maps(statuses)
+    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
   end
 
   def card
     @card = PreviewCard.find_by(status: @status)
-    render_empty if @card.nil?
+
+    if @card.nil?
+      render_empty
+    else
+      render json: @card, serializer: REST::PreviewCardSerializer
+    end
   end
 
   def create
@@ -43,7 +49,7 @@ class Api::V1::StatusesController < Api::BaseController
                                          application: doorkeeper_token.application,
                                          idempotency: request.headers['Idempotency-Key'])
 
-    render :show
+    render json: @status, serializer: REST::StatusSerializer
   end
 
   def destroy
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index 511d2f65d..3dd27710c 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -9,15 +9,13 @@ class Api::V1::Timelines::HomeController < Api::BaseController
 
   def show
     @statuses = load_statuses
-    render 'api/v1/timelines/show'
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
 
   def load_statuses
-    cached_home_statuses.tap do |statuses|
-      set_maps(statuses)
-    end
+    cached_home_statuses
   end
 
   def cached_home_statuses
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 305451cc7..49887778e 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -7,15 +7,13 @@ class Api::V1::Timelines::PublicController < Api::BaseController
 
   def show
     @statuses = load_statuses
-    render 'api/v1/timelines/show'
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
 
   def load_statuses
-    cached_public_statuses.tap do |statuses|
-      set_maps(statuses)
-    end
+    cached_public_statuses
   end
 
   def cached_public_statuses
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 50afca7c7..08db04a39 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -8,7 +8,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
 
   def show
     @statuses = load_statuses
-    render 'api/v1/timelines/show'
+    render json: @statuses, each_serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
   end
 
   private
@@ -18,9 +18,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
   end
 
   def load_statuses
-    cached_tagged_statuses.tap do |statuses|
-      set_maps(statuses)
-    end
+    cached_tagged_statuses
   end
 
   def cached_tagged_statuses
diff --git a/app/lib/inline_rabl_scope.rb b/app/lib/inline_rabl_scope.rb
deleted file mode 100644
index 26adcb03a..000000000
--- a/app/lib/inline_rabl_scope.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class InlineRablScope
-  include RoutingHelper
-
-  def initialize(account)
-    @account = account
-  end
-
-  def current_user
-    @account.try(:user)
-  end
-
-  def current_account
-    @account
-  end
-end
diff --git a/app/lib/inline_renderer.rb b/app/lib/inline_renderer.rb
index 8e04ad1d5..7cd9758ec 100644
--- a/app/lib/inline_renderer.rb
+++ b/app/lib/inline_renderer.rb
@@ -1,13 +1,33 @@
 # frozen_string_literal: true
 
 class InlineRenderer
-  def self.render(status, current_account, template)
-    Rabl::Renderer.new(
-      template,
-      status,
-      view_path: 'app/views',
-      format: :json,
-      scope: InlineRablScope.new(current_account)
-    ).render
+  def initialize(object, current_account, template)
+    @object          = object
+    @current_account = current_account
+    @template        = template
+  end
+
+  def render
+    case @template
+    when :status
+      serializer = REST::StatusSerializer
+    when :notification
+      serializer = REST::NotificationSerializer
+    else
+      return
+    end
+
+    serializable_resource = ActiveModelSerializers::SerializableResource.new(@object, serializer: serializer, scope: current_user, scope_name: :current_user)
+    serializable_resource.as_json
+  end
+
+  def self.render(object, current_account, template)
+    new(object, current_account, template).render
+  end
+
+  private
+
+  def current_user
+    @current_account&.user
   end
 end
diff --git a/app/models/context.rb b/app/models/context.rb
new file mode 100644
index 000000000..cc667999e
--- /dev/null
+++ b/app/models/context.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Context < ActiveModelSerializers::Model
+  attributes :ancestors, :descendants
+end
diff --git a/app/models/search.rb b/app/models/search.rb
new file mode 100644
index 000000000..676c2a7f8
--- /dev/null
+++ b/app/models/search.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Search < ActiveModelSerializers::Model
+  attributes :accounts, :statuses, :hashtags
+end
diff --git a/app/presenters/account_relationships_presenter.rb b/app/presenters/account_relationships_presenter.rb
new file mode 100644
index 000000000..657807863
--- /dev/null
+++ b/app/presenters/account_relationships_presenter.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AccountRelationshipsPresenter
+  attr_reader :following, :followed_by, :blocking,
+              :muting, :requested, :domain_blocking
+
+  def initialize(account_ids, current_account_id)
+    @following       = Account.following_map(account_ids, current_account_id)
+    @followed_by     = Account.followed_by_map(account_ids, current_account_id)
+    @blocking        = Account.blocking_map(account_ids, current_account_id)
+    @muting          = Account.muting_map(account_ids, current_account_id)
+    @requested       = Account.requested_map(account_ids, current_account_id)
+    @domain_blocking = Account.domain_blocking_map(account_ids, current_account_id)
+  end
+end
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
new file mode 100644
index 000000000..caf00791a
--- /dev/null
+++ b/app/presenters/status_relationships_presenter.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class StatusRelationshipsPresenter
+  attr_reader :reblogs_map, :favourites_map, :mutes_map
+
+  def initialize(statuses, current_account_id = nil)
+    if current_account_id.nil?
+      @reblogs_map    = {}
+      @favourites_map = {}
+      @mutes_map      = {}
+    else
+      status_ids       = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
+      conversation_ids = statuses.compact.map(&:conversation_id).compact.uniq
+      @reblogs_map     = Status.reblogs_map(status_ids, current_account_id)
+      @favourites_map  = Status.favourites_map(status_ids, current_account_id)
+      @mutes_map       = Status.mutes_map(conversation_ids, current_account_id)
+    end
+  end
+end
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
new file mode 100644
index 000000000..012a4fd18
--- /dev/null
+++ b/app/serializers/rest/account_serializer.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class REST::AccountSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :id, :username, :acct, :display_name, :locked, :created_at,
+             :note, :url, :avatar, :avatar_static, :header, :header_static,
+             :followers_count, :following_count, :statuses_count
+
+  def note
+    Formatter.instance.simplified_format(object)
+  end
+
+  def url
+    TagManager.instance.url_for(object)
+  end
+
+  def avatar
+    full_asset_url(object.avatar_original_url)
+  end
+
+  def avatar_static
+    full_asset_url(object.avatar_static_url)
+  end
+
+  def header
+    full_asset_url(object.header_original_url)
+  end
+
+  def header_static
+    full_asset_url(object.header_static_url)
+  end
+end
diff --git a/app/serializers/rest/application_serializer.rb b/app/serializers/rest/application_serializer.rb
new file mode 100644
index 000000000..868a62f1e
--- /dev/null
+++ b/app/serializers/rest/application_serializer.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class REST::ApplicationSerializer < ActiveModel::Serializer
+  attributes :id, :name, :website, :redirect_uri,
+             :client_id, :client_secret
+
+  def client_id
+    object.uid
+  end
+
+  def client_secret
+    object.secret
+  end
+end
diff --git a/app/serializers/rest/context_serializer.rb b/app/serializers/rest/context_serializer.rb
new file mode 100644
index 000000000..44515c85d
--- /dev/null
+++ b/app/serializers/rest/context_serializer.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+class REST::ContextSerializer < ActiveModel::Serializer
+  has_many :ancestors,   serializer: REST::StatusSerializer
+  has_many :descendants, serializer: REST::StatusSerializer
+end
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
new file mode 100644
index 000000000..8e32f9cb3
--- /dev/null
+++ b/app/serializers/rest/instance_serializer.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class REST::InstanceSerializer < ActiveModel::Serializer
+  attributes :uri, :title, :description, :email,
+             :version, :urls
+
+  def uri
+    Rails.configuration.x.local_domain
+  end
+
+  def title
+    Setting.site_title
+  end
+
+  def description
+    Setting.site_description
+  end
+
+  def email
+    Setting.site_contact_email
+  end
+
+  def version
+    Mastodon::Version.to_s
+  end
+
+  def urls
+    { streaming_api: Rails.configuration.x.streaming_api_base_url }
+  end
+end
diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
new file mode 100644
index 000000000..9b07a686e
--- /dev/null
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class REST::MediaAttachmentSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :id, :type, :url, :preview_url,
+             :remote_url, :text_url, :meta
+
+  def url
+    full_asset_url(object.file.url(:original))
+  end
+
+  def preview_url
+    full_asset_url(object.file.url(:small))
+  end
+
+  def text_url
+    medium_url(object.id)
+  end
+
+  def meta
+    object.file.meta
+  end
+end
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
new file mode 100644
index 000000000..97fadf32e
--- /dev/null
+++ b/app/serializers/rest/notification_serializer.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class REST::NotificationSerializer < ActiveModel::Serializer
+  attributes :id, :type, :created_at
+
+  belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
+  belongs_to :status, if: :status_type?,   serializer: REST::StatusSerializer
+
+  def status_type?
+    [:favourite, :reblog, :mention].include?(object.type)
+  end
+end
diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb
new file mode 100644
index 000000000..9c460332c
--- /dev/null
+++ b/app/serializers/rest/preview_card_serializer.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class REST::PreviewCardSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :url, :title, :description, :type,
+             :author_name, :author_url, :provider_name,
+             :provider_url, :html, :width, :height,
+             :image
+
+  def image
+    object.image? ? full_asset_url(object.image.url(:original)) : nil
+  end
+end
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb
new file mode 100644
index 000000000..1d431aa1b
--- /dev/null
+++ b/app/serializers/rest/relationship_serializer.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class REST::RelationshipSerializer < ActiveModel::Serializer
+  attributes :id, :following, :followed_by, :blocking,
+             :muting, :requested, :domain_blocking
+
+  def following
+    instance_options[:relationships].following[object.id] || false
+  end
+
+  def followed_by
+    instance_options[:relationships].followed_by[object.id] || false
+  end
+
+  def blocking
+    instance_options[:relationships].blocking[object.id] || false
+  end
+
+  def muting
+    instance_options[:relationships].muting[object.id] || false
+  end
+
+  def requested
+    instance_options[:relationships].requested[object.id] || false
+  end
+
+  def domain_blocking
+    instance_options[:relationships].domain_blocking[object.id] || false
+  end
+end
diff --git a/app/serializers/rest/report_serializer.rb b/app/serializers/rest/report_serializer.rb
new file mode 100644
index 000000000..0c6bd6556
--- /dev/null
+++ b/app/serializers/rest/report_serializer.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class REST::ReportSerializer < ActiveModel::Serializer
+  attributes :id, :action_taken
+end
diff --git a/app/serializers/rest/search_serializer.rb b/app/serializers/rest/search_serializer.rb
new file mode 100644
index 000000000..157f543ae
--- /dev/null
+++ b/app/serializers/rest/search_serializer.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class REST::SearchSerializer < ActiveModel::Serializer
+  attributes :hashtags
+
+  has_many :accounts, serializer: REST::AccountSerializer
+  has_many :statuses, serializer: REST::StatusSerializer
+
+  def hashtags
+    object.hashtags.map(&:name)
+  end
+end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
new file mode 100644
index 000000000..246b12a90
--- /dev/null
+++ b/app/serializers/rest/status_serializer.rb
@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+class REST::StatusSerializer < ActiveModel::Serializer
+  attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
+             :sensitive, :spoiler_text, :visibility, :language,
+             :uri, :content, :url, :reblogs_count, :favourites_count
+
+  attribute :favourited, if: :current_user?
+  attribute :reblogged, if: :current_user?
+  attribute :muted, if: :current_user?
+
+  belongs_to :reblog, serializer: REST::StatusSerializer
+  belongs_to :application
+  belongs_to :account, serializer: REST::AccountSerializer
+
+  has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
+  has_many :mentions
+  has_many :tags
+
+  def current_user?
+    !current_user.nil?
+  end
+
+  def uri
+    TagManager.instance.uri_for(object)
+  end
+
+  def content
+    Formatter.instance.format(object)
+  end
+
+  def url
+    TagManager.instance.url_for(object)
+  end
+
+  def favourited
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].favourites_map[object.id] || false
+    else
+      current_user.account.favourited?(object)
+    end
+  end
+
+  def reblogged
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].reblogs_map[object.id] || false
+    else
+      current_user.account.reblogged?(object)
+    end
+  end
+
+  def muted
+    if instance_options && instance_options[:relationships]
+      instance_options[:relationships].mutes_map[object.conversation_id] || false
+    else
+      current_user.account.muting_conversation?(object.conversation)
+    end
+  end
+
+  class ApplicationSerializer < ActiveModel::Serializer
+    attributes :name, :website
+  end
+
+  class MentionSerializer < ActiveModel::Serializer
+    attributes :id, :username, :url, :acct
+
+    def id
+      object.account_id
+    end
+
+    def username
+      object.account_username
+    end
+
+    def url
+      TagManager.instance.url_for(object.account)
+    end
+
+    def acct
+      object.account_acct
+    end
+  end
+
+  class TagSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :name, :url
+
+    def url
+      tag_url(object)
+    end
+  end
+end
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index 3b74696d5..47a47a735 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -54,7 +54,7 @@ class FanOutOnWriteService < BaseService
   end
 
   def render_anonymous_payload(status)
-    @payload = InlineRenderer.render(status, nil, 'api/v1/statuses/show')
+    @payload = InlineRenderer.render(status, nil, :status)
     @payload = Oj.dump(event: :update, payload: @payload)
   end
 
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 422d5f97e..407d385ea 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -60,7 +60,7 @@ class NotifyService < BaseService
   def create_notification
     @notification.save!
     return unless @notification.browserable?
-    Redis.current.publish("timeline:#{@recipient.id}", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, 'api/v1/notifications/show')))
+    Redis.current.publish("timeline:#{@recipient.id}", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
   end
 
   def send_email
diff --git a/app/views/api/v1/accounts/index.rabl b/app/views/api/v1/accounts/index.rabl
deleted file mode 100644
index 9f3b13a53..000000000
--- a/app/views/api/v1/accounts/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/show'
diff --git a/app/views/api/v1/accounts/relationship.rabl b/app/views/api/v1/accounts/relationship.rabl
deleted file mode 100644
index 4f7763d9d..000000000
--- a/app/views/api/v1/accounts/relationship.rabl
+++ /dev/null
@@ -1,9 +0,0 @@
-object @account
-
-attribute :id
-node(:following)       { |account| @following[account.id]       || false }
-node(:followed_by)     { |account| @followed_by[account.id]     || false }
-node(:blocking)        { |account| @blocking[account.id]        || false }
-node(:muting)          { |account| @muting[account.id]          || false }
-node(:requested)       { |account| @requested[account.id]       || false }
-node(:domain_blocking) { |account| @domain_blocking[account.id] || false }
diff --git a/app/views/api/v1/accounts/relationships/index.rabl b/app/views/api/v1/accounts/relationships/index.rabl
deleted file mode 100644
index 022ea2ac4..000000000
--- a/app/views/api/v1/accounts/relationships/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/relationship'
diff --git a/app/views/api/v1/accounts/show.rabl b/app/views/api/v1/accounts/show.rabl
deleted file mode 100644
index 8826aa22d..000000000
--- a/app/views/api/v1/accounts/show.rabl
+++ /dev/null
@@ -1,12 +0,0 @@
-object @account
-
-attributes :id, :username, :acct, :display_name, :locked, :created_at
-
-node(:note)            { |account| Formatter.instance.simplified_format(account) }
-node(:url)             { |account| TagManager.instance.url_for(account) }
-node(:avatar)          { |account| full_asset_url(account.avatar_original_url) }
-node(:avatar_static)   { |account| full_asset_url(account.avatar_static_url) }
-node(:header)          { |account| full_asset_url(account.header_original_url) }
-node(:header_static)   { |account| full_asset_url(account.header_static_url) }
-
-attributes :followers_count, :following_count, :statuses_count
diff --git a/app/views/api/v1/accounts/statuses/index.rabl b/app/views/api/v1/accounts/statuses/index.rabl
deleted file mode 100644
index 44d29d91b..000000000
--- a/app/views/api/v1/accounts/statuses/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends 'api/v1/statuses/show'
diff --git a/app/views/api/v1/apps/create.rabl b/app/views/api/v1/apps/create.rabl
deleted file mode 100644
index 1ff6469a4..000000000
--- a/app/views/api/v1/apps/create.rabl
+++ /dev/null
@@ -1,4 +0,0 @@
-object @app
-attributes :id, :redirect_uri
-node(:client_id) { |app| app.uid }
-node(:client_secret) { |app| app.secret }
diff --git a/app/views/api/v1/apps/show.rabl b/app/views/api/v1/apps/show.rabl
deleted file mode 100644
index 6d9e607db..000000000
--- a/app/views/api/v1/apps/show.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-object @application
-
-attributes :name, :website
diff --git a/app/views/api/v1/blocks/index.rabl b/app/views/api/v1/blocks/index.rabl
deleted file mode 100644
index 9f3b13a53..000000000
--- a/app/views/api/v1/blocks/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/show'
diff --git a/app/views/api/v1/favourites/index.rabl b/app/views/api/v1/favourites/index.rabl
deleted file mode 100644
index 44d29d91b..000000000
--- a/app/views/api/v1/favourites/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends 'api/v1/statuses/show'
diff --git a/app/views/api/v1/follow_requests/index.rabl b/app/views/api/v1/follow_requests/index.rabl
deleted file mode 100644
index 9f3b13a53..000000000
--- a/app/views/api/v1/follow_requests/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/show'
diff --git a/app/views/api/v1/follows/show.rabl b/app/views/api/v1/follows/show.rabl
deleted file mode 100644
index e07106164..000000000
--- a/app/views/api/v1/follows/show.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-object @account
-extends('api/v1/accounts/show')
diff --git a/app/views/api/v1/instances/show.rabl b/app/views/api/v1/instances/show.rabl
deleted file mode 100644
index 05fb65031..000000000
--- a/app/views/api/v1/instances/show.rabl
+++ /dev/null
@@ -1,10 +0,0 @@
-object false
-
-node(:uri)         { site_hostname }
-node(:title)       { Setting.site_title }
-node(:description) { Setting.site_description }
-node(:email)       { Setting.site_contact_email }
-node(:version)     { Mastodon::Version.to_s }
-node :urls do
-    { :streaming_api => Rails.configuration.x.streaming_api_base_url }
-end
diff --git a/app/views/api/v1/media/create.rabl b/app/views/api/v1/media/create.rabl
deleted file mode 100644
index 53c13bbda..000000000
--- a/app/views/api/v1/media/create.rabl
+++ /dev/null
@@ -1,7 +0,0 @@
-object @media
-attribute :id, :type
-
-node(:url)         { |media| full_asset_url(media.file.url(:original)) }
-node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
-node(:text_url)    { |media| medium_url(media) }
-node(:meta)        { |media| media.file.meta }
diff --git a/app/views/api/v1/mutes/index.rabl b/app/views/api/v1/mutes/index.rabl
deleted file mode 100644
index 9f3b13a53..000000000
--- a/app/views/api/v1/mutes/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/show'
diff --git a/app/views/api/v1/notifications/index.rabl b/app/views/api/v1/notifications/index.rabl
deleted file mode 100644
index 6abc3da36..000000000
--- a/app/views/api/v1/notifications/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @notifications
-extends 'api/v1/notifications/show'
diff --git a/app/views/api/v1/notifications/show.rabl b/app/views/api/v1/notifications/show.rabl
deleted file mode 100644
index ca34f2d5d..000000000
--- a/app/views/api/v1/notifications/show.rabl
+++ /dev/null
@@ -1,11 +0,0 @@
-object @notification
-
-attributes :id, :type, :created_at
-
-child from_account: :account do
-  extends 'api/v1/accounts/show'
-end
-
-node(:status, if: lambda { |n| [:favourite, :reblog, :mention].include?(n.type) }) do |n|
-  partial 'api/v1/statuses/show', object: n.target_status
-end
diff --git a/app/views/api/v1/reports/index.rabl b/app/views/api/v1/reports/index.rabl
deleted file mode 100644
index 4f0794027..000000000
--- a/app/views/api/v1/reports/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @reports
-extends 'api/v1/reports/show'
diff --git a/app/views/api/v1/reports/show.rabl b/app/views/api/v1/reports/show.rabl
deleted file mode 100644
index 006db51e3..000000000
--- a/app/views/api/v1/reports/show.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-object @report
-attributes :id, :action_taken
diff --git a/app/views/api/v1/search/index.rabl b/app/views/api/v1/search/index.rabl
deleted file mode 100644
index 8d1640f2d..000000000
--- a/app/views/api/v1/search/index.rabl
+++ /dev/null
@@ -1,13 +0,0 @@
-object @search
-
-child :accounts, object_root: false do
-  extends 'api/v1/accounts/show'
-end
-
-node(:hashtags) do |search|
-  search.hashtags.map(&:name)
-end
-
-child :statuses, object_root: false do
-  extends 'api/v1/statuses/show'
-end
diff --git a/app/views/api/v1/statuses/_media.rabl b/app/views/api/v1/statuses/_media.rabl
deleted file mode 100644
index 07ac31888..000000000
--- a/app/views/api/v1/statuses/_media.rabl
+++ /dev/null
@@ -1,6 +0,0 @@
-attributes :id, :remote_url, :type
-
-node(:url)         { |media| full_asset_url(media.file.url(:original)) }
-node(:preview_url) { |media| full_asset_url(media.file.url(:small)) }
-node(:text_url)    { |media| media.local? ? medium_url(media) : nil }
-node(:meta)        { |media| media.file.meta }
diff --git a/app/views/api/v1/statuses/_mention.rabl b/app/views/api/v1/statuses/_mention.rabl
deleted file mode 100644
index 8c95fc9bd..000000000
--- a/app/views/api/v1/statuses/_mention.rabl
+++ /dev/null
@@ -1,4 +0,0 @@
-node(:url)      { |mention| TagManager.instance.url_for(mention.account) }
-node(:acct)     { |mention| mention.account_acct }
-node(:id)       { |mention| mention.account_id }
-node(:username) { |mention| mention.account_username }
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl
deleted file mode 100644
index fe3ec89ab..000000000
--- a/app/views/api/v1/statuses/_show.rabl
+++ /dev/null
@@ -1,29 +0,0 @@
-attributes :id, :created_at, :in_reply_to_id,
-           :in_reply_to_account_id, :sensitive,
-           :spoiler_text, :visibility, :language
-
-node(:uri)              { |status| TagManager.instance.uri_for(status) }
-node(:content)          { |status| Formatter.instance.format(status) }
-node(:url)              { |status| TagManager.instance.url_for(status) }
-node(:reblogs_count)    { |status| defined?(@reblogs_counts_map)    ? (@reblogs_counts_map[status.id]    || 0) : status.reblogs_count }
-node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites_count }
-
-child :application do
-  extends 'api/v1/apps/show'
-end
-
-child :account do
-  extends 'api/v1/accounts/show'
-end
-
-child :media_attachments, object_root: false do
-  extends 'api/v1/statuses/_media'
-end
-
-child :mentions, object_root: false do
-  extends 'api/v1/statuses/_mention'
-end
-
-child :tags, object_root: false do
-  extends 'api/v1/statuses/_tags'
-end
diff --git a/app/views/api/v1/statuses/_tags.rabl b/app/views/api/v1/statuses/_tags.rabl
deleted file mode 100644
index 25e7b0fac..000000000
--- a/app/views/api/v1/statuses/_tags.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-attribute :name
-node(:url) { |tag| tag_url(tag) }
diff --git a/app/views/api/v1/statuses/accounts.rabl b/app/views/api/v1/statuses/accounts.rabl
deleted file mode 100644
index 9f3b13a53..000000000
--- a/app/views/api/v1/statuses/accounts.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @accounts
-extends 'api/v1/accounts/show'
diff --git a/app/views/api/v1/statuses/card.rabl b/app/views/api/v1/statuses/card.rabl
deleted file mode 100644
index 5d8d7af3b..000000000
--- a/app/views/api/v1/statuses/card.rabl
+++ /dev/null
@@ -1,7 +0,0 @@
-object @card
-
-attributes :url, :title, :description, :type,
-           :author_name, :author_url, :provider_name,
-           :provider_url, :html, :width, :height
-
-node(:image) { |card| card.image? ? full_asset_url(card.image.url(:original)) : nil }
diff --git a/app/views/api/v1/statuses/context.rabl b/app/views/api/v1/statuses/context.rabl
deleted file mode 100644
index 0b62f26d5..000000000
--- a/app/views/api/v1/statuses/context.rabl
+++ /dev/null
@@ -1,9 +0,0 @@
-object @context
-
-node :ancestors do |context|
-  partial 'api/v1/statuses/index', object: context.ancestors
-end
-
-node :descendants do |context|
-  partial 'api/v1/statuses/index', object: context.descendants
-end
diff --git a/app/views/api/v1/statuses/index.rabl b/app/views/api/v1/statuses/index.rabl
deleted file mode 100644
index 0a0ed13c5..000000000
--- a/app/views/api/v1/statuses/index.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends('api/v1/statuses/show')
diff --git a/app/views/api/v1/statuses/show.rabl b/app/views/api/v1/statuses/show.rabl
deleted file mode 100644
index 4b33fb2c3..000000000
--- a/app/views/api/v1/statuses/show.rabl
+++ /dev/null
@@ -1,15 +0,0 @@
-object @status
-
-extends 'api/v1/statuses/_show'
-
-node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? @favourites_map[status.id]         : current_account.favourited?(status) }
-node(:reblogged,  if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map)    ? @reblogs_map[status.id]            : current_account.reblogged?(status) }
-node(:muted,      if: proc { !current_account.nil? }) { |status| defined?(@mutes_map)      ? @mutes_map[status.conversation_id] : current_account.muting_conversation?(status.conversation) }
-
-child reblog: :reblog do
-  extends 'api/v1/statuses/_show'
-
-  node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? @favourites_map[status.id] : current_account.favourited?(status) }
-  node(:reblogged,  if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map)    ? @reblogs_map[status.id]    : current_account.reblogged?(status) }
-  node(:muted,      if: proc { !current_account.nil? }) { false }
-end
diff --git a/app/views/api/v1/timelines/show.rabl b/app/views/api/v1/timelines/show.rabl
deleted file mode 100644
index 0a0ed13c5..000000000
--- a/app/views/api/v1/timelines/show.rabl
+++ /dev/null
@@ -1,2 +0,0 @@
-collection @statuses
-extends('api/v1/statuses/show')
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl
index 291ff806b..c428a5a1f 100644
--- a/app/views/home/initial_state.json.rabl
+++ b/app/views/home/initial_state.json.rabl
@@ -24,8 +24,8 @@ end
 
 node(:accounts) do
   store = {}
-  store[current_account.id] = partial('api/v1/accounts/show', object: current_account)
-  store[@admin.id] = partial('api/v1/accounts/show', object: @admin) unless @admin.nil?
+  store[current_account.id] = ActiveModelSerializers::SerializableResource.new(current_account, serializer: REST::AccountSerializer)
+  store[@admin.id] = ActiveModelSerializers::SerializableResource.new(@admin, serializer: REST::AccountSerializer) unless @admin.nil?
   store
 end
 
diff --git a/app/workers/push_update_worker.rb b/app/workers/push_update_worker.rb
index fbcdcf634..697cbd6a6 100644
--- a/app/workers/push_update_worker.rb
+++ b/app/workers/push_update_worker.rb
@@ -6,7 +6,7 @@ class PushUpdateWorker
   def perform(account_id, status_id)
     account = Account.find(account_id)
     status  = Status.find(status_id)
-    message = InlineRenderer.render(status, account, 'api/v1/statuses/show')
+    message = InlineRenderer.render(status, account, :status)
 
     Redis.current.publish("timeline:#{account.id}", Oj.dump(event: :update, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
   rescue ActiveRecord::RecordNotFound
diff --git a/spec/lib/inline_rabl_scope_spec.rb b/spec/lib/inline_rabl_scope_spec.rb
deleted file mode 100644
index 3fff176e4..000000000
--- a/spec/lib/inline_rabl_scope_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe InlineRablScope do
-  describe '#current_account' do
-    it 'returns the given account' do
-      account = Fabricate(:account)
-      expect(InlineRablScope.new(account).current_account).to eq account
-    end
-  end
-
-  describe '#current_user' do
-    it 'returns nil if the given account is nil' do
-      expect(InlineRablScope.new(nil).current_user).to eq nil
-    end
-
-    it 'returns user of account if the given account is not nil' do
-      user = Fabricate(:user)
-      expect(InlineRablScope.new(user.account).current_user).to eq user
-    end
-  end
-end

From 1c1819a78a33cb7a90b499676c587f3c6dd7406f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jul 2017 04:31:40 +0200
Subject: [PATCH 157/382] Fix feed author not being enforced in
 ProcessFeedService (#4092)

Ensure the only allowed author of top-level entries in feed is the person
the feed belongs to (a verified user). Ensure delete events only apply
if the deleted item belonged to that user.
---
 app/services/process_feed_service.rb | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index fbdf92caa..028962d5b 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -42,7 +42,7 @@ class ProcessFeedService < BaseService
     private
 
     def create_status
-      if redis.exists("delete_upon_arrival:#{id}")
+      if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
         Rails.logger.debug "Delete for status #{id} was queued, ignoring"
         return
       end
@@ -99,15 +99,13 @@ class ProcessFeedService < BaseService
 
     def delete_status
       Rails.logger.debug "Deleting remote status #{id}"
-      status = Status.find_by(uri: id)
+      status = Status.find_by(uri: id, account: @account)
 
       if status.nil?
-        redis.setex("delete_upon_arrival:#{id}", 6 * 3_600, id)
+        redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
       else
         RemoveStatusService.new.call(status)
       end
-
-      nil
     end
 
     def skip_unsupported_type?
@@ -128,18 +126,7 @@ class ProcessFeedService < BaseService
 
       return [status, false] unless status.nil?
 
-      # If status embeds an author, find that author
-      # If that author cannot be found, don't record the status (do not misattribute)
-      if account?(entry)
-        begin
-          account = author_from_xml(entry)
-          return [nil, false] if account.nil?
-        rescue Goldfinger::Error
-          return [nil, false]
-        end
-      else
-        account = @account
-      end
+      account = @account
 
       return [nil, false] if account.suspended?
 

From 76eda2fc21dfe16fb470a235edacbed06f608d59 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 7 Jul 2017 21:12:16 +0900
Subject: [PATCH 158/382] Add recursive object support to API response (#4095)

---
 config/initializers/active_model_serializers.rb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 config/initializers/active_model_serializers.rb

diff --git a/config/initializers/active_model_serializers.rb b/config/initializers/active_model_serializers.rb
new file mode 100644
index 000000000..b0230267d
--- /dev/null
+++ b/config/initializers/active_model_serializers.rb
@@ -0,0 +1,3 @@
+ActiveModelSerializers.config.tap do |config|
+  config.default_includes = '**'
+end

From 91d548f7e6a0947e80be1dd4d4341b1d99c461e4 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 7 Jul 2017 21:12:45 +0900
Subject: [PATCH 159/382] Update webpack-dev-server to v2.5.1 (#4094)

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 49d9f0fdb..2f63d0bbd 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.6.1",
     "sinon": "^2.3.5",
-    "webpack-dev-server": "webpack/webpack-dev-server#047a5954398e67b0a17e6be7d5877d9f55f40cba",
+    "webpack-dev-server": "^2.5.1",
     "yargs": "^8.0.2"
   },
   "optionalDependencies": {
diff --git a/yarn.lock b/yarn.lock
index 4a909d134..d8ed20343 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7198,9 +7198,9 @@ webpack-dev-middleware@^1.10.2, webpack-dev-middleware@^1.11.0:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-dev-server@webpack/webpack-dev-server#047a5954398e67b0a17e6be7d5877d9f55f40cba:
-  version "2.5.0"
-  resolved "https://codeload.github.com/webpack/webpack-dev-server/tar.gz/047a5954398e67b0a17e6be7d5877d9f55f40cba"
+webpack-dev-server@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.5.1.tgz#a02e726a87bb603db5d71abb7d6d2649bf10c769"
   dependencies:
     ansi-html "0.0.7"
     bonjour "^3.5.0"

From 6e1261f277411300e4f1d24f8c1b14ad1a165915 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jul 2017 16:19:28 +0200
Subject: [PATCH 160/382] Fix notifications including wrong status in JSON
 (#4097)

---
 app/serializers/rest/notification_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 97fadf32e..f95d099a3 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -4,7 +4,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   attributes :id, :type, :created_at
 
   belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
-  belongs_to :status, if: :status_type?,   serializer: REST::StatusSerializer
+  belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
 
   def status_type?
     [:favourite, :reblog, :mention].include?(object.type)

From ebd2dde688b61b3987dc8e209921d964d10a33de Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jul 2017 16:56:52 +0200
Subject: [PATCH 161/382] Restore streaming API output format (#4100)

* Restore streaming API output format

Regression from #4090

* Remove whitespace
---
 streaming/index.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/streaming/index.js b/streaming/index.js
index 400456d24..6ee8baea8 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -262,11 +262,12 @@ const startWorker = (workerId) => {
       const { event, payload, queued_at } = JSON.parse(message);
 
       const transmit = () => {
-        const now   = new Date().getTime();
-        const delta = now - queued_at;
+        const now            = new Date().getTime();
+        const delta          = now - queued_at;
+        const encodedPayload = typeof payload === 'number' ? payload : JSON.stringify(payload);
 
-        log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${payload} Delay: ${delta}ms`);
-        output(event, payload);
+        log.silly(req.requestId, `Transmitting for ${req.accountId}: ${event} ${encodedPayload} Delay: ${delta}ms`);
+        output(event, encodedPayload);
       };
 
       if (notificationOnly && event !== 'notification') {
@@ -282,7 +283,7 @@ const startWorker = (workerId) => {
             return;
           }
 
-          const unpackedPayload  = JSON.parse(payload);
+          const unpackedPayload  = payload;
           const targetAccountIds = [unpackedPayload.account.id].concat(unpackedPayload.mentions.map(item => item.id));
           const accountDomain    = unpackedPayload.account.acct.split('@')[1];
 

From 9fe6cfca48b005158979583e2266d7899e84dbe0 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Fri, 7 Jul 2017 17:35:47 +0200
Subject: [PATCH 162/382] i18n: @18d3fa9 (pl) (#4101)

---
 config/locales/simple_form.pl.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 09e76eba0..2a3756d4d 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -43,6 +43,7 @@ pl:
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_privacy: Widoczność posta
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem postu
+        setting_system_font_ui: Używaj domyślnej czcionki systemu
         severity: Priorytet
         type: Typ importu
         username: Nazwa użytkownika

From 3f82d8b979104c7056fe431a9c2bd32e1004c9c5 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 7 Jul 2017 11:01:00 -0700
Subject: [PATCH 163/382] Gracefully stop streaming server (#4103)

---
 streaming/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/streaming/index.js b/streaming/index.js
index 6ee8baea8..c7e0de96c 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -467,6 +467,7 @@ const startWorker = (workerId) => {
   const onExit = () => {
     log.info(`Worker ${workerId} exiting, bye bye`);
     server.close();
+    process.exit(0);
   };
 
   const onError = (err) => {

From 7a549f830e0d77af3020243617c5ab8bd811fd8d Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Fri, 7 Jul 2017 20:01:17 +0200
Subject: [PATCH 164/382] i18n: improve consistency (pl) (#4104)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 config/locales/pl.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f0546dd0c..bf9d5e034 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -61,8 +61,8 @@ pl:
       edit: Edytuj
       email: Adres e-mail
       feed_url: Adres kanału
-      followers: Obserwujący
-      follows: Obserwacje
+      followers: Śledzący
+      follows: Śledzeni
       ip: Adres IP
       location:
         all: Wszystkie
@@ -114,7 +114,7 @@ pl:
         create: Utwórz blokadę
         hint: Blokada domen nie zabroni tworzenia wpisów kont w bazie danych, ale pozwoli na automatyczną moderację kont do nich należących.
         severity:
-          desc_html: "<strong>Wyciszenie</strong> uczyni wpisy użytkownika niewidoczne dla osób, które go nie obserwują. <strong>Zawieszenie</strong> spowoduje usunięcie całej zawartości dodanej przez użytkownika."
+          desc_html: "<strong>Wyciszenie</strong> uczyni wpisy użytkownika widoczne tylko dla osób, które go śledzą. <strong>Zawieszenie</strong> spowoduje usunięcie całej zawartości dodanej przez użytkownika."
           silence: Wycisz
           suspend: Zawieś
         title: Nowa blokada domen
@@ -262,15 +262,15 @@ pl:
     storage: Urządzenie przechowujące dane
   followers:
     domain: Domena
-    explanation_html: Jeżeli chcesz mieć pewność, kto może przeczytać Twoje statusy, musisz kontrolować, kto Cię obserwuje. <strong>Twoje prywatne statusy są dostarczane na te instancje, na których jesteś obserwowany</strong>. Możesz sprawdzać swoich obserwowanych i blokować ich, jeśli nie ufasz właścicielom lub oprogramowaniu danej instancji.
-    followers_count: Liczba obserwujących
+    explanation_html: Jeżeli chcesz mieć pewność, kto może przeczytać Twoje statusy, musisz kontrolować, kto śledzi Twój profil. <strong>Twoje prywatne statusy są dostarczane na te instancje, na których jesteś śledzony</strong>. Możesz sprawdzać, kto Cię śledzi i blokować ich, jeśli nie ufasz właścicielom lub oprogramowaniu danej instancji.
+    followers_count: Liczba śledzących
     lock_link: Zablokuj swoje konto
-    purge: Usuń z obserwujących
+    purge: Przestań śledzić
     success:
-      one: W trakcie usuwania obserwujcych z jednej domeny…
-      other: W trakcie usuwania obserwujących z %{count} domen…
+      one: W trakcie usuwania śledzących z jednej domeny…
+      other: W trakcie usuwania śledzących z %{count} domen…
     true_privacy_html: Pamiętaj, że <strong>rzeczywista prywatność może zostać uzyskana wyłącznie dzięki szyfrowaniu end-to-end</strong>.
-    unlocked_warning_html: Każdy może cię zaobserwować, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować obserwujących.
+    unlocked_warning_html: Każdy może cię śledzić, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować, kto Cię śledzi.
     unlocked_warning_title: Twoje konto nie jest zablokowane
   generic:
     changes_saved_msg: Ustawienia zapisane!
@@ -374,7 +374,7 @@ pl:
     delete: Usuń konto
     edit_profile: Edytuj profil
     export: Eksportuj dane
-    followers: Autoryzowani obserwujący
+    followers: Autoryzowani śledzący
     import: Importuj dane
     preferences: Preferencje
     settings: Ustawienia
@@ -385,7 +385,7 @@ pl:
     show_more: Pokaż więcej
     visibilities:
       private: Tylko dla śledzących
-      private_long: Widoczne tylko obserwowanych
+      private_long: Widoczne tylko dla śledzących
       public: Publiczny
       public_long: Widoczne dla wszystkich
       unlisted: Niewypisany

From 00df69bc89f1b5ffdf290bde8359b3854e2b1395 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 7 Jul 2017 23:25:15 +0200
Subject: [PATCH 165/382] Fix #4058 - Use a long-lived cookie to keep track of
 user-level sessions (#4091)

* Fix #4058 - Use a long-lived cookie to keep track of user-level sessions

* Fix tests, smooth migrate from previous session-based identifier
---
 app/controllers/application_controller.rb |  2 +-
 config/initializers/devise.rb             | 20 ++++++++++++++++----
 spec/rails_helper.rb                      | 11 ++++++++---
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 865fcd125..b3c2db02b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -70,7 +70,7 @@ class ApplicationController < ActionController::Base
   end
 
   def current_session
-    @current_session ||= SessionActivation.find_by(session_id: session['auth_id'])
+    @current_session ||= SessionActivation.find_by(session_id: cookies.signed['_session_id'])
   end
 
   def cache_collection(raw, klass)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index d51471d30..bf61ea0ea 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,17 +1,29 @@
 Warden::Manager.after_set_user except: :fetch do |user, warden|
-  SessionActivation.deactivate warden.raw_session['auth_id']
-  warden.raw_session['auth_id'] = user.activate_session(warden.request)
+  SessionActivation.deactivate warden.cookies.signed['_session_id']
+
+  warden.cookies.signed['_session_id'] = {
+    value: user.activate_session(warden.request),
+    expires: 1.year.from_now,
+    httponly: true,
+  }
 end
 
 Warden::Manager.after_fetch do |user, warden|
-  unless user.session_active?(warden.raw_session['auth_id'])
+  if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'])
+    warden.cookies.signed['_session_id'] = {
+      value: warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'],
+      expires: 1.year.from_now,
+      httponly: true,
+    }
+  else
     warden.logout
     throw :warden, message: :unauthenticated
   end
 end
 
 Warden::Manager.before_logout do |_, warden|
-  SessionActivation.deactivate warden.raw_session['auth_id']
+  SessionActivation.deactivate warden.cookies.signed['_session_id']
+  warden.cookies.delete('_session_id')
 end
 
 Devise.setup do |config|
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 9a4c8fd3c..4f7399505 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -20,11 +20,16 @@ Sidekiq::Logging.logger = nil
 Devise::Test::ControllerHelpers.module_eval do
   alias_method :original_sign_in, :sign_in
 
-  def sign_in(resource, deprecated = nil, scope: nil)
+  def sign_in(resource, _deprecated = nil, scope: nil)
     original_sign_in(resource, scope: scope)
 
-    SessionActivation.deactivate warden.raw_session["auth_id"]
-    warden.raw_session["auth_id"] = resource.activate_session(warden.request)
+    SessionActivation.deactivate warden.cookies.signed['_session_id']
+
+    warden.cookies.signed['_session_id'] = {
+      value: resource.activate_session(warden.request),
+      expires: 1.year.from_now,
+      httponly: true,
+    }
   end
 end
 

From 348d6f5e7551e632e7dea41e61c40f79aac59be9 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 8 Jul 2017 00:06:02 +0200
Subject: [PATCH 166/382] Lazy load components (#3879)

* feat: Lazy-load routes

* feat: Lazy-load modals

* feat: Lazy-load columns

* refactor: Simplify Bundle API

* feat: Optimize bundles

* feat: Prevent flashing the waiting state

* feat: Preload commonly used bundles

* feat: Lazy load Compose reducers

* feat: Lazy load Notifications reducer

* refactor: Move all dynamic imports into one file

* fix: Minor bugs

* fix: Manually hydrate the lazy-loaded reducers

* refactor: Move all dynamic imports to async-components

* fix: Loading modal style

* refactor: Avoid converting the raw state for each lazy hydration

* refactor: Remove unused component

* refactor: Maintain modal name

* fix: Add as=script to preload link

* chore: Fix lint error

* fix(components/bundle): Check if timestamp is set when computing elapsed

* fix: Load compose reducers for the onboarding modal
---
 app/javascript/mastodon/actions/bundles.js    |  25 +++
 app/javascript/mastodon/actions/store.js      |   8 +
 app/javascript/mastodon/components/status.js  |  27 +++-
 .../mastodon/containers/mastodon.js           |   5 +-
 .../components/emoji_picker_dropdown.js       |   3 +-
 .../mastodon/features/ui/components/bundle.js |  96 ++++++++++++
 .../ui/components/bundle_column_error.js      |  44 ++++++
 .../ui/components/bundle_modal_error.js       |  53 +++++++
 .../features/ui/components/column_loading.js  |  13 ++
 .../features/ui/components/columns_area.js    |  28 +++-
 .../features/ui/components/modal_loading.js   |  20 +++
 .../features/ui/components/modal_root.js      |  51 ++++---
 .../ui/containers/bundle_container.js         |  19 +++
 app/javascript/mastodon/features/ui/index.js  |  87 ++++-------
 .../features/ui/util/async-components.js      | 143 ++++++++++++++++++
 .../features/ui/util/react_router_helpers.js  |  65 ++++++++
 app/javascript/mastodon/reducers/compose.js   |   4 +-
 app/javascript/mastodon/reducers/index.js     |  21 +--
 .../mastodon/reducers/media_attachments.js    |   4 +-
 .../mastodon/store/configureStore.js          |  25 ++-
 app/javascript/styles/components.scss         |  31 +++-
 app/views/layouts/application.html.haml       |  17 +++
 22 files changed, 679 insertions(+), 110 deletions(-)
 create mode 100644 app/javascript/mastodon/actions/bundles.js
 create mode 100644 app/javascript/mastodon/features/ui/components/bundle.js
 create mode 100644 app/javascript/mastodon/features/ui/components/bundle_column_error.js
 create mode 100644 app/javascript/mastodon/features/ui/components/bundle_modal_error.js
 create mode 100644 app/javascript/mastodon/features/ui/components/column_loading.js
 create mode 100644 app/javascript/mastodon/features/ui/components/modal_loading.js
 create mode 100644 app/javascript/mastodon/features/ui/containers/bundle_container.js
 create mode 100644 app/javascript/mastodon/features/ui/util/async-components.js
 create mode 100644 app/javascript/mastodon/features/ui/util/react_router_helpers.js

diff --git a/app/javascript/mastodon/actions/bundles.js b/app/javascript/mastodon/actions/bundles.js
new file mode 100644
index 000000000..ecc9c8f7d
--- /dev/null
+++ b/app/javascript/mastodon/actions/bundles.js
@@ -0,0 +1,25 @@
+export const BUNDLE_FETCH_REQUEST = 'BUNDLE_FETCH_REQUEST';
+export const BUNDLE_FETCH_SUCCESS = 'BUNDLE_FETCH_SUCCESS';
+export const BUNDLE_FETCH_FAIL = 'BUNDLE_FETCH_FAIL';
+
+export function fetchBundleRequest(skipLoading) {
+  return {
+    type: BUNDLE_FETCH_REQUEST,
+    skipLoading,
+  };
+}
+
+export function fetchBundleSuccess(skipLoading) {
+  return {
+    type: BUNDLE_FETCH_SUCCESS,
+    skipLoading,
+  };
+}
+
+export function fetchBundleFail(error, skipLoading) {
+  return {
+    type: BUNDLE_FETCH_FAIL,
+    error,
+    skipLoading,
+  };
+}
diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js
index 601cea001..08c2810ca 100644
--- a/app/javascript/mastodon/actions/store.js
+++ b/app/javascript/mastodon/actions/store.js
@@ -1,6 +1,7 @@
 import Immutable from 'immutable';
 
 export const STORE_HYDRATE = 'STORE_HYDRATE';
+export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY';
 
 const convertState = rawState =>
   Immutable.fromJS(rawState, (k, v) =>
@@ -15,3 +16,10 @@ export function hydrateStore(rawState) {
     state,
   };
 };
+
+export function hydrateStoreLazy(name, state) {
+  return {
+    type: `${STORE_HYDRATE_LAZY}-${name}`,
+    state,
+  };
+};
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index ff574ab3d..18ce0198e 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -5,8 +5,6 @@ import Avatar from './avatar';
 import AvatarOverlay from './avatar_overlay';
 import RelativeTimestamp from './relative_timestamp';
 import DisplayName from './display_name';
-import MediaGallery from './media_gallery';
-import VideoPlayer from './video_player';
 import StatusContent from './status_content';
 import StatusActionBar from './status_action_bar';
 import { FormattedMessage } from 'react-intl';
@@ -14,6 +12,11 @@ import emojify from '../emoji';
 import escapeTextContentForBrowser from 'escape-html';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
+import { MediaGallery, VideoPlayer } from '../features/ui/util/async-components';
+
+// We use the component (and not the container) since we do not want
+// to use the progress bar to show download progress
+import Bundle from '../features/ui/components/bundle';
 
 export default class Status extends ImmutablePureComponent {
 
@@ -154,6 +157,14 @@ export default class Status extends ImmutablePureComponent {
     this.setState({ isExpanded: !this.state.isExpanded });
   };
 
+  renderLoadingMediaGallery () {
+    return <div className='media_gallery' style={{ height: '110px' }} />;
+  }
+
+  renderLoadingVideoPlayer () {
+    return <div className='media-spoiler-video' style={{ height: '110px' }} />;
+  }
+
   render () {
     let media = null;
     let statusAvatar;
@@ -201,9 +212,17 @@ export default class Status extends ImmutablePureComponent {
       if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) {
 
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
-        media = <VideoPlayer media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} onOpenVideo={this.props.onOpenVideo} />;
+        media = (
+          <Bundle fetchComponent={VideoPlayer} loading={this.renderLoadingVideoPlayer} onRender={this.saveHeight} >
+            {Component => <Component media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} onOpenVideo={this.props.onOpenVideo} />}
+          </Bundle>
+        );
       } else {
-        media = <MediaGallery media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} autoPlayGif={this.props.autoPlayGif} />;
+        media = (
+          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} onRender={this.saveHeight} >
+            {Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} autoPlayGif={this.props.autoPlayGif} />}
+          </Bundle>
+        );
       }
     }
 
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 3bd89902f..6e79f9e4f 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -22,9 +22,10 @@ import { getLocale } from '../locales';
 const { localeData, messages } = getLocale();
 addLocaleData(localeData);
 
-const store = configureStore();
+export const store = configureStore();
 const initialState = JSON.parse(document.getElementById('initial-state').textContent);
-store.dispatch(hydrateStore(initialState));
+export const hydrateAction = hydrateStore(initialState);
+store.dispatch(hydrateAction);
 
 export default class Mastodon extends React.PureComponent {
 
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index c83dbb63e..83c66a5d5 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -2,6 +2,7 @@ import React from 'react';
 import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
+import { EmojiPicker as EmojiPickerAsync } from '../../ui/util/async-components';
 
 const messages = defineMessages({
   emoji: { id: 'emoji_button.label', defaultMessage: 'Insert emoji' },
@@ -50,7 +51,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
     this.setState({ active: true });
     if (!EmojiPicker) {
       this.setState({ loading: true });
-      import(/* webpackChunkName: "emojione_picker" */ 'emojione-picker').then(TheEmojiPicker => {
+      EmojiPickerAsync().then(TheEmojiPicker => {
         EmojiPicker = TheEmojiPicker.default;
         this.setState({ loading: false });
       }).catch(() => {
diff --git a/app/javascript/mastodon/features/ui/components/bundle.js b/app/javascript/mastodon/features/ui/components/bundle.js
new file mode 100644
index 000000000..e69a32f47
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/bundle.js
@@ -0,0 +1,96 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const emptyComponent = () => null;
+const noop = () => { };
+
+class Bundle extends React.Component {
+
+  static propTypes = {
+    fetchComponent: PropTypes.func.isRequired,
+    loading: PropTypes.func,
+    error: PropTypes.func,
+    children: PropTypes.func.isRequired,
+    renderDelay: PropTypes.number,
+    onRender: PropTypes.func,
+    onFetch: PropTypes.func,
+    onFetchSuccess: PropTypes.func,
+    onFetchFail: PropTypes.func,
+  }
+
+  static defaultProps = {
+    loading: emptyComponent,
+    error: emptyComponent,
+    renderDelay: 0,
+    onRender: noop,
+    onFetch: noop,
+    onFetchSuccess: noop,
+    onFetchFail: noop,
+  }
+
+  state = {
+    mod: undefined,
+    forceRender: false,
+  }
+
+  componentWillMount() {
+    this.load(this.props);
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.fetchComponent !== this.props.fetchComponent) {
+      this.load(nextProps);
+    }
+  }
+
+  componentDidUpdate () {
+    this.props.onRender();
+  }
+
+  componentWillUnmount () {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    }
+  }
+
+  load = (props) => {
+    const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props;
+
+    this.setState({ mod: undefined });
+    onFetch();
+
+    if (renderDelay !== 0) {
+      this.timestamp = new Date();
+      this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
+    }
+
+    return fetchComponent()
+      .then((mod) => {
+        this.setState({ mod: mod.default });
+        onFetchSuccess();
+      })
+      .catch((error) => {
+        this.setState({ mod: null });
+        onFetchFail(error);
+      });
+  }
+
+  render() {
+    const { loading: Loading, error: Error, children, renderDelay } = this.props;
+    const { mod, forceRender } = this.state;
+    const elapsed = this.timestamp ? (new Date() - this.timestamp) : renderDelay;
+
+    if (mod === undefined) {
+      return (elapsed >= renderDelay || forceRender) ? <Loading /> : null;
+    }
+
+    if (mod === null) {
+      return <Error onRetry={this.load} />;
+    }
+
+    return children(mod);
+  }
+
+}
+
+export default Bundle;
diff --git a/app/javascript/mastodon/features/ui/components/bundle_column_error.js b/app/javascript/mastodon/features/ui/components/bundle_column_error.js
new file mode 100644
index 000000000..cd124746a
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/bundle_column_error.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+
+import Column from './column';
+import ColumnHeader from './column_header';
+import ColumnBackButtonSlim from '../../../components/column_back_button_slim';
+import IconButton from '../../../components/icon_button';
+
+const messages = defineMessages({
+  title: { id: 'bundle_column_error.title', defaultMessage: 'Network error' },
+  body: { id: 'bundle_column_error.body', defaultMessage: 'Something went wrong while loading this component.' },
+  retry: { id: 'bundle_column_error.retry', defaultMessage: 'Try again' },
+});
+
+class BundleColumnError extends React.Component {
+
+  static propTypes = {
+    onRetry: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  }
+
+  handleRetry = () => {
+    this.props.onRetry();
+  }
+
+  render () {
+    const { intl: { formatMessage } } = this.props;
+
+    return (
+      <Column>
+        <ColumnHeader icon='exclamation-circle' type={formatMessage(messages.title)} />
+        <ColumnBackButtonSlim />
+        <div className='error-column'>
+          <IconButton title={formatMessage(messages.retry)} icon='refresh' onClick={this.handleRetry} size={64} />
+          {formatMessage(messages.body)}
+        </div>
+      </Column>
+    );
+  }
+
+}
+
+export default injectIntl(BundleColumnError);
diff --git a/app/javascript/mastodon/features/ui/components/bundle_modal_error.js b/app/javascript/mastodon/features/ui/components/bundle_modal_error.js
new file mode 100644
index 000000000..928bfe1f7
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/bundle_modal_error.js
@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { defineMessages, injectIntl } from 'react-intl';
+
+import IconButton from '../../../components/icon_button';
+
+const messages = defineMessages({
+  error: { id: 'bundle_modal_error.message', defaultMessage: 'Something went wrong while loading this component.' },
+  retry: { id: 'bundle_modal_error.retry', defaultMessage: 'Try again' },
+  close: { id: 'bundle_modal_error.close', defaultMessage: 'Close' },
+});
+
+class BundleModalError extends React.Component {
+
+  static propTypes = {
+    onRetry: PropTypes.func.isRequired,
+    onClose: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  }
+
+  handleRetry = () => {
+    this.props.onRetry();
+  }
+
+  render () {
+    const { onClose, intl: { formatMessage } } = this.props;
+
+    // Keep the markup in sync with <ModalLoading />
+    // (make sure they have the same dimensions)
+    return (
+      <div className='modal-root__modal error-modal'>
+        <div className='error-modal__body'>
+          <IconButton title={formatMessage(messages.retry)} icon='refresh' onClick={this.handleRetry} size={64} />
+          {formatMessage(messages.error)}
+        </div>
+
+        <div className='error-modal__footer'>
+          <div>
+            <button
+              onClick={onClose}
+              className='error-modal__nav onboarding-modal__skip'
+            >
+              {formatMessage(messages.close)}
+            </button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(BundleModalError);
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.js b/app/javascript/mastodon/features/ui/components/column_loading.js
new file mode 100644
index 000000000..9bb9c14a1
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/column_loading.js
@@ -0,0 +1,13 @@
+import React from 'react';
+
+import Column from '../../../components/column';
+import ColumnHeader from '../../../components/column_header';
+
+const ColumnLoading = () => (
+  <Column>
+    <ColumnHeader icon=' ' title='' multiColumn={false} />
+    <div className='scrollable' />
+  </Column>
+);
+
+export default ColumnLoading;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 01167b6e5..5fa27599f 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -2,15 +2,15 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
+
 import ReactSwipeable from 'react-swipeable';
-import HomeTimeline from '../../home_timeline';
-import Notifications from '../../notifications';
-import PublicTimeline from '../../public_timeline';
-import CommunityTimeline from '../../community_timeline';
-import HashtagTimeline from '../../hashtag_timeline';
-import Compose from '../../compose';
 import { getPreviousLink, getNextLink } from './tabs_bar';
 
+import BundleContainer from '../containers/bundle_container';
+import ColumnLoading from './column_loading';
+import BundleColumnError from './bundle_column_error';
+import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline } from '../../ui/util/async-components';
+
 const componentMap = {
   'COMPOSE': Compose,
   'HOME': HomeTimeline,
@@ -48,6 +48,14 @@ export default class ColumnsArea extends ImmutablePureComponent {
     }
   };
 
+  renderLoading = () => {
+    return <ColumnLoading />;
+  }
+
+  renderError = (props) => {
+    return <BundleColumnError {...props} />;
+  }
+
   render () {
     const { columns, children, singleColumn } = this.props;
 
@@ -62,9 +70,13 @@ export default class ColumnsArea extends ImmutablePureComponent {
     return (
       <div className='columns-area'>
         {columns.map(column => {
-          const SpecificComponent = componentMap[column.get('id')];
           const params = column.get('params', null) === null ? null : column.get('params').toJS();
-          return <SpecificComponent key={column.get('uuid')} columnId={column.get('uuid')} params={params} multiColumn />;
+
+          return (
+            <BundleContainer key={column.get('uuid')} fetchComponent={componentMap[column.get('id')]} loading={this.renderLoading} error={this.renderError}>
+              {SpecificComponent => <SpecificComponent columnId={column.get('uuid')} params={params} multiColumn />}
+            </BundleContainer>
+          );
         })}
 
         {React.Children.map(children, child => React.cloneElement(child, { multiColumn: true }))}
diff --git a/app/javascript/mastodon/features/ui/components/modal_loading.js b/app/javascript/mastodon/features/ui/components/modal_loading.js
new file mode 100644
index 000000000..f403ca4c9
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/modal_loading.js
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import LoadingIndicator from '../../../components/loading_indicator';
+
+// Keep the markup in sync with <BundleModalError />
+// (make sure they have the same dimensions)
+const ModalLoading = () => (
+  <div className='modal-root__modal error-modal'>
+    <div className='error-modal__body'>
+      <LoadingIndicator />
+    </div>
+    <div className='error-modal__footer'>
+      <div>
+        <button className='error-modal__nav onboarding-modal__skip' />
+      </div>
+    </div>
+  </div>
+);
+
+export default ModalLoading;
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 48b048eb7..085299038 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -1,13 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import MediaModal from './media_modal';
-import OnboardingModal from './onboarding_modal';
-import VideoModal from './video_modal';
-import BoostModal from './boost_modal';
-import ConfirmationModal from './confirmation_modal';
-import ReportModal from './report_modal';
 import TransitionMotion from 'react-motion/lib/TransitionMotion';
 import spring from 'react-motion/lib/spring';
+import BundleContainer from '../containers/bundle_container';
+import BundleModalError from './bundle_modal_error';
+import ModalLoading from './modal_loading';
+import {
+  MediaModal,
+  OnboardingModal,
+  VideoModal,
+  BoostModal,
+  ConfirmationModal,
+  ReportModal,
+} from '../../../features/ui/util/async-components';
 
 const MODAL_COMPONENTS = {
   'MEDIA': MediaModal,
@@ -49,6 +54,22 @@ export default class ModalRoot extends React.PureComponent {
     return { opacity: spring(0), scale: spring(0.98) };
   }
 
+  renderModal = (SpecificComponent) => {
+    const { props, onClose } = this.props;
+
+    return <SpecificComponent {...props} onClose={onClose} />;
+  }
+
+  renderLoading = () => {
+    return <ModalLoading />;
+  }
+
+  renderError = (props) => {
+    const { onClose } = this.props;
+
+    return <BundleModalError {...props} onClose={onClose} />;
+  }
+
   render () {
     const { type, props, onClose } = this.props;
     const visible = !!type;
@@ -70,18 +91,14 @@ export default class ModalRoot extends React.PureComponent {
       >
         {interpolatedStyles =>
           <div className='modal-root'>
-            {interpolatedStyles.map(({ key, data: { type, props }, style }) => {
-              const SpecificComponent = MODAL_COMPONENTS[type];
-
-              return (
-                <div key={key} style={{ pointerEvents: visible ? 'auto' : 'none' }}>
-                  <div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} />
-                  <div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}>
-                    <SpecificComponent {...props} onClose={onClose} />
-                  </div>
+            {interpolatedStyles.map(({ key, data: { type }, style }) => (
+              <div key={key} style={{ pointerEvents: visible ? 'auto' : 'none' }}>
+                <div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} />
+                <div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}>
+                  <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>{this.renderModal}</BundleContainer>
                 </div>
-              );
-            })}
+              </div>
+            ))}
           </div>
         }
       </TransitionMotion>
diff --git a/app/javascript/mastodon/features/ui/containers/bundle_container.js b/app/javascript/mastodon/features/ui/containers/bundle_container.js
new file mode 100644
index 000000000..7e3f0c3a6
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/containers/bundle_container.js
@@ -0,0 +1,19 @@
+import { connect } from 'react-redux';
+
+import Bundle from '../components/bundle';
+
+import { fetchBundleRequest, fetchBundleSuccess, fetchBundleFail } from '../../../actions/bundles';
+
+const mapDispatchToProps = dispatch => ({
+  onFetch () {
+    dispatch(fetchBundleRequest());
+  },
+  onFetchSuccess () {
+    dispatch(fetchBundleSuccess());
+  },
+  onFetchFail (error) {
+    dispatch(fetchBundleFail(error));
+  },
+});
+
+export default connect(null, mapDispatchToProps)(Bundle);
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 54e623d99..6057d8797 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -1,7 +1,5 @@
 import React from 'react';
 import classNames from 'classnames';
-import Switch from 'react-router-dom/Switch';
-import Route from 'react-router-dom/Route';
 import Redirect from 'react-router-dom/Redirect';
 import NotificationsContainer from './containers/notifications_container';
 import PropTypes from 'prop-types';
@@ -14,64 +12,40 @@ import { debounce } from 'lodash';
 import { uploadCompose } from '../../actions/compose';
 import { refreshHomeTimeline } from '../../actions/timelines';
 import { refreshNotifications } from '../../actions/notifications';
+import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
 import UploadArea from './components/upload_area';
+import { store } from '../../containers/mastodon';
 import ColumnsAreaContainer from './containers/columns_area_container';
-import Status from '../../features/status';
-import GettingStarted from '../../features/getting_started';
-import PublicTimeline from '../../features/public_timeline';
-import CommunityTimeline from '../../features/community_timeline';
-import AccountTimeline from '../../features/account_timeline';
-import AccountGallery from '../../features/account_gallery';
-import HomeTimeline from '../../features/home_timeline';
-import Compose from '../../features/compose';
-import Followers from '../../features/followers';
-import Following from '../../features/following';
-import Reblogs from '../../features/reblogs';
-import Favourites from '../../features/favourites';
-import HashtagTimeline from '../../features/hashtag_timeline';
-import Notifications from '../../features/notifications';
-import FollowRequests from '../../features/follow_requests';
-import GenericNotFound from '../../features/generic_not_found';
-import FavouritedStatuses from '../../features/favourited_statuses';
-import Blocks from '../../features/blocks';
-import Mutes from '../../features/mutes';
+import {
+  Compose,
+  Status,
+  GettingStarted,
+  PublicTimeline,
+  CommunityTimeline,
+  AccountTimeline,
+  AccountGallery,
+  HomeTimeline,
+  Followers,
+  Following,
+  Reblogs,
+  Favourites,
+  HashtagTimeline,
+  Notifications as AsyncNotifications,
+  FollowRequests,
+  GenericNotFound,
+  FavouritedStatuses,
+  Blocks,
+  Mutes,
+} from './util/async-components';
 
-// Small wrapper to pass multiColumn to the route components
-const WrappedSwitch = ({ multiColumn, children }) => (
-  <Switch>
-    {React.Children.map(children, child => React.cloneElement(child, { multiColumn }))}
-  </Switch>
-);
+const Notifications = () => AsyncNotifications().then(component => {
+  store.dispatch(refreshNotifications());
+  return component;
+});
 
-WrappedSwitch.propTypes = {
-  multiColumn: PropTypes.bool,
-  children: PropTypes.node,
-};
-
-// Small Wraper to extract the params from the route and pass
-// them to the rendered component, together with the content to
-// be rendered inside (the children)
-class WrappedRoute extends React.Component {
-
-  static propTypes = {
-    component: PropTypes.func.isRequired,
-    content: PropTypes.node,
-    multiColumn: PropTypes.bool,
-  }
-
-  renderComponent = ({ match: { params } }) => {
-    const { component: Component, content, multiColumn } = this.props;
-
-    return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
-  }
-
-  render () {
-    const { component: Component, content, ...rest } = this.props;
-
-    return <Route {...rest} render={this.renderComponent} />;
-  }
-
-}
+// Dummy import, to make sure that <Status /> ends up in the application bundle.
+// Without this it ends up in ~8 very commonly used bundles.
+import '../../components/status';
 
 const mapStateToProps = state => ({
   systemFontUi: state.getIn(['meta', 'system_font_ui']),
@@ -162,7 +136,6 @@ export default class UI extends React.PureComponent {
     document.addEventListener('dragend', this.handleDragEnd, false);
 
     this.props.dispatch(refreshHomeTimeline());
-    this.props.dispatch(refreshNotifications());
   }
 
   componentWillUnmount () {
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
new file mode 100644
index 000000000..c9f81136d
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -0,0 +1,143 @@
+import { store } from '../../../containers/mastodon';
+import { injectAsyncReducer } from '../../../store/configureStore';
+
+// NOTE: When lazy-loading reducers, make sure to add them
+// to application.html.haml (if the component is preloaded there)
+
+export function EmojiPicker () {
+  return import(/* webpackChunkName: "emojione_picker" */'emojione-picker');
+}
+
+export function Compose () {
+  return Promise.all([
+    import(/* webpackChunkName: "features/compose" */'../../compose'),
+    import(/* webpackChunkName: "reducers/compose" */'../../../reducers/compose'),
+    import(/* webpackChunkName: "reducers/media_attachments" */'../../../reducers/media_attachments'),
+    import(/* webpackChunkName: "reducers/search" */'../../../reducers/search'),
+  ]).then(([component, composeReducer, mediaAttachmentsReducer, searchReducer]) => {
+    injectAsyncReducer(store, 'compose', composeReducer.default);
+    injectAsyncReducer(store, 'media_attachments', mediaAttachmentsReducer.default);
+    injectAsyncReducer(store, 'search', searchReducer.default);
+
+    return component;
+  });
+}
+
+export function Notifications () {
+  return Promise.all([
+    import(/* webpackChunkName: "features/notifications" */'../../notifications'),
+    import(/* webpackChunkName: "reducers/notifications" */'../../../reducers/notifications'),
+  ]).then(([component, notificationsReducer]) => {
+    injectAsyncReducer(store, 'notifications', notificationsReducer.default);
+
+    return component;
+  });
+}
+
+export function HomeTimeline () {
+  return import(/* webpackChunkName: "features/home_timeline" */'../../home_timeline');
+}
+
+export function PublicTimeline () {
+  return import(/* webpackChunkName: "features/public_timeline" */'../../public_timeline');
+}
+
+export function CommunityTimeline () {
+  return import(/* webpackChunkName: "features/community_timeline" */'../../community_timeline');
+}
+
+export function HashtagTimeline () {
+  return import(/* webpackChunkName: "features/hashtag_timeline" */'../../hashtag_timeline');
+}
+
+export function Status () {
+  return import(/* webpackChunkName: "features/status" */'../../status');
+}
+
+export function GettingStarted () {
+  return import(/* webpackChunkName: "features/getting_started" */'../../getting_started');
+}
+
+export function AccountTimeline () {
+  return import(/* webpackChunkName: "features/account_timeline" */'../../account_timeline');
+}
+
+export function AccountGallery () {
+  return import(/* webpackChunkName: "features/account_gallery" */'../../account_gallery');
+}
+
+export function Followers () {
+  return import(/* webpackChunkName: "features/followers" */'../../followers');
+}
+
+export function Following () {
+  return import(/* webpackChunkName: "features/following" */'../../following');
+}
+
+export function Reblogs () {
+  return import(/* webpackChunkName: "features/reblogs" */'../../reblogs');
+}
+
+export function Favourites () {
+  return import(/* webpackChunkName: "features/favourites" */'../../favourites');
+}
+
+export function FollowRequests () {
+  return import(/* webpackChunkName: "features/follow_requests" */'../../follow_requests');
+}
+
+export function GenericNotFound () {
+  return import(/* webpackChunkName: "features/generic_not_found" */'../../generic_not_found');
+}
+
+export function FavouritedStatuses () {
+  return import(/* webpackChunkName: "features/favourited_statuses" */'../../favourited_statuses');
+}
+
+export function Blocks () {
+  return import(/* webpackChunkName: "features/blocks" */'../../blocks');
+}
+
+export function Mutes () {
+  return import(/* webpackChunkName: "features/mutes" */'../../mutes');
+}
+
+export function MediaModal () {
+  return import(/* webpackChunkName: "modals/media_modal" */'../components/media_modal');
+}
+
+export function OnboardingModal () {
+  return Promise.all([
+    import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal'),
+    import(/* webpackChunkName: "reducers/compose" */'../../../reducers/compose'),
+    import(/* webpackChunkName: "reducers/media_attachments" */'../../../reducers/media_attachments'),
+  ]).then(([component, composeReducer, mediaAttachmentsReducer]) => {
+    injectAsyncReducer(store, 'compose', composeReducer.default);
+    injectAsyncReducer(store, 'media_attachments', mediaAttachmentsReducer.default);
+    return component;
+  });
+}
+
+export function VideoModal () {
+  return import(/* webpackChunkName: "modals/video_modal" */'../components/video_modal');
+}
+
+export function BoostModal () {
+  return import(/* webpackChunkName: "modals/boost_modal" */'../components/boost_modal');
+}
+
+export function ConfirmationModal () {
+  return import(/* webpackChunkName: "modals/confirmation_modal" */'../components/confirmation_modal');
+}
+
+export function ReportModal () {
+  return import(/* webpackChunkName: "modals/report_modal" */'../components/report_modal');
+}
+
+export function MediaGallery () {
+  return import(/* webpackChunkName: "status/MediaGallery" */'../../../components/media_gallery');
+}
+
+export function VideoPlayer () {
+  return import(/* webpackChunkName: "status/VideoPlayer" */'../../../components/video_player');
+}
diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.js b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
new file mode 100644
index 000000000..e33a6df6f
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
@@ -0,0 +1,65 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Switch from 'react-router-dom/Switch';
+import Route from 'react-router-dom/Route';
+
+import ColumnLoading from '../components/column_loading';
+import BundleColumnError from '../components/bundle_column_error';
+import BundleContainer from '../containers/bundle_container';
+
+// Small wrapper to pass multiColumn to the route components
+export const WrappedSwitch = ({ multiColumn, children }) => (
+  <Switch>
+    {React.Children.map(children, child => React.cloneElement(child, { multiColumn }))}
+  </Switch>
+);
+
+WrappedSwitch.propTypes = {
+  multiColumn: PropTypes.bool,
+  children: PropTypes.node,
+};
+
+// Small Wraper to extract the params from the route and pass
+// them to the rendered component, together with the content to
+// be rendered inside (the children)
+export class WrappedRoute extends React.Component {
+
+  static propTypes = {
+    component: PropTypes.func.isRequired,
+    content: PropTypes.node,
+    multiColumn: PropTypes.bool,
+  }
+
+  renderComponent = ({ match }) => {
+    this.match = match; // Needed for this.renderBundle
+
+    const { component } = this.props;
+
+    return (
+      <BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
+        {this.renderBundle}
+      </BundleContainer>
+    );
+  }
+
+  renderLoading = () => {
+    return <ColumnLoading />;
+  }
+
+  renderError = (props) => {
+    return <BundleColumnError {...props} />;
+  }
+
+  renderBundle = (Component) => {
+    const { match: { params }, props: { content, multiColumn } } = this;
+
+    return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
+  }
+
+  render () {
+    const { component: Component, content, ...rest } = this.props;
+
+    return <Route {...rest} render={this.renderComponent} />;
+  }
+
+}
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index d0b47a85c..09db95e2d 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -23,7 +23,7 @@ import {
   COMPOSE_EMOJI_INSERT,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { STORE_HYDRATE } from '../actions/store';
+import { STORE_HYDRATE_LAZY } from '../actions/store';
 import Immutable from 'immutable';
 import uuid from '../uuid';
 
@@ -134,7 +134,7 @@ const privacyPreference = (a, b) => {
 
 export default function compose(state = initialState, action) {
   switch(action.type) {
-  case STORE_HYDRATE:
+  case `${STORE_HYDRATE_LAZY}-compose`:
     return clearAll(state.merge(action.state.get('compose')));
   case COMPOSE_MOUNT:
     return state.set('mounted', true);
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index be402a16b..79062f2f9 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -1,7 +1,6 @@
 import { combineReducers } from 'redux-immutable';
 import timelines from './timelines';
 import meta from './meta';
-import compose from './compose';
 import alerts from './alerts';
 import { loadingBarReducer } from 'react-redux-loading-bar';
 import modal from './modal';
@@ -9,20 +8,16 @@ import user_lists from './user_lists';
 import accounts from './accounts';
 import accounts_counters from './accounts_counters';
 import statuses from './statuses';
-import media_attachments from './media_attachments';
 import relationships from './relationships';
-import search from './search';
-import notifications from './notifications';
 import settings from './settings';
 import status_lists from './status_lists';
 import cards from './cards';
 import reports from './reports';
 import contexts from './contexts';
 
-export default combineReducers({
+const reducers = {
   timelines,
   meta,
-  compose,
   alerts,
   loadingBar: loadingBarReducer,
   modal,
@@ -30,13 +25,19 @@ export default combineReducers({
   status_lists,
   accounts,
   accounts_counters,
-  media_attachments,
   statuses,
   relationships,
-  search,
-  notifications,
   settings,
   cards,
   reports,
   contexts,
-});
+};
+
+export function createReducer(asyncReducers) {
+  return combineReducers({
+    ...reducers,
+    ...asyncReducers,
+  });
+}
+
+export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/media_attachments.js b/app/javascript/mastodon/reducers/media_attachments.js
index 85bea4f0b..d17d465aa 100644
--- a/app/javascript/mastodon/reducers/media_attachments.js
+++ b/app/javascript/mastodon/reducers/media_attachments.js
@@ -1,4 +1,4 @@
-import { STORE_HYDRATE } from '../actions/store';
+import { STORE_HYDRATE_LAZY } from '../actions/store';
 import Immutable from 'immutable';
 
 const initialState = Immutable.Map({
@@ -7,7 +7,7 @@ const initialState = Immutable.Map({
 
 export default function meta(state = initialState, action) {
   switch(action.type) {
-  case STORE_HYDRATE:
+  case `${STORE_HYDRATE_LAZY}-media_attachments`:
     return state.merge(action.state.get('media_attachments'));
   default:
     return state;
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index 1376d4cba..0fe29f031 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -1,15 +1,36 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
-import appReducer from '../reducers';
+import appReducer, { createReducer } from '../reducers';
+import { hydrateStoreLazy } from '../actions/store';
+import { hydrateAction } from '../containers/mastodon';
 import loadingBarMiddleware from '../middleware/loading_bar';
 import errorsMiddleware from '../middleware/errors';
 import soundsMiddleware from '../middleware/sounds';
 
 export default function configureStore() {
-  return createStore(appReducer, compose(applyMiddleware(
+  const store = createStore(appReducer, compose(applyMiddleware(
     thunk,
     loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
     errorsMiddleware(),
     soundsMiddleware()
   ), window.devToolsExtension ? window.devToolsExtension() : f => f));
+
+  store.asyncReducers = { };
+
+  return store;
 };
+
+export function injectAsyncReducer(store, name, asyncReducer) {
+  if (!store.asyncReducers[name]) {
+    // Keep track that we injected this reducer
+    store.asyncReducers[name] = asyncReducer;
+
+    // Add the current reducer to the store
+    store.replaceReducer(createReducer(store.asyncReducers));
+
+    // The state this reducer handles defaults to its initial state (stored inside the reducer)
+    // But that state may be out of date because of the server-side hydration, so we replay
+    // the hydration action but only for this reducer (all async reducers must listen for this dynamic action)
+    store.dispatch(hydrateStoreLazy(name, hydrateAction.state));
+  }
+}
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index a87aa5d79..9b500c7ad 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2300,7 +2300,8 @@ button.icon-button.active i.fa-retweet {
   vertical-align: middle;
 }
 
-.empty-column-indicator {
+.empty-column-indicator,
+.error-column {
   color: lighten($ui-base-color, 20%);
   background: $ui-base-color;
   text-align: center;
@@ -2326,6 +2327,10 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.error-column {
+  flex-direction: column;
+}
+
 @keyframes pulse {
   0% {
     opacity: 1;
@@ -2909,7 +2914,8 @@ button.icon-button.active i.fa-retweet {
   z-index: 100;
 }
 
-.onboarding-modal {
+.onboarding-modal,
+.error-modal {
   background: $ui-secondary-color;
   color: $ui-base-color;
   border-radius: 8px;
@@ -2918,7 +2924,8 @@ button.icon-button.active i.fa-retweet {
   flex-direction: column;
 }
 
-.onboarding-modal__pager {
+.onboarding-modal__pager,
+.error-modal__body {
   height: 80vh;
   width: 80vw;
   max-width: 520px;
@@ -2943,6 +2950,14 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.error-modal__body {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+}
+
 @media screen and (max-width: 550px) {
   .onboarding-modal {
     width: 100%;
@@ -2959,7 +2974,8 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
-.onboarding-modal__paginator {
+.onboarding-modal__paginator,
+.error-modal__footer {
   flex: 0 0 auto;
   background: darken($ui-secondary-color, 8%);
   display: flex;
@@ -2969,7 +2985,8 @@ button.icon-button.active i.fa-retweet {
     min-width: 33px;
   }
 
-  .onboarding-modal__nav {
+  .onboarding-modal__nav,
+  .error-modal__nav {
     color: darken($ui-secondary-color, 34%);
     background-color: transparent;
     border: 0;
@@ -2992,6 +3009,10 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.error-modal__footer {
+  justify-content: center;
+}
+
 .onboarding-modal__dots {
   flex: 1 1 auto;
   display: flex;
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index f991bc74f..68d346859 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -20,6 +20,23 @@
 
     = stylesheet_pack_tag 'application', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
+
+    = javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
+    = javascript_pack_tag 'features/compose', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+    = javascript_pack_tag 'reducers/compose', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+    = javascript_pack_tag 'reducers/media_attachments', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+    = javascript_pack_tag 'reducers/search', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
+    = javascript_pack_tag 'features/home_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
+    = javascript_pack_tag 'features/notifications', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+    = javascript_pack_tag 'reducers/notifications', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
+    = javascript_pack_tag 'features/community_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
+    = javascript_pack_tag 'features/public_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = csrf_meta_tags
 

From 8fecd8010801c17d0d086fbb27d4d9a67ccbb6af Mon Sep 17 00:00:00 2001
From: Sylvhem <Sylvhem@users.noreply.github.com>
Date: Sat, 8 Jul 2017 01:27:22 +0200
Subject: [PATCH 167/382] Various fixes in the French translation (#4107)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Changement de « Changement de mot de passe » en « Sécurité »

* Suppression de « (Two-factor auth) »

Change la valeur de la chaîne « two_factor_authentication » de « Identification à deux facteurs (Two-factor auth) » à « Identification à deux facteurs ».
La traduction anglaise entre parathentèse était redondante et gênait la lecture.

Change the value of the "two_factor_authentication" from "Identification à deux facteurs (Two-factor auth)" to "Identification à deux facteurs".
The English translation in brackets was superflous and was getting in the way of the reader.

* Remplace « ' » par « ’ »

Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était jusqu’ici incohérente et utilisait les deux.

Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.

* Remplace « ... » par « … »

Remplace les séries de trois points par le caractère dédié « … » (U+2026).

Replace all the series of three dots by the dedicated character "…" (U+2026).

* Mise à jour

Crée config/locales/activerecord.fr.yml, ajoute de nouvelles chaînes et met à jour certains textes.
Les compteurs de caractères pour le pseudonyme et la biographie devrait maintenant pouvoir fonctionner même quand l’interface est en français.

Create config/locales/activerecord.fr.yml, add new strings et update some textes.
The caracters counters for the username and the biography should now work even when the interface is in French.

* Remplace « A » par « À »

Remplace « A » par « À » aux endroits où le mot est mal orthographié.

Replace "A" by "À" when the wrong word is used.

* Ajout d’espaces insécables

Ajoute des espaces insécables suivant les régles nécessaires en typographie française.

Add non-breaking spaces following rules of French typography.

* Remplace « certain » par « certain·e »

Harmonise la traduction en remplaçant « certain » par sa forme épicène.

Harmonize the translation by replacing "certain" (sure) by its epicene form.

* Corrige un angliscisme

Remplace « adresse e-mail » par « adresse électronique ».

Replace "adresse e-mail" (e-mail address) by "adresse électronique" (electronic address).
---
 app/javascript/mastodon/locales/fr.json       |  46 +++----
 .../confirmation_instructions.fr.html.erb     |   4 +-
 .../confirmation_instructions.fr.text.erb     |   6 +-
 .../reset_password_instructions.fr.html.erb   |   6 +-
 .../reset_password_instructions.fr.text.erb   |   6 +-
 config/locales/activerecord.fr.yml            |  12 ++
 config/locales/devise.fr.yml                  |  16 +--
 config/locales/doorkeeper.fr.yml              |  54 ++++----
 config/locales/fr.yml                         | 130 +++++++++---------
 config/locales/simple_form.fr.yml             |  24 +++-
 10 files changed, 163 insertions(+), 141 deletions(-)
 create mode 100644 config/locales/activerecord.fr.yml

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fd2b30444..cb7e1b5a7 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -31,10 +31,10 @@
   "column_header.unpin": "Retirer",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Paramètres",
-  "compose_form.lock_disclaimer": "Votre compte n'est pas {locked}. Tout le monde peut vous suivre et voir vos pouets restreints.",
+  "compose_form.lock_disclaimer": "Votre compte n’est pas {locked}. Tout le monde peut vous suivre et voir vos pouets restreints.",
   "compose_form.lock_disclaimer.lock": "verrouillé",
-  "compose_form.placeholder": "Qu’avez-vous en tête ?",
-  "compose_form.privacy_disclaimer": "Votre statut privé va être transmis aux personnes mentionnées sur {domains}. Avez-vous confiance en {domainsCount, plural, one {ce serveur} other {ces serveurs}} pour ne pas divulguer votre statut ? Les statuts privés ne fonctionnent que sur les instances de Mastodon. Si {domains} {domainsCount, plural, one {n’est pas une instance de Mastodon} other {ne sont pas des instances de Mastodon}}, il n’y aura aucune indication que votre statut est privé, et il pourrait être partagé ou rendu visible d’une autre manière à d’autres personnes imprévues.",
+  "compose_form.placeholder": "Qu’avez-vous en tête ?",
+  "compose_form.privacy_disclaimer": "Votre statut privé va être transmis aux personnes mentionnées sur {domains}. Avez-vous confiance en {domainsCount, plural, one {ce serveur} other {ces serveurs}} pour ne pas divulguer votre statut ? Les statuts privés ne fonctionnent que sur les instances de Mastodon. Si {domains} {domainsCount, plural, one {n’est pas une instance de Mastodon} other {ne sont pas des instances de Mastodon}}, il n’y aura aucune indication que votre statut est privé, et il pourrait être partagé ou rendu visible d’une autre manière à d’autres personnes imprévues.",
   "compose_form.publish": "Pouet ",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Marquer le média comme délicat",
@@ -42,13 +42,13 @@
   "compose_form.spoiler_placeholder": "Avertissement",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.confirm": "Bloquer",
-  "confirmations.block.message": "Confirmez vous le blocage de {name} ?",
+  "confirmations.block.message": "Confirmez vous le blocage de {name} ?",
   "confirmations.delete.confirm": "Supprimer",
-  "confirmations.delete.message": "Confirmez vous la suppression de ce pouet ?",
+  "confirmations.delete.message": "Confirmez vous la suppression de ce pouet ?",
   "confirmations.domain_block.confirm": "Masquer le domaine entier",
-  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou silenciations ciblés sont suffisants et préférables.",
+  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou silenciations ciblés sont suffisants et préférables.",
   "confirmations.mute.confirm": "Silencer",
-  "confirmations.mute.message": "Confirmez vous la silenciation {name} ?",
+  "confirmations.mute.message": "Confirmez vous la silenciation {name} ?",
   "emoji_button.activity": "Activités",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Boire et manger",
@@ -59,20 +59,20 @@
   "emoji_button.search": "Recherche…",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux et voyages",
-  "empty_column.community": "Le fil public local est vide. Écrivez-donc quelque chose pour le remplir !",
+  "empty_column.community": "Le fil public local est vide. Écrivez-donc quelque chose pour le remplir !",
   "empty_column.hashtag": "Il n’y a encore aucun contenu relatif à ce hashtag",
   "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres utilisateur⋅ice⋅s.",
   "empty_column.home.inactivity": "Votre accueil est vide. Si vous ne vous êtes pas connecté⋅e depuis un moment, il se remplira automatiquement très bientôt.",
   "empty_column.home.public_timeline": "le fil public",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres utilisateur⋅ice⋅s pour débuter la conversation.",
-  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice⋅s d’autres instances pour remplir le fil public.",
+  "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice⋅s d’autres instances pour remplir le fil public.",
   "follow_request.authorize": "Autoriser",
   "follow_request.reject": "Rejeter",
   "getting_started.appsshort": "Applications",
   "getting_started.faq": "FAQ",
   "getting_started.heading": "Pour commencer",
   "getting_started.open_source_notice": "Mastodon est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.",
-  "getting_started.userguide": "Guide d'utilisation",
+  "getting_started.userguide": "Guide d’utilisation",
   "home.column_settings.advanced": "Avancé",
   "home.column_settings.basic": "Basique",
   "home.column_settings.filter_regex": "Filtrer avec une expression rationnelle",
@@ -93,17 +93,17 @@
   "navigation_bar.mutes": "Comptes silencés",
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.public_timeline": "Fil public global",
-  "notification.favourite": "{name} a ajouté à ses favoris :",
+  "notification.favourite": "{name} a ajouté à ses favoris :",
   "notification.follow": "{name} vous suit.",
-  "notification.mention": "{name} vous a mentionné⋅e :",
-  "notification.reblog": "{name} a partagé votre statut :",
+  "notification.mention": "{name} vous a mentionné⋅e :",
+  "notification.reblog": "{name} a partagé votre statut :",
   "notifications.clear": "Nettoyer",
-  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
+  "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?",
   "notifications.column_settings.alert": "Notifications locales",
-  "notifications.column_settings.favourite": "Favoris :",
-  "notifications.column_settings.follow": "Nouveaux⋅elles abonn⋅é⋅s :",
-  "notifications.column_settings.mention": "Mentions :",
-  "notifications.column_settings.reblog": "Partages :",
+  "notifications.column_settings.favourite": "Favoris :",
+  "notifications.column_settings.follow": "Nouveaux⋅elles abonn⋅é⋅s :",
+  "notifications.column_settings.mention": "Mentions :",
+  "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Émettre un son",
   "onboarding.done": "Effectué",
@@ -112,18 +112,18 @@
   "onboarding.page_four.home": "L’Accueil affiche les posts de tou⋅te⋅s les utilisateur⋅ice⋅s que vous suivez",
   "onboarding.page_four.notifications": "Les Notifications vous informent lorsque quelqu’un interagit avec vous",
   "onboarding.page_one.federation": "Mastodon est un réseau social qui appartient à tou⋅te⋅s.",
-  "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d'utilisateur⋅ice complet est {handle}",
-  "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
+  "onboarding.page_one.handle": "Vous êtes sur {domain}, une des nombreuses instances indépendantes de Mastodon. Votre nom d’utilisateur⋅ice complet est {handle}",
+  "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
   "onboarding.page_six.admin": "L’administrateur⋅trice de votre instance est {admin}",
   "onboarding.page_six.almost_done": "Nous y sommes presque…",
   "onboarding.page_six.appetoot": "Bon Appetoot!",
   "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres. Et maintenant… Bon Appetoot!",
   "onboarding.page_six.github": "Mastodon est un logiciel libre, gratuit et open-source. Vous pouvez rapporter des bogues, suggérer des fonctionnalités, ou contribuer à son développement sur {github}.",
   "onboarding.page_six.guidelines": "règles de la communauté",
-  "onboarding.page_six.read_guidelines": "S’il vous plaît, n’oubliez pas de lire les {guidelines} !",
+  "onboarding.page_six.read_guidelines": "S’il vous plaît, n’oubliez pas de lire les {guidelines} !",
   "onboarding.page_six.various_app": "applications mobiles",
   "onboarding.page_three.profile": "Modifiez votre profil pour changer votre avatar, votre description ainsi que votre nom. Vous y trouverez également d’autres préférences.",
-  "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateur⋅ice⋅s et regarder des hashtags tels que {illustration} et {introductions}. Pour trouver quelqu’un qui n’est pas sur cette instance, utilisez son nom d'utilisateur⋅ice complet.",
+  "onboarding.page_three.search": "Utilisez la barre de recherche pour trouver des utilisateur⋅ice⋅s et regarder des hashtags tels que {illustration} et {introductions}. Pour trouver quelqu’un qui n’est pas sur cette instance, utilisez son nom d’utilisateur⋅ice complet.",
   "onboarding.page_two.compose": "Écrivez depuis la colonne de composition. Vous pouvez ajouter des images, changer les réglages de confidentialité, et ajouter des avertissements de contenu (Content Warning) grâce aux icônes en dessous.",
   "onboarding.skip": "Passer",
   "privacy.change": "Ajuster la confidentialité du message",
@@ -151,7 +151,7 @@
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Déplier ce statut",
   "status.reblog": "Partager",
-  "status.reblogged_by": "{name} a partagé :",
+  "status.reblogged_by": "{name} a partagé :",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
diff --git a/app/views/user_mailer/confirmation_instructions.fr.html.erb b/app/views/user_mailer/confirmation_instructions.fr.html.erb
index b0b3d0f51..fe3f0a010 100644
--- a/app/views/user_mailer/confirmation_instructions.fr.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.fr.html.erb
@@ -5,10 +5,10 @@
 <p>Pour confirmer votre inscription, merci de cliquer sur le lien suivant : <br>
 <%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p>
 
-<p>Après votre première connexion, vous pourrez accéder à la documentation de l'outil.</p>
+<p>Après votre première connexion, vous pourrez accéder à la documentation de l’outil.</p>
 
 <p>Pensez également à jeter un œil à nos <%= link_to 'conditions d\'utilisation', terms_url %>.</p>
 
 <p>Amicalement,</p>
 
-<p>L'équipe <%= @instance %></p>
\ No newline at end of file
+<p>L’équipe <%= @instance %></p>
diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb
index cf8e39689..7730715f8 100644
--- a/app/views/user_mailer/confirmation_instructions.fr.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.fr.text.erb
@@ -5,10 +5,10 @@ Vous venez de vous créer un compte sur <%= @instance %> et nous vous en remerci
 Pour confirmer votre inscription, merci de cliquer sur le lien suivant :
 <%= confirmation_url(@resource, confirmation_token: @token) %>
 
-Après votre première connexion, vous pourrez accéder à la documentation de l'outil.
+Après votre première connexion, vous pourrez accéder à la documentation de l’outil.
 
-Pour rappel, nos conditions d'utilisation sont indiquées ici <%= terms_url %>
+Pour rappel, nos conditions d’utilisation sont indiquées ici <%= terms_url %>
 
 Amicalement,
 
-L'équipe <%= @instance %>
\ No newline at end of file
+L’équipe <%= @instance %>
diff --git a/app/views/user_mailer/reset_password_instructions.fr.html.erb b/app/views/user_mailer/reset_password_instructions.fr.html.erb
index 95789e387..db55c5884 100644
--- a/app/views/user_mailer/reset_password_instructions.fr.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.fr.html.erb
@@ -1,8 +1,8 @@
 <p>Bonjour <%= @resource.email %>&nbsp;!</p>
 
-<p>Quelqu'un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.</p>
+<p>Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.</p>
 
 <p><%= link_to 'Modifier mon mot de passe', edit_password_url(@resource, reset_password_token: @token) %></p>
 
-<p>Si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message.</p>
-<p>Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau.</p>
+<p>Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message.</p>
+<p>Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau.</p>
diff --git a/app/views/user_mailer/reset_password_instructions.fr.text.erb b/app/views/user_mailer/reset_password_instructions.fr.text.erb
index 73160cb4c..07fa3644a 100644
--- a/app/views/user_mailer/reset_password_instructions.fr.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.fr.text.erb
@@ -1,8 +1,8 @@
 Bonjour <%= @resource.email %> !
 
-Quelqu'un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
+Quelqu’un a demandé à réinitialiser votre mot de passe sur Mastodon. Vous pouvez effectuer la réinitialisation en cliquant sur le lien ci-dessous.
 
 <%= edit_password_url(@resource, reset_password_token: @token) %>
 
-Si vous n'êtes pas à l'origine de cette demande, vous pouvez ignorer ce message.
-Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau.
+Si vous n’êtes pas à l’origine de cette demande, vous pouvez ignorer ce message.
+Votre mot de passe ne sera pas modifié tant que vous n’accéderez pas au lien ci-dessus et n’en choisirez pas un nouveau.
diff --git a/config/locales/activerecord.fr.yml b/config/locales/activerecord.fr.yml
new file mode 100644
index 000000000..858777c0e
--- /dev/null
+++ b/config/locales/activerecord.fr.yml
@@ -0,0 +1,12 @@
+fr:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: seulement des lettres, des nombres et des tirets bas
+        status:
+          attributes:
+            reblog:
+              taken: du statut existe déjà
diff --git a/config/locales/devise.fr.yml b/config/locales/devise.fr.yml
index c4dbc62e0..6805e4f38 100644
--- a/config/locales/devise.fr.yml
+++ b/config/locales/devise.fr.yml
@@ -3,8 +3,8 @@ fr:
   devise:
     confirmations:
       confirmed: Votre compte a été validé.
-      send_instructions: Vous allez recevoir les instructions nécessaires à la confirmation de votre compte dans quelques minutes.
-      send_paranoid_instructions: Si votre adresse e-mail existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte.
+      send_instructions: Vous allez recevoir les instructions nécessaires à la confirmation de votre compte dans quelques minutes. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+      send_paranoid_instructions: Si votre adresse électronique existe dans notre base de données, vous allez bientôt recevoir un courriel contenant les instructions de confirmation de votre compte. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
     failure:
       already_authenticated: Vous êtes déjà connecté⋅e
       inactive: Votre compte n’est pas encore activé.
@@ -25,12 +25,12 @@ fr:
       unlock_instructions:
         subject: Instructions pour déverrouiller votre compte
     omniauth_callbacks:
-      failure: 'Nous n’avons pas pu vous authentifier via %{kind} : ''%{reason}''.'
+      failure: 'Nous n’avons pas pu vous authentifier via %{kind} : ''%{reason}''.'
       success: Authentifié avec succès via %{kind}.
     passwords:
-      no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d'utiliser l'URL complète.
-      send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants
-      send_paranoid_instructions: Si votre addresse e-mail existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel
+      no_token: Vous ne pouvez accéder à cette page sans passer par un courriel de réinitialisation de mot de passe. Si vous êtes passé⋅e par un courriel de ce type, assurez-vous d’utiliser l’URL complète.
+      send_instructions: Vous allez recevoir les instructions de réinitialisation du mot de passe dans quelques instants. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+      send_paranoid_instructions: Si votre addresse électronique existe dans notre base de données, vous allez recevoir un lien de réinitialisation par courriel. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
       updated: Votre mot de passe a été modifié avec succès, vous êtes maintenant connecté⋅e
       updated_not_active: Votre mot de passe a été modifié avec succès.
     registrations:
@@ -46,8 +46,8 @@ fr:
       signed_in: Connecté.
       signed_out: Déconnecté.
     unlocks:
-      send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants
-      send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller.
+      send_instructions: Vous allez recevoir les instructions nécessaires au déverrouillage de votre compte dans quelques instants. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
+      send_paranoid_instructions: Si votre compte existe, vous allez bientôt recevoir un courriel contenant les instructions pour le déverrouiller. S’il vous plaît, dans le cas où vous ne recevriez pas ce message, vérifiez votre dossier d’indésirables.
       unlocked: Votre compte a été déverrouillé avec succès, vous êtes maintenant connecté⋅e.
   errors:
     messages:
diff --git a/config/locales/doorkeeper.fr.yml b/config/locales/doorkeeper.fr.yml
index 24538bc48..0e74532c1 100644
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@@ -6,12 +6,12 @@ fr:
         remote_follow:
           attributes:
             acct:
-              blank: Le nom d'utilisateur ne doit pas être vide
+              blank: Le nom d’utilisateur ne doit pas être vide
   activerecord:
     attributes:
       doorkeeper/application:
         name: Nom
-        redirect_uri: L'URL de redirection
+        redirect_uri: L’URL de redirection
     errors:
       messages:
         record_invalid: Données invalides
@@ -50,17 +50,17 @@ fr:
         edit: Modifier
         submit: Envoyer
       confirmations:
-        destroy: Êtes-vous certain ?
+        destroy: Êtes-vous certain·e ?
       edit:
-        title: Modifier l'application
+        title: Modifier l’application
       form:
-        error: Oups ! Vérifier votre formulaire pour des erreurs possibles
+        error: Oups ! Vérifier votre formulaire pour des erreurs possibles
       help:
         native_redirect_uri: Utiliser %{native_redirect_uri} pour les tests locaux
         redirect_uri: Utiliser une ligne par URL
         scopes: Séparer les portées avec des espaces. Laisser vide pour utiliser les portées par défaut.
       index:
-        callback_url: URL de retour d'appel
+        callback_url: URL de retour d’appel
         name: Nom
         new: Nouvelle application
         title: Vos applications
@@ -68,11 +68,11 @@ fr:
         title: Nouvelle application
       show:
         actions: Actions
-        application_id: ID de l'application
-        callback_urls: URL du retour d'appel
+        application_id: ID de l’application
+        callback_urls: URL du retour d’appel
         scopes: Portées
         secret: Secret
-        title: 'Application : %{name}'
+        title: 'Application : %{name}'
     authorizations:
       buttons:
         authorize: Autoriser
@@ -81,15 +81,15 @@ fr:
         title: Une erreur est survenue
       new:
         able_to: Cette application pourra
-        prompt: Autoriser %{client_name} à utiliser votre compte ?
+        prompt: Autoriser %{client_name} à utiliser votre compte ?
         title: Autorisation requise
       show:
-        title: Code d'autorisation
+        title: Code d’autorisation
     authorized_applications:
       buttons:
         revoke: Annuler
       confirmations:
-        revoke: Êtes-vous certain ?
+        revoke: Êtes-vous certain·e ?
       index:
         application: Application
         created_at: Créé le
@@ -98,24 +98,24 @@ fr:
         title: Vos applications autorisées
     errors:
       messages:
-        access_denied: Le propriétaire de la ressource ou le serveur d'autorisation a refusé la requête.
-        credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n'est pas configuré.
-        invalid_client: L'authentification du client a échoué à cause d'un client inconnu, d'aucune authentification de client incluse ou d'une méthode d'authentification non prise en charge.
-        invalid_grant: Le consentement d'autorisation accordé n'est pas valide, a expiré, est annulé, ne concorde pas avec l'URL de redirection utilisée dans la requête d'autorisation ou a été émis à un autre client.
-        invalid_redirect_uri: L'URL de redirection n'est pas valide.
+        access_denied: Le propriétaire de la ressource ou le serveur d’autorisation a refusé la requête.
+        credential_flow_not_configured: Le flux des identifiants du mot de passe du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_from_credentials n’est pas configuré.
+        invalid_client: L’authentification du client a échoué à cause d’un client inconnu, d’aucune authentification de client incluse ou d’une méthode d’authentification non prise en charge.
+        invalid_grant: Le consentement d’autorisation accordé n’est pas valide, a expiré, est annulé, ne concorde pas avec l’URL de redirection utilisée dans la requête d’autorisation ou a été émis à un autre client.
+        invalid_redirect_uri: L’URL de redirection n’est pas valide.
         invalid_request: La requête omet un paramètre requis, inclut une valeur de paramètre non prise en charge ou est autrement mal formée.
         invalid_resource_owner: Les identifiants fournis par le propriétaire de la ressource ne sont pas valides ou le propriétaire de la ressource ne peut être trouvé
-        invalid_scope: La portée demandée n'est pas valide, est inconnue ou mal formée.
+        invalid_scope: La portée demandée n’est pas valide, est inconnue ou mal formée.
         invalid_token:
-          expired: Le jeton d'accès a expiré
-          revoked: Le jeton d'accès a été révoqué
-          unknown: Le jeton d'accès n'est pas valide
-        resource_owner_authenticator_not_configured: La recherche du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_authenticator n'est pas configuré.
-        server_error: Le serveur d'autorisation a rencontré une condition inattendue l'empêchant de faire aboutir la requête.
-        temporarily_unavailable: Le serveur d'autorisation est actuellement incapable de traiter la requête à cause d'une surcharge ou d'une maintenance temporaire du serveur.
-        unauthorized_client: Le client n'est pas autorisé à effectuer cette requête à l'aide de cette méthode.
-        unsupported_grant_type: Le type de consentement d'autorisation n'est pas pris en charge par le serveur d'autorisation.
-        unsupported_response_type: Le serveur d'autorisation ne prend pas en charge ce type de réponse.
+          expired: Le jeton d’accès a expiré
+          revoked: Le jeton d’accès a été révoqué
+          unknown: Le jeton d’accès n’est pas valide
+        resource_owner_authenticator_not_configured: La recherche du propriétaire de la ressource a échoué car Doorkeeper.configure.resource_owner_authenticator n’est pas configuré.
+        server_error: Le serveur d’autorisation a rencontré une condition inattendue l’empêchant de faire aboutir la requête.
+        temporarily_unavailable: Le serveur d’autorisation est actuellement incapable de traiter la requête à cause d’une surcharge ou d’une maintenance temporaire du serveur.
+        unauthorized_client: Le client n’est pas autorisé à effectuer cette requête à l’aide de cette méthode.
+        unsupported_grant_type: Le type de consentement d’autorisation n’est pas pris en charge par le serveur d’autorisation.
+        unsupported_response_type: Le serveur d’autorisation ne prend pas en charge ce type de réponse.
     flash:
       applications:
         create:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5a3e0c552..fcf5f6f9e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -7,7 +7,7 @@ fr:
     business_email: Courriel professionnel
     closed_registrations: Les inscriptions sont actuellement fermées sur cette instance.
     contact: Contact
-    description_headline: Qu'est-ce que %{domain} ?
+    description_headline: Qu’est-ce que %{domain} ?
     domain_count_after: autres instances
     domain_count_before: Connectés à
     features:
@@ -34,12 +34,12 @@ fr:
     follow: Suivre
     followers: Abonné⋅es
     following: Abonnements
-    nothing_here: Rien à voir ici !
+    nothing_here: Rien à voir ici !
     people_followed_by: Personnes suivies par %{name}
     people_who_follow: Personnes qui suivent %{name}
     posts: Statuts
     remote_follow: Suivre à distance
-    reserved_username: Ce nom d'utilisateur⋅ice est réservé
+    reserved_username: Ce nom d’utilisateur⋅ice est réservé
     unfollow: Ne plus suivre
   activitypub:
     activity:
@@ -48,14 +48,14 @@ fr:
       create:
         name: "%{account_name} a créé une note."
     outbox:
-      name: "Boîte d'envoi de %{account_name}"
-      summary: Liste d'activités de %{account_name}
+      name: "Boîte d’envoi de %{account_name}"
+      summary: Liste d’activités de %{account_name}
   admin:
     accounts:
-      are_you_sure: Êtes-vous certain⋅e ?
+      are_you_sure: Êtes-vous certain⋅e ?
       confirm: Confirmer
       confirmed: Confirmé
-      disable_two_factor_authentication: Désactiver l'authentification à deux facteurs
+      disable_two_factor_authentication: Désactiver l’authentification à deux facteurs
       display_name: Nom affiché
       domain: Domaine
       edit: Éditer
@@ -85,7 +85,7 @@ fr:
       perform_full_suspension: Effectuer une suspension complète
       profile_url: URL du profil
       public: Public
-      push_subscription_expires: Expiration de l'abonnement PuSH
+      push_subscription_expires: Expiration de l’abonnement PuSH
       redownload: Rafraîchir les avatars
       reset: Réinitialiser
       reset_password: Réinitialiser le mot de passe
@@ -98,12 +98,12 @@ fr:
         targeted_reports: Signalements créés visant ce compte
       silence: Rendre muet
       statuses: Statuts
-      subscribe: S'abonner
+      subscribe: S’abonner
       title: Comptes
       undo_silenced: Annuler le silence
       undo_suspension: Annuler la suspension
       unsubscribe: Se désabonner
-      username: Nom d'utilisateur⋅ice
+      username: Nom d’utilisateur⋅ice
       web: Web
     domain_blocks:
       add_new: Ajouter
@@ -112,14 +112,14 @@ fr:
       domain: Domaine
       new:
         create: Créer le blocage
-        hint: Le blocage de domaine n'empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
+        hint: Le blocage de domaine n’empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
         severity:
           desc_html: "<strong>Silence</strong> rendra les messages des comptes concernés invisibles à ceux qui ne les suivent pas. <strong>Suspend</strong> supprimera tout le contenu des comptes concernés, les médias, et les données du profil."
           silence: Muet
           suspend: Suspendre
         title: Nouveau blocage de domaine
       reject_media: Fichiers média rejetés
-      reject_media_hint: Supprime localement les fichiers média stockés et refuse d'en télécharger ultérieurement. Ne concerne pas les suspensions.
+      reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions.
       severities:
         silence: Rendre muet
         suspend: Suspendre
@@ -167,10 +167,10 @@ fr:
       contact_information:
         email: Entrez une adresse courriel publique
         label: Informations de contact
-        username: Entrez un nom d'utilisateur⋅ice
+        username: Entrez un nom d’utilisateur⋅ice
       registrations:
         closed_message:
-          desc_html: Affiché sur la page d'accueil lorsque les inscriptions sont fermées<br>Vous pouvez utiliser des balises HTML
+          desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées<br>Vous pouvez utiliser des balises HTML
           title: Message de fermeture des inscriptions
         open:
           disabled: Désactivées
@@ -178,10 +178,10 @@ fr:
           title: Inscriptions
       setting: Paramètre
       site_description:
-        desc_html: Affichée sous la forme d'un paragraphe sur la page d'accueil et utilisée comme balise meta.<br>Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
+        desc_html: Affichée sous la forme d’un paragraphe sur la page d’accueil et utilisée comme balise meta.<br>Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
         title: Description du site
       site_description_extended:
-        desc_html: Affichée sur la page d'informations complémentaires du site<br>Vous pouvez utiliser des balises HTML
+        desc_html: Affichée sur la page d’informations complémentaires du site<br>Vous pouvez utiliser des balises HTML
         title: Description étendue du site
       site_title: Titre du site
       title: Paramètres du site
@@ -198,17 +198,17 @@ fr:
       body: "%{reporter} a signalé %{target}"
       subject: Nouveau signalement sur %{instance} (#%{id})
   application_mailer:
-    settings: 'Changer les préférences courriel : %{link}'
+    settings: 'Changer les préférences courriel : %{link}'
     signature: Notifications de Mastodon depuis %{instance}
-    view: 'Voir :'
+    view: 'Voir :'
   applications:
-    invalid_url: L'URL fournie est invalide
+    invalid_url: L’URL fournie est invalide
   auth:
-    change_password: Changer de mot de passe
+    change_password: Sécurité
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.
-    didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
-    forgot_password: Mot de passe oublié ?
+    didnt_get_confirmation: Vous n’avez pas reçu les consignes de confirmation ?
+    forgot_password: Mot de passe oublié ?
     login: Se connecter
     logout: Se déconnecter
     register: S’inscrire
@@ -218,7 +218,7 @@ fr:
   authorize_follow:
     error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
     follow: Suivre
-    prompt_html: 'Vous (<strong>%{self}</strong>) avez demandé à suivre :'
+    prompt_html: 'Vous (<strong>%{self}</strong>) avez demandé à suivre :'
     title: Suivre %{acct}
   datetime:
     distance_in_words:
@@ -230,9 +230,9 @@ fr:
       almost_x_years:
         one: un an
         other: "%{count} ans"
-      half_a_minute: A l'instant
+      half_a_minute: À l’instant
       less_than_x_minutes: "%{count}min"
-      less_than_x_seconds: A l'instant
+      less_than_x_seconds: À l’instant
       over_x_years:
         one: un an
         other: "%{count} ans"
@@ -241,19 +241,19 @@ fr:
       x_months: "%{count}mois"
       x_seconds: "%{count}s"
   deletes:
-    bad_password_msg: Bien essayé ! Mot de passe incorrect
+    bad_password_msg: Bien essayé ! Mot de passe incorrect
     confirm_password: Entrez votre mot de passe pour vérifier votre identité
-    description_html: Cela va supprimer votre compte et le désactiver de manière <strong>permanente et irréversible</strong>. Votre nom d'utilisateur⋅ice restera réservé afin d'éviter la confusion
+    description_html: Cela va supprimer votre compte et le désactiver de manière <strong>permanente et irréversible</strong>. Votre nom d’utilisateur⋅ice restera réservé afin d’éviter la confusion
     proceed: Supprimer compte
     success_msg: Votre compte a été supprimé avec succès
-    warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a été partagé est susceptible de laisser des traces. Les serveurs hors-lignes ainsi que ceux n'étant plus abonnés à vos publications ne mettront pas leur base de données à jour.
+    warning_html: Seule la suppression du contenu depuis cette instance est garantie. Le contenu qui a été partagé est susceptible de laisser des traces. Les serveurs hors-lignes ainsi que ceux n’étant plus abonnés à vos publications ne mettront pas leur base de données à jour.
     warning_title: Disponibilité du contenu disséminé
   errors:
-    '403': Vous n'avez pas accès à cette page.
-    '404': La page que vous recherchez n'existe pas.
-    '410': La page que vous recherchez n'existe plus.
+    '403': Vous n’avez pas accès à cette page.
+    '404': La page que vous recherchez n’existe pas.
+    '410': La page que vous recherchez n’existe plus.
     '422':
-      content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
+      content: Vérification de sécurité échouée. Bloquez-vous les cookies ?
       title: Vérification de sécurité échouée
     '429': Trop de requêtes émises dans un délai donné.
     noscript: Pour utiliser Mastodon, veuillez activer JavaScript
@@ -265,70 +265,70 @@ fr:
     storage: Médias stockés
   followers:
     domain: Domaine
-    explanation_html: Si vous voulez être sûr⋅e que vos status restent privés, vous devez savoir qui vous suit. <strong>Vos status privés seront diffusés à toutes les instances des utilisateur⋅ice⋅s qui vous suivent</strong>. Vous voudrez peut-être les passer en revue et les supprimer si vous n'êtes pas sûr⋅e que votre vie privée sera respectée par l'administration ou le logiciel de ces instances.
-    followers_count: Nombre d'abonné⋅es
+    explanation_html: Si vous voulez être sûr⋅e que vos status restent privés, vous devez savoir qui vous suit. <strong>Vos status privés seront diffusés à toutes les instances des utilisateur⋅ice⋅s qui vous suivent</strong>. Vous voudrez peut-être les passer en revue et les supprimer si vous n’êtes pas sûr⋅e que votre vie privée sera respectée par l’administration ou le logiciel de ces instances.
+    followers_count: Nombre d’abonné⋅es
     lock_link: Rendez votre compte privé
-    purge: Retirer de la liste d'abonné⋅es
+    purge: Retirer de la liste d’abonné⋅es
     success:
-      one: Suppression des abonné⋅es venant d'un domaine en cours...
-      other: Suppression des abonné⋅es venant de %{count} domaines en cours...
-    true_privacy_html: Soyez conscient⋅es <strong>qu'une vraie confidentialité ne peut être atteinte que par un chiffrement de bout-en-bout</strong>.
-    unlocked_warning_html: N'importe qui peut vous suivre et voir vos status privés. %{lock_link} afin de pouvoir vérifier et rejeter des abonné⋅es.
-    unlocked_warning_title: Votre compte n'est pas privé
+      one: Suppression des abonné⋅es venant d’un domaine en cours…
+      other: Suppression des abonné⋅es venant de %{count} domaines en cours…
+    true_privacy_html: Soyez conscient⋅es <strong>qu’une vraie confidentialité ne peut être atteinte que par un chiffrement de bout-en-bout</strong>.
+    unlocked_warning_html: N’importe qui peut vous suivre et voir vos status privés. %{lock_link} afin de pouvoir vérifier et rejeter des abonné⋅es.
+    unlocked_warning_title: Votre compte n’est pas privé
   generic:
-    changes_saved_msg: Les modifications ont été enregistrées avec succès !
+    changes_saved_msg: Les modifications ont été enregistrées avec succès !
     powered_by: propulsé par %{link}
     save_changes: Enregistrer les modifications
     validation_errors:
-      one: Quelque chose ne va pas ! Vérifiez l’erreur ci-dessous.
-      other: Certaines choses ne vont pas ! Vérifiez les erreurs ci-dessous.
+      one: Quelque chose ne va pas ! Vérifiez l’erreur ci-dessous.
+      other: Certaines choses ne vont pas ! Vérifiez les erreurs ci-dessous.
   imports:
     preface: Vous pouvez importer certaines données comme les personnes que vous suivez ou bloquez sur votre compte sur cette instance à partir de fichiers créés sur une autre instance.
     success: Vos données ont été importées avec succès et seront traitées en temps et en heure
     types:
-      blocking: Liste d'utilisateur⋅ice⋅s bloqué⋅es
-      following: Liste d'utilisateur⋅ice⋅s suivi⋅es
-      muting: Liste d'utilisateur⋅ice⋅s que vous faites taire
+      blocking: Liste d’utilisateur⋅ice⋅s bloqué⋅es
+      following: Liste d’utilisateur⋅ice⋅s suivi⋅es
+      muting: Liste d’utilisateur⋅ice⋅s que vous faites taire
     upload: Importer
   landing_strip_html: <strong>%{name}</strong> utilise %{link_to_root_path}. Vous pouvez le/la suivre et interagir si vous possédez un compte quelque part dans le "fediverse".
-  landing_strip_signup_html: Si ce n'est pas le cas, vous pouvez <a href="%{sign_up_path}">en créer un ici</a>.
+  landing_strip_signup_html: Si ce n’est pas le cas, vous pouvez <a href="%{sign_up_path}">en créer un ici</a>.
   media_attachments:
     validations:
       images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
       too_many: Impossible de joindre plus de 4 fichiers
   notification_mailer:
     digest:
-      body: 'Voici ce que vous avez raté sur ${instance} depuis votre dernière visite (%{}) :'
+      body: 'Voici ce que vous avez raté sur ${instance} depuis votre dernière visite (%{}) :'
       mention: "%{name} vous a mentionné⋅e"
       new_followers_summary:
-        one: Vous avez un⋅e nouvel⋅le abonné⋅e ! Youpi !
-        other: Vous avez %{count} nouveaux⋅elles abonné⋅e⋅s ! Incroyable !
+        one: Vous avez un⋅e nouvel⋅le abonné⋅e ! Youpi !
+        other: Vous avez %{count} nouveaux⋅elles abonné⋅e⋅s ! Incroyable !
       subject:
         one: "Une nouvelle notification depuis votre dernière visite \U0001F418"
         other: "%{count} nouvelles notifications depuis votre dernière visite \U0001F418"
     favourite:
-      body: "%{name} a ajouté votre post à ses favoris :"
+      body: "%{name} a ajouté votre post à ses favoris :"
       subject: "%{name} a ajouté votre post à ses favoris"
     follow:
-      body: "%{name} vous suit !"
+      body: "%{name} vous suit !"
       subject: "%{name} vous suit"
     follow_request:
       body: "%{name} a demandé à vous suivre"
-      subject: 'Abonné⋅es en attente : %{name}'
+      subject: 'Abonné⋅es en attente : %{name}'
     mention:
-      body: "%{name} vous a mentionné⋅e dans :"
+      body: "%{name} vous a mentionné⋅e dans :"
       subject: "%{name} vous a mentionné⋅e"
     reblog:
-      body: "%{name} a partagé votre statut :"
+      body: "%{name} a partagé votre statut :"
       subject: "%{name} a partagé votre statut"
   pagination:
     next: Suivant
     prev: Précédent
   remote_follow:
     acct: Entrez votre pseudo@instance depuis lequel vous voulez suivre ce⋅tte utilisateur⋅trice
-    missing_resource: L'URL de redirection n'a pas pu être trouvée
+    missing_resource: L’URL de redirection n’a pas pu être trouvée
     proceed: Continuez pour suivre
-    prompt: 'Vous allez suivre :'
+    prompt: 'Vous allez suivre :'
   sessions:
     activity: Dernière activité
     browser: Navigateur
@@ -376,7 +376,7 @@ fr:
     import: Import de données
     preferences: Préférences
     settings: Réglages
-    two_factor_authentication: Identification à deux facteurs (Two-factor auth)
+    two_factor_authentication: Identification à deux facteurs
   statuses:
     open_in_web: Ouvrir sur le web
     over_character_limit: limite de caractères dépassée de %{max} caractères
@@ -397,20 +397,20 @@ fr:
       default: "%d %b %Y, %H:%M"
   two_factor_authentication:
     code_hint: Entrez le code généré par votre application pour confirmer
-    description_html: Si vous activez <strong>l'identification à deux facteurs</strong>, vous devrez être en possession de votre téléphone afin de générer un code de connexion.
+    description_html: Si vous activez <strong>l’identification à deux facteurs</strong>, vous devrez être en possession de votre téléphone afin de générer un code de connexion.
     disable: Désactiver
     enable: Activer
-    enabled: L'authentification à deux facteurs est activée
+    enabled: L’authentification à deux facteurs est activée
     enabled_success: Identification à deux facteurs activée avec succès
     generate_recovery_codes: Générer les codes de récupération
     instructions_html: "<strong>Scannez ce QR code grâce à Google Authenticator, Authy ou une application similaire sur votre téléphone</strong>. Désormais, cette application générera des jetons que vous devrez saisir à chaque connexion."
     lost_recovery_codes: Les codes de récupération vous permettent de retrouver les accès à votre comptre si vous perdez votre téléphone. Si vous perdez vos codes de récupération, vous pouvez les générer à nouveau ici. Vos anciens codes de récupération seront invalidés.
-    manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l''entrer manuellement, voici le secret en clair :'
+    manual_instructions: 'Si vous ne pouvez pas scanner ce QR code et devez l’entrer manuellement, voici le secret en clair :'
     recovery_codes: Codes de récupération
     recovery_codes_regenerated: Codes de récupération régénérés avec succès
-    recovery_instructions_html: Si vous perdez l'accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l'accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
+    recovery_instructions_html: Si vous perdez l’accès à votre téléphone, vous pouvez utiliser un des codes de récupération ci-dessous pour récupérer l’accès à votre compte. Conservez les codes de récupération en toute sécurité, par exemple, en les imprimant et en les stockant avec vos autres documents importants.
     setup: Installer
-    wrong_code: Les codes entrés sont incorrects ! L'heure du serveur et celle de votre appareil sont-elles correctes ?
+    wrong_code: Les codes entrés sont incorrects ! L’heure du serveur et celle de votre appareil sont-elles correctes ?
   users:
-    invalid_email: L'adresse courriel est invalide
-    invalid_otp_token: Le code d'authentification à deux facteurs est invalide
+    invalid_email: L’adresse courriel est invalide
+    invalid_otp_token: Le code d’authentification à deux facteurs est invalide
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 446c56947..8717a4abd 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -4,12 +4,20 @@ fr:
     hints:
       defaults:
         avatar: Au format PNG, GIF ou JPG. 2Mo maximum. Sera réduit à 120x120px
-        display_name: 30 caractères maximum
+        display_name:
+          one: <span class="name-counter">1</span> caractère restant
+          other: <span class="name-counter">%{count}</span> caractères restants
         header: Au format PNG, GIF ou JPG. 2Mo maximum. Sera réduit à 700x335px
-        locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s'afficheront qu'à vos abonné⋅es
-        note: 160 caractères maximum
+        locked: Vous devrez approuver chaque abonné⋅e et vos statuts ne s’afficheront qu’à vos abonné⋅es
+        note:
+          one: <span class="note-counter">1</span> caractère restant
+          other: <span class="note-counter">%{count}</span> caractères restants
       imports:
         data: Un fichier CSV généré par une autre instance de Mastodon
+      sessions:
+        otp: Entrez le code d’authentification à deux facteurs depuis votre téléphone ou utilisez un de vos codes de récupération.
+      user:
+        filtered_languages: Les langues sélectionnées seront retirées de vos fils publics.
     labels:
       defaults:
         avatar: Image de profil
@@ -21,16 +29,18 @@ fr:
         email: Adresse courriel
         header: Image d’en-tête
         locale: Langue
-        locked: Rendre le compte privé
+        locked: Verrouiller le compte
         new_password: Nouveau mot de passe
         note: Présentation
-        otp_attempt: Code d'identification à deux facteurs
+        otp_attempt: Code d’identification à deux facteurs
         password: Mot de passe
+        setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Afficher un dialogue de confirmation avant de partager
         setting_default_privacy: Confidentialité des statuts
+        setting_delete_modal: Afficher un dialogue de confirmation avant de supprimer un pouet
         setting_system_font_ui: Utiliser la police par défaut du système
         severity: Séverité
-        type: Type d'import
+        type: Type d’import
         username: Identifiant
       interactions:
         must_be_follower: Masquer les notifications des personnes qui ne vous suivent pas
@@ -39,7 +49,7 @@ fr:
         digest: Envoyer des courriels récapitulatifs
         favourite: Envoyer un courriel lorsque quelqu’un ajoute mes statuts à ses favoris
         follow: Envoyer un courriel lorsque quelqu’un me suit
-        follow_request: Envoyer un courriel lorsque quelqu'un demande à me suivre
+        follow_request: Envoyer un courriel lorsque quelqu’un demande à me suivre
         mention: Envoyer un courriel lorsque quelqu’un me mentionne
         reblog: Envoyer un courriel lorsque quelqu’un partage mes statuts
     'no': Non

From 63b77f23202a6dece419e2eb7180395b2e276b09 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Fri, 7 Jul 2017 16:57:22 -0700
Subject: [PATCH 168/382] Avoid using getBoundingClientRect to calculate height
 (#4001)

---
 app/javascript/mastodon/components/status.js  | 19 ++++++++---------
 .../mastodon/components/status_content.js     |  4 ----
 .../mastodon/features/ui/components/bundle.js |  6 ------
 .../features/ui/util/get_rect_from_entry.js   | 21 +++++++++++++++++++
 4 files changed, 30 insertions(+), 20 deletions(-)
 create mode 100644 app/javascript/mastodon/features/ui/util/get_rect_from_entry.js

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 18ce0198e..df771f5a8 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -17,6 +17,7 @@ import { MediaGallery, VideoPlayer } from '../features/ui/util/async-components'
 // We use the component (and not the container) since we do not want
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
+import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
 
 export default class Status extends ImmutablePureComponent {
 
@@ -101,6 +102,11 @@ export default class Status extends ImmutablePureComponent {
   }
 
   handleIntersection = (entry) => {
+    if (this.node && this.node.children.length !== 0) {
+      // save the height of the fully-rendered element
+      this.height = getRectFromEntry(entry).height;
+    }
+
     // Edge 15 doesn't support isIntersecting, but we can infer it
     // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12156111/
     // https://github.com/WICG/IntersectionObserver/issues/211
@@ -129,15 +135,8 @@ export default class Status extends ImmutablePureComponent {
     this.setState((prevState) => ({ isHidden: !prevState.isIntersecting }));
   }
 
-  saveHeight = () => {
-    if (this.node && this.node.children.length !== 0) {
-      this.height = this.node.getBoundingClientRect().height;
-    }
-  }
-
   handleRef = (node) => {
     this.node = node;
-    this.saveHeight();
   }
 
   handleClick = () => {
@@ -213,13 +212,13 @@ export default class Status extends ImmutablePureComponent {
 
       } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
         media = (
-          <Bundle fetchComponent={VideoPlayer} loading={this.renderLoadingVideoPlayer} onRender={this.saveHeight} >
+          <Bundle fetchComponent={VideoPlayer} loading={this.renderLoadingVideoPlayer} >
             {Component => <Component media={status.getIn(['media_attachments', 0])} sensitive={status.get('sensitive')} onOpenVideo={this.props.onOpenVideo} />}
           </Bundle>
         );
       } else {
         media = (
-          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} onRender={this.saveHeight} >
+          <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} >
             {Component => <Component media={status.get('media_attachments')} sensitive={status.get('sensitive')} height={110} onOpenMedia={this.props.onOpenMedia} autoPlayGif={this.props.autoPlayGif} />}
           </Bundle>
         );
@@ -246,7 +245,7 @@ export default class Status extends ImmutablePureComponent {
           </a>
         </div>
 
-        <StatusContent status={status} onClick={this.handleClick} expanded={isExpanded} onExpandedToggle={this.handleExpandedToggle} onHeightUpdate={this.saveHeight} />
+        <StatusContent status={status} onClick={this.handleClick} expanded={isExpanded} onExpandedToggle={this.handleExpandedToggle} />
 
         {media}
 
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 78656571d..02b4c8402 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -17,7 +17,6 @@ export default class StatusContent extends React.PureComponent {
     status: ImmutablePropTypes.map.isRequired,
     expanded: PropTypes.bool,
     onExpandedToggle: PropTypes.func,
-    onHeightUpdate: PropTypes.func,
     onClick: PropTypes.func,
   };
 
@@ -56,9 +55,6 @@ export default class StatusContent extends React.PureComponent {
   }
 
   componentDidUpdate () {
-    if (this.props.onHeightUpdate) {
-      this.props.onHeightUpdate();
-    }
     this._updateStatusLinks();
   }
 
diff --git a/app/javascript/mastodon/features/ui/components/bundle.js b/app/javascript/mastodon/features/ui/components/bundle.js
index e69a32f47..3eed446fe 100644
--- a/app/javascript/mastodon/features/ui/components/bundle.js
+++ b/app/javascript/mastodon/features/ui/components/bundle.js
@@ -12,7 +12,6 @@ class Bundle extends React.Component {
     error: PropTypes.func,
     children: PropTypes.func.isRequired,
     renderDelay: PropTypes.number,
-    onRender: PropTypes.func,
     onFetch: PropTypes.func,
     onFetchSuccess: PropTypes.func,
     onFetchFail: PropTypes.func,
@@ -22,7 +21,6 @@ class Bundle extends React.Component {
     loading: emptyComponent,
     error: emptyComponent,
     renderDelay: 0,
-    onRender: noop,
     onFetch: noop,
     onFetchSuccess: noop,
     onFetchFail: noop,
@@ -43,10 +41,6 @@ class Bundle extends React.Component {
     }
   }
 
-  componentDidUpdate () {
-    this.props.onRender();
-  }
-
   componentWillUnmount () {
     if (this.timeout) {
       clearTimeout(this.timeout);
diff --git a/app/javascript/mastodon/features/ui/util/get_rect_from_entry.js b/app/javascript/mastodon/features/ui/util/get_rect_from_entry.js
new file mode 100644
index 000000000..c266cd7dc
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/get_rect_from_entry.js
@@ -0,0 +1,21 @@
+
+// Get the bounding client rect from an IntersectionObserver entry.
+// This is to work around a bug in Chrome: https://crbug.com/737228
+
+let hasBoundingRectBug;
+
+function getRectFromEntry(entry) {
+  if (typeof hasBoundingRectBug !== 'boolean') {
+    const boundingRect = entry.target.getBoundingClientRect();
+    const observerRect = entry.boundingClientRect;
+    hasBoundingRectBug = boundingRect.height !== observerRect.height ||
+      boundingRect.top !== observerRect.top ||
+      boundingRect.width !== observerRect.width ||
+      boundingRect.bottom !== observerRect.bottom ||
+      boundingRect.left !== observerRect.left ||
+      boundingRect.right !== observerRect.right;
+  }
+  return hasBoundingRectBug ? entry.target.getBoundingClientRect() : entry.boundingClientRect;
+}
+
+export default getRectFromEntry;

From 102466ac5842b20f32a9c5e2fa3f35414c34574b Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 8 Jul 2017 21:50:45 +0900
Subject: [PATCH 169/382] Fix JSON serialization of media_attachment (#4111)

---
 app/serializers/rest/media_attachment_serializer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/serializers/rest/media_attachment_serializer.rb b/app/serializers/rest/media_attachment_serializer.rb
index 9b07a686e..9055b8db4 100644
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@@ -15,7 +15,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
   end
 
   def text_url
-    medium_url(object.id)
+    object.local? ? medium_url(object) : nil
   end
 
   def meta

From 864e3f8d9ca652e10a28bddbb0d0df629d2849d4 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 8 Jul 2017 14:51:05 +0200
Subject: [PATCH 170/382] Replace OEmbed and initial state Rabl templates with
 serializers (#4110)

* Replace OEmbed Rabl template with serializer

* Replace initial state rabl with serializer
---
 app/controllers/api/oembed_controller.rb    |  3 +-
 app/controllers/home_controller.rb          | 17 +++++--
 app/presenters/initial_state_presenter.rb   |  5 ++
 app/serializers/initial_state_serializer.rb | 39 ++++++++++++++
 app/serializers/oembed_serializer.rb        | 56 +++++++++++++++++++++
 app/views/api/oembed/show.json.rabl         | 14 ------
 app/views/home/index.html.haml              |  2 +-
 app/views/home/initial_state.json.rabl      | 38 --------------
 spec/controllers/home_controller_spec.rb    | 41 +++------------
 9 files changed, 121 insertions(+), 94 deletions(-)
 create mode 100644 app/presenters/initial_state_presenter.rb
 create mode 100644 app/serializers/initial_state_serializer.rb
 create mode 100644 app/serializers/oembed_serializer.rb
 delete mode 100644 app/views/api/oembed/show.json.rabl
 delete mode 100644 app/views/home/initial_state.json.rabl

diff --git a/app/controllers/api/oembed_controller.rb b/app/controllers/api/oembed_controller.rb
index 6e3e34d96..f8c87dd16 100644
--- a/app/controllers/api/oembed_controller.rb
+++ b/app/controllers/api/oembed_controller.rb
@@ -5,8 +5,7 @@ class Api::OEmbedController < Api::BaseController
 
   def show
     @stream_entry = find_stream_entry.stream_entry
-    @width = maxwidth_or_default
-    @height = maxheight_or_default
+    render json: @stream_entry, serializer: OEmbedSerializer, width: maxwidth_or_default, height: maxheight_or_default
   end
 
   private
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 6209a3ae9..218da6906 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,13 +2,10 @@
 
 class HomeController < ApplicationController
   before_action :authenticate_user!
+  before_action :set_initial_state_json
 
   def index
-    @body_classes           = 'app-body'
-    @token                  = current_session.token
-    @web_settings           = Web::Setting.find_by(user: current_user)&.data || {}
-    @admin                  = Account.find_local(Setting.site_contact_username)
-    @streaming_api_base_url = Rails.configuration.x.streaming_api_base_url
+    @body_classes = 'app-body'
   end
 
   private
@@ -16,4 +13,14 @@ class HomeController < ApplicationController
   def authenticate_user!
     redirect_to(single_user_mode? ? account_path(Account.first) : about_path) unless user_signed_in?
   end
+
+  def set_initial_state_json
+    state = InitialStatePresenter.new(settings: Web::Setting.find_by(user: current_user)&.data || {},
+                                      current_account: current_account,
+                                      token: current_session.token,
+                                      admin: Account.find_local(Setting.site_contact_username))
+
+    serializable_resource = ActiveModelSerializers::SerializableResource.new(state, serializer: InitialStateSerializer)
+    @initial_state_json   = serializable_resource.to_json
+  end
 end
diff --git a/app/presenters/initial_state_presenter.rb b/app/presenters/initial_state_presenter.rb
new file mode 100644
index 000000000..75fef28a8
--- /dev/null
+++ b/app/presenters/initial_state_presenter.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class InitialStatePresenter < ActiveModelSerializers::Model
+  attributes :settings, :token, :current_account, :admin
+end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
new file mode 100644
index 000000000..84f9e23a6
--- /dev/null
+++ b/app/serializers/initial_state_serializer.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class InitialStateSerializer < ActiveModel::Serializer
+  attributes :meta, :compose, :accounts,
+             :media_attachments, :settings
+
+  def meta
+    {
+      streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
+      access_token: object.token,
+      locale: I18n.locale,
+      domain: Rails.configuration.x.local_domain,
+      me: object.current_account.id,
+      admin: object.admin&.id,
+      boost_modal: object.current_account.user.setting_boost_modal,
+      delete_modal: object.current_account.user.setting_delete_modal,
+      auto_play_gif: object.current_account.user.setting_auto_play_gif,
+      system_font_ui: object.current_account.user.setting_system_font_ui,
+    }
+  end
+
+  def compose
+    {
+      me: object.current_account.id,
+      default_privacy: object.current_account.user.setting_default_privacy,
+    }
+  end
+
+  def accounts
+    store = {}
+    store[object.current_account.id] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer)
+    store[object.admin.id]           = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) unless object.admin.nil?
+    store
+  end
+
+  def media_attachments
+    { accept_content_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES }
+  end
+end
diff --git a/app/serializers/oembed_serializer.rb b/app/serializers/oembed_serializer.rb
new file mode 100644
index 000000000..78376d253
--- /dev/null
+++ b/app/serializers/oembed_serializer.rb
@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+class OEmbedSerializer < ActiveModel::Serializer
+  include RoutingHelper
+  include ActionView::Helpers::TagHelper
+
+  attributes :type, :version, :title, :author_name,
+             :author_url, :provider_name, :provider_url,
+             :cache_age, :html, :width, :height
+
+  def type
+    'rich'
+  end
+
+  def version
+    '1.0'
+  end
+
+  def author_name
+    object.account.display_name.presence || object.account.username
+  end
+
+  def author_url
+    account_url(object.account)
+  end
+
+  def provider_name
+    Rails.configuration.x.local_domain
+  end
+
+  def provider_url
+    root_url
+  end
+
+  def cache_age
+    86_400
+  end
+
+  def html
+    tag :iframe,
+        src: embed_account_stream_entry_url(object.account, object),
+        style: 'width: 100%; overflow: hidden',
+        frameborder: '0',
+        scrolling: 'no',
+        width: width,
+        height: height
+  end
+
+  def width
+    instance_options[:width]
+  end
+
+  def height
+    instance_options[:height]
+  end
+end
diff --git a/app/views/api/oembed/show.json.rabl b/app/views/api/oembed/show.json.rabl
deleted file mode 100644
index 11dcec538..000000000
--- a/app/views/api/oembed/show.json.rabl
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-object @stream_entry
-
-node(:type) { 'rich' }
-node(:version) { '1.0' }
-node(:title, &:title)
-node(:author_name) { |entry| entry.account.display_name.blank? ? entry.account.username : entry.account.display_name }
-node(:author_url) { |entry| account_url(entry.account) }
-node(:provider_name) { site_hostname }
-node(:provider_url) { root_url }
-node(:cache_age) { 86_400 }
-node(:html) { |entry| "<iframe src=\"#{embed_account_stream_entry_url(entry.account, entry)}\" style=\"width: 100%; overflow: hidden\" frameborder=\"0\" width=\"#{@width}\" height=\"#{@height}\" scrolling=\"no\"></iframe>" }
-node(:width) { @width }
-node(:height) { @height }
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 33c978c89..71dcb54c6 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
-  %script#initial-state{ type: 'application/json' }!= json_escape(render(file: 'home/initial_state', formats: :json))
+  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
 
   = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
 
diff --git a/app/views/home/initial_state.json.rabl b/app/views/home/initial_state.json.rabl
deleted file mode 100644
index c428a5a1f..000000000
--- a/app/views/home/initial_state.json.rabl
+++ /dev/null
@@ -1,38 +0,0 @@
-object false
-
-node(:meta) do
-  {
-    streaming_api_base_url: @streaming_api_base_url,
-    access_token: @token,
-    locale: I18n.locale,
-    domain: site_hostname,
-    me: current_account.id,
-    admin: @admin.try(:id),
-    boost_modal: current_account.user.setting_boost_modal,
-    delete_modal: current_account.user.setting_delete_modal,
-    auto_play_gif: current_account.user.setting_auto_play_gif,
-    system_font_ui: current_account.user.setting_system_font_ui,
-  }
-end
-
-node(:compose) do
-  {
-    me: current_account.id,
-    default_privacy: current_account.user.setting_default_privacy,
-  }
-end
-
-node(:accounts) do
-  store = {}
-  store[current_account.id] = ActiveModelSerializers::SerializableResource.new(current_account, serializer: REST::AccountSerializer)
-  store[@admin.id] = ActiveModelSerializers::SerializableResource.new(@admin, serializer: REST::AccountSerializer) unless @admin.nil?
-  store
-end
-
-node(:media_attachments) do
-  {
-    accept_content_types: MediaAttachment::IMAGE_MIME_TYPES + MediaAttachment::VIDEO_MIME_TYPES
-  }
-end
-
-node(:settings) { @web_settings }
diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
index cc1dbe5a1..d44d720b1 100644
--- a/spec/controllers/home_controller_spec.rb
+++ b/spec/controllers/home_controller_spec.rb
@@ -23,41 +23,14 @@ RSpec.describe HomeController, type: :controller do
         expect(assigns(:body_classes)).to eq 'app-body'
       end
 
-      it 'assigns @token' do
-        app = Doorkeeper::Application.create!(name: 'Web', superapp: true, redirect_uri: Doorkeeper.configuration.native_redirect_uri)
-        allow(Doorkeeper.configuration).to receive(:access_token_expires_in).and_return(42)
-
+      it 'assigns @initial_state_json' do
         subject
-        token = Doorkeeper::AccessToken.find_by(token: assigns(:token))
-
-        expect(token.application).to eq app
-        expect(token.resource_owner_id).to eq user.id
-        expect(token.scopes).to eq Doorkeeper::OAuth::Scopes.from_string('read write follow')
-        expect(token.expires_in_seconds).to eq 42
-        expect(token.use_refresh_token?).to eq false
-      end
-
-      it 'assigns @web_settings for {} if not available' do
-        subject
-        expect(assigns(:web_settings)).to eq({})
-      end
-
-      it 'assigns @web_settings for Web::Setting if available' do
-        setting = Fabricate('Web::Setting', data: '{"home":{}}', user: user)
-        subject
-        expect(assigns(:web_settings)).to eq setting.data
-      end
-
-      it 'assigns @admin' do
-        admin = Fabricate(:account)
-        Setting.site_contact_username = admin.username
-        subject
-        expect(assigns(:admin)).to eq admin
-      end
-
-      it 'assigns streaming_api_base_url' do
-        subject
-        expect(assigns(:streaming_api_base_url)).to eq 'ws://localhost:4000'
+        initial_state_json = json_str_to_hash(assigns(:initial_state_json))
+        expect(initial_state_json[:meta]).to_not be_nil
+        expect(initial_state_json[:compose]).to_not be_nil
+        expect(initial_state_json[:accounts]).to_not be_nil
+        expect(initial_state_json[:settings]).to_not be_nil
+        expect(initial_state_json[:media_attachments]).to_not be_nil
       end
     end
   end

From 0324f807f4f7b557bb0c38f0dbb4cfd98490957d Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpraat@users.noreply.github.com>
Date: Sat, 8 Jul 2017 17:17:02 +0200
Subject: [PATCH 171/382] Update and improvement Dutch language strings (#4117)

* Update

* Update
---
 app/javascript/mastodon/locales/nl.json |  10 +--
 config/locales/nl.yml                   | 102 +++++++++++++++++++-----
 2 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 38ca6518a..05a9e3a12 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -10,7 +10,7 @@
   "account.media": "Media",
   "account.mention": "Vermeld @{name}",
   "account.mute": "Negeer @{name}",
-  "account.posts": "Berichten",
+  "account.posts": "Toots",
   "account.report": "Rapporteer @{name}",
   "account.requested": "Wacht op goedkeuring",
   "account.unblock": "Deblokkeer @{name}",
@@ -22,7 +22,7 @@
   "column.community": "Lokale tijdlijn",
   "column.favourites": "Favorieten",
   "column.follow_requests": "Volgverzoeken",
-  "column.home": "Jouw tijdlijn",
+  "column.home": "Start",
   "column.mutes": "Genegeerde gebruikers",
   "column.notifications": "Meldingen",
   "column.public": "Globale tijdlijn",
@@ -62,7 +62,7 @@
   "empty_column.community": "De lokale tijdlijn is leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Jij volgt nog niemand. Bezoek {public} of gebruik het zoekvenster om andere mensen te ontmoeten.",
-  "empty_column.home.inactivity": "Jouw tijdlijn is leeg. Wanneer je een tijdje inactief bent geweest wordt deze snel opnieuw aangemaakt.",
+  "empty_column.home.inactivity": "Deze tijdlijn is leeg. Wanneer je een tijdje inactief bent geweest wordt deze snel opnieuw aangemaakt.",
   "empty_column.home.public_timeline": "de globale tijdlijn",
   "empty_column.notifications": "Je hebt nog geen meldingen. Heb interactie met andere mensen om het gesprek aan te gaan.",
   "empty_column.public": "Er is hier helemaal niks! Toot iets in het openbaar of volg mensen van andere Mastodon-servers om het te vullen.",
@@ -109,7 +109,7 @@
   "onboarding.done": "Klaar",
   "onboarding.next": "Volgende",
   "onboarding.page_five.public_timelines": "De lokale tijdlijn toont openbare toots van iedereen op {domain}. De globale tijdlijn toont openbare toots van iedereen die door gebruikers van {domain} worden gevolgd, dus ook mensen van andere Mastodon-servers. Dit zijn de openbare tijdlijnen en vormen een uitstekende manier om nieuwe mensen te ontdekken.",
-  "onboarding.page_four.home": "Jouw tijdlijn laat toots zien van mensen die jij volgt.",
+  "onboarding.page_four.home": "Deze tijdlijn laat toots zien van mensen die jij volgt.",
   "onboarding.page_four.notifications": "De kolom met meldingen toont alle interacties die je met andere Mastodon-gebruikers hebt.",
   "onboarding.page_one.federation": "Mastodon is een netwerk van onafhankelijke servers die samen een groot sociaal netwerk vormen.",
   "onboarding.page_one.handle": "Je bevindt je nu op {domain}, dus is jouw volledige Mastodon-adres {handle}",
@@ -162,7 +162,7 @@
   "status.unmute_conversation": "Conversatie niet meer negeren",
   "tabs_bar.compose": "Schrijven",
   "tabs_bar.federated_timeline": "Globaal",
-  "tabs_bar.home": "Jouw tijdlijn",
+  "tabs_bar.home": "Start",
   "tabs_bar.local_timeline": "Lokaal",
   "tabs_bar.notifications": "Meldingen",
   "upload_area.title": "Hierin slepen om te uploaden",
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d9b02e09c..306ce6b1f 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -36,10 +36,33 @@ nl:
     nothing_here: Hier is niets!
     people_followed_by: Mensen die %{name} volgt
     people_who_follow: Mensen die %{name} volgen
-    posts: Berichten
+    posts: Toots
     remote_follow: Extern volgen
     unfollow: Ontvolgen
   admin:
+    reports:
+      action_taken_by: Actie uitgevoerd door
+      are_you_sure: Weet je het zeker?
+      comment:
+        label: Opmerking
+        none: Geen
+      delete: Verwijderen
+      id: ID
+      mark_as_resolved: Markeer als opgelost
+      nsfw:
+        'false': Media tonen
+        'true': Media verbergen
+      report: 'Gerapporteerde toot #%{id}'
+      reported_account: Gerapporteerde account
+      reported_by: Gerapporteerd door
+      resolved: Opgelost
+      silence_account: Account stilzwijgen
+      status: Toot
+      suspend_account: Account blokkeren
+      target: Target
+      title: Gerapporteerde toots
+      unresolved: Onopgelost
+      view: Weergeven
     settings:
       contact_information:
         email: Vul een openbaar gebruikt e-mailadres in
@@ -62,24 +85,11 @@ nl:
         title: Uitgebreide omschrijving Mastodon-server
       site_title: Naam Mastodon-server
       title: Server-instellingen
-  admin.reports:
-    comment:
-      label: Opmerking
-      none: Geen
-    delete: Verwijderen
-    id: ID
-    mark_as_resolved: Markeer als opgelost
-    report: 'Gerapporteerde toot #%{id}'
-    reported_account: Gerapporteerde account
-    reported_by: Gerapporteerd door
-    resolved: Opgelost
-    silence_account: Account stilzwijgen
-    status: Toot
-    suspend_account: Account blokkeren
-    target: Target
-    title: Gerapporteerde toots
-    unresolved: Onopgelost
-    view: Weergeven
+    title: Beheer
+  admin_mailer:
+    new_report:
+      body: "%{reporter} heeft %{target} gerapporteerd"
+      subject: Nieuwe toots gerapporteerd op %{instance} (#%{id})     
   application_mailer:
     settings: 'E-mailvoorkeuren wijzigen: %{link}'
     signature: Mastodon-meldingen van %{instance}
@@ -87,7 +97,9 @@ nl:
   applications:
     invalid_url: De opgegevens URL is ongeldig
   auth:
-    change_password: Inloggegevens
+    change_password: Beveiliging
+    delete_account: Account verwijderen
+    delete_account_html: Wanneer je jouw account graag wilt verwijderen, kan je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
     didnt_get_confirmation: Geen bevestigingsinstructies ontvangen?
     forgot_password: Wachtwoord vergeten?
     login: Aanmelden
@@ -115,12 +127,23 @@ nl:
       x_minutes: "%{count}m"
       x_months: "%{count}ma"
       x_seconds: "%{count}s"
+  deletes:
+    bad_password_msg: Goed geprobeerd hackers! Ongeldig wachtwoord
+    confirm_password: Voer jouw huidige wachtwoord in om jouw identiteit te bevestigen
+    description_html: Hierdoor worden alle gegevens van jouw account <strong>permanent, onomkeerbaar</strong> verwijderd en wordt deze gedeactiveerd. Om toekomstige identiteitsdiefstal te voorkomen, kan op deze server jouw gebruikersnaam niet meer gebruikt worden.
+    proceed: Account verwijderen 
+    success_msg: Jouw account is succesvol verwijderd
+    warning_html: We kunnen alleen garanderen dat jouw gegevens op deze server worden verwijderd. Berichten (toots), incl. media, die veel zijn gedeeld laten mogelijk sporen achter. Offline servers en servers die niet meer op jouw updates zijn geabonneerd zullen niet hun databases updaten.
+    warning_title: Verwijdering gegevens op andere servers
   errors:
+    '403': Jij hebt geen toestemming om deze pagina te bekijken.
     '404': De pagina waarnaar jij op zoek bent bestaat niet.
     '410': De pagina waarnaar jij op zoek bent bestaat niet meer.
     '422':
       content: Veiligheidsverificatie mislukt. Blokkeer je toevallig cookies?
       title: Veiligheidsverificatie mislukt
+    '429': Te veel verbindingsaanvragen.
+    noscript: Schakel JavaScript in om Mastodon te kunnen gebruiken.
   exports:
     blocks: Jij blokkeert
     csv: CSV
@@ -141,7 +164,7 @@ nl:
     unlocked_warning_title: Jouw account is niet besloten
   generic:
     changes_saved_msg: Wijzigingen succesvol opgeslagen!
-    powered_by: mogelijk gemaakt door %{link}
+    powered_by: wordt mogelijk gemaakt door %{link}
     save_changes: Wijzigingen opslaan
     validation_errors:
       one: Er is iets niet helemaal goed! Bekijk onderstaande fout
@@ -189,6 +212,43 @@ nl:
     missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden
     proceed: Ga door om te volgen
     prompt: 'Jij gaat volgen:'
+  sessions:
+    activity: Laatst actief
+    browser: Webbrowser
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: Onbekende webbrowser
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Huidige sessie
+    description: "%{browser} op %{platform}"
+    explanation: Dit zijn de webbrowsers die momenteel met jouw Mastodon-account zijn ingelogd.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: Onbekend platform
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    title: Sessies
   settings:
     authorized_apps: Geautoriseerde apps
     back: Terug naar Mastodon

From 852bda3d320563400eaa74f02ef0c6c73cd8180d Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 9 Jul 2017 00:20:53 +0900
Subject: [PATCH 172/382] Use srcSet only when know width (#4112)

---
 app/javascript/mastodon/components/media_gallery.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 2cb1ce51c..75222e965 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -91,8 +91,10 @@ class Item extends React.PureComponent {
       const originalUrl = attachment.get('url');
       const originalWidth = attachment.getIn(['meta', 'original', 'width']);
 
-      const srcSet = `${originalUrl} ${originalWidth}w, ${previewUrl} ${previewWidth}w`;
-      const sizes = `(min-width: 1025px) ${320 * (width / 100)}px, ${width}vw`;
+      const hasSize = typeof originalWidth === 'number' && typeof previewWidth === 'number';
+
+      const srcSet = hasSize && `${originalUrl} ${originalWidth}w, ${previewUrl} ${previewWidth}w`;
+      const sizes = hasSize && `(min-width: 1025px) ${320 * (width / 100)}px, ${width}vw`;
 
       thumbnail = (
         <a

From 76318f88306656a4a74f190375a78713327bc4e4 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 9 Jul 2017 00:21:59 +0900
Subject: [PATCH 173/382] Don't use preview when image size is unknown (#4113)

---
 .../features/ui/components/image_loader.js       | 16 ++++++++++++----
 .../features/ui/components/media_modal.js        |  5 ++++-
 app/javascript/styles/components.scss            | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index 52c3a898b..5ea55d1d2 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -8,12 +8,14 @@ export default class ImageLoader extends React.PureComponent {
     alt: PropTypes.string,
     src: PropTypes.string.isRequired,
     previewSrc: PropTypes.string.isRequired,
-    width: PropTypes.number.isRequired,
-    height: PropTypes.number.isRequired,
+    width: PropTypes.number,
+    height: PropTypes.number,
   }
 
   static defaultProps = {
     alt: '',
+    width: null,
+    height: null,
   };
 
   state = {
@@ -46,8 +48,8 @@ export default class ImageLoader extends React.PureComponent {
     this.setState({ loading: true, error: false });
     Promise.all([
       this.loadPreviewCanvas(props),
-      this.loadOriginalImage(props),
-    ])
+      this.hasSize() && this.loadOriginalImage(props),
+    ].filter(Boolean))
       .then(() => {
         this.setState({ loading: false, error: false });
         this.clearPreviewCanvas();
@@ -106,6 +108,11 @@ export default class ImageLoader extends React.PureComponent {
     this.removers = [];
   }
 
+  hasSize () {
+    const { width, height } = this.props;
+    return typeof width === 'number' && typeof height === 'number';
+  }
+
   setCanvasRef = c => {
     this.canvas = c;
   }
@@ -116,6 +123,7 @@ export default class ImageLoader extends React.PureComponent {
 
     const className = classNames('image-loader', {
       'image-loader--loading': loading,
+      'image-loader--amorphous': !this.hasSize(),
     });
 
     return (
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 8bb81ca01..a5b9dc19f 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -74,7 +74,10 @@ export default class MediaModal extends ImmutablePureComponent {
     }
 
     if (attachment.get('type') === 'image') {
-      content = <ImageLoader previewSrc={attachment.get('preview_url')} src={url} width={attachment.getIn(['meta', 'original', 'width'])} height={attachment.getIn(['meta', 'original', 'height'])} />;
+      const width  = attachment.getIn(['meta', 'original', 'width']) || null;
+      const height = attachment.getIn(['meta', 'original', 'height']) || null;
+
+      content = <ImageLoader previewSrc={attachment.get('preview_url')} src={url} width={width} height={height} />;
     } else if (attachment.get('type') === 'gifv') {
       content = <ExtendedVideoPlayer src={url} muted controls={false} />;
     }
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 9b500c7ad..66d2715da 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1117,6 +1117,20 @@
     height: 100%;
     background-image: none;
   }
+
+  &.image-loader--amorphous {
+    position: static;
+
+    .image-loader__preview-canvas {
+      display: none;
+    }
+
+    .image-loader__img {
+      position: static;
+      width: auto;
+      height: auto;
+    }
+  }
 }
 
 .navigation-bar {

From 46f5d3a2e95a2db7a8197929a7973259ad067a07 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 9 Jul 2017 00:22:24 +0900
Subject: [PATCH 174/382] Fix first loading of notifications when the column is
 pinned (#4114)

---
 app/javascript/mastodon/features/ui/index.js             | 9 +--------
 .../mastodon/features/ui/util/async-components.js        | 3 +++
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 6057d8797..8d784dfe0 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -11,10 +11,8 @@ import { isMobile } from '../../is_mobile';
 import { debounce } from 'lodash';
 import { uploadCompose } from '../../actions/compose';
 import { refreshHomeTimeline } from '../../actions/timelines';
-import { refreshNotifications } from '../../actions/notifications';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
 import UploadArea from './components/upload_area';
-import { store } from '../../containers/mastodon';
 import ColumnsAreaContainer from './containers/columns_area_container';
 import {
   Compose,
@@ -30,7 +28,7 @@ import {
   Reblogs,
   Favourites,
   HashtagTimeline,
-  Notifications as AsyncNotifications,
+  Notifications,
   FollowRequests,
   GenericNotFound,
   FavouritedStatuses,
@@ -38,11 +36,6 @@ import {
   Mutes,
 } from './util/async-components';
 
-const Notifications = () => AsyncNotifications().then(component => {
-  store.dispatch(refreshNotifications());
-  return component;
-});
-
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
 // Without this it ends up in ~8 very commonly used bundles.
 import '../../components/status';
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index c9f81136d..56880dd1f 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -1,4 +1,5 @@
 import { store } from '../../../containers/mastodon';
+import { refreshNotifications } from '../../../actions/notifications';
 import { injectAsyncReducer } from '../../../store/configureStore';
 
 // NOTE: When lazy-loading reducers, make sure to add them
@@ -30,6 +31,8 @@ export function Notifications () {
   ]).then(([component, notificationsReducer]) => {
     injectAsyncReducer(store, 'notifications', notificationsReducer.default);
 
+    store.dispatch(refreshNotifications());
+
     return component;
   });
 }

From 91cacb1e8f9b2cb20a7cda2195b91d7d85c494e9 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 8 Jul 2017 18:34:55 +0200
Subject: [PATCH 175/382] fix: Rerender Bundle on route change (#4120)

---
 .../features/ui/util/react_router_helpers.js         | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/util/react_router_helpers.js b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
index e33a6df6f..ede578e56 100644
--- a/app/javascript/mastodon/features/ui/util/react_router_helpers.js
+++ b/app/javascript/mastodon/features/ui/util/react_router_helpers.js
@@ -31,13 +31,11 @@ export class WrappedRoute extends React.Component {
   }
 
   renderComponent = ({ match }) => {
-    this.match = match; // Needed for this.renderBundle
-
-    const { component } = this.props;
+    const { component, content, multiColumn } = this.props;
 
     return (
       <BundleContainer fetchComponent={component} loading={this.renderLoading} error={this.renderError}>
-        {this.renderBundle}
+        {Component => <Component params={match.params} multiColumn={multiColumn}>{content}</Component>}
       </BundleContainer>
     );
   }
@@ -50,12 +48,6 @@ export class WrappedRoute extends React.Component {
     return <BundleColumnError {...props} />;
   }
 
-  renderBundle = (Component) => {
-    const { match: { params }, props: { content, multiColumn } } = this;
-
-    return <Component params={params} multiColumn={multiColumn}>{content}</Component>;
-  }
-
   render () {
     const { component: Component, content, ...rest } = this.props;
 

From 794781d1219112482e4abbc0a98683a17d170e2b Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Sun, 9 Jul 2017 01:35:08 +0900
Subject: [PATCH 176/382] Change account link to admin account link on report
 page (#4119)

---
 app/views/admin/reports/show.html.haml      | 4 ++--
 app/views/authorize_follows/_card.html.haml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 965b71180..44486cb42 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -4,11 +4,11 @@
 .report-accounts
   .report-accounts__item
     %strong= t('admin.reports.reported_account')
-    = render 'authorize_follows/card', account: @report.target_account
+    = render 'authorize_follows/card', account: @report.target_account, admin: true
     = render 'admin/accounts/card', account: @report.target_account
   .report-accounts__item
     %strong= t('admin.reports.reported_by')
-    = render 'authorize_follows/card', account: @report.account
+    = render 'authorize_follows/card', account: @report.account, admin: true
     = render 'admin/accounts/card', account: @report.account
 
 %p
diff --git a/app/views/authorize_follows/_card.html.haml b/app/views/authorize_follows/_card.html.haml
index 13d9c7719..e81e292ba 100644
--- a/app/views/authorize_follows/_card.html.haml
+++ b/app/views/authorize_follows/_card.html.haml
@@ -4,7 +4,8 @@
       = image_tag account.avatar.url(:original), alt: '', width: 48, height: 48, class: 'avatar'
 
     %span.display-name
-      = link_to TagManager.instance.url_for(account), class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
+      - account_url = local_assigns[:admin] ? admin_account_path(account.id) : TagManager.instance.url_for(account)
+      = link_to account_url, class: 'detailed-status__display-name p-author h-card', target: '_blank', rel: 'noopener' do
         %strong.emojify= display_name(account)
         %span @#{account.acct}
 

From 007ab330e6ffb1e07995d4e306473d457043e2eb Mon Sep 17 00:00:00 2001
From: nullkal <nullkal@users.noreply.github.com>
Date: Sun, 9 Jul 2017 05:44:31 +0900
Subject: [PATCH 177/382] Use charlock_holmes instead of nkf at
 FetchLinkCardService (#4080)

* Specs for language detection

* Use CharlockHolmes instead of NKF

* Correct mistakes

* Correct style

* Set hint_enc instead of falling back and strip_tags

* Improve specs

* Add dependencies
---
 .travis.yml                                   |  1 +
 Aptfile                                       |  1 +
 Dockerfile                                    |  1 +
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  2 ++
 Vagrantfile                                   |  1 +
 app/services/fetch_link_card_service.rb       |  8 +++++--
 spec/fixtures/requests/koi8-r.txt             | 20 ++++++++++++++++
 spec/fixtures/requests/sjis.txt               |  4 ++--
 .../requests/sjis_with_wrong_charset.txt      | 20 ++++++++++++++++
 spec/services/fetch_link_card_service_spec.rb | 23 +++++++++++++++++++
 11 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 spec/fixtures/requests/koi8-r.txt
 create mode 100644 spec/fixtures/requests/sjis_with_wrong_charset.txt

diff --git a/.travis.yml b/.travis.yml
index 4bb332666..4d4dc0893 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,6 +32,7 @@ addons:
     - g++-6
     - libprotobuf-dev
     - protobuf-compiler
+    - libicu-dev
 
 rvm:
   - 2.3.4
diff --git a/Aptfile b/Aptfile
index 0456343ef..3af0956e3 100644
--- a/Aptfile
+++ b/Aptfile
@@ -3,3 +3,4 @@ libprotobuf-dev
 ffmpeg
 libxdamage1
 libxfixes3
+libicu-dev
diff --git a/Dockerfile b/Dockerfile
index 7033cddd4..97a691393 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
     ffmpeg \
     file \
     git \
+    icu-dev \
     imagemagick@edge \
     libpq \
     libxml2 \
diff --git a/Gemfile b/Gemfile
index 95c74eef9..b52685cba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,6 +22,7 @@ gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.5'
 gem 'bootsnap'
 gem 'browser'
+gem 'charlock_holmes', '~> 0.7.3'
 gem 'cld3', '~> 3.1'
 gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 71f83f736..de0d6a107 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,6 +106,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
+    charlock_holmes (0.7.3)
     case_transform (0.2)
       activesupport
     chunky_png (1.3.8)
@@ -501,6 +502,7 @@ DEPENDENCIES
   capistrano-rbenv (~> 2.1)
   capistrano-yarn (~> 2.0)
   capybara (~> 2.14)
+  charlock_holmes (~> 0.7.3)
   cld3 (~> 3.1)
   climate_control (~> 0.2)
   devise (~> 4.2)
diff --git a/Vagrantfile b/Vagrantfile
index 1f56fcfb3..cbe6623b3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,6 +37,7 @@ sudo apt-get install \
   yarn \
   libprotobuf-dev \
   libreadline-dev \
+  libicu-dev \
   -y
 
 # Install rvm
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 8ddaa2bf4..6ef3abb66 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'nkf'
 
 class FetchLinkCardService < BaseService
   include HttpHelper
@@ -86,7 +85,12 @@ class FetchLinkCardService < BaseService
     return if response.code != 200 || response.mime_type != 'text/html'
 
     html = response.to_s
-    page = Nokogiri::HTML(html, nil, NKF.guess(html).to_s)
+
+    detector = CharlockHolmes::EncodingDetector.new
+    detector.strip_tags = true
+
+    guess = detector.detect(html, response.charset)
+    page = Nokogiri::HTML(html, nil, guess&.fetch(:encoding))
 
     card.type             = :link
     card.title            = meta_property(page, 'og:title') || page.at_xpath('//title')&.content
diff --git a/spec/fixtures/requests/koi8-r.txt b/spec/fixtures/requests/koi8-r.txt
new file mode 100644
index 000000000..d4242af01
--- /dev/null
+++ b/spec/fixtures/requests/koi8-r.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+<HTML>
+<HEAD>
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=koi8-r">
+  <TITLE>������� ��������� ������ �� XVI ��. ���������� ������� ������������.</TITLE>
+</HEAD>
+<BODY>
+<P><CENTER><B><FONT SIZE="+2">������� ��������� ������ �� XVI ��. ���������� ������� ������������.</FONT></B><BR>
+<HR><BR>
+</BODY>
+</HTML>
diff --git a/spec/fixtures/requests/sjis.txt b/spec/fixtures/requests/sjis.txt
index 9041aa25d..faf18d35c 100644
--- a/spec/fixtures/requests/sjis.txt
+++ b/spec/fixtures/requests/sjis.txt
@@ -11,10 +11,10 @@ Accept-Ranges: bytes
 <HEAD>
   <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
   <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=x-sjis">
-  <TITLE>JSIS�̃y�[�W</TITLE>
+  <TITLE>SJIS�̃y�[�W</TITLE>
 </HEAD>
 <BODY>
-<P><CENTER><B><FONT SIZE="+2">SJIS�̃y�[�W</FONT></B><BR>
+<P><CENTER><B><FONT SIZE="+2">�������N�܂��Ă�����L�O�l���Ă��̂̎��ł�����ł��B�������ԂɈӖ��҂͐������ǂ�Ȕ���܂����܂ł��\���グ�����������邽�ɂ͎Q�l�A�邽��������A�����ɂ���������܂��Ȃ��B�����炢���Ȃ��̂͂ǂ����㌎���ł��邾�����������B�������ĉ��c����ɔ��R�K�������ɉ]���ł�����͂����������͂��Ȃ����w�}���Ƃ������o����Ȃ�����Ȃ���āA���͎̐̂������͉A��{�炩��A�v������̂��̂������̂��‚�������ɂ���]�ƌ����΂���man�ɂ������֎Q��悤�ɓ����ɂ����������łȂ�̂ŁA���������\���ɕς����Ă���ł����ōl�������B�������Ⴆ�΂��������Ƃǂ܂���̂����ۂނ�݂Ƃ���ł��āA���̎����ł͐\����ĂƂ��Đ��Ԃɕ��ׂ̂ɍs���Ȃ����ȁB</FONT></B><BR>
 <HR><BR>
 </BODY>
 </HTML>
diff --git a/spec/fixtures/requests/sjis_with_wrong_charset.txt b/spec/fixtures/requests/sjis_with_wrong_charset.txt
new file mode 100644
index 000000000..456750c6b
--- /dev/null
+++ b/spec/fixtures/requests/sjis_with_wrong_charset.txt
@@ -0,0 +1,20 @@
+HTTP/1.1 200 OK
+Server: nginx/1.11.10
+Date: Tue, 04 Jul 2017 16:43:39 GMT
+Content-Type: text/html; charset=utf-8
+Content-Length: 273
+Connection: keep-alive
+Last-Modified: Tue, 04 Jul 2017 16:41:34 GMT
+Accept-Ranges: bytes
+
+<HTML>
+<HEAD>
+  <META NAME="GENERATOR" CONTENT="Adobe PageMill 3.0J Mac">
+  <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=x-sjis">
+  <TITLE>SJIS�̃y�[�W</TITLE>
+</HEAD>
+<BODY>
+<P><CENTER><B><FONT SIZE="+2">�������N�܂��Ă�����L�O�l���Ă��̂̎��ł�����ł��B�������ԂɈӖ��҂͐������ǂ�Ȕ���܂����܂ł��\���グ�����������邽�ɂ͎Q�l�A�邽��������A�����ɂ���������܂��Ȃ��B�����炢���Ȃ��̂͂ǂ����㌎���ł��邾�����������B�������ĉ��c����ɔ��R�K�������ɉ]���ł�����͂����������͂��Ȃ����w�}���Ƃ������o����Ȃ�����Ȃ���āA���͎̐̂������͉A��{�炩��A�v������̂��̂������̂��‚�������ɂ���]�ƌ����΂���man�ɂ������֎Q��悤�ɓ����ɂ����������łȂ�̂ŁA���������\���ɕς����Ă���ł����ōl�������B�������Ⴆ�΂��������Ƃǂ܂���̂����ۂނ�݂Ƃ���ł��āA���̎����ł͐\����ĂƂ��Đ��Ԃɕ��ׂ̂ɍs���Ȃ����ȁB</FONT></B><BR>
+<HR><BR>
+</BODY>
+</HTML>
diff --git a/spec/services/fetch_link_card_service_spec.rb b/spec/services/fetch_link_card_service_spec.rb
index 7d7f8e748..698eb0324 100644
--- a/spec/services/fetch_link_card_service_spec.rb
+++ b/spec/services/fetch_link_card_service_spec.rb
@@ -8,6 +8,10 @@ RSpec.describe FetchLinkCardService do
     stub_request(:get, 'http://example.xn--fiqs8s/').to_return(request_fixture('idn.txt'))
     stub_request(:head, 'http://example.com/sjis').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
     stub_request(:get, 'http://example.com/sjis').to_return(request_fixture('sjis.txt'))
+    stub_request(:head, 'http://example.com/sjis_with_wrong_charset').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/sjis_with_wrong_charset').to_return(request_fixture('sjis_with_wrong_charset.txt'))
+    stub_request(:head, 'http://example.com/koi8-r').to_return(status: 200, headers: { 'Content-Type' => 'text/html' })
+    stub_request(:get, 'http://example.com/koi8-r').to_return(request_fixture('koi8-r.txt'))
     stub_request(:head, 'https://github.com/qbi/WannaCry').to_return(status: 404)
 
     subject.call(status)
@@ -27,6 +31,25 @@ RSpec.describe FetchLinkCardService do
 
       it 'works with SJIS' do
         expect(a_request(:get, 'http://example.com/sjis')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("SJISのページ")
+      end
+    end
+
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/sjis_with_wrong_charset') }
+
+      it 'works with SJIS even with wrong charset header' do
+        expect(a_request(:get, 'http://example.com/sjis_with_wrong_charset')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("SJISのページ")
+      end
+    end
+
+    context do
+      let(:status) { Fabricate(:status, text: 'Check out http://example.com/koi8-r') }
+
+      it 'works with koi8-r' do
+        expect(a_request(:get, 'http://example.com/koi8-r')).to have_been_made.at_least_once
+        expect(status.preview_card.title).to eq("Московя начинаетъ только въ XVI ст. привлекать внимане иностранцевъ.")
       end
     end
   end

From f68fa930ea448f5e94057160cfdcc78fec4aba11 Mon Sep 17 00:00:00 2001
From: Daniel Hunsaker <danhunsaker@gmail.com>
Date: Sat, 8 Jul 2017 18:52:36 -0600
Subject: [PATCH 178/382] [nanobox] Allow Full-size Uploads (#4123)

The Nginx configurations used by Nanobox previously neglected to increase the default upload size limit. This PR bumps that value up to the current Mastodon limit of 8MiB.
---
 nanobox/nginx-local.conf      | 6 ++++--
 nanobox/nginx-stream.conf.erb | 4 ++--
 nanobox/nginx-web.conf.erb    | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nanobox/nginx-local.conf b/nanobox/nginx-local.conf
index 023328733..f56339cac 100644
--- a/nanobox/nginx-local.conf
+++ b/nanobox/nginx-local.conf
@@ -27,8 +27,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
@@ -38,6 +38,8 @@ http {
 
         root /app/public;
 
+        client_max_body_size 8M;
+
         location / {
             try_files $uri @rails;
         }
diff --git a/nanobox/nginx-stream.conf.erb b/nanobox/nginx-stream.conf.erb
index b39d3ff1d..2a047dd9f 100644
--- a/nanobox/nginx-stream.conf.erb
+++ b/nanobox/nginx-stream.conf.erb
@@ -22,8 +22,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
diff --git a/nanobox/nginx-web.conf.erb b/nanobox/nginx-web.conf.erb
index 55245bf28..24cd17cff 100644
--- a/nanobox/nginx-web.conf.erb
+++ b/nanobox/nginx-web.conf.erb
@@ -22,8 +22,8 @@ http {
     }
 
     map $http_upgrade $connection_upgrade {
-      default upgrade;
-      ''      close;
+        default upgrade;
+        ''      close;
     }
 
     # Configuration for Nginx
@@ -36,6 +36,8 @@ http {
 
         root /app/public;
 
+        client_max_body_size 8M;
+
         location / {
             try_files $uri @rails;
         }

From 37c832cdf7a307511b27e64174ed1a3e160ec66e Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 9 Jul 2017 12:16:08 +0200
Subject: [PATCH 179/382] refactor: Make all reducers sync (#4125)

---
 app/javascript/mastodon/actions/store.js      |  7 ----
 .../mastodon/containers/mastodon.js           |  3 +-
 .../features/ui/util/async-components.js      | 41 ++-----------------
 app/javascript/mastodon/reducers/compose.js   |  4 +-
 app/javascript/mastodon/reducers/index.js     | 15 +++----
 .../mastodon/reducers/media_attachments.js    |  4 +-
 .../mastodon/store/configureStore.js          | 25 +----------
 app/views/layouts/application.html.haml       |  9 ----
 8 files changed, 18 insertions(+), 90 deletions(-)

diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js
index 08c2810ca..efdb0771a 100644
--- a/app/javascript/mastodon/actions/store.js
+++ b/app/javascript/mastodon/actions/store.js
@@ -16,10 +16,3 @@ export function hydrateStore(rawState) {
     state,
   };
 };
-
-export function hydrateStoreLazy(name, state) {
-  return {
-    type: `${STORE_HYDRATE_LAZY}-${name}`,
-    state,
-  };
-};
diff --git a/app/javascript/mastodon/containers/mastodon.js b/app/javascript/mastodon/containers/mastodon.js
index 6e79f9e4f..87ab6023c 100644
--- a/app/javascript/mastodon/containers/mastodon.js
+++ b/app/javascript/mastodon/containers/mastodon.js
@@ -23,8 +23,7 @@ const { localeData, messages } = getLocale();
 addLocaleData(localeData);
 
 export const store = configureStore();
-const initialState = JSON.parse(document.getElementById('initial-state').textContent);
-export const hydrateAction = hydrateStore(initialState);
+const hydrateAction = hydrateStore(JSON.parse(document.getElementById('initial-state').textContent));
 store.dispatch(hydrateAction);
 
 export default class Mastodon extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index 56880dd1f..55de114b5 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -1,40 +1,13 @@
-import { store } from '../../../containers/mastodon';
-import { refreshNotifications } from '../../../actions/notifications';
-import { injectAsyncReducer } from '../../../store/configureStore';
-
-// NOTE: When lazy-loading reducers, make sure to add them
-// to application.html.haml (if the component is preloaded there)
-
 export function EmojiPicker () {
   return import(/* webpackChunkName: "emojione_picker" */'emojione-picker');
 }
 
 export function Compose () {
-  return Promise.all([
-    import(/* webpackChunkName: "features/compose" */'../../compose'),
-    import(/* webpackChunkName: "reducers/compose" */'../../../reducers/compose'),
-    import(/* webpackChunkName: "reducers/media_attachments" */'../../../reducers/media_attachments'),
-    import(/* webpackChunkName: "reducers/search" */'../../../reducers/search'),
-  ]).then(([component, composeReducer, mediaAttachmentsReducer, searchReducer]) => {
-    injectAsyncReducer(store, 'compose', composeReducer.default);
-    injectAsyncReducer(store, 'media_attachments', mediaAttachmentsReducer.default);
-    injectAsyncReducer(store, 'search', searchReducer.default);
-
-    return component;
-  });
+  return import(/* webpackChunkName: "features/compose" */'../../compose');
 }
 
 export function Notifications () {
-  return Promise.all([
-    import(/* webpackChunkName: "features/notifications" */'../../notifications'),
-    import(/* webpackChunkName: "reducers/notifications" */'../../../reducers/notifications'),
-  ]).then(([component, notificationsReducer]) => {
-    injectAsyncReducer(store, 'notifications', notificationsReducer.default);
-
-    store.dispatch(refreshNotifications());
-
-    return component;
-  });
+  return import(/* webpackChunkName: "features/notifications" */'../../notifications');
 }
 
 export function HomeTimeline () {
@@ -110,15 +83,7 @@ export function MediaModal () {
 }
 
 export function OnboardingModal () {
-  return Promise.all([
-    import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal'),
-    import(/* webpackChunkName: "reducers/compose" */'../../../reducers/compose'),
-    import(/* webpackChunkName: "reducers/media_attachments" */'../../../reducers/media_attachments'),
-  ]).then(([component, composeReducer, mediaAttachmentsReducer]) => {
-    injectAsyncReducer(store, 'compose', composeReducer.default);
-    injectAsyncReducer(store, 'media_attachments', mediaAttachmentsReducer.default);
-    return component;
-  });
+  return import(/* webpackChunkName: "modals/onboarding_modal" */'../components/onboarding_modal');
 }
 
 export function VideoModal () {
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 09db95e2d..d0b47a85c 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -23,7 +23,7 @@ import {
   COMPOSE_EMOJI_INSERT,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import { STORE_HYDRATE_LAZY } from '../actions/store';
+import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';
 import uuid from '../uuid';
 
@@ -134,7 +134,7 @@ const privacyPreference = (a, b) => {
 
 export default function compose(state = initialState, action) {
   switch(action.type) {
-  case `${STORE_HYDRATE_LAZY}-compose`:
+  case STORE_HYDRATE:
     return clearAll(state.merge(action.state.get('compose')));
   case COMPOSE_MOUNT:
     return state.set('mounted', true);
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 79062f2f9..919345f16 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -14,6 +14,10 @@ import status_lists from './status_lists';
 import cards from './cards';
 import reports from './reports';
 import contexts from './contexts';
+import compose from './compose';
+import search from './search';
+import media_attachments from './media_attachments';
+import notifications from './notifications';
 
 const reducers = {
   timelines,
@@ -31,13 +35,10 @@ const reducers = {
   cards,
   reports,
   contexts,
+  compose,
+  search,
+  media_attachments,
+  notifications,
 };
 
-export function createReducer(asyncReducers) {
-  return combineReducers({
-    ...reducers,
-    ...asyncReducers,
-  });
-}
-
 export default combineReducers(reducers);
diff --git a/app/javascript/mastodon/reducers/media_attachments.js b/app/javascript/mastodon/reducers/media_attachments.js
index d17d465aa..85bea4f0b 100644
--- a/app/javascript/mastodon/reducers/media_attachments.js
+++ b/app/javascript/mastodon/reducers/media_attachments.js
@@ -1,4 +1,4 @@
-import { STORE_HYDRATE_LAZY } from '../actions/store';
+import { STORE_HYDRATE } from '../actions/store';
 import Immutable from 'immutable';
 
 const initialState = Immutable.Map({
@@ -7,7 +7,7 @@ const initialState = Immutable.Map({
 
 export default function meta(state = initialState, action) {
   switch(action.type) {
-  case `${STORE_HYDRATE_LAZY}-media_attachments`:
+  case STORE_HYDRATE:
     return state.merge(action.state.get('media_attachments'));
   default:
     return state;
diff --git a/app/javascript/mastodon/store/configureStore.js b/app/javascript/mastodon/store/configureStore.js
index 0fe29f031..1376d4cba 100644
--- a/app/javascript/mastodon/store/configureStore.js
+++ b/app/javascript/mastodon/store/configureStore.js
@@ -1,36 +1,15 @@
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
-import appReducer, { createReducer } from '../reducers';
-import { hydrateStoreLazy } from '../actions/store';
-import { hydrateAction } from '../containers/mastodon';
+import appReducer from '../reducers';
 import loadingBarMiddleware from '../middleware/loading_bar';
 import errorsMiddleware from '../middleware/errors';
 import soundsMiddleware from '../middleware/sounds';
 
 export default function configureStore() {
-  const store = createStore(appReducer, compose(applyMiddleware(
+  return createStore(appReducer, compose(applyMiddleware(
     thunk,
     loadingBarMiddleware({ promiseTypeSuffixes: ['REQUEST', 'SUCCESS', 'FAIL'] }),
     errorsMiddleware(),
     soundsMiddleware()
   ), window.devToolsExtension ? window.devToolsExtension() : f => f));
-
-  store.asyncReducers = { };
-
-  return store;
 };
-
-export function injectAsyncReducer(store, name, asyncReducer) {
-  if (!store.asyncReducers[name]) {
-    // Keep track that we injected this reducer
-    store.asyncReducers[name] = asyncReducer;
-
-    // Add the current reducer to the store
-    store.replaceReducer(createReducer(store.asyncReducers));
-
-    // The state this reducer handles defaults to its initial state (stored inside the reducer)
-    // But that state may be out of date because of the server-side hydration, so we replay
-    // the hydration action but only for this reducer (all async reducers must listen for this dynamic action)
-    store.dispatch(hydrateStoreLazy(name, hydrateAction.state));
-  }
-}
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 68d346859..580d8fb4d 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -22,19 +22,10 @@
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 
     = javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-
     = javascript_pack_tag 'features/compose', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-    = javascript_pack_tag 'reducers/compose', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-    = javascript_pack_tag 'reducers/media_attachments', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-    = javascript_pack_tag 'reducers/search', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-
     = javascript_pack_tag 'features/home_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-
     = javascript_pack_tag 'features/notifications', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-    = javascript_pack_tag 'reducers/notifications', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-
     = javascript_pack_tag 'features/community_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
-
     = javascript_pack_tag 'features/public_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
 
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'

From 8781a8e2030b6b75d9412cddd7a696506c4633f0 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Sun, 9 Jul 2017 12:17:00 +0200
Subject: [PATCH 180/382] i18n: minor change (pl) (#4124)

---
 config/locales/pl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index bf9d5e034..0dc1da8b4 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -392,7 +392,7 @@ pl:
       unlisted_long: Widoczne dla wszystkich, ale nie wyświetlane na publicznych osiach czasu
   stream_entries:
     click_to_show: Naciśnij aby wyświetlić
-    reblogged: podbito
+    reblogged: podbił
     sensitive_content: Wrażliwa zawartość
   terms:
     body_html: |

From ce3a371eeeaae35e49f1938ede5eb6105c764fbc Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 9 Jul 2017 20:04:30 +0900
Subject: [PATCH 181/382] Fix initial loading of pinned Notifications column
 (#4126)

---
 app/javascript/mastodon/features/ui/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 8d784dfe0..3baf09b93 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -11,6 +11,7 @@ import { isMobile } from '../../is_mobile';
 import { debounce } from 'lodash';
 import { uploadCompose } from '../../actions/compose';
 import { refreshHomeTimeline } from '../../actions/timelines';
+import { refreshNotifications } from '../../actions/notifications';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
 import UploadArea from './components/upload_area';
 import ColumnsAreaContainer from './containers/columns_area_container';
@@ -129,6 +130,7 @@ export default class UI extends React.PureComponent {
     document.addEventListener('dragend', this.handleDragEnd, false);
 
     this.props.dispatch(refreshHomeTimeline());
+    this.props.dispatch(refreshNotifications());
   }
 
   componentWillUnmount () {

From caf938562ef0d0fdb03bf57f15bbab8d76c5b4c0 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 9 Jul 2017 21:52:03 +0900
Subject: [PATCH 182/382] Avoid async import if the component is previously
 loaded (#4127)

---
 .../mastodon/features/ui/components/bundle.js         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/javascript/mastodon/features/ui/components/bundle.js b/app/javascript/mastodon/features/ui/components/bundle.js
index 3eed446fe..72798f690 100644
--- a/app/javascript/mastodon/features/ui/components/bundle.js
+++ b/app/javascript/mastodon/features/ui/components/bundle.js
@@ -26,6 +26,8 @@ class Bundle extends React.Component {
     onFetchFail: noop,
   }
 
+  static cache = {}
+
   state = {
     mod: undefined,
     forceRender: false,
@@ -58,8 +60,17 @@ class Bundle extends React.Component {
       this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
     }
 
+    if (Bundle.cache[fetchComponent.name]) {
+      const mod = Bundle.cache[fetchComponent.name];
+
+      this.setState({ mod: mod.default });
+      onFetchSuccess();
+      return Promise.resolve();
+    }
+
     return fetchComponent()
       .then((mod) => {
+        Bundle.cache[fetchComponent.name] = mod;
         this.setState({ mod: mod.default });
         onFetchSuccess();
       })

From fc4c74660b690038ae48264f9d5b0230df58acc4 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 9 Jul 2017 15:02:26 +0200
Subject: [PATCH 183/382] Swipeable views (#4105)

* feat: Replace react-swipeable with react-swipeable-views

* fix: iOS 9
---
 .../mastodon/components/column_header.js      |  2 +-
 .../features/ui/components/column_loading.js  | 10 +++-
 .../features/ui/components/columns_area.js    | 48 +++++++++++--------
 .../features/ui/components/media_modal.js     | 18 ++++---
 .../ui/components/onboarding_modal.js         | 40 ++++++----------
 .../features/ui/components/tabs_bar.js        | 26 +++-------
 app/javascript/styles/components.scss         | 40 +++++++++++++++-
 package.json                                  |  2 +-
 yarn.lock                                     | 46 +++++++++++++++---
 9 files changed, 150 insertions(+), 82 deletions(-)

diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index ec9379320..5b2a4d84c 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -10,7 +10,7 @@ export default class ColumnHeader extends React.PureComponent {
   };
 
   static propTypes = {
-    title: PropTypes.string.isRequired,
+    title: PropTypes.node.isRequired,
     icon: PropTypes.string.isRequired,
     active: PropTypes.bool,
     multiColumn: PropTypes.bool,
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.js b/app/javascript/mastodon/features/ui/components/column_loading.js
index 9bb9c14a1..7ecfaf77a 100644
--- a/app/javascript/mastodon/features/ui/components/column_loading.js
+++ b/app/javascript/mastodon/features/ui/components/column_loading.js
@@ -1,13 +1,19 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 import Column from '../../../components/column';
 import ColumnHeader from '../../../components/column_header';
 
-const ColumnLoading = () => (
+const ColumnLoading = ({ title = '', icon = ' ' }) => (
   <Column>
-    <ColumnHeader icon=' ' title='' multiColumn={false} />
+    <ColumnHeader icon={icon} title={title} multiColumn={false} />
     <div className='scrollable' />
   </Column>
 );
 
+ColumnLoading.propTypes = {
+  title: PropTypes.node,
+  icon: PropTypes.string,
+};
+
 export default ColumnLoading;
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 5fa27599f..9ff913774 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import ReactSwipeable from 'react-swipeable';
-import { getPreviousLink, getNextLink } from './tabs_bar';
+import ReactSwipeableViews from 'react-swipeable-views';
+import { links, getIndex, getLink } from './tabs_bar';
 
 import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
@@ -32,21 +32,29 @@ export default class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
-  handleRightSwipe = () => {
-    const previousLink = getPreviousLink(this.context.router.history.location.pathname);
-
-    if (previousLink) {
-      this.context.router.history.push(previousLink);
-    }
+  handleSwipe = (index) => {
+    window.requestAnimationFrame(() => {
+      window.requestAnimationFrame(() => {
+        this.context.router.history.push(getLink(index));
+      });
+    });
   }
 
-  handleLeftSwipe = () => {
-    const previousLink = getNextLink(this.context.router.history.location.pathname);
+  renderView = (link, index) => {
+    const columnIndex = getIndex(this.context.router.history.location.pathname);
+    const title = link.props.children[1] && React.cloneElement(link.props.children[1]);
+    const icon = (link.props.children[0] || link.props.children).props.className.split(' ')[2].split('-')[1];
 
-    if (previousLink) {
-      this.context.router.history.push(previousLink);
-    }
-  };
+    const view = (index === columnIndex) ?
+      React.cloneElement(this.props.children) :
+      <ColumnLoading title={title} icon={icon} />;
+
+    return (
+      <div className='columns-area' key={index}>
+        {view}
+      </div>
+    );
+  }
 
   renderLoading = () => {
     return <ColumnLoading />;
@@ -59,12 +67,14 @@ export default class ColumnsArea extends ImmutablePureComponent {
   render () {
     const { columns, children, singleColumn } = this.props;
 
+    const columnIndex = getIndex(this.context.router.history.location.pathname);
+
     if (singleColumn) {
-      return (
-        <ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} delta={30} className='columns-area'>
-          {children}
-        </ReactSwipeable>
-      );
+      return columnIndex !== -1 ? (
+        <ReactSwipeableViews index={columnIndex} onChangeIndex={this.handleSwipe} animateTransitions={false} style={{ height: '100%' }}>
+          {links.map(this.renderView)}
+        </ReactSwipeableViews>
+      ) : <div className='columns-area'>{children}></div>;
     }
 
     return (
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index a5b9dc19f..769e18820 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import ReactSwipeable from 'react-swipeable';
+import ReactSwipeableViews from 'react-swipeable-views';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import ExtendedVideoPlayer from '../../../components/extended_video_player';
@@ -26,6 +26,10 @@ export default class MediaModal extends ImmutablePureComponent {
     index: null,
   };
 
+  handleSwipe = (index) => {
+    this.setState({ index: (index) % this.props.media.size });
+  }
+
   handleNextClick = () => {
     this.setState({ index: (this.getIndex() + 1) % this.props.media.size });
   }
@@ -74,10 +78,12 @@ export default class MediaModal extends ImmutablePureComponent {
     }
 
     if (attachment.get('type') === 'image') {
-      const width  = attachment.getIn(['meta', 'original', 'width']) || null;
-      const height = attachment.getIn(['meta', 'original', 'height']) || null;
+      content = media.map((image) => {
+        const width  = image.getIn(['meta', 'original', 'width']) || null;
+        const height = image.getIn(['meta', 'original', 'height']) || null;
 
-      content = <ImageLoader previewSrc={attachment.get('preview_url')} src={url} width={width} height={height} />;
+        return <ImageLoader previewSrc={image.get('preview_url')} src={image.get('url')} width={width} height={height} key={image.get('preview_url')} />;
+      }).toArray();
     } else if (attachment.get('type') === 'gifv') {
       content = <ExtendedVideoPlayer src={url} muted controls={false} />;
     }
@@ -88,9 +94,9 @@ export default class MediaModal extends ImmutablePureComponent {
 
         <div className='media-modal__content'>
           <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} />
-          <ReactSwipeable onSwipedRight={this.handlePrevClick} onSwipedLeft={this.handleNextClick}>
+          <ReactSwipeableViews onChangeIndex={this.handleSwipe} index={index}>
             {content}
-          </ReactSwipeable>
+          </ReactSwipeableViews>
         </div>
 
         {rightNav}
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index b056357a2..189bd8665 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -3,11 +3,9 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import ReactSwipeable from 'react-swipeable';
+import ReactSwipeableViews from 'react-swipeable-views';
 import classNames from 'classnames';
 import Permalink from '../../../components/permalink';
-import TransitionMotion from 'react-motion/lib/TransitionMotion';
-import spring from 'react-motion/lib/spring';
 import ComposeForm from '../../compose/components/compose_form';
 import Search from '../../compose/components/search';
 import NavigationBar from '../../compose/components/navigation_bar';
@@ -227,6 +225,10 @@ export default class OnboardingModal extends React.PureComponent {
     }));
   }
 
+  handleSwipe = (index) => {
+    this.setState({ currentIndex: index });
+  }
+
   handleKeyUp = ({ key }) => {
     switch (key) {
     case 'ArrowLeft':
@@ -263,30 +265,18 @@ export default class OnboardingModal extends React.PureComponent {
       </button>
     );
 
-    const styles = pages.map((data, i) => ({
-      key: `page-${i}`,
-      data,
-      style: {
-        opacity: spring(i === currentIndex ? 1 : 0),
-      },
-    }));
-
     return (
       <div className='modal-root__modal onboarding-modal'>
-        <TransitionMotion styles={styles}>
-          {interpolatedStyles => (
-            <ReactSwipeable onSwipedRight={this.handlePrev} onSwipedLeft={this.handleNext} className='onboarding-modal__pager'>
-              {interpolatedStyles.map(({ key, data, style }, i) => {
-                const className = classNames('onboarding-modal__page__wrapper', {
-                  'onboarding-modal__page__wrapper--active': i === currentIndex,
-                });
-                return (
-                  <div key={key} style={style} className={className}>{data}</div>
-                );
-              })}
-            </ReactSwipeable>
-          )}
-        </TransitionMotion>
+        <ReactSwipeableViews index={currentIndex} onChangeIndex={this.handleSwipe} className='onboarding-modal__pager'>
+          {pages.map((page, i) => {
+            const className = classNames('onboarding-modal__page__wrapper', {
+              'onboarding-modal__page__wrapper--active': i === currentIndex,
+            });
+            return (
+              <div key={i} className={className}>{page}</div>
+            );
+          })}
+        </ReactSwipeableViews>
 
         <div className='onboarding-modal__paginator'>
           <div>
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index c2e6c88b5..b4153ff45 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -2,7 +2,7 @@ import React from 'react';
 import NavLink from 'react-router-dom/NavLink';
 import { FormattedMessage } from 'react-intl';
 
-const links = [
+export const links = [
   <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
   <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
   <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
@@ -13,25 +13,13 @@ const links = [
   <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>,
 ];
 
-export function getPreviousLink (path) {
-  const index = links.findIndex(link => link.props.to === path);
+export function getIndex (path) {
+  return links.findIndex(link => link.props.to === path);
+}
 
-  if (index > 0) {
-    return links[index - 1].props.to;
-  }
-
-  return null;
-};
-
-export function getNextLink (path) {
-  const index = links.findIndex(link => link.props.to === path);
-
-  if (index !== -1 && index < links.length - 1) {
-    return links[index + 1].props.to;
-  }
-
-  return null;
-};
+export function getLink (index) {
+  return links[index].props.to;
+}
 
 export default class TabsBar extends React.Component {
 
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 66d2715da..397126ec1 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1266,6 +1266,23 @@
   .columns-area {
     padding: 10px;
   }
+
+  .react-swipeable-view-container .columns-area {
+    height: calc(100% - 20px) !important;
+  }
+}
+
+.react-swipeable-view-container {
+  &,
+  .columns-area,
+  .drawer,
+  .column {
+    height: 100%;
+  }
+}
+
+.react-swipeable-view-container > * {
+  height: 100%;
 }
 
 .column {
@@ -2910,7 +2927,7 @@ button.icon-button.active i.fa-retweet {
   video {
     max-width: 80vw;
     max-height: 80vh;
-    width: auto;
+    width: 100%;
     height: auto;
   }
 
@@ -2938,7 +2955,26 @@ button.icon-button.active i.fa-retweet {
   flex-direction: column;
 }
 
-.onboarding-modal__pager,
+.onboarding-modal__pager {
+  height: 80vh;
+  width: 80vw;
+  max-width: 520px;
+  max-height: 420px;
+
+  .react-swipeable-view-container > div {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    padding: 25px;
+    display: none;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    display: flex;
+    user-select: text;
+  }
+}
+
 .error-modal__body {
   height: 80vh;
   width: 80vw;
diff --git a/package.json b/package.json
index 2f63d0bbd..94545c47e 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "react-router-dom": "^4.1.1",
     "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
-    "react-swipeable": "^4.0.1",
+    "react-swipeable-views": "^0.12.3",
     "react-textarea-autosize": "^5.0.7",
     "react-toggle": "^4.0.1",
     "redis": "^2.7.1",
diff --git a/yarn.lock b/yarn.lock
index d8ed20343..d4295cb50 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1259,7 +1259,7 @@ babel-register@^6.24.1:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
+babel-runtime@6.x.x, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.5.0, babel-runtime@^6.9.2:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
@@ -2318,7 +2318,7 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.0.0:
+"dom-helpers@^2.4.0 || ^3.0.0", dom-helpers@^3.0.0, dom-helpers@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
 
@@ -3937,7 +3937,7 @@ jsx-ast-utils@^1.0.0, jsx-ast-utils@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
 
-keycode@^2.1.8:
+keycode@^2.1.7, keycode@^2.1.8:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.1.9.tgz#964a23c54e4889405b4861a5c9f0480d45141dfa"
 
@@ -5711,6 +5711,15 @@ react-element-to-jsx-string@^5.0.0:
     stringify-object "2.4.0"
     traverse "^0.6.6"
 
+react-event-listener@^0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/react-event-listener/-/react-event-listener-0.4.5.tgz#e3e895a0970cf14ee8f890113af68197abf3d0b1"
+  dependencies:
+    babel-runtime "^6.20.0"
+    fbjs "^0.8.4"
+    prop-types "^15.5.4"
+    warning "^3.0.0"
+
 react-html-attributes@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/react-html-attributes/-/react-html-attributes-1.3.0.tgz#c97896e9cac47ad9c4e6618b835029a826f5d28c"
@@ -5875,11 +5884,34 @@ react-style-proptype@^3.0.0:
   dependencies:
     prop-types "^15.5.4"
 
-react-swipeable@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/react-swipeable/-/react-swipeable-4.0.1.tgz#2cb3a04a52ccebf5361881b30e233dc13ee4b115"
+react-swipeable-views-core@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views-core/-/react-swipeable-views-core-0.11.1.tgz#61d046799f90725bbf91a0eb3abcab805c774cac"
   dependencies:
-    prop-types "^15.5.8"
+    babel-runtime "^6.23.0"
+    warning "^3.0.0"
+
+react-swipeable-views-utils@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views-utils/-/react-swipeable-views-utils-0.12.0.tgz#4ff11f20a8da0561f623876d9fd691116e1a6a03"
+  dependencies:
+    babel-runtime "^6.23.0"
+    fbjs "^0.8.4"
+    keycode "^2.1.7"
+    prop-types "^15.5.4"
+    react-event-listener "^0.4.5"
+    react-swipeable-views-core "^0.11.1"
+
+react-swipeable-views@^0.12.3:
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/react-swipeable-views/-/react-swipeable-views-0.12.3.tgz#b0d3f417bcbcd06afda2f8437c15e8360a568744"
+  dependencies:
+    babel-runtime "^6.23.0"
+    dom-helpers "^3.2.1"
+    prop-types "^15.5.4"
+    react-swipeable-views-core "^0.11.1"
+    react-swipeable-views-utils "^0.12.0"
+    warning "^3.0.0"
 
 react-test-renderer@^15.6.1:
   version "15.6.1"

From 307f3e0dd77b338669648f830f7f74103d2d226f Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Mon, 10 Jul 2017 00:33:21 +0900
Subject: [PATCH 184/382] Rescue exceptions related to Goldfinger (#4044)

* Rescue exceptions related to Goldfinger

* Exclude Goldfinger::SSLError
---
 app/services/fetch_remote_account_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
index 8eed0d454..1efac365b 100644
--- a/app/services/fetch_remote_account_service.rb
+++ b/app/services/fetch_remote_account_service.rb
@@ -32,5 +32,8 @@ class FetchRemoteAccountService < BaseService
   rescue Nokogiri::XML::XPath::SyntaxError
     Rails.logger.debug 'Invalid XML or missing namespace'
     nil
+  rescue Goldfinger::NotFoundError, Goldfinger::Error
+    Rails.logger.debug 'Exceptions related to Goldfinger occurs'
+    nil
   end
 end

From 5fa2dd6e652ac6400b793602c446fcd55000d498 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Sun, 9 Jul 2017 08:34:05 -0700
Subject: [PATCH 185/382] Use babel-plugin-transform-react-inline-elements
 (#4109)

---
 .babelrc     | 1 +
 package.json | 1 +
 yarn.lock    | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/.babelrc b/.babelrc
index 292d52e27..19968964e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -44,6 +44,7 @@
             ]
           }
         ],
+        "transform-react-inline-elements",
         [
           "transform-runtime",
           {
diff --git a/package.json b/package.json
index 94545c47e..4c5a3f1d9 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-react-inline-elements": "^6.22.0",
     "babel-plugin-transform-react-jsx-self": "^6.22.0",
     "babel-plugin-transform-react-jsx-source": "^6.22.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.6",
diff --git a/yarn.lock b/yarn.lock
index d4295cb50..aedbde6be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1027,6 +1027,12 @@ babel-plugin-transform-react-display-name@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-react-inline-elements@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-inline-elements/-/babel-plugin-transform-react-inline-elements-6.22.0.tgz#6687211a32b49a52f22c573a2b5504a25ef17c53"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-react-jsx-self@6.22.0, babel-plugin-transform-react-jsx-self@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"

From 4122a837fadf8cf59712b5c1790ac0af96bcbc84 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 9 Jul 2017 18:49:07 +0200
Subject: [PATCH 186/382] fix(components/media_modal): Aspect ratio (#4128)

* fix(components/media_modal): Aspect ratio

* fix: Remove useless style
---
 app/javascript/mastodon/features/ui/components/image_loader.js | 1 +
 app/javascript/mastodon/features/ui/components/media_modal.js  | 2 +-
 app/javascript/styles/components.scss                          | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/image_loader.js b/app/javascript/mastodon/features/ui/components/image_loader.js
index 5ea55d1d2..aad594380 100644
--- a/app/javascript/mastodon/features/ui/components/image_loader.js
+++ b/app/javascript/mastodon/features/ui/components/image_loader.js
@@ -133,6 +133,7 @@ export default class ImageLoader extends React.PureComponent {
           width={width}
           height={height}
           ref={this.setCanvasRef}
+          style={{ opacity: loading ? 1 : 0 }}
         />
 
         {!loading && (
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 769e18820..23f588669 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -94,7 +94,7 @@ export default class MediaModal extends ImmutablePureComponent {
 
         <div className='media-modal__content'>
           <IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} />
-          <ReactSwipeableViews onChangeIndex={this.handleSwipe} index={index}>
+          <ReactSwipeableViews onChangeIndex={this.handleSwipe} index={index} animateHeight>
             {content}
           </ReactSwipeableViews>
         </div>
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 397126ec1..97651b5f4 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2935,6 +2935,7 @@ button.icon-button.active i.fa-retweet {
   canvas {
     display: block;
     background: url('../images/void.png') repeat;
+    object-fit: contain;
   }
 }
 

From f8212da329cf857478746c23314e5c662cd490e3 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 10 Jul 2017 10:29:34 +0900
Subject: [PATCH 187/382] Add attribute for default privacy to verify
 credentials (#4075)

* Add attribute for default privacy to verify credentials

* add raw_note

* source
---
 .../api/v1/accounts/credentials_controller.rb       |  4 ++--
 .../rest/credential_account_serializer.rb           | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 app/serializers/rest/credential_account_serializer.rb

diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index 8ee9a2416..073808532 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -6,13 +6,13 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
 
   def show
     @account = current_account
-    render json: @account, serializer: REST::AccountSerializer
+    render json: @account, serializer: REST::CredentialAccountSerializer
   end
 
   def update
     current_account.update!(account_params)
     @account = current_account
-    render json: @account, serializer: REST::AccountSerializer
+    render json: @account, serializer: REST::CredentialAccountSerializer
   end
 
   private
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
new file mode 100644
index 000000000..094b831c9
--- /dev/null
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class REST::CredentialAccountSerializer < REST::AccountSerializer
+  attributes :source
+
+  def source
+    user = object.user
+    {
+      privacy: user.setting_default_privacy,
+      note: object.note,
+    }
+  end
+end

From 1c6cbdd4e4894cc5c8928fe1d6f45d781049a59c Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Mon, 10 Jul 2017 11:37:10 +0900
Subject: [PATCH 188/382] Fix duplication of tag in columns_area.js (#4131)

Deleted ">" just a typo.
---
 app/javascript/mastodon/features/ui/components/columns_area.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 9ff913774..cbc185a7d 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -74,7 +74,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
         <ReactSwipeableViews index={columnIndex} onChangeIndex={this.handleSwipe} animateTransitions={false} style={{ height: '100%' }}>
           {links.map(this.renderView)}
         </ReactSwipeableViews>
-      ) : <div className='columns-area'>{children}></div>;
+      ) : <div className='columns-area'>{children}</div>;
     }
 
     return (

From 4aa6cd66fce2940b1a26859de942fc5ec7ea4127 Mon Sep 17 00:00:00 2001
From: Sadiq Saif <staticsafe@users.noreply.github.com>
Date: Sun, 9 Jul 2017 22:49:48 -0400
Subject: [PATCH 189/382] Change default for auto_play_fit to false for a11y
 (#4132)

This is per issue #3876
---
 config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/settings.yml b/config/settings.yml
index 18b70b51f..be2a7a1f8 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -17,7 +17,7 @@ defaults: &defaults
   closed_registrations_message: ''
   open_deletion: true
   boost_modal: false
-  auto_play_gif: true
+  auto_play_gif: false
   delete_modal: true
   system_font_ui: false
   notification_emails:

From 617208053c2bf935d2dd3944bb2b9192a388f0b4 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Mon, 10 Jul 2017 20:59:29 +0900
Subject: [PATCH 190/382] Rescue exceptions related to Goldfinger at
 FetchRemoteStatusService (#4138)

---
 app/services/fetch_remote_status_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
index f414813ad..4cfd33d90 100644
--- a/app/services/fetch_remote_status_service.rb
+++ b/app/services/fetch_remote_status_service.rb
@@ -33,6 +33,9 @@ class FetchRemoteStatusService < BaseService
   rescue Nokogiri::XML::XPath::SyntaxError
     Rails.logger.debug 'Invalid XML or missing namespace'
     nil
+  rescue Goldfinger::NotFoundError, Goldfinger::Error
+    Rails.logger.debug 'Exceptions related to Goldfinger occurs'
+    nil
   end
 
   def confirmed_domain?(domain, account)

From 2b9721d1b38319d70bed98e76a0fe1d648780298 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 10 Jul 2017 21:00:32 +0900
Subject: [PATCH 191/382] Add setting a always mark media as sensitive (#4136)

---
 app/controllers/settings/preferences_controller.rb    | 1 +
 app/javascript/mastodon/reducers/compose.js           | 7 +++++++
 app/lib/user_settings_decorator.rb                    | 5 +++++
 app/models/user.rb                                    | 4 ++++
 app/serializers/initial_state_serializer.rb           | 1 +
 app/serializers/rest/credential_account_serializer.rb | 1 +
 app/views/settings/preferences/show.html.haml         | 2 ++
 config/locales/simple_form.en.yml                     | 1 +
 spec/lib/user_settings_decorator_spec.rb              | 7 +++++++
 9 files changed, 29 insertions(+)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index a15c26031..cac5b0ba8 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -34,6 +34,7 @@ class Settings::PreferencesController < ApplicationController
   def user_settings_params
     params.require(:user).permit(
       :setting_default_privacy,
+      :setting_default_sensitive,
       :setting_boost_modal,
       :setting_delete_modal,
       :setting_auto_play_gif,
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index d0b47a85c..752377739 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -45,6 +45,7 @@ const initialState = Immutable.Map({
   suggestions: Immutable.List(),
   me: null,
   default_privacy: 'public',
+  default_sensitive: false,
   resetFileKey: Math.floor((Math.random() * 0x10000)),
   idempotencyKey: null,
 });
@@ -75,6 +76,8 @@ function clearAll(state) {
 };
 
 function appendMedia(state, media) {
+  const prevSize = state.get('media_attachments').size;
+
   return state.withMutations(map => {
     map.update('media_attachments', list => list.push(media));
     map.set('is_uploading', false);
@@ -82,6 +85,10 @@ function appendMedia(state, media) {
     map.update('text', oldText => `${oldText.trim()} ${media.get('text_url')}`);
     map.set('focusDate', new Date());
     map.set('idempotencyKey', uuid());
+
+    if (prevSize === 0 && state.get('default_sensitive')) {
+      map.set('sensitive', true);
+    }
   });
 };
 
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index 9c0cb4545..e0e92b19d 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -18,6 +18,7 @@ class UserSettingsDecorator
     user.settings['notification_emails'] = merged_notification_emails
     user.settings['interactions'] = merged_interactions
     user.settings['default_privacy'] = default_privacy_preference
+    user.settings['default_sensitive'] = default_sensitive_preference
     user.settings['boost_modal'] = boost_modal_preference
     user.settings['delete_modal'] = delete_modal_preference
     user.settings['auto_play_gif'] = auto_play_gif_preference
@@ -36,6 +37,10 @@ class UserSettingsDecorator
     settings['setting_default_privacy']
   end
 
+  def default_sensitive_preference
+    boolean_cast_setting 'setting_default_sensitive'
+  end
+
   def boost_modal_preference
     boolean_cast_setting 'setting_boost_modal'
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index e2bb3d0ed..c80115a08 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -79,6 +79,10 @@ class User < ApplicationRecord
     settings.default_privacy || (account.locked? ? 'private' : 'public')
   end
 
+  def setting_default_sensitive
+    settings.default_sensitive
+  end
+
   def setting_boost_modal
     settings.boost_modal
   end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 84f9e23a6..49ff9e377 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -23,6 +23,7 @@ class InitialStateSerializer < ActiveModel::Serializer
     {
       me: object.current_account.id,
       default_privacy: object.current_account.user.setting_default_privacy,
+      default_sensitive: object.current_account.user.setting_default_sensitive,
     }
   end
 
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
index 094b831c9..870d8b71f 100644
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -7,6 +7,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
     user = object.user
     {
       privacy: user.setting_default_privacy,
+      sensitive: user.setting_default_sensitive,
       note: object.note,
     }
   end
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 26fbfdf82..56a261ab6 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -24,6 +24,8 @@
 
     = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
+    = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
+
   .fields-group
     = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
       = ff.input :follow, as: :boolean, wrapper: :with_label
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index d8d3b8a6f..fc5ab5ec8 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -37,6 +37,7 @@ en:
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_privacy: Post privacy
+        setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_system_font_ui: Use system's default font
         severity: Severity
diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb
index e1ba56d97..a67487779 100644
--- a/spec/lib/user_settings_decorator_spec.rb
+++ b/spec/lib/user_settings_decorator_spec.rb
@@ -28,6 +28,13 @@ describe UserSettingsDecorator do
       expect(user.settings['default_privacy']).to eq 'public'
     end
 
+    it 'updates the user settings value for sensitive' do
+      values = { 'setting_default_sensitive' => '1' }
+
+      settings.update(values)
+      expect(user.settings['default_sensitive']).to eq true
+    end
+
     it 'updates the user settings value for boost modal' do
       values = { 'setting_boost_modal' => '1' }
 

From 63baab088d734a982d21a5df538db554091188ad Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 10 Jul 2017 21:02:18 +0900
Subject: [PATCH 192/382] Fix regular expression for RFC 5646 (regression from
 #3604) (#4133)

---
 app/javascript/mastodon/locales/ar.json       |  7 ++-
 app/javascript/mastodon/locales/bg.json       |  7 ++-
 app/javascript/mastodon/locales/ca.json       |  7 ++-
 app/javascript/mastodon/locales/de.json       |  7 ++-
 .../mastodon/locales/defaultMessages.json     | 55 ++++++++++++-------
 app/javascript/mastodon/locales/en.json       |  7 ++-
 app/javascript/mastodon/locales/eo.json       |  7 ++-
 app/javascript/mastodon/locales/es.json       |  7 ++-
 app/javascript/mastodon/locales/fa.json       |  7 ++-
 app/javascript/mastodon/locales/fi.json       |  7 ++-
 app/javascript/mastodon/locales/fr.json       |  7 ++-
 app/javascript/mastodon/locales/he.json       |  7 ++-
 app/javascript/mastodon/locales/hr.json       |  7 ++-
 app/javascript/mastodon/locales/hu.json       |  7 ++-
 app/javascript/mastodon/locales/id.json       |  7 ++-
 app/javascript/mastodon/locales/io.json       |  7 ++-
 app/javascript/mastodon/locales/it.json       |  7 ++-
 app/javascript/mastodon/locales/ja.json       |  7 ++-
 app/javascript/mastodon/locales/ko.json       |  7 ++-
 app/javascript/mastodon/locales/nl.json       |  7 ++-
 app/javascript/mastodon/locales/no.json       |  7 ++-
 app/javascript/mastodon/locales/oc.json       |  7 ++-
 app/javascript/mastodon/locales/pl.json       |  7 ++-
 app/javascript/mastodon/locales/pt-BR.json    |  9 ++-
 app/javascript/mastodon/locales/pt.json       |  7 ++-
 app/javascript/mastodon/locales/ru.json       |  7 ++-
 app/javascript/mastodon/locales/th.json       |  7 ++-
 app/javascript/mastodon/locales/tr.json       |  7 ++-
 app/javascript/mastodon/locales/uk.json       |  7 ++-
 .../mastodon/locales/whitelist_zh-HK.json     |  1 -
 app/javascript/mastodon/locales/zh-CN.json    |  9 ++-
 app/javascript/mastodon/locales/zh-HK.json    |  9 ++-
 app/javascript/mastodon/locales/zh-TW.json    |  9 ++-
 config/webpack/translationRunner.js           |  2 +-
 34 files changed, 221 insertions(+), 62 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index c13bc73d3..6992e7e0f 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -18,6 +18,12 @@
   "account.unfollow": "إلغاء المتابعة",
   "account.unmute": "إلغاء الكتم عن @{name}",
   "boost_modal.combo": "يمكنك ضغط {combo} لتخطّي هذه في المرّة القادمة",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "الحسابات المحجوبة",
   "column.community": "الخيط العام المحلي",
   "column.favourites": "المفضلة",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
   "privacy.unlisted.short": "غير مدرج",
   "reply_indicator.cancel": "إلغاء",
-  "report.heading": "تقرير جديد",
   "report.placeholder": "تعليقات إضافية",
   "report.submit": "إرسال",
   "report.target": "إبلاغ",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 3b6f228c6..7a56e1446 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Не следвай",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Отказ",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 8e8c95d56..b2673915a 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Treure silenci de @{name}",
   "boost_modal.combo": "Pots premer {combo} per saltar-te això el proper cop",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Usuaris bloquejats",
   "column.community": "Línia de temps local",
   "column.favourites": "Favorits",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "No publicar en línies de temps públiques",
   "privacy.unlisted.short": "No llistat",
   "reply_indicator.cancel": "Cancel·lar",
-  "report.heading": "Nou informe",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Enviar",
   "report.target": "Informes",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 55499c0a3..4b62403c3 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
   "boost_modal.combo": "Du kannst {combo} drücken, um dies beim nächsten Mal zu überspringen",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blockierte Benutzer",
   "column.community": "Lokale Zeitleiste",
   "column.favourites": "Favoriten",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
   "privacy.unlisted.short": "Nicht gelistet",
   "reply_indicator.cancel": "Abbrechen",
-  "report.heading": "Neue Meldung",
   "report.placeholder": "Zusätzliche Kommentare",
   "report.submit": "Absenden",
   "report.target": "Melden",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index ccf2e6303..88f0f9c30 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -928,27 +928,6 @@
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "New report",
-        "id": "report.heading"
-      },
-      {
-        "defaultMessage": "Additional comments",
-        "id": "report.placeholder"
-      },
-      {
-        "defaultMessage": "Submit",
-        "id": "report.submit"
-      },
-      {
-        "defaultMessage": "Reporting",
-        "id": "report.target"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/index.json"
-  },
   {
     "descriptors": [
       {
@@ -1008,6 +987,40 @@
     ],
     "path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Network error",
+        "id": "bundle_column_error.title"
+      },
+      {
+        "defaultMessage": "Something went wrong while loading this component.",
+        "id": "bundle_column_error.body"
+      },
+      {
+        "defaultMessage": "Try again",
+        "id": "bundle_column_error.retry"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/bundle_column_error.json"
+  },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Something went wrong while loading this component.",
+        "id": "bundle_modal_error.message"
+      },
+      {
+        "defaultMessage": "Try again",
+        "id": "bundle_modal_error.retry"
+      },
+      {
+        "defaultMessage": "Close",
+        "id": "bundle_modal_error.close"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 253db7110..778f33269 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "Report {target}",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting {target}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 330fe831d..2648a6840 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Malsekvi",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Loka tempolinio",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Rezigni",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 6469aa6f2..c42930380 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Usuarios bloqueados",
   "column.community": "Historia local",
   "column.favourites": "Favoritos",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "No mostrar en la historia federada",
   "privacy.unlisted.short": "Sin federar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 3835caab1..c9f1888b5 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -18,6 +18,12 @@
   "account.unfollow": "پایان پیگیری",
   "account.unmute": "باصدا کردن @{name}",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "کاربران مسدودشده",
   "column.community": "نوشته‌های محلی",
   "column.favourites": "پسندیده‌ها",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
   "privacy.unlisted.short": "فهرست‌نشده",
   "reply_indicator.cancel": "لغو",
-  "report.heading": "گزارش تازه",
   "report.placeholder": "توضیح اضافه",
   "report.submit": "بفرست",
   "report.target": "گزارش‌دادن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index dae911799..b836d2f5d 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Paikallinen aikajana",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Peruuta",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index cb7e1b5a7..eaa01638c 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Comptes bloqués",
   "column.community": "Fil public local",
   "column.favourites": "Favoris",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
   "privacy.unlisted.short": "Non-listé",
   "reply_indicator.cancel": "Annuler",
-  "report.heading": "Nouveau signalement",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",
   "report.target": "Signalement",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index db3d00394..98c7ea021 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -18,6 +18,12 @@
   "account.unfollow": "הפסקת מעקב",
   "account.unmute": "הפסקת השתקת @{name}",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "חסימות",
   "column.community": "ציר זמן מקומי",
   "column.favourites": "חיבובים",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
   "privacy.unlisted.short": "לא לפיד הכללי",
   "reply_indicator.cancel": "ביטול",
-  "report.heading": "דווח חדש",
   "report.placeholder": "הערות נוספות",
   "report.submit": "שליחה",
   "report.target": "דיווח",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index f85eb8a3f..fdf5c11c0 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Prestani slijediti",
   "account.unmute": "Poništi utišavanje @{name}",
   "boost_modal.combo": "Možeš pritisnuti {combo} kako bi ovo preskočio sljedeći put",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blokirani korisnici",
   "column.community": "Lokalni timeline",
   "column.favourites": "Favoriti",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Ne prikazuj u javnim timelineovima",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Otkaži",
-  "report.heading": "Nova prijava",
   "report.placeholder": "Dodatni komentari",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 350410c4b..baf762c8d 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Követés abbahagyása",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Mégsem",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 6e9bc5ba9..6f6d688e9 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Pengguna diblokir",
   "column.community": "Linimasa Lokal",
   "column.favourites": "Favorit",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
   "privacy.unlisted.short": "Tak Terdaftar",
   "reply_indicator.cancel": "Batal",
-  "report.heading": "Laporan baru",
   "report.placeholder": "Komentar tambahan",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 005dd4f56..25e0adc8a 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Ne plus sequar",
   "account.unmute": "Ne plus celar @{name}",
   "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blokusita uzeri",
   "column.community": "Lokala tempolineo",
   "column.favourites": "Favorati",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Ne montrar en publika tempolinei",
   "privacy.unlisted.short": "Ne enlistigota",
   "reply_indicator.cancel": "Nihiligar",
-  "report.heading": "Nova denunco",
   "report.placeholder": "Plusa komenti",
   "report.submit": "Sendar",
   "report.target": "Denuncante",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4a5b218e8..4881b0f08 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Non seguire",
   "account.unmute": "Non silenziare @{name}",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Utenti bloccati",
   "column.community": "Timeline locale",
   "column.favourites": "Apprezzati",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
   "privacy.unlisted.short": "Non elencato",
   "reply_indicator.cancel": "Annulla",
-  "report.heading": "Nuova segnalazione",
   "report.placeholder": "Commenti aggiuntivi",
   "report.submit": "Invia",
   "report.target": "Invio la segnalazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index cb8074b5d..a133e6330 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -18,6 +18,12 @@
   "account.unfollow": "フォロー解除",
   "account.unmute": "ミュート解除",
   "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "ブロックしたユーザー",
   "column.community": "ローカルタイムライン",
   "column.favourites": "お気に入り",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
   "reply_indicator.cancel": "キャンセル",
-  "report.heading": "新規通報",
   "report.placeholder": "コメント",
   "report.submit": "通報する",
   "report.target": "問題のユーザー",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index e88d4a531..5e1aaac85 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -18,6 +18,12 @@
   "account.unfollow": "팔로우 해제",
   "account.unmute": "뮤트 해제",
   "boost_modal.combo": "다음부터 {combo}를 누르면 이 과정을 건너뛸 수 있습니다.",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "차단 중인 사용자",
   "column.community": "로컬 타임라인",
   "column.favourites": "즐겨찾기",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "취소",
-  "report.heading": "신고",
   "report.placeholder": "코멘트",
   "report.submit": "신고하기",
   "report.target": "문제가 된 사용자",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 05a9e3a12..479d157f3 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet meer negeren",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.community": "Lokale tijdlijn",
   "column.favourites": "Favorieten",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
-  "report.heading": "Rapporteren",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a3c956279..4bbf14938 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Avfølg",
   "account.unmute": "Avdemp @{name}",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blokkerte brukere",
   "column.community": "Lokal tidslinje",
   "column.favourites": "Likt",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
   "privacy.unlisted.short": "Uoppført",
   "reply_indicator.cancel": "Avbryt",
-  "report.heading": "Ny rapport",
   "report.placeholder": "Tilleggskommentarer",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 5f226bc70..2c119ef41 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Quitar de sègre",
   "account.unmute": "Quitar de rescondre @{name}",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Personas blocadas",
   "column.community": "Flux d’actualitat public local",
   "column.favourites": "Favorits",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
   "reply_indicator.cancel": "Anullar",
-  "report.heading": "Senhalar {target}",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Mandar",
   "report.target": "Senhalar {target}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 2a69824ee..b547a1737 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Przestań obserwować",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Zablokowani użytkownicy",
   "column.community": "Lokalna oś czasu",
   "column.favourites": "Ulubione",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
-  "report.heading": "Zgłoś {target}",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 5e5834a0e..b199a39ce 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Utilizadores Bloqueados",
   "column.community": "Local",
   "column.favourites": "Favoritos",
@@ -72,7 +78,6 @@
   "getting_started.faq": "FAQ",
   "getting_started.heading": "Primeiros passos",
   "getting_started.open_source_notice": "Mastodon é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}.",
-  "getting_started.support": "{faq} • {userguide} • {apps}",
   "getting_started.userguide": "User Guide",
   "home.column_settings.advanced": "Avançado",
   "home.column_settings.basic": "Básico",
@@ -107,7 +112,6 @@
   "notifications.column_settings.reblog": "Partilhas:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
-  "notifications.settings": "Parâmetros da listagem de Notificações",
   "onboarding.done": "Done",
   "onboarding.next": "Next",
   "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
@@ -138,7 +142,6 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "Nova denúncia",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 4ebfe0c60..b199a39ce 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Utilizadores Bloqueados",
   "column.community": "Local",
   "column.favourites": "Favoritos",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "Nova denúncia",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index f561f0151..f9f48a48d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Отписаться",
   "account.unmute": "Снять глушение",
   "boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Список блокировки",
   "column.community": "Локальная лента",
   "column.favourites": "Понравившееся",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Не показывать в лентах",
   "privacy.unlisted.short": "Скрытый",
   "reply_indicator.cancel": "Отмена",
-  "report.heading": "Новая жалоба",
   "report.placeholder": "Комментарий",
   "report.submit": "Отправить",
   "report.target": "Жалуемся на",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 608d911e9..8a39beacb 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
   "boost_modal.combo": "You can press {combo} to skip this next time",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Blocked users",
   "column.community": "Local timeline",
   "column.favourites": "Favourites",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 7512971f5..203e4a09e 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Takipten vazgeç",
   "account.unmute": "Sesi aç @{name}",
   "boost_modal.combo": "Bir dahaki sefere {combo} tuşuna basabilirsiniz",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Engellenen kullanıcılar",
   "column.community": "Yerel zaman tüneli",
   "column.favourites": "Favoriler",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
   "privacy.unlisted.short": "Listelenmemiş",
   "reply_indicator.cancel": "İptal",
-  "report.heading": "Yeni rapor",
   "report.placeholder": "Ek yorumlar",
   "report.submit": "Gönder",
   "report.target": "Raporlama",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index a117c854b..c0f4a8dbb 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -18,6 +18,12 @@
   "account.unfollow": "Відписатися",
   "account.unmute": "Зняти глушення",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "Заблоковані користувачі",
   "column.community": "Локальна стрічка",
   "column.favourites": "Вподобане",
@@ -136,7 +142,6 @@
   "privacy.unlisted.long": "Не показувати у публічних стрічках",
   "privacy.unlisted.short": "Прихований",
   "reply_indicator.cancel": "Відмінити",
-  "report.heading": "Нова скарга",
   "report.placeholder": "Додаткові коментарі",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на",
diff --git a/app/javascript/mastodon/locales/whitelist_zh-HK.json b/app/javascript/mastodon/locales/whitelist_zh-HK.json
index d5fddc3bc..0d4f101c7 100644
--- a/app/javascript/mastodon/locales/whitelist_zh-HK.json
+++ b/app/javascript/mastodon/locales/whitelist_zh-HK.json
@@ -1,3 +1,2 @@
 [
-  "getting_started.support"
 ]
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 68648f2dd..998e1c8da 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -18,6 +18,12 @@
   "account.unfollow": "取消关注",
   "account.unmute": "取消 @{name} 的静音",
   "boost_modal.combo": "如你想在下次路过时显示，请按{combo}，",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "屏蔽用户",
   "column.community": "本站时间轴",
   "column.favourites": "赞过的嘟文",
@@ -72,7 +78,6 @@
   "getting_started.faq": "FAQ",
   "getting_started.heading": "开始使用",
   "getting_started.open_source_notice": "Mastodon 是一个开放源码的软件。你可以在官方 GitHub ({github}) 贡献或者回报问题。",
-  "getting_started.support": "{faq} • {userguide} • {apps}",
   "getting_started.userguide": "User Guide",
   "home.column_settings.advanced": "高端",
   "home.column_settings.basic": "基本",
@@ -107,7 +112,6 @@
   "notifications.column_settings.reblog": "你的嘟文被转嘟：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
-  "notifications.settings": "字段设置",
   "onboarding.done": "出发！",
   "onboarding.next": "下一步",
   "onboarding.page_five.public_timelines": "本站时间轴显示来自 {domain} 的所有人的公共嘟文。 跨站公共时间轴显示 {domain} 上的各位关注的来自所有Mastodon服务器实例上的人发表的公共嘟文。这些就是寻人好去处的公共时间轴啦。",
@@ -138,7 +142,6 @@
   "privacy.unlisted.long": "公开，但不在公共时间轴显示",
   "privacy.unlisted.short": "公开",
   "reply_indicator.cancel": "取消",
-  "report.heading": "举报",
   "report.placeholder": "额外消息",
   "report.submit": "提交",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index a9844a625..1079d5429 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -18,6 +18,12 @@
   "account.unfollow": "取消關注",
   "account.unmute": "取消 @{name} 的靜音",
   "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "封鎖用戶",
   "column.community": "本站時間軸",
   "column.favourites": "喜歡的文章",
@@ -72,7 +78,6 @@
   "getting_started.faq": "常見問題",
   "getting_started.heading": "開始使用",
   "getting_started.open_source_notice": "Mastodon（萬象）是一個開放源碼的軟件。你可以在官方 GitHub ({github}) 貢獻或者回報問題。",
-  "getting_started.support": "{faq} • {userguide} • {apps}",
   "getting_started.userguide": "使用指南",
   "home.column_settings.advanced": "進階",
   "home.column_settings.basic": "基本",
@@ -107,7 +112,6 @@
   "notifications.column_settings.reblog": "轉推你的文章:",
   "notifications.column_settings.show": "在通知欄顯示",
   "notifications.column_settings.sound": "播放音效",
-  "notifications.settings": "欄位設定",
   "onboarding.done": "開始使用",
   "onboarding.next": "繼續",
   "onboarding.page_five.public_timelines": "「本站時間軸」顯示在 {domain} 各用戶的公開文章。「跨站時間軸」顯示在 {domain} 各人關注的所有用戶（包括其他服務站）的公開文章。這些都是「公共時間軸」，是認識新朋友的好地方。",
@@ -138,7 +142,6 @@
   "privacy.unlisted.long": "公開，但不在公共時間軸顯示",
   "privacy.unlisted.short": "公開",
   "reply_indicator.cancel": "取消",
-  "report.heading": "舉報",
   "report.placeholder": "額外訊息",
   "report.submit": "提交",
   "report.target": "舉報",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 5497becf0..6240b8879 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -18,6 +18,12 @@
   "account.unfollow": "取消關注",
   "account.unmute": "不再消音 @{name}",
   "boost_modal.combo": "下次你可以按 {combo} 來跳過",
+  "bundle_column_error.body": "Something went wrong while loading this component.",
+  "bundle_column_error.retry": "Try again",
+  "bundle_column_error.title": "Network error",
+  "bundle_modal_error.close": "Close",
+  "bundle_modal_error.message": "Something went wrong while loading this component.",
+  "bundle_modal_error.retry": "Try again",
   "column.blocks": "封鎖的使用者",
   "column.community": "本地時間軸",
   "column.favourites": "最愛",
@@ -72,7 +78,6 @@
   "getting_started.faq": "FAQ",
   "getting_started.heading": "馬上開始",
   "getting_started.open_source_notice": "Mastodon 是開源軟體。你可以在 GitHub {github} 上做出貢獻或是回報問題。",
-  "getting_started.support": "{faq} • {userguide} • {apps}",
   "getting_started.userguide": "使用者指南",
   "home.column_settings.advanced": "進階",
   "home.column_settings.basic": "基本",
@@ -107,7 +112,6 @@
   "notifications.column_settings.reblog": "轉推：",
   "notifications.column_settings.show": "顯示在欄位中",
   "notifications.column_settings.sound": "播放音效",
-  "notifications.settings": "欄位設定",
   "onboarding.done": "完成",
   "onboarding.next": "下一步",
   "onboarding.page_five.public_timelines": "本地時間軸顯示 {domain} 上所有人的公開貼文。聯盟時間軸顯示 {domain} 上所有人關注的公開貼文。這就是公開時間軸，發現新朋友的好地方。",
@@ -138,7 +142,6 @@
   "privacy.unlisted.long": "不要貼到公開時間軸",
   "privacy.unlisted.short": "不列出來",
   "reply_indicator.cancel": "取消",
-  "report.heading": "新的通報",
   "report.placeholder": "更多訊息",
   "report.submit": "送出",
   "report.target": "通報中",
diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js
index 097099b48..d616c7839 100644
--- a/config/webpack/translationRunner.js
+++ b/config/webpack/translationRunner.js
@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { default: manageTranslations } = require('react-intl-translations-manager');
 
-const RFC5646_REGEXP = /^[a-z]{2,3}(?:|[A-Z]+)$/;
+const RFC5646_REGEXP = /^[a-z]{2,3}(?:|-[A-Z]+)$/;
 
 const rootDirectory = path.resolve(__dirname, '..', '..');
 const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales');

From ca45bd0361fa1d182a505cf2eff1a69bc7712a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AE=E3=82=89?= <noraworld@users.noreply.github.com>
Date: Mon, 10 Jul 2017 21:04:05 +0900
Subject: [PATCH 193/382] Add Japanese translation of terms and flash (#4137)

---
 app/controllers/admin/settings_controller.rb | 2 +-
 config/locales/ja.yml                        | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 7542f55e8..f27a1f4d4 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -24,7 +24,7 @@ module Admin
         setting.update(value: value_for_update(key, value))
       end
 
-      flash[:notice] = 'Success!'
+      flash[:notice] = I18n.t('generic.changes_saved_msg')
       redirect_to edit_admin_settings_path
     end
 
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 347270af2..9cb2428f7 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -183,6 +183,9 @@ ja:
       site_description_extended:
         desc_html: インスタンスについてのページに表示されます。<br>HTMLタグが利用可能です。
         title: サイトの詳細な説明
+      site_terms:
+        desc_html: プライバシーポリシーのページに表示されます。<br>HTMLタグが利用可能です。
+        title: サイトのプライバシーポリシー
       site_title: サイトのタイトル
       title: サイト設定
     subscriptions:

From 31490e0d6ce5f967146da7f7bafa73a1ecb65fb9 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 10 Jul 2017 23:32:17 +0900
Subject: [PATCH 194/382] Add Japanese translations (#4140)

* Add Japanese translations for #3879

* Add Japanese translations for #4033

* Add Japanese translations for #4136
---
 app/javascript/mastodon/locales/ja.json | 12 ++++++------
 config/locales/simple_form.ja.yml       |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a133e6330..f62072852 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -18,12 +18,12 @@
   "account.unfollow": "フォロー解除",
   "account.unmute": "ミュート解除",
   "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。",
+  "bundle_column_error.retry": "再試行",
+  "bundle_column_error.title": "ネットワークエラー",
+  "bundle_modal_error.close": "閉じる",
+  "bundle_modal_error.message": "コンポーネントの読み込み中に問題が発生しました。",
+  "bundle_modal_error.retry": "再試行",
   "column.blocks": "ブロックしたユーザー",
   "column.community": "ローカルタイムライン",
   "column.favourites": "お気に入り",
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index b9f11d7b3..9342398a8 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -34,7 +34,9 @@ ja:
         setting_auto_play_gif: アニメーションGIFを自動再生する
         setting_boost_modal: ブーストする前に確認ダイアログを表示する
         setting_default_privacy: 投稿の公開範囲
+        setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
+        setting_system_font_ui: システムのデフォルトフォントを使う
         severity: 重大性
         type: インポートする項目
         username: ユーザー名

From 7f9a353b94f628396c445ae07ed1508c91b93fcb Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 10 Jul 2017 18:04:06 +0200
Subject: [PATCH 195/382] i18n: @63baab0 (pl) (#4141)

---
 app/javascript/mastodon/locales/pl.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index b547a1737..ac63ec40f 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -18,12 +18,12 @@
   "account.unfollow": "Przestań obserwować",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.",
+  "bundle_column_error.retry": "Spróbuj ponownie",
+  "bundle_column_error.title": "Błąd sieci",
+  "bundle_modal_error.close": "Zamknij",
+  "bundle_modal_error.message": "Coś poszło nie tak podczas ładowania tego składnika.",
+  "bundle_modal_error.retry": "Spróbuj ponownie",
   "column.blocks": "Zablokowani użytkownicy",
   "column.community": "Lokalna oś czasu",
   "column.favourites": "Ulubione",

From 34ccc058fa738cd73c273d6b64efbe67402bd86c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 10 Jul 2017 18:04:23 +0200
Subject: [PATCH 196/382] Limit total subscribe retries to 10, but space them
 out more (#4142)

Since there is little point in retrying so often when a service is down
or does not exist anymore. Subscriptions are renewed 1 day before they
should expire, so retrying in 30 minutes, then 2 hours, then 12 hours
is fine. If even after that, the remote server does not work, there is
little sense in retrying more often than once a day

Also, uniqueness of the job should ensure that failed retries will
not result in multiple retries for the same endpoint when the next
resubscription cycle comes
---
 app/workers/pubsubhubbub/subscribe_worker.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb
index 5b0956b6b..6865e7136 100644
--- a/app/workers/pubsubhubbub/subscribe_worker.rb
+++ b/app/workers/pubsubhubbub/subscribe_worker.rb
@@ -3,7 +3,20 @@
 class Pubsubhubbub::SubscribeWorker
   include Sidekiq::Worker
 
-  sidekiq_options queue: 'push'
+  sidekiq_options queue: 'push', retry: 10, unique: :until_executed
+
+  sidekiq_retry_in do |count|
+    case count
+    when 0
+      30.minutes.seconds
+    when 1
+      2.hours.seconds
+    when 2
+      12.hours.seconds
+    else
+      24.hours.seconds * (count - 2)
+    end
+  end
 
   def perform(account_id)
     account = Account.find(account_id)

From d081d4a4226ba317a1b653aa6eef57543cbe4430 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 10 Jul 2017 18:04:43 +0200
Subject: [PATCH 197/382] i18n: @2b9721d (pl) (#4143)

---
 config/locales/simple_form.pl.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 2a3756d4d..e4c4d7c8c 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -42,6 +42,7 @@ pl:
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_privacy: Widoczność posta
+        setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem postu
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         severity: Priorytet

From 7a889a8e125a03e109b225cd83b0abcbdc76d95b Mon Sep 17 00:00:00 2001
From: STJrInuyasha <MattWCSTRFAN@gmail.com>
Date: Mon, 10 Jul 2017 09:05:06 -0700
Subject: [PATCH 198/382] Remote following success page (#4129)

* Added a success page to remote following
Includes follow-through links to web (the old redirect target) and back to the remote user's profile

* Use Account.new in spec instead of a fake with only id
(fixes spec)

* Fabricate(:account) over Account.new

* Remove self from the success text
(and all HTML with it)
---
 app/controllers/authorize_follows_controller.rb  |  2 +-
 app/javascript/styles/forms.scss                 |  9 +++++++++
 app/views/authorize_follows/success.html.haml    | 16 ++++++++++++++++
 config/locales/en.yml                            |  6 ++++++
 .../authorize_follows_controller_spec.rb         |  4 ++--
 5 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 app/views/authorize_follows/success.html.haml

diff --git a/app/controllers/authorize_follows_controller.rb b/app/controllers/authorize_follows_controller.rb
index da4ef022a..dccd1c209 100644
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -15,7 +15,7 @@ class AuthorizeFollowsController < ApplicationController
     if @account.nil?
       render :error
     else
-      redirect_to web_url("accounts/#{@account.id}")
+      render :success
     end
   rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     render :error
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index 7a181f36b..414dc4fe8 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -375,3 +375,12 @@ code {
     width: 50%;
   }
 }
+
+.post-follow-actions {
+  text-align: center;
+  color: $ui-primary-color;
+
+  div {
+    margin-bottom: 4px;
+  }
+}
diff --git a/app/views/authorize_follows/success.html.haml b/app/views/authorize_follows/success.html.haml
new file mode 100644
index 000000000..f0b495689
--- /dev/null
+++ b/app/views/authorize_follows/success.html.haml
@@ -0,0 +1,16 @@
+- content_for :page_title do
+  = t('authorize_follow.title', acct: @account.acct)
+
+.form-container
+  .follow-prompt
+    - if @account.locked?
+      %h2= t('authorize_follow.follow_request')
+    - else
+      %h2= t('authorize_follow.following')
+
+    = render 'card', account: @account
+
+  .post-follow-actions
+    %div= link_to t('authorize_follow.post_follow.web'), web_url("accounts/#{@account.id}"), class: 'button button--block'
+    %div= link_to t('authorize_follow.post_follow.return'), @account.url, class: 'button button--block'
+    %div= t('authorize_follow.post_follow.close')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 60e192491..8bb893d1c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -221,6 +221,12 @@ en:
   authorize_follow:
     error: Unfortunately, there was an error looking up the remote account
     follow: Follow
+    following: 'Success! You are now following:'
+    follow_request: 'You have sent a follow request to:'
+    post_follow:
+      web: Go to web
+      return: Return to the user's profile
+      close: Or, you can just close this window.
     prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:'
     title: Follow %{acct}
   datetime:
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb
index b801aa661..26e46a23c 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_follows_controller_spec.rb
@@ -94,7 +94,7 @@ describe AuthorizeFollowsController do
       end
 
       it 'follows account when found' do
-        target_account = double(id: '123')
+        target_account = Fabricate(:account)
         result_account = double(target_account: target_account)
         service = double
         allow(FollowService).to receive(:new).and_return(service)
@@ -103,7 +103,7 @@ describe AuthorizeFollowsController do
         post :create, params: { acct: 'acct:user@hostname' }
 
         expect(service).to have_received(:call).with(account, 'user@hostname')
-        expect(response).to redirect_to(web_url('accounts/123'))
+        expect(response).to render_template(:success)
       end
     end
   end

From a3d93e8bbede04ddbbab10168360a32aedc6bcf7 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 10 Jul 2017 18:46:46 +0200
Subject: [PATCH 199/382] Fix #4059 - Remove ModuleConcatenationPlugin (#4139)

It increased memory usage of Webpack 1.5x fold with little benefits
---
 config/webpack/production.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/webpack/production.js b/config/webpack/production.js
index 0d2c9acfb..303fca81b 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -12,7 +12,6 @@ module.exports = merge(sharedConfig, {
   stats: 'normal',
 
   plugins: [
-    new webpack.optimize.ModuleConcatenationPlugin(),
     new webpack.optimize.UglifyJsPlugin({
       sourceMap: true,
       mangle: true,

From e670fa2af6420268960129d04406db23c3554570 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Tue, 11 Jul 2017 02:41:55 +0900
Subject: [PATCH 200/382] Update es5-ext to avoid CSP violation (#4145)

Since es5-ext used `new Function("...")`, it caused CSP violation unless "unsafe-eval" included. So this patch updates it to the version which fixes it.

Note that this package is used in polyfills, so loaded only if needed. I've encountered this issue on iOS9.

cf. medikoo/es5-ext@d3864493
---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index aedbde6be..fba802e0a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2512,8 +2512,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.23"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.23.tgz#7578b51be974207a5487821b56538c224e4e7b38"
+  version "0.10.24"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.24.tgz#a55877c9924bc0c8d9bd3c2cbe17495ac1709b14"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"

From 958fe0f7db6702d65791def89fceef77d6f43589 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 10 Jul 2017 19:42:37 +0200
Subject: [PATCH 201/382] i18n: @7a889a8 (pl) (#4144)

* i18n: @7a889a8 (pl)

* Update pl.yml
---
 config/locales/pl.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 0dc1da8b4..321b1590e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -221,6 +221,12 @@ pl:
   authorize_follow:
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
     follow: Śledź
+    following: 'Pomyślnie! Od teraz śledzisz:'
+    follow_request: 'Wysłano prośbę o pozwolenie na obserwację:'
+    post_follow:
+      web: Przejdź do sieci
+      return: Powróć do strony użytkownika
+      close: Ewentualnie, możesz po prostu zamknąć tą stronę.
     prompt_html: 'Ty (<strong>%{self}</strong>) chcesz śledzić:'
     title: Śledź %{acct}
   datetime:

From 7bacdd718a143f54f47ddc3afa39504636be65c0 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 11 Jul 2017 08:00:01 +0900
Subject: [PATCH 202/382] Fix PrecomputeFeedService for filtered statuses
 (#4148)

---
 app/services/precompute_feed_service.rb       |  4 ++--
 spec/services/precompute_feed_service_spec.rb | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb
index a32ba1dae..85635a008 100644
--- a/app/services/precompute_feed_service.rb
+++ b/app/services/precompute_feed_service.rb
@@ -13,7 +13,7 @@ class PrecomputeFeedService < BaseService
   attr_reader :account
 
   def populate_feed
-    pairs = statuses.reverse_each.map(&method(:process_status))
+    pairs = statuses.reverse_each.lazy.reject(&method(:status_filtered?)).map(&method(:process_status)).to_a
 
     redis.pipelined do
       redis.zadd(account_home_key, pairs) if pairs.any?
@@ -22,7 +22,7 @@ class PrecomputeFeedService < BaseService
   end
 
   def process_status(status)
-    [status.id, status.reblog? ? status.reblog_of_id : status.id] unless status_filtered?(status)
+    [status.id, status.reblog? ? status.reblog_of_id : status.id]
   end
 
   def status_filtered?(status)
diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb
index e2294469c..dbd08ac1b 100644
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -23,5 +23,17 @@ RSpec.describe PrecomputeFeedService do
       account = Fabricate(:account)
       subject.call(account)
     end
+
+    it 'filters statuses' do
+      account = Fabricate(:account)
+      muted_account = Fabricate(:account)
+      Fabricate(:mute, account: account, target_account: muted_account)
+      reblog = Fabricate(:status, account: muted_account)
+      status = Fabricate(:status, account: account, reblog: reblog)
+
+      subject.call(account)
+
+      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq nil
+    end
   end
 end

From cc68d1945b42459a787e0ce216e8f49393eeb197 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 11 Jul 2017 01:00:14 +0200
Subject: [PATCH 203/382] refactor: Rewrite immutablejs import statements using
 destructuring (#4147)

---
 .../mastodon/actions/notifications.js         |  4 +--
 app/javascript/mastodon/actions/store.js      |  6 ++--
 app/javascript/mastodon/actions/timelines.js  | 10 +++---
 .../features/account_timeline/index.js        |  4 +--
 .../mastodon/features/notifications/index.js  |  4 +--
 .../containers/status_check_box_container.js  |  4 +--
 .../ui/components/onboarding_modal.js         |  4 +--
 .../features/ui/components/report_modal.js    |  4 +--
 .../ui/containers/status_list_container.js    |  6 ++--
 app/javascript/mastodon/reducers/accounts.js  |  6 ++--
 .../mastodon/reducers/accounts_counters.js    |  8 ++---
 app/javascript/mastodon/reducers/alerts.js    |  6 ++--
 app/javascript/mastodon/reducers/cards.js     |  6 ++--
 app/javascript/mastodon/reducers/compose.js   | 18 +++++------
 app/javascript/mastodon/reducers/contexts.js  | 18 +++++------
 .../mastodon/reducers/media_attachments.js    |  4 +--
 app/javascript/mastodon/reducers/meta.js      |  4 +--
 .../mastodon/reducers/notifications.js        | 14 ++++----
 .../mastodon/reducers/relationships.js        |  6 ++--
 app/javascript/mastodon/reducers/reports.js   | 16 +++++-----
 app/javascript/mastodon/reducers/search.js    | 16 +++++-----
 app/javascript/mastodon/reducers/settings.js  | 30 ++++++++---------
 .../mastodon/reducers/status_lists.js         | 10 +++---
 app/javascript/mastodon/reducers/statuses.js  |  6 ++--
 app/javascript/mastodon/reducers/timelines.js | 24 +++++++-------
 .../mastodon/reducers/user_lists.js           | 32 +++++++++----------
 app/javascript/mastodon/selectors/index.js    |  6 ++--
 .../components/display_name.test.js           |  6 ++--
 28 files changed, 141 insertions(+), 141 deletions(-)

diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index cda636139..c7d248122 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -1,5 +1,5 @@
 import api, { getLinks } from '../api';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
 import IntlMessageFormat from 'intl-messageformat';
 import { fetchRelationships } from './accounts';
 import { defineMessages } from 'react-intl';
@@ -124,7 +124,7 @@ export function refreshNotificationsFail(error, skipLoading) {
 
 export function expandNotifications() {
   return (dispatch, getState) => {
-    const items  = getState().getIn(['notifications', 'items'], Immutable.List());
+    const items  = getState().getIn(['notifications', 'items'], ImmutableList());
 
     if (getState().getIn(['notifications', 'isLoading']) || items.size === 0) {
       return;
diff --git a/app/javascript/mastodon/actions/store.js b/app/javascript/mastodon/actions/store.js
index efdb0771a..0597d265e 100644
--- a/app/javascript/mastodon/actions/store.js
+++ b/app/javascript/mastodon/actions/store.js
@@ -1,11 +1,11 @@
-import Immutable from 'immutable';
+import { Iterable, fromJS } from 'immutable';
 
 export const STORE_HYDRATE = 'STORE_HYDRATE';
 export const STORE_HYDRATE_LAZY = 'STORE_HYDRATE_LAZY';
 
 const convertState = rawState =>
-  Immutable.fromJS(rawState, (k, v) =>
-    Immutable.Iterable.isIndexed(v) ? v.toList() : v.toMap().mapKeys(x =>
+  fromJS(rawState, (k, v) =>
+    Iterable.isIndexed(v) ? v.toList() : v.toMap().mapKeys(x =>
       Number.isNaN(x * 1) ? x : x * 1));
 
 export function hydrateStore(rawState) {
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index cb4410eba..dd14cb1cd 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -1,5 +1,5 @@
 import api, { getLinks } from '../api';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
 export const TIMELINE_UPDATE  = 'TIMELINE_UPDATE';
 export const TIMELINE_DELETE  = 'TIMELINE_DELETE';
@@ -66,13 +66,13 @@ export function refreshTimelineRequest(timeline, skipLoading) {
 
 export function refreshTimeline(timelineId, path, params = {}) {
   return function (dispatch, getState) {
-    const timeline = getState().getIn(['timelines', timelineId], Immutable.Map());
+    const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
 
     if (timeline.get('isLoading') || timeline.get('online')) {
       return;
     }
 
-    const ids      = timeline.get('items', Immutable.List());
+    const ids      = timeline.get('items', ImmutableList());
     const newestId = ids.size > 0 ? ids.first() : null;
 
     let skipLoading = timeline.get('loaded');
@@ -111,8 +111,8 @@ export function refreshTimelineFail(timeline, error, skipLoading) {
 
 export function expandTimeline(timelineId, path, params = {}) {
   return (dispatch, getState) => {
-    const timeline = getState().getIn(['timelines', timelineId], Immutable.Map());
-    const ids      = timeline.get('items', Immutable.List());
+    const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
+    const ids      = timeline.get('items', ImmutableList());
 
     if (timeline.get('isLoading') || ids.size === 0) {
       return;
diff --git a/app/javascript/mastodon/features/account_timeline/index.js b/app/javascript/mastodon/features/account_timeline/index.js
index 955d0000e..3c8b63114 100644
--- a/app/javascript/mastodon/features/account_timeline/index.js
+++ b/app/javascript/mastodon/features/account_timeline/index.js
@@ -9,11 +9,11 @@ import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import HeaderContainer from './containers/header_container';
 import ColumnBackButton from '../../components/column_back_button';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
 const mapStateToProps = (state, props) => ({
-  statusIds: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'items'], Immutable.List()),
+  statusIds: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'items'], ImmutableList()),
   isLoading: state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'isLoading']),
   hasMore: !!state.getIn(['timelines', `account:${Number(props.params.accountId)}`, 'next']),
   me: state.getIn(['meta', 'me']),
diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index 2f545fa4a..c5853d3ba 100644
--- a/app/javascript/mastodon/features/notifications/index.js
+++ b/app/javascript/mastodon/features/notifications/index.js
@@ -11,7 +11,7 @@ import { ScrollContainer } from 'react-router-scroll';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import ColumnSettingsContainer from './containers/column_settings_container';
 import { createSelector } from 'reselect';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
 import LoadMore from '../../components/load_more';
 import { debounce } from 'lodash';
 
@@ -20,7 +20,7 @@ const messages = defineMessages({
 });
 
 const getNotifications = createSelector([
-  state => Immutable.List(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),
+  state => ImmutableList(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()),
   state => state.getIn(['notifications', 'items']),
 ], (excludedTypes, notifications) => notifications.filterNot(item => excludedTypes.includes(item.get('type'))));
 
diff --git a/app/javascript/mastodon/features/report/containers/status_check_box_container.js b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
index 8997718a2..48cd0319b 100644
--- a/app/javascript/mastodon/features/report/containers/status_check_box_container.js
+++ b/app/javascript/mastodon/features/report/containers/status_check_box_container.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';
 import StatusCheckBox from '../components/status_check_box';
 import { toggleStatusReport } from '../../../actions/reports';
-import Immutable from 'immutable';
+import { Set as ImmutableSet } from 'immutable';
 
 const mapStateToProps = (state, { id }) => ({
   status: state.getIn(['statuses', id]),
-  checked: state.getIn(['reports', 'new', 'status_ids'], Immutable.Set()).includes(id),
+  checked: state.getIn(['reports', 'new', 'status_ids'], ImmutableSet()).includes(id),
 });
 
 const mapDispatchToProps = (dispatch, { id }) => ({
diff --git a/app/javascript/mastodon/features/ui/components/onboarding_modal.js b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
index 189bd8665..3d59785e2 100644
--- a/app/javascript/mastodon/features/ui/components/onboarding_modal.js
+++ b/app/javascript/mastodon/features/ui/components/onboarding_modal.js
@@ -10,7 +10,7 @@ import ComposeForm from '../../compose/components/compose_form';
 import Search from '../../compose/components/search';
 import NavigationBar from '../../compose/components/navigation_bar';
 import ColumnHeader from './column_header';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
 
 const noop = () => { };
 
@@ -48,7 +48,7 @@ const PageTwo = ({ me }) => (
       </div>
       <ComposeForm
         text='Awoo! #introductions'
-        suggestions={Immutable.List()}
+        suggestions={ImmutableList()}
         mentionedDomains={[]}
         spoiler={false}
         onChange={noop}
diff --git a/app/javascript/mastodon/features/ui/components/report_modal.js b/app/javascript/mastodon/features/ui/components/report_modal.js
index c989d2c9b..b5dfa422e 100644
--- a/app/javascript/mastodon/features/ui/components/report_modal.js
+++ b/app/javascript/mastodon/features/ui/components/report_modal.js
@@ -7,7 +7,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { makeGetAccount } from '../../../selectors';
 import { defineMessages, FormattedMessage, injectIntl } from 'react-intl';
 import StatusCheckBox from '../../report/containers/status_check_box_container';
-import Immutable from 'immutable';
+import { OrderedSet } from 'immutable';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Button from '../../../components/button';
 
@@ -26,7 +26,7 @@ const makeMapStateToProps = () => {
       isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
       account: getAccount(state, accountId),
       comment: state.getIn(['reports', 'new', 'comment']),
-      statusIds: Immutable.OrderedSet(state.getIn(['timelines', `account:${accountId}`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
+      statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])),
     };
   };
 
diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 45ad6209b..1b2e1056a 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -1,13 +1,13 @@
 import { connect } from 'react-redux';
 import StatusList from '../../../components/status_list';
 import { scrollTopTimeline } from '../../../actions/timelines';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 import { createSelector } from 'reselect';
 import { debounce } from 'lodash';
 
 const makeGetStatusIds = () => createSelector([
-  (state, { type }) => state.getIn(['settings', type], Immutable.Map()),
-  (state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
+  (state, { type }) => state.getIn(['settings', type], ImmutableMap()),
+  (state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()),
   (state)           => state.get('statuses'),
   (state)           => state.getIn(['meta', 'me']),
 ], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index 7b7074317..4d7c3adc9 100644
--- a/app/javascript/mastodon/reducers/accounts.js
+++ b/app/javascript/mastodon/reducers/accounts.js
@@ -44,7 +44,7 @@ import {
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const normalizeAccount = (state, account) => {
   account = { ...account };
@@ -53,7 +53,7 @@ const normalizeAccount = (state, account) => {
   delete account.following_count;
   delete account.statuses_count;
 
-  return state.set(account.id, Immutable.fromJS(account));
+  return state.set(account.id, fromJS(account));
 };
 
 const normalizeAccounts = (state, accounts) => {
@@ -82,7 +82,7 @@ const normalizeAccountsFromStatuses = (state, statuses) => {
   return state;
 };
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
 export default function accounts(state = initialState, action) {
   switch(action.type) {
diff --git a/app/javascript/mastodon/reducers/accounts_counters.js b/app/javascript/mastodon/reducers/accounts_counters.js
index eb8a4f83d..4423e1b50 100644
--- a/app/javascript/mastodon/reducers/accounts_counters.js
+++ b/app/javascript/mastodon/reducers/accounts_counters.js
@@ -46,9 +46,9 @@ import {
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
 } from '../actions/favourites';
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
-const normalizeAccount = (state, account) => state.set(account.id, Immutable.fromJS({
+const normalizeAccount = (state, account) => state.set(account.id, fromJS({
   followers_count: account.followers_count,
   following_count: account.following_count,
   statuses_count: account.statuses_count,
@@ -80,12 +80,12 @@ const normalizeAccountsFromStatuses = (state, statuses) => {
   return state;
 };
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
 export default function accountsCounters(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
-    return state.merge(action.state.get('accounts').map(item => Immutable.fromJS({
+    return state.merge(action.state.get('accounts').map(item => fromJS({
       followers_count: item.get('followers_count'),
       following_count: item.get('following_count'),
       statuses_count: item.get('statuses_count'),
diff --git a/app/javascript/mastodon/reducers/alerts.js b/app/javascript/mastodon/reducers/alerts.js
index aaea9775f..089d920c3 100644
--- a/app/javascript/mastodon/reducers/alerts.js
+++ b/app/javascript/mastodon/reducers/alerts.js
@@ -3,14 +3,14 @@ import {
   ALERT_DISMISS,
   ALERT_CLEAR,
 } from '../actions/alerts';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-const initialState = Immutable.List([]);
+const initialState = ImmutableList([]);
 
 export default function alerts(state = initialState, action) {
   switch(action.type) {
   case ALERT_SHOW:
-    return state.push(Immutable.Map({
+    return state.push(ImmutableMap({
       key: state.size > 0 ? state.last().get('key') + 1 : 0,
       title: action.title,
       message: action.message,
diff --git a/app/javascript/mastodon/reducers/cards.js b/app/javascript/mastodon/reducers/cards.js
index 3c9395011..4d86b0d7e 100644
--- a/app/javascript/mastodon/reducers/cards.js
+++ b/app/javascript/mastodon/reducers/cards.js
@@ -1,13 +1,13 @@
 import { STATUS_CARD_FETCH_SUCCESS } from '../actions/cards';
 
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
 export default function cards(state = initialState, action) {
   switch(action.type) {
   case STATUS_CARD_FETCH_SUCCESS:
-    return state.set(action.id, Immutable.fromJS(action.card));
+    return state.set(action.id, fromJS(action.card));
   default:
     return state;
   }
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 752377739..a92b5aa23 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -24,10 +24,10 @@ import {
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 import uuid from '../uuid';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   mounted: false,
   sensitive: false,
   spoiler: false,
@@ -40,9 +40,9 @@ const initialState = Immutable.Map({
   is_submitting: false,
   is_uploading: false,
   progress: 0,
-  media_attachments: Immutable.List(),
+  media_attachments: ImmutableList(),
   suggestion_token: null,
-  suggestions: Immutable.List(),
+  suggestions: ImmutableList(),
   me: null,
   default_privacy: 'public',
   default_sensitive: false,
@@ -51,7 +51,7 @@ const initialState = Immutable.Map({
 });
 
 function statusToTextMentions(state, status) {
-  let set = Immutable.OrderedSet([]);
+  let set = ImmutableOrderedSet([]);
   let me  = state.get('me');
 
   if (status.getIn(['account', 'id']) !== me) {
@@ -111,7 +111,7 @@ const insertSuggestion = (state, position, token, completion) => {
   return state.withMutations(map => {
     map.update('text', oldText => `${oldText.slice(0, position)}${completion} ${oldText.slice(position + token.length)}`);
     map.set('suggestion_token', null);
-    map.update('suggestions', Immutable.List(), list => list.clear());
+    map.update('suggestions', ImmutableList(), list => list.clear());
     map.set('focusDate', new Date());
     map.set('idempotencyKey', uuid());
   });
@@ -206,7 +206,7 @@ export default function compose(state = initialState, action) {
       map.set('is_uploading', true);
     });
   case COMPOSE_UPLOAD_SUCCESS:
-    return appendMedia(state, Immutable.fromJS(action.media));
+    return appendMedia(state, fromJS(action.media));
   case COMPOSE_UPLOAD_FAIL:
     return state.set('is_uploading', false);
   case COMPOSE_UPLOAD_UNDO:
@@ -219,9 +219,9 @@ export default function compose(state = initialState, action) {
       .set('focusDate', new Date())
       .set('idempotencyKey', uuid());
   case COMPOSE_SUGGESTIONS_CLEAR:
-    return state.update('suggestions', Immutable.List(), list => list.clear()).set('suggestion_token', null);
+    return state.update('suggestions', ImmutableList(), list => list.clear()).set('suggestion_token', null);
   case COMPOSE_SUGGESTIONS_READY:
-    return state.set('suggestions', Immutable.List(action.accounts.map(item => item.id))).set('suggestion_token', action.token);
+    return state.set('suggestions', ImmutableList(action.accounts.map(item => item.id))).set('suggestion_token', action.token);
   case COMPOSE_SUGGESTION_SELECT:
     return insertSuggestion(state, action.position, action.token, action.completion);
   case TIMELINE_DELETE:
diff --git a/app/javascript/mastodon/reducers/contexts.js b/app/javascript/mastodon/reducers/contexts.js
index 8a24f5f7a..9bfc09aa7 100644
--- a/app/javascript/mastodon/reducers/contexts.js
+++ b/app/javascript/mastodon/reducers/contexts.js
@@ -1,10 +1,10 @@
 import { CONTEXT_FETCH_SUCCESS } from '../actions/statuses';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
-const initialState = Immutable.Map({
-  ancestors: Immutable.Map(),
-  descendants: Immutable.Map(),
+const initialState = ImmutableMap({
+  ancestors: ImmutableMap(),
+  descendants: ImmutableMap(),
 });
 
 const normalizeContext = (state, id, ancestors, descendants) => {
@@ -18,12 +18,12 @@ const normalizeContext = (state, id, ancestors, descendants) => {
 };
 
 const deleteFromContexts = (state, id) => {
-  state.getIn(['descendants', id], Immutable.List()).forEach(descendantId => {
-    state = state.updateIn(['ancestors', descendantId], Immutable.List(), list => list.filterNot(itemId => itemId === id));
+  state.getIn(['descendants', id], ImmutableList()).forEach(descendantId => {
+    state = state.updateIn(['ancestors', descendantId], ImmutableList(), list => list.filterNot(itemId => itemId === id));
   });
 
-  state.getIn(['ancestors', id], Immutable.List()).forEach(ancestorId => {
-    state = state.updateIn(['descendants', ancestorId], Immutable.List(), list => list.filterNot(itemId => itemId === id));
+  state.getIn(['ancestors', id], ImmutableList()).forEach(ancestorId => {
+    state = state.updateIn(['descendants', ancestorId], ImmutableList(), list => list.filterNot(itemId => itemId === id));
   });
 
   state = state.deleteIn(['descendants', id]).deleteIn(['ancestors', id]);
@@ -34,7 +34,7 @@ const deleteFromContexts = (state, id) => {
 export default function contexts(state = initialState, action) {
   switch(action.type) {
   case CONTEXT_FETCH_SUCCESS:
-    return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants));
+    return normalizeContext(state, action.id, fromJS(action.ancestors), fromJS(action.descendants));
   case TIMELINE_DELETE:
     return deleteFromContexts(state, action.id);
   default:
diff --git a/app/javascript/mastodon/reducers/media_attachments.js b/app/javascript/mastodon/reducers/media_attachments.js
index 85bea4f0b..24119f628 100644
--- a/app/javascript/mastodon/reducers/media_attachments.js
+++ b/app/javascript/mastodon/reducers/media_attachments.js
@@ -1,7 +1,7 @@
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   accept_content_types: [],
 });
 
diff --git a/app/javascript/mastodon/reducers/meta.js b/app/javascript/mastodon/reducers/meta.js
index 1551228ec..119ef9d8f 100644
--- a/app/javascript/mastodon/reducers/meta.js
+++ b/app/javascript/mastodon/reducers/meta.js
@@ -1,7 +1,7 @@
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   streaming_api_base_url: null,
   access_token: null,
   me: null,
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 0c1cf5b0f..0063d24e4 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -11,10 +11,10 @@ import {
 } from '../actions/notifications';
 import { ACCOUNT_BLOCK_SUCCESS } from '../actions/accounts';
 import { TIMELINE_DELETE } from '../actions/timelines';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-const initialState = Immutable.Map({
-  items: Immutable.List(),
+const initialState = ImmutableMap({
+  items: ImmutableList(),
   next: null,
   top: true,
   unread: 0,
@@ -22,7 +22,7 @@ const initialState = Immutable.Map({
   isLoading: true,
 });
 
-const notificationToMap = notification => Immutable.Map({
+const notificationToMap = notification => ImmutableMap({
   id: notification.id,
   type: notification.type,
   account: notification.account.id,
@@ -46,7 +46,7 @@ const normalizeNotification = (state, notification) => {
 };
 
 const normalizeNotifications = (state, notifications, next) => {
-  let items    = Immutable.List();
+  let items    = ImmutableList();
   const loaded = state.get('loaded');
 
   notifications.forEach((n, i) => {
@@ -64,7 +64,7 @@ const normalizeNotifications = (state, notifications, next) => {
 };
 
 const appendNormalizedNotifications = (state, notifications, next) => {
-  let items = Immutable.List();
+  let items = ImmutableList();
 
   notifications.forEach((n, i) => {
     items = items.set(i, notificationToMap(n));
@@ -110,7 +110,7 @@ export default function notifications(state = initialState, action) {
   case ACCOUNT_BLOCK_SUCCESS:
     return filterNotifications(state, action.relationship);
   case NOTIFICATIONS_CLEAR:
-    return state.set('items', Immutable.List()).set('next', null);
+    return state.set('items', ImmutableList()).set('next', null);
   case TIMELINE_DELETE:
     return deleteByStatus(state, action.id);
   default:
diff --git a/app/javascript/mastodon/reducers/relationships.js b/app/javascript/mastodon/reducers/relationships.js
index b6607860c..c7b04a668 100644
--- a/app/javascript/mastodon/reducers/relationships.js
+++ b/app/javascript/mastodon/reducers/relationships.js
@@ -11,9 +11,9 @@ import {
   DOMAIN_BLOCK_SUCCESS,
   DOMAIN_UNBLOCK_SUCCESS,
 } from '../actions/domain_blocks';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
-const normalizeRelationship = (state, relationship) => state.set(relationship.id, Immutable.fromJS(relationship));
+const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
 
 const normalizeRelationships = (state, relationships) => {
   relationships.forEach(relationship => {
@@ -23,7 +23,7 @@ const normalizeRelationships = (state, relationships) => {
   return state;
 };
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
 export default function relationships(state = initialState, action) {
   switch(action.type) {
diff --git a/app/javascript/mastodon/reducers/reports.js b/app/javascript/mastodon/reducers/reports.js
index ad35eaa05..283c5b6f5 100644
--- a/app/javascript/mastodon/reducers/reports.js
+++ b/app/javascript/mastodon/reducers/reports.js
@@ -7,13 +7,13 @@ import {
   REPORT_STATUS_TOGGLE,
   REPORT_COMMENT_CHANGE,
 } from '../actions/reports';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
 
-const initialState = Immutable.Map({
-  new: Immutable.Map({
+const initialState = ImmutableMap({
+  new: ImmutableMap({
     isSubmitting: false,
     account_id: null,
-    status_ids: Immutable.Set(),
+    status_ids: ImmutableSet(),
     comment: '',
   }),
 });
@@ -26,14 +26,14 @@ export default function reports(state = initialState, action) {
       map.setIn(['new', 'account_id'], action.account.get('id'));
 
       if (state.getIn(['new', 'account_id']) !== action.account.get('id')) {
-        map.setIn(['new', 'status_ids'], action.status ? Immutable.Set([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : Immutable.Set());
+        map.setIn(['new', 'status_ids'], action.status ? ImmutableSet([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : ImmutableSet());
         map.setIn(['new', 'comment'], '');
       } else {
-        map.updateIn(['new', 'status_ids'], Immutable.Set(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
+        map.updateIn(['new', 'status_ids'], ImmutableSet(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
       }
     });
   case REPORT_STATUS_TOGGLE:
-    return state.updateIn(['new', 'status_ids'], Immutable.Set(), set => {
+    return state.updateIn(['new', 'status_ids'], ImmutableSet(), set => {
       if (action.checked) {
         return set.add(action.statusId);
       }
@@ -50,7 +50,7 @@ export default function reports(state = initialState, action) {
   case REPORT_SUBMIT_SUCCESS:
     return state.withMutations(map => {
       map.setIn(['new', 'account_id'], null);
-      map.setIn(['new', 'status_ids'], Immutable.Set());
+      map.setIn(['new', 'status_ids'], ImmutableSet());
       map.setIn(['new', 'comment'], '');
       map.setIn(['new', 'isSubmitting'], false);
     });
diff --git a/app/javascript/mastodon/reducers/search.js b/app/javascript/mastodon/reducers/search.js
index 0a3adac05..08d90e4e8 100644
--- a/app/javascript/mastodon/reducers/search.js
+++ b/app/javascript/mastodon/reducers/search.js
@@ -5,13 +5,13 @@ import {
   SEARCH_SHOW,
 } from '../actions/search';
 import { COMPOSE_MENTION, COMPOSE_REPLY } from '../actions/compose';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   value: '',
   submitted: false,
   hidden: false,
-  results: Immutable.Map(),
+  results: ImmutableMap(),
 });
 
 export default function search(state = initialState, action) {
@@ -21,7 +21,7 @@ export default function search(state = initialState, action) {
   case SEARCH_CLEAR:
     return state.withMutations(map => {
       map.set('value', '');
-      map.set('results', Immutable.Map());
+      map.set('results', ImmutableMap());
       map.set('submitted', false);
       map.set('hidden', false);
     });
@@ -31,10 +31,10 @@ export default function search(state = initialState, action) {
   case COMPOSE_MENTION:
     return state.set('hidden', true);
   case SEARCH_FETCH_SUCCESS:
-    return state.set('results', Immutable.Map({
-      accounts: Immutable.List(action.results.accounts.map(item => item.id)),
-      statuses: Immutable.List(action.results.statuses.map(item => item.id)),
-      hashtags: Immutable.List(action.results.hashtags),
+    return state.set('results', ImmutableMap({
+      accounts: ImmutableList(action.results.accounts.map(item => item.id)),
+      statuses: ImmutableList(action.results.statuses.map(item => item.id)),
+      hashtags: ImmutableList(action.results.hashtags),
     })).set('submitted', true);
   default:
     return state;
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index ddad7a4fc..dd2d76ec0 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -1,39 +1,39 @@
 import { SETTING_CHANGE } from '../actions/settings';
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE } from '../actions/columns';
 import { STORE_HYDRATE } from '../actions/store';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 import uuid from '../uuid';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   onboarded: false,
 
-  home: Immutable.Map({
-    shows: Immutable.Map({
+  home: ImmutableMap({
+    shows: ImmutableMap({
       reblog: true,
       reply: true,
     }),
 
-    regex: Immutable.Map({
+    regex: ImmutableMap({
       body: '',
     }),
   }),
 
-  notifications: Immutable.Map({
-    alerts: Immutable.Map({
+  notifications: ImmutableMap({
+    alerts: ImmutableMap({
       follow: true,
       favourite: true,
       reblog: true,
       mention: true,
     }),
 
-    shows: Immutable.Map({
+    shows: ImmutableMap({
       follow: true,
       favourite: true,
       reblog: true,
       mention: true,
     }),
 
-    sounds: Immutable.Map({
+    sounds: ImmutableMap({
       follow: true,
       favourite: true,
       reblog: true,
@@ -41,20 +41,20 @@ const initialState = Immutable.Map({
     }),
   }),
 
-  community: Immutable.Map({
-    regex: Immutable.Map({
+  community: ImmutableMap({
+    regex: ImmutableMap({
       body: '',
     }),
   }),
 
-  public: Immutable.Map({
-    regex: Immutable.Map({
+  public: ImmutableMap({
+    regex: ImmutableMap({
       body: '',
     }),
   }),
 });
 
-const defaultColumns = Immutable.fromJS([
+const defaultColumns = fromJS([
   { id: 'COMPOSE', uuid: uuid(), params: {} },
   { id: 'HOME', uuid: uuid(), params: {} },
   { id: 'NOTIFICATIONS', uuid: uuid(), params: {} },
@@ -82,7 +82,7 @@ export default function settings(state = initialState, action) {
   case SETTING_CHANGE:
     return state.setIn(action.key, action.value);
   case COLUMN_ADD:
-    return state.update('columns', list => list.push(Immutable.fromJS({ id: action.id, uuid: uuid(), params: action.params })));
+    return state.update('columns', list => list.push(fromJS({ id: action.id, uuid: uuid(), params: action.params })));
   case COLUMN_REMOVE:
     return state.update('columns', list => list.filterNot(item => item.get('uuid') === action.uuid));
   case COLUMN_MOVE:
diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index 7d00f6d30..bbc973302 100644
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -2,13 +2,13 @@ import {
   FAVOURITED_STATUSES_FETCH_SUCCESS,
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
 } from '../actions/favourites';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-const initialState = Immutable.Map({
-  favourites: Immutable.Map({
+const initialState = ImmutableMap({
+  favourites: ImmutableMap({
     next: null,
     loaded: false,
-    items: Immutable.List(),
+    items: ImmutableList(),
   }),
 });
 
@@ -16,7 +16,7 @@ const normalizeList = (state, listType, statuses, next) => {
   return state.update(listType, listMap => listMap.withMutations(map => {
     map.set('next', next);
     map.set('loaded', true);
-    map.set('items', Immutable.List(statuses.map(item => item.id)));
+    map.set('items', ImmutableList(statuses.map(item => item.id)));
   }));
 };
 
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 691135ff7..b1b1d0988 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -33,7 +33,7 @@ import {
   FAVOURITED_STATUSES_EXPAND_SUCCESS,
 } from '../actions/favourites';
 import { SEARCH_FETCH_SUCCESS } from '../actions/search';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const normalizeStatus = (state, status) => {
   if (!status) {
@@ -51,7 +51,7 @@ const normalizeStatus = (state, status) => {
   const searchContent = [status.spoiler_text, status.content].join(' ').replace(/<br \/>/g, '\n').replace(/<\/p><p>/g, '\n\n');
   normalStatus.search_index = new DOMParser().parseFromString(searchContent, 'text/html').documentElement.textContent;
 
-  return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus)));
+  return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus)));
 };
 
 const normalizeStatuses = (state, statuses) => {
@@ -82,7 +82,7 @@ const filterStatuses = (state, relationship) => {
   return state;
 };
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
 export default function statuses(state = initialState, action) {
   switch(action.type) {
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js
index 1b738a16a..065e89f96 100644
--- a/app/javascript/mastodon/reducers/timelines.js
+++ b/app/javascript/mastodon/reducers/timelines.js
@@ -15,25 +15,25 @@ import {
   ACCOUNT_BLOCK_SUCCESS,
   ACCOUNT_MUTE_SUCCESS,
 } from '../actions/accounts';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
-const initialState = Immutable.Map();
+const initialState = ImmutableMap();
 
-const initialTimeline = Immutable.Map({
+const initialTimeline = ImmutableMap({
   unread: 0,
   online: false,
   top: true,
   loaded: false,
   isLoading: false,
   next: false,
-  items: Immutable.List(),
+  items: ImmutableList(),
 });
 
 const normalizeTimeline = (state, timeline, statuses, next) => {
-  const ids       = Immutable.List(statuses.map(status => status.get('id')));
+  const ids       = ImmutableList(statuses.map(status => status.get('id')));
   const wasLoaded = state.getIn([timeline, 'loaded']);
   const hadNext   = state.getIn([timeline, 'next']);
-  const oldIds    = state.getIn([timeline, 'items'], Immutable.List());
+  const oldIds    = state.getIn([timeline, 'items'], ImmutableList());
 
   return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
     mMap.set('loaded', true);
@@ -44,8 +44,8 @@ const normalizeTimeline = (state, timeline, statuses, next) => {
 };
 
 const appendNormalizedTimeline = (state, timeline, statuses, next) => {
-  const ids    = Immutable.List(statuses.map(status => status.get('id')));
-  const oldIds = state.getIn([timeline, 'items'], Immutable.List());
+  const ids    = ImmutableList(statuses.map(status => status.get('id')));
+  const oldIds = state.getIn([timeline, 'items'], ImmutableList());
 
   return state.update(timeline, initialTimeline, map => map.withMutations(mMap => {
     mMap.set('isLoading', false);
@@ -56,7 +56,7 @@ const appendNormalizedTimeline = (state, timeline, statuses, next) => {
 
 const updateTimeline = (state, timeline, status, references) => {
   const top        = state.getIn([timeline, 'top']);
-  const ids        = state.getIn([timeline, 'items'], Immutable.List());
+  const ids        = state.getIn([timeline, 'items'], ImmutableList());
   const includesId = ids.includes(status.get('id'));
   const unread     = state.getIn([timeline, 'unread'], 0);
 
@@ -124,11 +124,11 @@ export default function timelines(state = initialState, action) {
   case TIMELINE_EXPAND_FAIL:
     return state.update(action.timeline, initialTimeline, map => map.set('isLoading', false));
   case TIMELINE_REFRESH_SUCCESS:
-    return normalizeTimeline(state, action.timeline, Immutable.fromJS(action.statuses), action.next);
+    return normalizeTimeline(state, action.timeline, fromJS(action.statuses), action.next);
   case TIMELINE_EXPAND_SUCCESS:
-    return appendNormalizedTimeline(state, action.timeline, Immutable.fromJS(action.statuses), action.next);
+    return appendNormalizedTimeline(state, action.timeline, fromJS(action.statuses), action.next);
   case TIMELINE_UPDATE:
-    return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
+    return updateTimeline(state, action.timeline, fromJS(action.status), action.references);
   case TIMELINE_DELETE:
     return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
   case ACCOUNT_BLOCK_SUCCESS:
diff --git a/app/javascript/mastodon/reducers/user_lists.js b/app/javascript/mastodon/reducers/user_lists.js
index 83bf1be1b..8db18c5dc 100644
--- a/app/javascript/mastodon/reducers/user_lists.js
+++ b/app/javascript/mastodon/reducers/user_lists.js
@@ -20,22 +20,22 @@ import {
   MUTES_FETCH_SUCCESS,
   MUTES_EXPAND_SUCCESS,
 } from '../actions/mutes';
-import Immutable from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
 
-const initialState = Immutable.Map({
-  followers: Immutable.Map(),
-  following: Immutable.Map(),
-  reblogged_by: Immutable.Map(),
-  favourited_by: Immutable.Map(),
-  follow_requests: Immutable.Map(),
-  blocks: Immutable.Map(),
-  mutes: Immutable.Map(),
+const initialState = ImmutableMap({
+  followers: ImmutableMap(),
+  following: ImmutableMap(),
+  reblogged_by: ImmutableMap(),
+  favourited_by: ImmutableMap(),
+  follow_requests: ImmutableMap(),
+  blocks: ImmutableMap(),
+  mutes: ImmutableMap(),
 });
 
 const normalizeList = (state, type, id, accounts, next) => {
-  return state.setIn([type, id], Immutable.Map({
+  return state.setIn([type, id], ImmutableMap({
     next,
-    items: Immutable.List(accounts.map(item => item.id)),
+    items: ImmutableList(accounts.map(item => item.id)),
   }));
 };
 
@@ -56,22 +56,22 @@ export default function userLists(state = initialState, action) {
   case FOLLOWING_EXPAND_SUCCESS:
     return appendToList(state, 'following', action.id, action.accounts, action.next);
   case REBLOGS_FETCH_SUCCESS:
-    return state.setIn(['reblogged_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
+    return state.setIn(['reblogged_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
   case FAVOURITES_FETCH_SUCCESS:
-    return state.setIn(['favourited_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
+    return state.setIn(['favourited_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
   case FOLLOW_REQUESTS_FETCH_SUCCESS:
-    return state.setIn(['follow_requests', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
+    return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
   case FOLLOW_REQUESTS_EXPAND_SUCCESS:
     return state.updateIn(['follow_requests', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next);
   case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
   case FOLLOW_REQUEST_REJECT_SUCCESS:
     return state.updateIn(['follow_requests', 'items'], list => list.filterNot(item => item === action.id));
   case BLOCKS_FETCH_SUCCESS:
-    return state.setIn(['blocks', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
+    return state.setIn(['blocks', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
   case BLOCKS_EXPAND_SUCCESS:
     return state.updateIn(['blocks', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['blocks', 'next'], action.next);
   case MUTES_FETCH_SUCCESS:
-    return state.setIn(['mutes', 'items'], Immutable.List(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
+    return state.setIn(['mutes', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
   case MUTES_EXPAND_SUCCESS:
     return state.updateIn(['mutes', 'items'], list => list.concat(action.accounts.map(item => item.id))).setIn(['mutes', 'next'], action.next);
   default:
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 07d9a2629..d26d1b727 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import Immutable from 'immutable';
+import { List as ImmutableList } from 'immutable';
 
 const getAccountBase         = (state, id) => state.getIn(['accounts', id], null);
 const getAccountCounters     = (state, id) => state.getIn(['accounts_counters', id], null);
@@ -73,10 +73,10 @@ export const makeGetNotification = () => {
 };
 
 export const getAccountGallery = createSelector([
-  (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], Immutable.List()),
+  (state, id) => state.getIn(['timelines', `account:${id}:media`, 'items'], ImmutableList()),
   state       => state.get('statuses'),
 ], (statusIds, statuses) => {
-  let medias = Immutable.List();
+  let medias = ImmutableList();
 
   statusIds.forEach(statusId => {
     const status = statuses.get(statusId);
diff --git a/spec/javascript/components/display_name.test.js b/spec/javascript/components/display_name.test.js
index d6dc7edc0..ad9288d4d 100644
--- a/spec/javascript/components/display_name.test.js
+++ b/spec/javascript/components/display_name.test.js
@@ -1,12 +1,12 @@
 import { expect } from 'chai';
 import { render } from 'enzyme';
-import Immutable  from 'immutable';
+import { fromJS }  from 'immutable';
 import React from 'react';
 import DisplayName from '../../../app/javascript/mastodon/components/display_name';
 
 describe('<DisplayName />', () => {
   it('renders display name + account name', () => {
-    const account = Immutable.fromJS({
+    const account = fromJS({
       username: 'bar',
       acct: 'bar@baz',
       display_name: 'Foo',
@@ -16,7 +16,7 @@ describe('<DisplayName />', () => {
   });
 
   it('renders the username + account name if display name is empty', () => {
-    const account = Immutable.fromJS({
+    const account = fromJS({
       username: 'bar',
       acct: 'bar@baz',
       display_name: '',

From 29f314a50209f64b551be7fae2744234bcca2627 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 11 Jul 2017 18:55:48 +0900
Subject: [PATCH 204/382] Remove redundant inclusion (#4150)

---
 app/services/process_feed_service.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 028962d5b..c335d2159 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -20,8 +20,6 @@ class ProcessFeedService < BaseService
   end
 
   class ProcessEntry
-    include AuthorExtractor
-
     def call(xml, account)
       @account = account
       @xml     = xml

From 425acecfdb15093a265b191120fb2d4e4c4135c4 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 11 Jul 2017 20:37:05 +0900
Subject: [PATCH 205/382] Wrap methods of ProcessFeedService::ProcessEntry in
 classes (#4151)

ProcessFeedService::ProcessEntry had many methods, so wrap them in classes
representing activities.
---
 app/services/process_feed_service.rb | 433 ++++++++++++++-------------
 1 file changed, 225 insertions(+), 208 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index c335d2159..19ab0c858 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -22,268 +22,285 @@ class ProcessFeedService < BaseService
   class ProcessEntry
     def call(xml, account)
       @account = account
-      @xml     = xml
+      @fetched = Activity.new(xml)
 
-      return if skip_unsupported_type?
+      return unless [:activity, :note, :comment].include?(@fetched.type)
 
-      case verb
-      when :post, :share
-        return create_status
-      when :delete
-        return delete_status
-      end
+      klass = case @fetched.verb
+              when :post
+                PostActivity
+              when :share
+                ShareActivity
+              when :delete
+                DeletionActivity
+              else
+                return
+              end
+
+      @fetched = klass.new(xml, account)
+      @fetched.perform
     rescue ActiveRecord::RecordInvalid => e
       Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
       nil
     end
 
-    private
-
-    def create_status
-      if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
-        Rails.logger.debug "Delete for status #{id} was queued, ignoring"
-        return
+    class Activity
+      def initialize(xml, account = nil)
+        @xml = xml
+        @account = account
       end
 
-      status, just_created = nil
-
-      Rails.logger.debug "Creating remote status #{id}"
-
-      if verb == :share
-        original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
-        return nil if original_status.nil?
+      def verb
+        raw = @xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
+        TagManager::VERBS.key(raw)
+      rescue
+        :post
       end
 
-      ApplicationRecord.transaction do
-        status, just_created = status_from_xml(@xml)
+      def type
+        raw = @xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
+        TagManager::TYPES.key(raw)
+      rescue
+        :activity
+      end
 
-        return if status.nil?
-        return status unless just_created
+      def id
+        @xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
+      end
 
-        if verb == :share
-          status.reblog = original_status.reblog? ? original_status.reblog : original_status
+      def url
+        link = @xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
+        link.nil? ? nil : link['href']
+      end
+
+      private
+
+      def find_status(uri)
+        if TagManager.instance.local_id?(uri)
+          local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
+          return Status.find_by(id: local_id)
         end
 
-        status.save!
+        Status.find_by(uri: uri)
       end
 
-      if thread?(@xml) && status.thread.nil?
-        Rails.logger.debug "Trying to attach #{status.id} (#{id(@xml)}) to #{thread(@xml).first}"
-        ThreadResolveWorker.perform_async(status.id, thread(@xml).second)
-      end
-
-      notify_about_mentions!(status) unless status.reblog?
-      notify_about_reblog!(status) if status.reblog? && status.reblog.account.local?
-
-      Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
-
-      LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-      DistributionWorker.perform_async(status.id)
-
-      status
-    end
-
-    def notify_about_mentions!(status)
-      status.mentions.includes(:account).each do |mention|
-        mentioned_account = mention.account
-        next unless mentioned_account.local?
-        NotifyService.new.call(mentioned_account, mention)
+      def redis
+        Redis.current
       end
     end
 
-    def notify_about_reblog!(status)
-      NotifyService.new.call(status.reblog.account, status)
-    end
+    class CreationActivity < Activity
+      def perform
+        if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
+          Rails.logger.debug "Delete for status #{id} was queued, ignoring"
+          return
+        end
 
-    def delete_status
-      Rails.logger.debug "Deleting remote status #{id}"
-      status = Status.find_by(uri: id, account: @account)
+        Rails.logger.debug "Creating remote status #{id}"
+        # Return early if status already exists in db
+        status = find_status(id)
 
-      if status.nil?
-        redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
-      else
-        RemoveStatusService.new.call(status)
-      end
-    end
+        return [status, false] unless status.nil?
 
-    def skip_unsupported_type?
-      !([:post, :share, :delete].include?(verb) && [:activity, :note, :comment].include?(type))
-    end
+        return [nil, false] if @account.suspended?
 
-    def shared_status_from_xml(entry)
-      status = find_status(id(entry))
+        status = Status.create!(
+          uri: id,
+          url: url,
+          account: @account,
+          reblog: reblog,
+          text: content,
+          spoiler_text: content_warning,
+          created_at: published,
+          reply: thread?,
+          language: content_language,
+          visibility: visibility_scope,
+          conversation: converstation_to_persistent&.first,
+          thread: thread? ? find_status(thread.first) : nil
+        )
 
-      return status unless status.nil?
+        save_mentions(status)
+        save_hashtags(status)
+        save_media(status)
 
-      FetchRemoteStatusService.new.call(url(entry))
-    end
+        if thread? && status.thread.nil?
+          Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
+          ThreadResolveWorker.perform_async(status.id, thread.second)
+        end
 
-    def status_from_xml(entry)
-      # Return early if status already exists in db
-      status = find_status(id(entry))
+        Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
 
-      return [status, false] unless status.nil?
+        LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
+        DistributionWorker.perform_async(status.id)
 
-      account = @account
-
-      return [nil, false] if account.suspended?
-
-      status = Status.create!(
-        uri: id(entry),
-        url: url(entry),
-        account: account,
-        text: content(entry),
-        spoiler_text: content_warning(entry),
-        created_at: published(entry),
-        reply: thread?(entry),
-        language: content_language(entry),
-        visibility: visibility_scope(entry),
-        conversation: find_or_create_conversation(entry),
-        thread: thread?(entry) ? find_status(thread(entry).first) : nil
-      )
-
-      mentions_from_xml(status, entry)
-      hashtags_from_xml(status, entry)
-      media_from_xml(status, entry)
-
-      [status, true]
-    end
-
-    def find_or_create_conversation(xml)
-      uri = xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
-      return if uri.nil?
-
-      if TagManager.instance.local_id?(uri)
-        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
-        return Conversation.find_by(id: local_id)
+        [status, true]
       end
 
-      Conversation.find_by(uri: uri) || Conversation.create!(uri: uri)
-    end
-
-    def find_status(uri)
-      if TagManager.instance.local_id?(uri)
-        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
-        return Status.find_by(id: local_id)
+      def content
+        @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
       end
 
-      Status.find_by(uri: uri)
-    end
-
-    def mentions_from_xml(parent, xml)
-      processed_account_ids = []
-
-      xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
-        next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
-
-        mentioned_account = account_from_href(link['href'])
-
-        next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
-
-        mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
-
-        # So we can skip duplicate mentions
-        processed_account_ids << mentioned_account.id
+      def content_language
+        @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
       end
-    end
 
-    def account_from_href(href)
-      url = Addressable::URI.parse(href).normalize
-
-      if TagManager.instance.web_domain?(url.host)
-        Account.find_local(url.path.gsub('/users/', ''))
-      else
-        Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
+      def content_warning
+        @xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
       end
-    end
 
-    def hashtags_from_xml(parent, xml)
-      tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
-      ProcessHashtagsService.new.call(parent, tags)
-    end
+      def visibility_scope
+        @xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
+      end
 
-    def media_from_xml(parent, xml)
-      do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
+      def published
+        @xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
+      end
 
-      xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
-        next unless link['href']
+      def thread?
+        !@xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
+      end
 
-        media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
-        parsed_url = Addressable::URI.parse(link['href']).normalize
+      def thread
+        thr = @xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
+        [thr['ref'], thr['href']]
+      end
 
-        next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
+      private
 
-        media.save
+      def converstation_to_persistent
+        uri = @xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
+        return if uri.nil?
 
-        next if do_not_download
+        if TagManager.instance.local_id?(uri)
+          local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
+          return Conversation.find_by(id: local_id)
+        end
 
-        begin
-          media.file_remote_url = link['href']
-          media.save!
-        rescue ActiveRecord::RecordInvalid
-          next
+        found = Conversation.find_by(uri: uri)
+        found ? [found, false] : [Conversation.create!(uri: uri), true]
+      end
+
+      def save_mentions(parent)
+        processed_account_ids = []
+
+        @xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
+          next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
+
+          mentioned_account = account_from_href(link['href'])
+
+          next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
+
+          mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
+
+          # So we can skip duplicate mentions
+          processed_account_ids << mentioned_account.id
+        end
+      end
+
+      def save_hashtags(parent)
+        tags = @xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
+        ProcessHashtagsService.new.call(parent, tags)
+      end
+
+      def save_media(parent)
+        do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
+
+        @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
+          next unless link['href']
+
+          media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
+          parsed_url = Addressable::URI.parse(link['href']).normalize
+
+          next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
+
+          media.save
+
+          next if do_not_download
+
+          begin
+            media.file_remote_url = link['href']
+            media.save!
+          rescue ActiveRecord::RecordInvalid
+            next
+          end
+        end
+      end
+
+      def account_from_href(href)
+        url = Addressable::URI.parse(href).normalize
+
+        if TagManager.instance.web_domain?(url.host)
+          Account.find_local(url.path.gsub('/users/', ''))
+        else
+          Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
         end
       end
     end
 
-    def id(xml = @xml)
-      xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
+    class ShareActivity < CreationActivity
+      def perform
+        status, just_created = super
+        NotifyService.new.call(reblog.account, status) if reblog&.account&.local? && just_created
+        status
+      end
+
+      def object
+        @xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)
+      end
+
+      private
+
+      def status
+        reblog && super
+      end
+
+      def reblog
+        return @reblog if defined? @reblog
+
+        original_status = RemoteActivity.new(object).perform
+        @reblog = original_status.reblog? ? original_status.reblog : original_status
+      end
     end
 
-    def verb(xml = @xml)
-      raw = xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
-      TagManager::VERBS.key(raw)
-    rescue
-      :post
+    class PostActivity < CreationActivity
+      def perform
+        status, just_created = super
+
+        if just_created
+          status.mentions.includes(:account).each do |mention|
+            mentioned_account = mention.account
+            next unless mentioned_account.local?
+            NotifyService.new.call(mentioned_account, mention)
+          end
+        end
+
+        status
+      end
+
+      private
+
+      def reblog
+        nil
+      end
     end
 
-    def type(xml = @xml)
-      raw = xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
-      TagManager::TYPES.key(raw)
-    rescue
-      :activity
+    class DeletionActivity < Activity
+      def perform
+        Rails.logger.debug "Deleting remote status #{id}"
+        status = Status.find_by(uri: id, account: @account)
+
+        if status.nil?
+          redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
+        else
+          RemoveStatusService.new.call(status)
+        end
+      end
     end
 
-    def url(xml = @xml)
-      link = xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
-      link.nil? ? nil : link['href']
-    end
-
-    def content(xml = @xml)
-      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
-    end
-
-    def content_language(xml = @xml)
-      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
-    end
-
-    def content_warning(xml = @xml)
-      xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
-    end
-
-    def visibility_scope(xml = @xml)
-      xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
-    end
-
-    def published(xml = @xml)
-      xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
-    end
-
-    def thread?(xml = @xml)
-      !xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
-    end
-
-    def thread(xml = @xml)
-      thr = xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
-      [thr['ref'], thr['href']]
-    end
-
-    def account?(xml = @xml)
-      !xml.at_xpath('./xmlns:author', xmlns: TagManager::XMLNS).nil?
-    end
-
-    def redis
-      Redis.current
+    class RemoteActivity < Activity
+      def perform
+        find_status(id) || FetchRemoteStatusService.new.call(url)
+      end
     end
   end
 end

From 31366334cb186974fe97234e05fe36d19d33841b Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 11 Jul 2017 21:36:27 +0900
Subject: [PATCH 206/382] Drawer tab according to column (#4135)

* Add notifications link to drawer

* Remove local and public timeline tab in drawer

* Add home
---
 .../mastodon/features/compose/index.js        | 20 +++++++++++++++++--
 .../mastodon/locales/defaultMessages.json     |  8 ++++++++
 app/javascript/styles/components.scss         |  3 +--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 747fe4216..6aa5de96c 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -2,6 +2,7 @@ import React from 'react';
 import ComposeFormContainer from './containers/compose_form_container';
 import NavigationContainer from './containers/navigation_container';
 import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 import { mountCompose, unmountCompose } from '../../actions/compose';
 import Link from 'react-router-dom/Link';
@@ -13,6 +14,8 @@ import SearchResultsContainer from './containers/search_results_container';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
+  home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
+  notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
   public: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
   community: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
   preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
@@ -20,6 +23,7 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
+  columns: state.getIn(['settings', 'columns']),
   showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']),
 });
 
@@ -29,6 +33,7 @@ export default class Compose extends React.PureComponent {
 
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
+    columns: ImmutablePropTypes.list.isRequired,
     multiColumn: PropTypes.bool,
     showSearch: PropTypes.bool,
     intl: PropTypes.object.isRequired,
@@ -48,11 +53,22 @@ export default class Compose extends React.PureComponent {
     let header = '';
 
     if (multiColumn) {
+      const { columns } = this.props;
       header = (
         <div className='drawer__header'>
           <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' aria-label={intl.formatMessage(messages.start)} className='fa fa-fw fa-asterisk' /></Link>
-          <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' aria-label={intl.formatMessage(messages.community)} className='fa fa-fw fa-users' /></Link>
-          <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' aria-label={intl.formatMessage(messages.public)} className='fa fa-fw fa-globe' /></Link>
+          {!columns.some(column => column.get('id') === 'HOME') && (
+            <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' aria-label={intl.formatMessage(messages.home_timeline)} /></Link>
+          )}
+          {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
+            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)}><i role='img' className='fa fa-fw fa-bell' aria-label={intl.formatMessage(messages.notifications)} /></Link>
+          )}
+          {!columns.some(column => column.get('id') === 'COMMUNITY') && (
+            <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' aria-label={intl.formatMessage(messages.community)} className='fa fa-fw fa-users' /></Link>
+          )}
+          {!columns.some(column => column.get('id') === 'PUBLIC') && (
+            <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' aria-label={intl.formatMessage(messages.public)} className='fa fa-fw fa-globe' /></Link>
+          )}
           <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)}><i role='img' aria-label={intl.formatMessage(messages.preferences)} className='fa fa-fw fa-cog' /></a>
           <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' aria-label={intl.formatMessage(messages.logout)} className='fa fa-fw fa-sign-out' /></a>
         </div>
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 88f0f9c30..7c1522299 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -635,6 +635,14 @@
         "defaultMessage": "Getting started",
         "id": "getting_started.heading"
       },
+      {
+        "defaultMessage": "Home",
+        "id": "tabs_bar.home"
+      },
+      {
+        "defaultMessage": "Notifications",
+        "id": "tabs_bar.notifications"
+      },
       {
         "defaultMessage": "Federated timeline",
         "id": "navigation_bar.public_timeline"
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 97651b5f4..def69d250 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1317,8 +1317,7 @@
 .drawer__tab {
   display: block;
   flex: 1 1 auto;
-  padding: 15px;
-  padding-bottom: 13px;
+  padding: 15px 5px 13px;
   color: $ui-primary-color;
   text-decoration: none;
   text-align: center;

From 8784bd79d0053cb15775eb078f45e6aca7775d77 Mon Sep 17 00:00:00 2001
From: "Akihiko Odaki (@fn_aki@pawoo.net)" <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 11 Jul 2017 22:15:42 +0900
Subject: [PATCH 207/382] Require stylesheets in common.js (#4152)

Require stylesheets in common.js because stylesheets are shared by the
entry points.
---
 app/javascript/mastodon/main.js         | 4 ----
 app/javascript/packs/common.js          | 5 +++++
 app/views/layouts/application.html.haml | 2 +-
 app/views/layouts/embedded.html.haml    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index aca64c075..d7ffa8ea6 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,9 +1,5 @@
 const perf = require('./performance');
 
-// import default stylesheet with variables
-require('font-awesome/css/font-awesome.css');
-require('mastodon-application-style');
-
 function onDomContentLoaded(callback) {
   if (document.readyState !== 'loading') {
     callback();
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index 9d63d8f98..a0cb91ae4 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -1,2 +1,7 @@
 import { start } from 'rails-ujs';
+
+// import default stylesheet with variables
+require('font-awesome/css/font-awesome.css');
+require('mastodon-application-style');
+
 start();
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 580d8fb4d..ef97fb127 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -18,7 +18,7 @@
         = ' - '
       = title
 
-    = stylesheet_pack_tag 'application', media: 'all'
+    = stylesheet_pack_tag 'common', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 
     = javascript_pack_tag 'features/getting_started', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 5680c1ff9..4826f32f7 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
-    = stylesheet_pack_tag 'application', media: 'all'
+    = stylesheet_pack_tag 'common', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'

From e19eefe219c46ea9f763d0279029f03c5cf4554f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 11 Jul 2017 15:27:59 +0200
Subject: [PATCH 208/382] Redesign the landing page, mount public timeline on
 it (#4122)

* Redesign the landing page, mount public timeline on it

* Adjust the standalone mounted component to the lacking of router

* Adjust auth layout pages to new design

* Fix tests

* Standalone public timeline polling every 5 seconds

* Remove now obsolete translations

* Add responsive design for new landing page

* Address reviews

* Add floating clouds behind frontpage form

* Use access token from public page when available

* Fix mentions and hashtags links, cursor on status content in standalone mode

* Add footer link to source code

* Fix errors on pages that don't embed the component, use classnames

* Fix tests

* Change anonymous autoPlayGif default to false

* When gif autoplay is disabled, hover to play

* Add option to hide the timeline preview

* Slightly improve alt layout

* Add elephant friend to new frontpage

* Display "back to mastodon" in place of "login" when logged in on frontpage

* Change polling time to 3s
---
 app/controllers/about_controller.rb           |  13 +-
 app/controllers/admin/settings_controller.rb  |   9 +-
 app/controllers/home_controller.rb            |  16 +-
 .../fonts/montserrat/Montserrat-Medium.ttf    | Bin 0 -> 192488 bytes
 app/javascript/images/cloud2.png              | Bin 0 -> 4973 bytes
 app/javascript/images/cloud3.png              | Bin 0 -> 5860 bytes
 app/javascript/images/cloud4.png              | Bin 0 -> 5273 bytes
 app/javascript/images/elephant-fren.png       | Bin 0 -> 40859 bytes
 app/javascript/images/logo.svg                |   2 +-
 .../mastodon/components/dropdown_menu.js      |  19 +-
 .../mastodon/components/media_gallery.js      |  38 +-
 .../mastodon/components/permalink.js          |   4 +-
 app/javascript/mastodon/components/status.js  |   8 +-
 .../mastodon/components/status_action_bar.js  |  11 +-
 .../mastodon/components/status_content.js     |  17 +-
 .../mastodon/components/video_player.js       |  22 +-
 .../mastodon/containers/timeline_container.js |  39 ++
 .../standalone/public_timeline/index.js       |  76 +++
 app/javascript/packs/public.js                |  10 +
 app/javascript/styles/about.scss              | 454 ++++++++++++++++--
 app/javascript/styles/basics.scss             |   7 +-
 app/javascript/styles/boost.scss              |   4 +
 app/javascript/styles/components.scss         |  32 +-
 app/javascript/styles/containers.scss         |  48 +-
 app/javascript/styles/fonts/montserrat.scss   |   8 +
 app/javascript/styles/forms.scss              |  39 +-
 app/presenters/instance_presenter.rb          |   1 +
 app/serializers/initial_state_serializer.rb   |  35 +-
 app/views/about/_features.html.haml           |  25 +
 app/views/about/_registration.html.haml       |  20 +-
 app/views/about/show.html.haml                | 120 +++--
 app/views/admin/settings/edit.html.haml       |  43 +-
 app/views/auth/registrations/new.html.haml    |   6 +-
 app/views/layouts/auth.html.haml              |   3 +-
 config/locales/ar.yml                         |  13 +-
 config/locales/bg.yml                         |  13 +-
 config/locales/ca.yml                         |  17 +-
 config/locales/de.yml                         |  13 -
 config/locales/en.yml                         |  43 +-
 config/locales/eo.yml                         |  23 +-
 config/locales/es.yml                         |  13 +-
 config/locales/fa.yml                         |  13 -
 config/locales/fi.yml                         |  13 +-
 config/locales/fr.yml                         |  15 +-
 config/locales/he.yml                         |  13 -
 config/locales/hr.yml                         |  13 +-
 config/locales/id.yml                         |  13 -
 config/locales/io.yml                         |  13 -
 config/locales/it.yml                         |  13 +-
 config/locales/ja.yml                         |  15 +-
 config/locales/ko.yml                         |  19 +-
 config/locales/nl.yml                         |  21 +-
 config/locales/no.yml                         |  13 -
 config/locales/oc.yml                         |  17 +-
 config/locales/pl.yml                         |  19 +-
 config/locales/pt-BR.yml                      |  13 -
 config/locales/pt.yml                         |  13 -
 config/locales/ru.yml                         |  13 -
 config/locales/th.yml                         |  13 -
 config/locales/tr.yml                         |  13 -
 config/locales/uk.yml                         |  13 -
 config/locales/zh-CN.yml                      |  13 -
 config/locales/zh-HK.yml                      |  13 -
 config/locales/zh-TW.yml                      |  13 -
 config/settings.yml                           |   1 +
 lib/tasks/mastodon.rake                       |   8 +-
 spec/requests/localization_spec.rb            |   8 +-
 spec/views/about/show.html.haml_spec.rb       |   9 +-
 68 files changed, 959 insertions(+), 658 deletions(-)
 create mode 100644 app/javascript/fonts/montserrat/Montserrat-Medium.ttf
 create mode 100644 app/javascript/images/cloud2.png
 create mode 100644 app/javascript/images/cloud3.png
 create mode 100644 app/javascript/images/cloud4.png
 create mode 100644 app/javascript/images/elephant-fren.png
 create mode 100644 app/javascript/mastodon/containers/timeline_container.js
 create mode 100644 app/javascript/mastodon/features/standalone/public_timeline/index.js
 create mode 100644 app/views/about/_features.html.haml

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index c0addbecc..47690e81e 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -4,7 +4,10 @@ class AboutController < ApplicationController
   before_action :set_body_classes
   before_action :set_instance_presenter, only: [:show, :more, :terms]
 
-  def show; end
+  def show
+    serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
+    @initial_state_json   = serializable_resource.to_json
+  end
 
   def more; end
 
@@ -15,6 +18,7 @@ class AboutController < ApplicationController
   def new_user
     User.new.tap(&:build_account)
   end
+
   helper_method :new_user
 
   def set_instance_presenter
@@ -24,4 +28,11 @@ class AboutController < ApplicationController
   def set_body_classes
     @body_classes = 'about-body'
   end
+
+  def initial_state_params
+    {
+      settings: {},
+      token: current_session&.token,
+    }
+  end
 end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index f27a1f4d4..29b590d7a 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -11,8 +11,15 @@ module Admin
       site_terms
       open_registrations
       closed_registrations_message
+      open_deletion
+      timeline_preview
+    ).freeze
+
+    BOOLEAN_SETTINGS = %w(
+      open_registrations
+      open_deletion
+      timeline_preview
     ).freeze
-    BOOLEAN_SETTINGS = %w(open_registrations).freeze
 
     def edit
       @settings = Setting.all_as_records
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 218da6906..8a8b9ec76 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -15,12 +15,16 @@ class HomeController < ApplicationController
   end
 
   def set_initial_state_json
-    state = InitialStatePresenter.new(settings: Web::Setting.find_by(user: current_user)&.data || {},
-                                      current_account: current_account,
-                                      token: current_session.token,
-                                      admin: Account.find_local(Setting.site_contact_username))
-
-    serializable_resource = ActiveModelSerializers::SerializableResource.new(state, serializer: InitialStateSerializer)
+    serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
     @initial_state_json   = serializable_resource.to_json
   end
+
+  def initial_state_params
+    {
+      settings: Web::Setting.find_by(user: current_user)&.data || {},
+      current_account: current_account,
+      token: current_session.token,
+      admin: Account.find_local(Setting.site_contact_username),
+    }
+  end
 end
diff --git a/app/javascript/fonts/montserrat/Montserrat-Medium.ttf b/app/javascript/fonts/montserrat/Montserrat-Medium.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..88d70b89c3f2740e9b9c80881616136b5f697091
GIT binary patch
literal 192488
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
UzrlvwI85(kltu&EBk>jGKbyx+3IG5A

literal 0
HcmV?d00001

diff --git a/app/javascript/images/cloud2.png b/app/javascript/images/cloud2.png
new file mode 100644
index 0000000000000000000000000000000000000000..f325ca6de0967bec0b77f532cf7e961adb89b99a
GIT binary patch
literal 4973
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
b)&0+1YW~Zts=5n4jG^Eo#}Ahu^t=3j6x<=*

literal 0
HcmV?d00001

diff --git a/app/javascript/images/cloud3.png b/app/javascript/images/cloud3.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab194d0b857a946094418fdf4bd87caadb8d8122
GIT binary patch
literal 5860
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
N<0p^Z|J(P<{{Zxw-<SXZ

literal 0
HcmV?d00001

diff --git a/app/javascript/images/cloud4.png b/app/javascript/images/cloud4.png
new file mode 100644
index 0000000000000000000000000000000000000000..98323f5a271555a8e5cc72a8a166ddbd8de7eddc
GIT binary patch
literal 5273
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
CO5;fY

literal 0
HcmV?d00001

diff --git a/app/javascript/images/elephant-fren.png b/app/javascript/images/elephant-fren.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b64edf084c020002a00022bd188837a82ed0727
GIT binary patch
literal 40859
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

literal 0
HcmV?d00001

diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
index c233db842..16cb3a944 100644
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" height="1000" width="1000"><path d="M500 0a500 500 0 0 0-353.553 146.447 500 500 0 1 0 707.106 707.106A500 500 0 0 0 500 0zm-.059 280.05h107.12c-19.071 13.424-26.187 51.016-27.12 73.843V562.05c0 44.32-35.68 80-80 80s-80-35.68-80-80v-202c0-44.32 35.68-80 80-80zm-.441 52c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zm-279.059 7.9c44.32 0 80 35.68 80 80v206.157c.933 22.827 8.049 60.42 27.12 73.842H220.44c-44.32 0-80-35.68-80-80v-200c0-44.32 35.68-80 80-80zm559.12 0c44.32 0 80 35.68 80 80v200c0 44.32-35.68 80-80 80H672.44c19.071-13.424 26.187-51.016 27.12-73.843V419.95c0-44.32 35.68-80 80-80zM220 392c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm560 0c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm-280.5 40.05c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zM220 491.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zM499.5 532c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zM220 591.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28z" fill="#189efc"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" height="1000" width="1000"><path d="M500 0a500 500 0 0 0-353.553 146.447 500 500 0 1 0 707.106 707.106A500 500 0 0 0 500 0zm-.059 280.05h107.12c-19.071 13.424-26.187 51.016-27.12 73.843V562.05c0 44.32-35.68 80-80 80s-80-35.68-80-80v-202c0-44.32 35.68-80 80-80zm-.441 52c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zm-279.059 7.9c44.32 0 80 35.68 80 80v206.157c.933 22.827 8.049 60.42 27.12 73.842H220.44c-44.32 0-80-35.68-80-80v-200c0-44.32 35.68-80 80-80zm559.12 0c44.32 0 80 35.68 80 80v200c0 44.32-35.68 80-80 80H672.44c19.071-13.424 26.187-51.016 27.12-73.843V419.95c0-44.32 35.68-80 80-80zM220 392c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm560 0c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm-280.5 40.05c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zM220 491.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zM499.5 532c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zM220 591.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28z" fill="#fff"/></svg>
diff --git a/app/javascript/mastodon/components/dropdown_menu.js b/app/javascript/mastodon/components/dropdown_menu.js
index 12e1b44fa..98323b069 100644
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -14,6 +14,7 @@ export default class DropdownMenu extends React.PureComponent {
     size: PropTypes.number.isRequired,
     direction: PropTypes.string,
     ariaLabel: PropTypes.string,
+    disabled: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -68,9 +69,19 @@ export default class DropdownMenu extends React.PureComponent {
   }
 
   render () {
-    const { icon, items, size, direction, ariaLabel } = this.props;
-    const { expanded } = this.state;
+    const { icon, items, size, direction, ariaLabel, disabled } = this.props;
+    const { expanded }   = this.state;
     const directionClass = (direction === 'left') ? 'dropdown__left' : 'dropdown__right';
+    const iconStyle      = { fontSize: `${size}px`, width: `${size}px`, lineHeight: `${size}px` };
+    const iconClassname  = `fa fa-fw fa-${icon} dropdown__icon`;
+
+    if (disabled) {
+      return (
+        <div className='icon-button disabled' style={iconStyle} aria-label={ariaLabel}>
+          <i className={iconClassname} aria-hidden />
+        </div>
+      );
+    }
 
     const dropdownItems = expanded && (
       <ul className='dropdown__content-list'>
@@ -80,8 +91,8 @@ export default class DropdownMenu extends React.PureComponent {
 
     return (
       <Dropdown ref={this.setRef} onShow={this.handleShow} onHide={this.handleHide}>
-        <DropdownTrigger className='icon-button' style={{ fontSize: `${size}px`, width: `${size}px`, lineHeight: `${size}px` }} aria-label={ariaLabel}>
-          <i className={`fa fa-fw fa-${icon} dropdown__icon`}  aria-hidden />
+        <DropdownTrigger className='icon-button' style={iconStyle} aria-label={ariaLabel}>
+          <i className={iconClassname} aria-hidden />
         </DropdownTrigger>
 
         <DropdownContent className={directionClass}>
diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 75222e965..89a358e38 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -11,18 +11,44 @@ const messages = defineMessages({
 
 class Item extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     attachment: ImmutablePropTypes.map.isRequired,
     index: PropTypes.number.isRequired,
     size: PropTypes.number.isRequired,
     onClick: PropTypes.func.isRequired,
-    autoPlayGif: PropTypes.bool.isRequired,
+    autoPlayGif: PropTypes.bool,
   };
 
+  static defaultProps = {
+    autoPlayGif: false,
+  };
+
+  handleMouseEnter = (e) => {
+    if (this.hoverToPlay()) {
+      e.target.play();
+    }
+  }
+
+  handleMouseLeave = (e) => {
+    if (this.hoverToPlay()) {
+      e.target.pause();
+      e.target.currentTime = 0;
+    }
+  }
+
+  hoverToPlay () {
+    const { attachment, autoPlayGif } = this.props;
+    return !autoPlayGif && attachment.get('type') === 'gifv';
+  }
+
   handleClick = (e) => {
     const { index, onClick } = this.props;
 
-    if (e.button === 0) {
+    if (this.context.router && e.button === 0) {
       e.preventDefault();
       onClick(index);
     }
@@ -116,6 +142,8 @@ class Item extends React.PureComponent {
             role='application'
             src={attachment.get('url')}
             onClick={this.handleClick}
+            onMouseEnter={this.handleMouseEnter}
+            onMouseLeave={this.handleMouseLeave}
             autoPlay={autoPlay}
             loop
             muted
@@ -144,7 +172,11 @@ export default class MediaGallery extends React.PureComponent {
     height: PropTypes.number.isRequired,
     onOpenMedia: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
-    autoPlayGif: PropTypes.bool.isRequired,
+    autoPlayGif: PropTypes.bool,
+  };
+
+  static defaultProps = {
+    autoPlayGif: false,
   };
 
   state = {
diff --git a/app/javascript/mastodon/components/permalink.js b/app/javascript/mastodon/components/permalink.js
index 0b7d0a65a..d726d37a2 100644
--- a/app/javascript/mastodon/components/permalink.js
+++ b/app/javascript/mastodon/components/permalink.js
@@ -15,7 +15,7 @@ export default class Permalink extends React.PureComponent {
   };
 
   handleClick = (e) => {
-    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+    if (this.context.router && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
       e.preventDefault();
       this.context.router.history.push(this.props.to);
     }
@@ -25,7 +25,7 @@ export default class Permalink extends React.PureComponent {
     const { href, children, className, ...other } = this.props;
 
     return (
-      <a href={href} onClick={this.handleClick} {...other} className={`permalink${className ? ' ' + className : ''}`}>
+      <a target='_blank' href={href} onClick={this.handleClick} {...other} className={`permalink${className ? ' ' + className : ''}`}>
         {children}
       </a>
     );
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index df771f5a8..6b9fdd2af 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -140,12 +140,16 @@ export default class Status extends ImmutablePureComponent {
   }
 
   handleClick = () => {
+    if (!this.context.router) {
+      return;
+    }
+
     const { status } = this.props;
     this.context.router.history.push(`/statuses/${status.getIn(['reblog', 'id'], status.get('id'))}`);
   }
 
   handleAccountClick = (e) => {
-    if (e.button === 0) {
+    if (this.context.router && e.button === 0) {
       const id = Number(e.currentTarget.getAttribute('data-id'));
       e.preventDefault();
       this.context.router.history.push(`/accounts/${id}`);
@@ -236,7 +240,7 @@ export default class Status extends ImmutablePureComponent {
         <div className='status__info'>
           <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
 
-          <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name'>
+          <a onClick={this.handleAccountClick} target='_blank' data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name'>
             <div className='status__avatar'>
               {statusAvatar}
             </div>
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index fd7c99054..7bb394e71 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -40,7 +40,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
     onBlock: PropTypes.func,
     onReport: PropTypes.func,
     onMuteConversation: PropTypes.func,
-    me: PropTypes.number.isRequired,
+    me: PropTypes.number,
     withDismiss: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
@@ -97,6 +97,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
     const { status, me, intl, withDismiss } = this.props;
     const reblogDisabled = status.get('visibility') === 'private' || status.get('visibility') === 'direct';
     const mutingConversation = status.get('muted');
+    const anonymousAccess = !me;
 
     let menu = [];
     let reblogIcon = 'retweet';
@@ -137,12 +138,12 @@ export default class StatusActionBar extends ImmutablePureComponent {
 
     return (
       <div className='status__action-bar'>
-        <IconButton className='status__action-bar-button' title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
-        <IconButton className='status__action-bar-button' disabled={reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
-        <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
+        <IconButton className='status__action-bar-button' disabled={anonymousAccess || reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
+        <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
 
         <div className='status__action-bar-dropdown'>
-          <DropdownMenu items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />
+          <DropdownMenu disabled={anonymousAccess} items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js
index 02b4c8402..1b803a22e 100644
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -6,6 +6,7 @@ import emojify from '../emoji';
 import { isRtl } from '../rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
+import classnames from 'classnames';
 
 export default class StatusContent extends React.PureComponent {
 
@@ -43,10 +44,11 @@ export default class StatusContent extends React.PureComponent {
       } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
         link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
       } else {
-        link.setAttribute('target', '_blank');
-        link.setAttribute('rel', 'noopener');
         link.setAttribute('title', link.href);
       }
+
+      link.setAttribute('target', '_blank');
+      link.setAttribute('rel', 'noopener');
     }
   }
 
@@ -59,7 +61,7 @@ export default class StatusContent extends React.PureComponent {
   }
 
   onMentionClick = (mention, e) => {
-    if (e.button === 0) {
+    if (this.context.router && e.button === 0) {
       e.preventDefault();
       this.context.router.history.push(`/accounts/${mention.get('id')}`);
     }
@@ -68,7 +70,7 @@ export default class StatusContent extends React.PureComponent {
   onHashtagClick = (hashtag, e) => {
     hashtag = hashtag.replace(/^#/, '').toLowerCase();
 
-    if (e.button === 0) {
+    if (this.context.router && e.button === 0) {
       e.preventDefault();
       this.context.router.history.push(`/timelines/tag/${hashtag}`);
     }
@@ -120,6 +122,9 @@ export default class StatusContent extends React.PureComponent {
     const content = { __html: emojify(status.get('content')) };
     const spoilerContent = { __html: emojify(escapeTextContentForBrowser(status.get('spoiler_text', ''))) };
     const directionStyle = { direction: 'ltr' };
+    const classNames = classnames('status__content', {
+      'status__content--with-action': this.props.onClick && this.context.router,
+    });
 
     if (isRtl(status.get('search_index'))) {
       directionStyle.direction = 'rtl';
@@ -141,7 +146,7 @@ export default class StatusContent extends React.PureComponent {
       }
 
       return (
-        <div className='status__content status__content--with-action' ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+        <div className={classNames} ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
           <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
             <span dangerouslySetInnerHTML={spoilerContent} />
             {' '}
@@ -157,7 +162,7 @@ export default class StatusContent extends React.PureComponent {
       return (
         <div
           ref={this.setRef}
-          className='status__content status__content--with-action'
+          className={classNames}
           style={directionStyle}
           onMouseDown={this.handleMouseDown}
           onMouseUp={this.handleMouseUp}
diff --git a/app/javascript/mastodon/components/video_player.js b/app/javascript/mastodon/components/video_player.js
index 452a84319..999cf42d9 100644
--- a/app/javascript/mastodon/components/video_player.js
+++ b/app/javascript/mastodon/components/video_player.js
@@ -14,6 +14,10 @@ const messages = defineMessages({
 @injectIntl
 export default class VideoPlayer extends React.PureComponent {
 
+  static contextTypes = {
+    router: PropTypes.object,
+  };
+
   static propTypes = {
     media: ImmutablePropTypes.map.isRequired,
     width: PropTypes.number,
@@ -119,11 +123,15 @@ export default class VideoPlayer extends React.PureComponent {
       </div>
     );
 
-    let expandButton = (
-      <div className='status__video-player-expand'>
-        <IconButton overlay title={intl.formatMessage(messages.expand_video)} icon='expand' onClick={this.handleExpand} />
-      </div>
-    );
+    let expandButton = '';
+
+    if (this.context.router) {
+      expandButton = (
+        <div className='status__video-player-expand'>
+          <IconButton overlay title={intl.formatMessage(messages.expand_video)} icon='expand' onClick={this.handleExpand} />
+        </div>
+      );
+    }
 
     let muteButton = '';
 
@@ -138,7 +146,7 @@ export default class VideoPlayer extends React.PureComponent {
     if (!this.state.visible) {
       if (sensitive) {
         return (
-          <div role='button' tabIndex='0' style={{ width: `${width}px`, height: `${height}px` }} className='media-spoiler' onClick={this.handleVisibility}>
+          <div role='button' tabIndex='0' style={{ width: `${width}px`, height: `${height}px`, marginTop: '8px' }} className='media-spoiler' onClick={this.handleVisibility}>
             {spoilerButton}
             <span className='media-spoiler__warning'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
             <span className='media-spoiler__trigger'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
@@ -146,7 +154,7 @@ export default class VideoPlayer extends React.PureComponent {
         );
       } else {
         return (
-          <div role='button' tabIndex='0' style={{ width: `${width}px`, height: `${height}px` }} className='media-spoiler' onClick={this.handleVisibility}>
+          <div role='button' tabIndex='0' style={{ width: `${width}px`, height: `${height}px`, marginTop: '8px' }} className='media-spoiler' onClick={this.handleVisibility}>
             {spoilerButton}
             <span className='media-spoiler__warning'><FormattedMessage id='status.media_hidden' defaultMessage='Media hidden' /></span>
             <span className='media-spoiler__trigger'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
new file mode 100644
index 000000000..6b545ef09
--- /dev/null
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import PropTypes from 'prop-types';
+import configureStore from '../store/configureStore';
+import { hydrateStore } from '../actions/store';
+import { IntlProvider, addLocaleData } from 'react-intl';
+import { getLocale } from '../locales';
+import PublicTimeline from '../features/standalone/public_timeline';
+
+const { localeData, messages } = getLocale();
+addLocaleData(localeData);
+
+const store = configureStore();
+const initialStateContainer = document.getElementById('initial-state');
+
+if (initialStateContainer !== null) {
+  const initialState = JSON.parse(initialStateContainer.textContent);
+  store.dispatch(hydrateStore(initialState));
+}
+
+export default class TimelineContainer extends React.PureComponent {
+
+  static propTypes = {
+    locale: PropTypes.string.isRequired,
+  };
+
+  render () {
+    const { locale } = this.props;
+
+    return (
+      <IntlProvider locale={locale} messages={messages}>
+        <Provider store={store}>
+          <PublicTimeline />
+        </Provider>
+      </IntlProvider>
+    );
+  }
+
+}
diff --git a/app/javascript/mastodon/features/standalone/public_timeline/index.js b/app/javascript/mastodon/features/standalone/public_timeline/index.js
new file mode 100644
index 000000000..de4b5320a
--- /dev/null
+++ b/app/javascript/mastodon/features/standalone/public_timeline/index.js
@@ -0,0 +1,76 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+import StatusListContainer from '../../ui/containers/status_list_container';
+import {
+  refreshPublicTimeline,
+  expandPublicTimeline,
+} from '../../../actions/timelines';
+import Column from '../../../components/column';
+import ColumnHeader from '../../../components/column_header';
+import { defineMessages, injectIntl } from 'react-intl';
+
+const messages = defineMessages({
+  title: { id: 'standalone.public_title', defaultMessage: 'A look inside...' },
+});
+
+@connect()
+@injectIntl
+export default class PublicTimeline extends React.PureComponent {
+
+  static propTypes = {
+    dispatch: PropTypes.func.isRequired,
+    intl: PropTypes.object.isRequired,
+  };
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  }
+
+  setRef = c => {
+    this.column = c;
+  }
+
+  componentDidMount () {
+    const { dispatch } = this.props;
+
+    dispatch(refreshPublicTimeline());
+
+    this.polling = setInterval(() => {
+      dispatch(refreshPublicTimeline());
+    }, 3000);
+  }
+
+  componentWillUnmount () {
+    if (typeof this.polling !== 'undefined') {
+      clearInterval(this.polling);
+      this.polling = null;
+    }
+  }
+
+  handleLoadMore = () => {
+    this.props.dispatch(expandPublicTimeline());
+  }
+
+  render () {
+    const { intl } = this.props;
+
+    return (
+      <Column ref={this.setRef}>
+        <ColumnHeader
+          icon='globe'
+          title={intl.formatMessage(messages.title)}
+          onClick={this.handleHeaderClick}
+        />
+
+        <StatusListContainer
+          timelineId='public'
+          loadMore={this.handleLoadMore}
+          scrollKey='standalone_public_timeline'
+          trackScroll={false}
+        />
+      </Column>
+    );
+  }
+
+}
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 254250a3b..0b00da39d 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -4,6 +4,9 @@ import { delegate } from 'rails-ujs';
 import emojify from '../mastodon/emoji';
 import { getLocale } from '../mastodon/locales';
 import loadPolyfills from '../mastodon/load_polyfills';
+import TimelineContainer from '../mastodon/containers/timeline_container';
+import React from 'react';
+import ReactDOM from 'react-dom';
 
 require.context('../images/', true);
 
@@ -36,6 +39,13 @@ function loaded() {
     const datetime = new Date(content.getAttribute('datetime'));
     content.textContent = relativeFormat.format(datetime);;
   });
+
+  const mountNode = document.getElementById('mastodon-timeline');
+
+  if (mountNode !== null) {
+    const props = JSON.parse(mountNode.getAttribute('data-props'));
+    ReactDOM.render(<TimelineContainer {...props} />, mountNode);
+  }
 }
 
 function main() {
diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 3512bdcb4..b9c018391 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -116,10 +116,6 @@
     .wrapper {
       padding: 20px;
     }
-
-    .features-list {
-      display: block;
-    }
   }
 }
 
@@ -301,80 +297,438 @@
   }
 }
 
-.features-list {
+.features-list__row {
   display: flex;
-  margin-bottom: 20px;
+  padding: 10px 0;
+  justify-content: space-between;
 
-  .features-list__column {
-    flex: 1 1 0;
+  &:first-child {
+    padding-top: 0;
+  }
 
-    ul {
-      list-style: none;
+  .visual {
+    flex: 0 0 auto;
+    display: flex;
+    align-items: center;
+    margin-left: 15px;
+
+    .fa {
+      display: block;
+      color: $ui-primary-color;
+      font-size: 48px;
     }
+  }
 
-    li {
-      margin: 0;
+  .text {
+    font-size: 16px;
+    line-height: 30px;
+    color: lighten($ui-base-color, 26%);
+
+    h6 {
+      font-weight: 500;
+      color: $ui-primary-color;
     }
   }
 }
 
-.screenshot-with-signup {
-  display: flex;
-  margin-bottom: 20px;
+.landing-page {
+  .header-wrapper {
+    padding-top: 15px;
+    background: $ui-base-color;
+    background: linear-gradient(150deg, lighten($ui-base-color, 8%), $ui-base-color);
+    position: relative;
 
-  .mascot {
-    flex: 1 1 auto;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    flex-direction: column;
-
-    img {
-      display: block;
+    .mascot-container {
+      max-width: 800px;
       margin: 0 auto;
-      max-width: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      height: 100%;
+    }
+
+    .mascot {
+      position: absolute;
+      bottom: -14px;
+      width: auto;
       height: auto;
+      left: 60px;
+      z-index: 3;
     }
   }
 
-  .simple_form,
-  .closed-registrations-message {
-    width: 300px;
-    flex: 0 0 auto;
-    background: rgba(darken($ui-base-color, 7%), 0.5);
-    padding: 14px;
-    border-radius: 4px;
-    box-shadow: 0 0 15px rgba($base-shadow-color, 0.4);
+  p,
+  li {
+    font: inherit;
+    font-weight: inherit;
+    margin-bottom: 0;
+  }
 
-    .actions {
-      margin-bottom: 0;
+  .header {
+    line-height: 30px;
+    overflow: hidden;
+
+    .container {
+      display: flex;
+      justify-content: space-between;
     }
 
-    .info {
-      text-align: center;
+    .hero {
+      margin-top: 50px;
+      align-items: center;
+      position: relative;
+
+      .floats {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+
+        img {
+          position: absolute;
+          transition: all 0.1s linear;
+          animation-name: floating;
+          animation-duration: 1.7s;
+          animation-iteration-count: infinite;
+          animation-direction: alternate;
+          animation-timing-function: linear;
+          z-index: 2;
+        }
+
+        .float-1 {
+          height: 170px;
+          right: -120px;
+          bottom: 0;
+        }
+
+        .float-2 {
+          height: 100px;
+          right: 210px;
+          bottom: 0;
+          animation-delay: 0.2s;
+        }
+
+        .float-3 {
+          height: 140px;
+          right: 110px;
+          top: -30px;
+          animation-delay: 0.1s;
+        }
+      }
+
+      .simple_form,
+      .closed-registrations-message {
+        background: darken($ui-base-color, 4%);
+        width: 280px;
+        padding: 15px 20px;
+        border-radius: 4px 4px 0 0;
+        line-height: initial;
+        position: relative;
+        z-index: 4;
+
+        .actions {
+          margin-bottom: 0;
+
+          button,
+          .button,
+          .block-button {
+            margin-bottom: 0;
+          }
+        }
+      }
+
+      .heading {
+        position: relative;
+        z-index: 4;
+        padding-bottom: 150px;
+      }
+
+      .closed-registrations-message {
+        min-height: 330px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+
+    ul {
+      list-style: none;
+      margin: 0;
+
+      li {
+        display: inline-block;
+        vertical-align: bottom;
+        margin: 0;
+
+        &:first-child a {
+          padding-left: 0;
+        }
+
+        &:last-child a {
+          padding-right: 0;
+        }
+      }
+    }
+
+    .links {
+      position: relative;
+      z-index: 4;
 
       a {
-        color: $ui-secondary-color;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: $ui-primary-color;
+        text-decoration: none;
+        padding: 12px 16px;
+        line-height: 32px;
+        font-family: 'mastodon-font-display', sans-serif;
+        font-weight: 500;
+        font-size: 14px;
+
+        &:hover {
+          color: $ui-secondary-color;
+        }
+      }
+
+      .brand {
+        a {
+          padding-left: 0;
+          color: $white;
+        }
+
+        img {
+          width: 32px;
+          height: 32px;
+          margin-right: 10px;
+        }
       }
     }
   }
 
-  @media screen and (max-width: 625px) {
-    .mascot {
-      display: none;
+  .container {
+    width: 100%;
+    box-sizing: border-box;
+    max-width: 800px;
+    margin: 0 auto;
+  }
+
+  .wrapper {
+    max-width: 800px;
+    margin: 0 auto;
+    padding: 0;
+  }
+
+  .learn-more-cta {
+    background: darken($ui-base-color, 4%);
+    padding: 50px 0;
+  }
+
+  h3 {
+    font-family: 'mastodon-font-display', sans-serif;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: 500;
+    margin-bottom: 20px;
+    color: $ui-primary-color;
+  }
+
+  p {
+    font-size: 16px;
+    line-height: 30px;
+    color: lighten($ui-base-color, 26%);
+  }
+
+  .features {
+    padding: 50px 0;
+
+    .container {
+      display: flex;
+    }
+  }
+
+  #mastodon-timeline {
+    -webkit-overflow-scrolling: touch;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    font-family: 'mastodon-font-sans-serif', sans-serif;
+    font-size: 13px;
+    line-height: 18px;
+    font-weight: 400;
+    color: $primary-text-color;
+    width: 330px;
+    margin-right: 30px;
+    flex: 0 0 auto;
+    background: $ui-base-color;
+    overflow: hidden;
+    box-shadow: 0 0 6px rgba($black, 0.1);
+
+    .column {
+      padding: 0;
+      border-radius: 4px;
+      overflow: hidden;
+      height: 100%;
     }
 
-    .simple_form,
-    .closed-registrations-message {
-      flex: auto;
+    .scrollable {
+      height: 400px;
+    }
+
+    p {
+      font-size: inherit;
+      line-height: inherit;
+      font-weight: inherit;
+      color: $primary-text-color;
+
+      a {
+        color: $ui-secondary-color;
+        text-decoration: none;
+      }
+    }
+  }
+
+  .about-mastodon {
+    max-width: 675px;
+
+    p {
+      margin-bottom: 20px;
+    }
+
+    .features-list {
+      margin-top: 20px;
+    }
+  }
+
+  em {
+    display: inline;
+    margin: 0;
+    padding: 0;
+    font-weight: 500;
+    background: transparent;
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+    color: $ui-primary-color;
+  }
+
+  h1 {
+    font-family: 'mastodon-font-display', sans-serif;
+    font-size: 26px;
+    line-height: 30px;
+    margin-bottom: 0;
+    font-weight: 500;
+    color: $ui-secondary-color;
+
+    small {
+      font-family: 'mastodon-font-sans-serif', sans-serif;
+      display: block;
+      font-size: 18px;
+      font-weight: 400;
+      color: lighten($ui-base-color, 26%);
+    }
+  }
+
+  .footer-links {
+    padding-bottom: 50px;
+    text-align: right;
+    color: lighten($ui-base-color, 26%);
+
+    p {
+      font-size: 14px;
+    }
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+    }
+  }
+
+  @media screen and (max-width: 800px) {
+    .container {
+      padding: 0 20px;
+    }
+
+    .header-wrapper .mascot {
+      left: 20px;
+    }
+  }
+
+  @media screen and (max-width: 689px) {
+    .header-wrapper .mascot {
+      display: none;
+    }
+  }
+
+  @media screen and (max-width: 675px) {
+    .header-wrapper {
+      padding-top: 0;
+    }
+
+    .header .container,
+    .features .container {
+      display: block;
+    }
+
+    .links {
+      padding-top: 15px;
+      background: darken($ui-base-color, 4%);
+    }
+
+    .header {
+      padding-top: 0;
+
+      .hero {
+        margin-top: 30px;
+        padding: 0;
+
+        .heading {
+          padding-bottom: 20px;
+        }
+      }
+
+      .floats {
+        display: none;
+      }
+
+      .heading,
+      .nav {
+        text-align: center;
+      }
+
+      .heading h1 {
+        padding: 30px 0;
+      }
+
+      .hero {
+        .simple_form,
+        .closed-registrations-message {
+          background: darken($ui-base-color, 8%);
+          width: 100%;
+          border-radius: 0;
+          box-sizing: border-box;
+        }
+      }
+    }
+
+    #mastodon-timeline {
+      height: 70vh;
+      width: 100%;
+      margin-bottom: 50px;
     }
   }
 }
 
-.closed-registrations-message {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
+@keyframes floating {
+  from {
+    transform: translate(0, 0);
+  }
+
+  65% {
+    transform: translate(0, 4px);
+  }
+
+  to {
+    transform: translate(0, -0);
+  }
 }
diff --git a/app/javascript/styles/basics.scss b/app/javascript/styles/basics.scss
index 4da698e81..182ea36a4 100644
--- a/app/javascript/styles/basics.scss
+++ b/app/javascript/styles/basics.scss
@@ -1,6 +1,6 @@
 body {
   font-family: 'mastodon-font-sans-serif', sans-serif;
-  background: $ui-base-color url('../images/background-photo.jpg');
+  background: $ui-base-color;
   background-size: cover;
   background-attachment: fixed;
   font-size: 13px;
@@ -22,6 +22,11 @@ body {
     background: $ui-base-color;
   }
 
+  &.about-body {
+    background: darken($ui-base-color, 8%);
+    padding-bottom: 0;
+  }
+
   &.embed {
     background: transparent;
     margin: 0;
diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/boost.scss
index 8d6478e10..5eb3149ef 100644
--- a/app/javascript/styles/boost.scss
+++ b/app/javascript/styles/boost.scss
@@ -12,3 +12,7 @@ button.icon-button i.fa-retweet {
     background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 33%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
   }
 }
+
+button.icon-button.disabled i.fa-retweet {
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 13%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
+}
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index def69d250..8d0350eb6 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -42,8 +42,38 @@
     cursor: default;
   }
 
+  &.button-alternative {
+    font-size: 16px;
+    line-height: 36px;
+    height: auto;
+    color: $ui-base-color;
+    background: $ui-primary-color;
+    text-transform: none;
+    padding: 4px 16px;
+
+    &:active,
+    &:focus,
+    &:hover {
+      background-color: lighten($ui-primary-color, 4%);
+    }
+  }
+
   &.button-secondary {
-    //
+    font-size: 16px;
+    line-height: 36px;
+    height: auto;
+    color: $ui-primary-color;
+    text-transform: none;
+    background: transparent;
+    padding: 3px 15px;
+    border: 1px solid $ui-primary-color;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: lighten($ui-primary-color, 4%);
+      color: lighten($ui-primary-color, 4%);
+    }
   }
 
   &.button--block {
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/containers.scss
index 68f73e0c0..44d4c1118 100644
--- a/app/javascript/styles/containers.scss
+++ b/app/javascript/styles/containers.scss
@@ -10,52 +10,36 @@
 }
 
 .logo-container {
-  max-width: 400px;
   margin: 100px auto;
-  margin-bottom: 0;
-  cursor: default;
+  margin-bottom: 50px;
 
   @media screen and (max-width: 360px) {
     margin: 30px auto;
   }
 
   h1 {
-    display: block;
-    text-align: center;
-    color: $primary-text-color;
-    font-size: 48px;
-    font-weight: 500;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 
     img {
-      display: block;
-      margin: 20px auto;
-      width: 180px;
-      height: 180px;
+      width: 32px;
+      height: 32px;
+      margin-right: 10px;
     }
 
     a {
-      color: inherit;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      color: $primary-text-color;
       text-decoration: none;
       outline: 0;
-
-      img {
-        opacity: 0.8;
-        transition: opacity 0.8s ease;
-      }
-
-      &:hover {
-        img {
-          opacity: 1;
-          transition-duration: 0.2s;
-        }
-      }
-    }
-
-    small {
-      display: block;
-      font-size: 12px;
-      font-weight: 400;
-      font-family: 'mastodon-font-monospace', monospace;
+      padding: 12px 16px;
+      line-height: 32px;
+      font-family: 'mastodon-font-display', sans-serif;
+      font-weight: 500;
+      font-size: 14px;
     }
   }
 }
diff --git a/app/javascript/styles/fonts/montserrat.scss b/app/javascript/styles/fonts/montserrat.scss
index e4012ab02..206f1865e 100644
--- a/app/javascript/styles/fonts/montserrat.scss
+++ b/app/javascript/styles/fonts/montserrat.scss
@@ -7,3 +7,11 @@
   font-weight: 400;
   font-style: normal;
 }
+
+@font-face {
+  font-family: 'mastodon-font-display';
+  src: local('Montserrat'),
+    url('../fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
+  font-weight: 500;
+  font-style: normal;
+}
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index 414dc4fe8..e723b50ff 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -24,6 +24,20 @@ code {
 
   p.hint {
     margin-bottom: 15px;
+    color: lighten($ui-base-color, 32%);
+
+    &.subtle-hint {
+      text-align: center;
+      font-size: 12px;
+      line-height: 18px;
+      margin-top: 15px;
+      margin-bottom: 0;
+      color: lighten($ui-base-color, 26%);
+
+      a {
+        color: $ui-primary-color;
+      }
+    }
   }
 
   strong {
@@ -197,8 +211,6 @@ code {
 
     &:active,
     &:focus {
-      position: relative;
-      top: 1px;
       background-color: darken($ui-highlight-color, 5%);
     }
 
@@ -219,6 +231,27 @@ code {
   select {
     font-size: 16px;
   }
+
+  .input-with-append {
+    position: relative;
+
+    .input input {
+      padding-right: 127px;
+    }
+
+    .append {
+      position: absolute;
+      right: 0;
+      top: 0;
+      padding: 7px 4px;
+      padding-bottom: 9px;
+      font-size: 16px;
+      color: lighten($ui-base-color, 26%);
+      font-family: inherit;
+      pointer-events: none;
+      cursor: default;
+    }
+  }
 }
 
 .flash-message {
@@ -240,7 +273,7 @@ code {
   text-align: center;
 
   a {
-    color: $primary-text-color;
+    color: $ui-primary-color;
     text-decoration: none;
 
     &:hover {
diff --git a/app/presenters/instance_presenter.rb b/app/presenters/instance_presenter.rb
index 63ef23d5d..5d5be58ba 100644
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -5,6 +5,7 @@ class InstancePresenter
     :closed_registrations_message,
     :site_contact_email,
     :open_registrations,
+    :site_title,
     :site_description,
     :site_extended_description,
     :site_terms,
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 49ff9e377..6751c9411 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -5,32 +5,41 @@ class InitialStateSerializer < ActiveModel::Serializer
              :media_attachments, :settings
 
   def meta
-    {
+    store = {
       streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
       access_token: object.token,
       locale: I18n.locale,
       domain: Rails.configuration.x.local_domain,
-      me: object.current_account.id,
       admin: object.admin&.id,
-      boost_modal: object.current_account.user.setting_boost_modal,
-      delete_modal: object.current_account.user.setting_delete_modal,
-      auto_play_gif: object.current_account.user.setting_auto_play_gif,
-      system_font_ui: object.current_account.user.setting_system_font_ui,
     }
+
+    if object.current_account
+      store[:me]             = object.current_account.id
+      store[:boost_modal]    = object.current_account.user.setting_boost_modal
+      store[:delete_modal]   = object.current_account.user.setting_delete_modal
+      store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
+      store[:system_font_ui] = object.current_account.user.setting_system_font_ui
+    end
+
+    store
   end
 
   def compose
-    {
-      me: object.current_account.id,
-      default_privacy: object.current_account.user.setting_default_privacy,
-      default_sensitive: object.current_account.user.setting_default_sensitive,
-    }
+    store = {}
+
+    if object.current_account
+      store[:me]                = object.current_account.id
+      store[:default_privacy]   = object.current_account.user.setting_default_privacy
+      store[:default_sensitive] = object.current_account.user.setting_default_sensitive
+    end
+
+    store
   end
 
   def accounts
     store = {}
-    store[object.current_account.id] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer)
-    store[object.admin.id]           = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) unless object.admin.nil?
+    store[object.current_account.id] = ActiveModelSerializers::SerializableResource.new(object.current_account, serializer: REST::AccountSerializer) if object.current_account
+    store[object.admin.id]           = ActiveModelSerializers::SerializableResource.new(object.admin, serializer: REST::AccountSerializer) if object.admin
     store
   end
 
diff --git a/app/views/about/_features.html.haml b/app/views/about/_features.html.haml
new file mode 100644
index 000000000..8fbc6b760
--- /dev/null
+++ b/app/views/about/_features.html.haml
@@ -0,0 +1,25 @@
+.features-list
+  .features-list__row
+    .text
+      %h6= t 'about.features.real_conversation_title'
+      = t 'about.features.real_conversation_body'
+    .visual
+      = fa_icon 'fw comments'
+  .features-list__row
+    .text
+      %h6= t 'about.features.not_a_product_title'
+      = t 'about.features.not_a_product_body'
+    .visual
+      = fa_icon 'fw users'
+  .features-list__row
+    .text
+      %h6= t 'about.features.within_reach_title'
+      = t 'about.features.within_reach_body'
+    .visual
+      = fa_icon 'fw mobile'
+  .features-list__row
+    .text
+      %h6= t 'about.features.humane_approach_title'
+      = t 'about.features.humane_approach_body'
+    .visual
+      = fa_icon 'fw leaf'
diff --git a/app/views/about/_registration.html.haml b/app/views/about/_registration.html.haml
index 4f38c1ecc..eeeb0088f 100644
--- a/app/views/about/_registration.html.haml
+++ b/app/views/about/_registration.html.haml
@@ -1,10 +1,13 @@
 = simple_form_for(new_user, url: user_registration_path) do |f|
   = f.simple_fields_for :account do |account_fields|
-    = account_fields.input :username,
-      autofocus: true,
-      placeholder: t('simple_form.labels.defaults.username'),
-      required: true,
-      input_html: { 'aria-label' => t('simple_form.labels.defaults.username') }
+    .input-with-append
+      = account_fields.input :username,
+        autofocus: true,
+        placeholder: t('simple_form.labels.defaults.username'),
+        required: true,
+        input_html: { 'aria-label' => t('simple_form.labels.defaults.username') }
+      .append
+        = "@#{site_hostname}"
 
   = f.input :email,
     placeholder: t('simple_form.labels.defaults.email'),
@@ -22,9 +25,6 @@
     input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password') }
 
   .actions
-    = f.button :button, t('about.get_started'), type: :submit
+    = f.button :button, t('auth.register'), type: :submit, class: 'button button-alternative'
 
-  .info
-    = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
-    ·
-    = link_to t('about.about_this'), about_more_path
+  %p.hint.subtle-hint=t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path)
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index d15b04163..f75f87c99 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -1,4 +1,5 @@
 - content_for :header_tags do
+  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
   = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 
 - content_for :page_title do
@@ -9,79 +10,70 @@
   %meta{ property: 'og:url', content: about_url }/
   %meta{ property: 'og:type', content: 'website' }/
   %meta{ property: 'og:title', content: site_hostname }/
-  %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon')) }/
+  %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html')) }/
   %meta{ property: 'og:image', content: asset_pack_path('mastodon_small.jpg', protocol: :request) }/
   %meta{ property: 'og:image:width', content: '400' }/
   %meta{ property: 'og:image:height', content: '400' }/
   %meta{ property: 'twitter:card', content: 'summary' }/
 
-.wrapper
-  %h1
-    = image_tag asset_pack_path('logo.png')
-    = Setting.site_title
+.landing-page
+  .header-wrapper
+    .mascot-container
+      = image_tag asset_pack_path('elephant-fren.png'), class: 'mascot'
 
-  %p!= t('about.about_mastodon')
+    .header
+      .container.links
+        .brand
+          = link_to root_url do
+            = image_tag asset_pack_path('logo.svg')
+            Mastodon
 
-  .screenshot-with-signup
-    .mascot= image_tag asset_pack_path('fluffy-elephant-friend.png')
+        %ul.nav
+          %li
+            - if user_signed_in?
+              = link_to t('settings.back'), root_url, class: 'webapp-btn'
+            - else
+              = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
+          %li= link_to t('about.about_this'), about_more_path
+          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
 
-    - if @instance_presenter.open_registrations
-      = render 'registration'
-    - else
-      .closed-registrations-message
-        - if @instance_presenter.closed_registrations_message.blank?
-          %p= t('about.closed_registrations')
+      .container.hero
+        .floats
+          = image_tag asset_pack_path('cloud2.png'), class: 'float-1'
+          = image_tag asset_pack_path('cloud3.png'), class: 'float-2'
+          = image_tag asset_pack_path('cloud4.png'), class: 'float-3'
+        .heading
+          %h1
+            = @instance_presenter.site_title
+            %small= t 'about.hosted_on', domain: site_hostname
+        - if @instance_presenter.open_registrations
+          = render 'registration'
         - else
-          != @instance_presenter.closed_registrations_message
-        .info
-          = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
-          ·
-          = link_to t('about.other_instances'), 'https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/List-of-Mastodon-instances.md'
-          ·
-          = link_to t('about.about_this'), about_more_path
+          .closed-registrations-message
+            %div
+              - if @instance_presenter.closed_registrations_message.blank?
+                %p= t('about.closed_registrations')
+              - else
+                = @instance_presenter.closed_registrations_message.html_safe
+            = link_to t('about.find_another_instance'), 'https://joinmastodon.org', class: 'button button-alternative button--block'
 
-  %h3= t('about.features_headline')
+  .learn-more-cta
+    .container
+      %h3= t('about.description_headline', domain: site_hostname)
+      %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
 
-  .features-list
-    .features-list__column
-      %ul.fa-ul
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.chronology'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.public'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.characters'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.gifv'
-    .features-list__column
-      %ul.fa-ul
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.privacy'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.blocks'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.ethics'
-        %li
-          = fa_icon('li check-square')
-          = t 'about.features.api'
+  .features
+    .container
+      - if Setting.timeline_preview
+        #mastodon-timeline{ data: { props: Oj.dump(default_props) } }
 
-  - unless @instance_presenter.site_description.blank?
-    %h3= t('about.description_headline', domain: site_hostname)
-    %p!= @instance_presenter.site_description
-
-  .actions
-    .info
-      = link_to t('about.terms'), terms_path
-      ·
-      = link_to t('about.apps'), 'https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md'
-      ·
-      = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
-      ·
-      = link_to t('about.other_instances'), 'https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/List-of-Mastodon-instances.md'
+      .about-mastodon
+        %h3= t 'about.what_is_mastodon'
+        %p= t 'about.about_mastodon_html'
+        %a.button.button-secondary{ href: 'https://joinmastodon.org' }= t 'about.learn_more'
+        = render 'features'
+  .footer-links
+    .container
+      %p
+        = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
+        = " (#{@instance_presenter.version_number})"
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 3096a958d..59192530b 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -12,54 +12,53 @@
       %tr
         %td
           %strong= t('admin.settings.contact_information.label')
-        %td= text_field_tag :site_contact_username,
-          @settings['site_contact_username'].value,
-          place_holder: t('admin.settings.contact_information.username')
+        %td= text_field_tag :site_contact_username, @settings['site_contact_username'].value, place_holder: t('admin.settings.contact_information.username')
       %tr
         %td
           %strong= t('admin.accounts.email')
-        %td= text_field_tag :site_contact_email,
-          @settings['site_contact_email'].value,
-          place_holder: t('admin.settings.contact_information.email')
+        %td= text_field_tag :site_contact_email, @settings['site_contact_email'].value, place_holder: t('admin.settings.contact_information.email')
       %tr
         %td
           %strong= t('admin.settings.site_title')
-        %td= text_field_tag :site_title,
-          @settings['site_title'].value
+        %td= text_field_tag :site_title, @settings['site_title'].value
       %tr
         %td
           %strong= t('admin.settings.site_description.title')
           %p= t('admin.settings.site_description.desc_html')
-        %td= text_area_tag :site_description,
-          @settings['site_description'].value,
-          rows: 8
+        %td= text_area_tag :site_description, @settings['site_description'].value, rows: 8
       %tr
         %td
           %strong= t('admin.settings.site_description_extended.title')
           %p= t('admin.settings.site_description_extended.desc_html')
-        %td= text_area_tag :site_extended_description,
-          @settings['site_extended_description'].value,
-          rows: 8
+        %td= text_area_tag :site_extended_description, @settings['site_extended_description'].value, rows: 8
       %tr
         %td
           %strong= t('admin.settings.site_terms.title')
           %p= t('admin.settings.site_terms.desc_html')
-        %td= text_area_tag :site_terms,
-          @settings['site_terms'].value,
-          rows: 8
+        %td= text_area_tag :site_terms, @settings['site_terms'].value, rows: 8
       %tr
         %td
           %strong= t('admin.settings.registrations.open.title')
+          %p= t('admin.settings.registrations.open.desc_html')
         %td
-          = select_tag :open_registrations,
-          options_for_select({ t('admin.settings.registrations.open.disabled') => false, t('admin.settings.registrations.open.enabled') => true }, @settings['open_registrations'].value)
+          = select_tag :open_registrations, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['open_registrations'].value)
       %tr
         %td
           %strong= t('admin.settings.registrations.closed_message.title')
           %p= t('admin.settings.registrations.closed_message.desc_html')
-        %td= text_area_tag :closed_registrations_message,
-          @settings['closed_registrations_message'].value,
-          rows: 8
+        %td= text_area_tag :closed_registrations_message, @settings['closed_registrations_message'].value, rows: 8
+      %tr
+        %td
+          %strong= t('admin.settings.registrations.deletion.title')
+          %p= t('admin.settings.registrations.deletion.desc_html')
+        %td
+          = select_tag :open_deletion, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['open_deletion'].value)
+      %tr
+        %td
+          %strong= t('admin.settings.timeline_preview.title')
+          %p= t('admin.settings.timeline_preview.desc_html')
+        %td
+          = select_tag :timeline_preview, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['timeline_preview'].value)
 
   .simple_form.actions
     = button_tag t('generic.save_changes'), type: :submit, class: :btn
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 82d5483dd..af7ee2b28 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -5,7 +5,10 @@
   = render 'shared/error_messages', object: resource
 
   = f.simple_fields_for :account do |ff|
-    = ff.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username') }
+    .input-with-append
+      = ff.input :username, autofocus: true, placeholder: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username') }
+      .append
+        = "@#{site_hostname}"
 
   = f.input :email, placeholder: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email') }
   = f.input :password, autocomplete: 'off', placeholder: t('simple_form.labels.defaults.password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.password') }
@@ -14,4 +17,5 @@
   .actions
     = f.button :button, t('auth.register'), type: :submit
 
+  %p.hint.subtle-hint=t('auth.agreement_html', rules_path: about_more_path, terms_path: terms_path)
 .form-footer= render 'auth/shared/links'
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index e5429a8ed..b4f1bd0f3 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,8 @@
     .logo-container
       %h1
         = link_to root_path do
-          = image_tag asset_pack_path('logo.png')
+          = image_tag asset_pack_path('logo.svg')
+          Mastodon
 
     .form-container
       = render 'flashes'
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 4d045dee1..d395dc9c3 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -3,23 +3,12 @@ ar:
   about:
     about_mastodon: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
     about_this: عن مثيل الخادوم هذا
-    apps: التطبيقات
     business_email: 'البريد الإلكتروني المهني :'
     closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا.
     contact: للتواصل معنا
     description_headline: ما هو %{domain}?
     domain_count_after: خوادم أخرى
     domain_count_before: متصل بـ
-    features:
-      api: واجهة برمجة مفتوحة للتطبيقات والخدمات
-      blocks: نص منسق وأدوات كتم
-      characters: 500 حرف في كل رسالة
-      chronology: خيوط متسلسلة زمنيا
-      ethics: 'تصميم أخلاقي : لا إعلانات و لا تعقُّب'
-      gifv: مجموعات صور GIFV وأشرطة فيديو قصيرة
-      privacy: إعدادات مدققة لخصوصية كل منشور
-      public: الخيوط الزمنية العمومية
-    features_headline: ما الذي يجعل ماستدون فريدًا ؟
     get_started: إبدأ الآن
     links: الروابط
     other_instances: خوادم أخرى
@@ -93,7 +82,7 @@ ar:
       blocking: قائمة المحظورين
       following: قائمة المستخدمين المتبوعين
     upload: تحميل
-  landing_strip_html: <strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse..
+  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse.."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   media_attachments:
     validations:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 76d6a2605..042d609b0 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -3,23 +3,12 @@ bg:
   about:
     about_mastodon: Mastodon е <em>безплатен</em> сървър с <em>отворен код</em> за социални мрежи. Като <em>децентрализирана</em> алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в <em>социалната мрежа</em>.
     about_this: За тази инстанция
-    apps: Приложения
     business_email: 'Служебен e-mail:'
     closed_registrations: В момента регистрациите за тази инстанция са затворени.
     contact: За контакти
     description_headline: Какво е %{domain}?
     domain_count_after: други инстанции
     domain_count_before: Свързани към
-    features:
-      api: Отворено API за приложения и услуги
-      blocks: Богат на инструменти за блокиране и заглушаване
-      characters: Публикации от 500 символа
-      chronology: Публикациите се показват хронологично
-      ethics: 'Етичен дизайн: без реклами и проследяване'
-      gifv: GIFV комплекти и кратки видео клипове
-      privacy: Настройване на поверителността за всяка публикация
-      public: Публични канали
-    features_headline: Какво откроява Mastodon
     get_started: Първи стъпки
     links: Връзки
     other_instances: Други инстанции
@@ -93,7 +82,7 @@ bg:
       blocking: Списък на блокираните
       following: Списък на последователите
     upload: Качване
-  landing_strip_html: <strong>%{name}</strong> е потребител от %{link_to_root_path}. Можеш да ги следваш, или да контактуваш с тях, ако имаш акаунт където и да е из федерираната вселена на Mastodon.
+  landing_strip_html: "<strong>%{name}</strong> е потребител от %{link_to_root_path}. Можеш да ги следваш, или да контактуваш с тях, ако имаш акаунт където и да е из федерираната вселена на Mastodon."
   landing_strip_signup_html: Ако нямаш акаунт, можеш да си <a href="%{sign_up_path}">създадеш ето тук</a>.
   media_attachments:
     validations:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 2fbc63ef9..10c34498b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3,23 +3,12 @@ ca:
   about:
     about_mastodon: Mastodon és un servidor de xarxa social <em>lliure i de codi obert</em>. Una alternativa <em>descentralitzada</em> a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la <em>xarxa social</em>.
     about_this: Sobre aquesta instància
-    apps: Apps
     business_email: 'Adreça de contacte:'
     closed_registrations: Els registres estan actualment tancats en aquesta instància.
     contact: Contacte
     description_headline: Què es %{domain}?
     domain_count_after: altres instàncies
     domain_count_before: Connectat a
-    features:
-      api: API pública per a aplicacions i serveis
-      blocks: Moderació de contingut
-      characters: 500 caràcters per publicació
-      chronology: Les histories son cronològiques
-      ethics: 'Disseny ètic: sense anuncis, sense rastrejos'
-      gifv: Vídeos curts i GIFV
-      privacy: Configuracions de privacitat ajustables
-      public: Història federada
-    features_headline: El que distingeix a Mastodon
     get_started: Començar
     links: Vincles
     other_instances: Altres instàncies
@@ -173,8 +162,6 @@ ca:
           desc_html: Apareix en la primera pàgina quan es tanquen els registres<br>Pot utilitzar etiquetes HTML
           title: Missatge de registre tancat
         open:
-          disabled: Desactivat
-          enabled: Activat
           title: Registre obert
       setting: Ajust
       site_description:
@@ -203,8 +190,8 @@ ca:
     change_password: Canviar contrasenya
     delete_account: Esborrar el compte
     delete_account_html: Si vols esborrar el teu compte pots <a href="%{path}">fer-ho aquí</a>. S'et demanarà confirmació.
-    didnt_get_confirmation: "No vas rebre el correu de confirmació?"
-    forgot_password: "Has oblidat la contrasenya?"
+    didnt_get_confirmation: No vas rebre el correu de confirmació?
+    forgot_password: Has oblidat la contrasenya?
     login: Iniciar sessió
     logout: Tancar sessió
     register: Enregistrarse
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f2841d0b7..2bdb87708 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,23 +3,12 @@ de:
   about:
     about_mastodon: Mastodon ist ein <em>freier, quelloffener</em> sozialer Netzwerkserver. Als <em>dezentralisierte</em> Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am <em>sozialen Netzwerk</em> teilnehmen.
     about_this: Über diese Instanz
-    apps: Apps
     business_email: 'Geschäftliche E-Mail:'
     closed_registrations: Die Registrierung ist auf dieser Instanz momentan geschlossen.
     contact: Kontakt
     description_headline: Was ist %{domain}?
     domain_count_after: andere Instanzen
     domain_count_before: Verbunden mit
-    features:
-      api: Offene API für Apps und Dienste
-      blocks: Mächtige Block- und Stummschaltungswerkzeuge
-      characters: 500 Zeichen pro Beitrag
-      chronology: Zeitleisten sind chronologisch
-      ethics: 'Ethisches Design: keine Werbung, kein Tracking'
-      gifv: GIFV-Sets und kurze Videos
-      privacy: Granulare Privatsphäre-Einstellungen für jeden Beitrag
-      public: Öffentliche Zeitleisten
-    features_headline: Was Mastodon einzigartig macht
     get_started: Erste Schritte
     links: Links
     other_instances: Andere Instanzen
@@ -147,8 +136,6 @@ de:
           desc_html: Wird auf der Frontseite angezeigt, wenn die Registrierung geschlossen ist<br>Du kannst HTML-Tags benutzen
           title: Nachricht über geschlossene Registrierung
         open:
-          disabled: Deaktiviert
-          enabled: Aktiviert
           title: Offene Registrierung
       setting: Einstellung
       site_description:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bb893d1c..e33dde038 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,28 +1,30 @@
 ---
 en:
   about:
-    about_mastodon: Mastodon is a <em>free, open-source</em> social network. A <em>decentralized</em> alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust &mdash; whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the <em>social network</em> seamlessly.
-    about_this: About this instance
-    apps: Apps
+    about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail.
+    about_this: About
     business_email: 'Business e-mail:'
-    closed_registrations: Registrations are currently closed on this instance.
+    closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there.
     contact: Contact
     description_headline: What is %{domain}?
     domain_count_after: other instances
     domain_count_before: Connected to
     features:
-      api: Open API for apps and services
-      blocks: Rich block and muting tools
-      characters: 500 characters per post
-      chronology: Timelines are chronological
-      ethics: 'Ethical design: no ads, no tracking'
-      gifv: GIFV sets and short videos
-      privacy: Granular, per-post privacy settings
-      public: Public timelines
-    features_headline: What sets Mastodon apart
+      humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media.
+      humane_approach_title: A more humane approach
+      not_a_product_body: Mastodon is not a commercial network. No advertising, no data mining, no walled gardens. There is no central authority.
+      not_a_product_title: You’re a person, not a product
+      real_conversation_body: With 500 characters at your disposal and support for granular content and media warnings, you can express yourself the way you want to.
+      real_conversation_title: Built for real conversation
+      within_reach_body: Multiple apps for iOS, Android, and other platforms thanks to a developer-friendly API ecosystem allow you to keep up with your friends anywhere.
+      within_reach_title: Always within reach
+    find_another_instance: Find another instance
+    generic_description: "%{domain} is one server in the network"
     get_started: Get started
+    hosted_on: Mastodon hosted on %{domain}
+    learn_more: Learn more
     links: Links
-    other_instances: Other instances
+    other_instances: Instance list
     source_code: Source code
     status_count_after: statuses
     status_count_before: Who authored
@@ -30,6 +32,7 @@ en:
     user_count_after: users
     user_count_before: Home to
     version: Version
+    what_is_mastodon: What is Mastodon?
   accounts:
     follow: Follow
     followers: Followers
@@ -173,9 +176,14 @@ en:
           desc_html: Displayed on frontpage when registrations are closed<br>You can use HTML tags
           title: Closed registration message
         open:
-          disabled: Disabled
-          enabled: Enabled
+          desc_html: Allow anyone to create an account
           title: Open registration
+        deletion:
+          desc_html: Allow anyone to delete their account
+          title: Open deletion
+      timeline_preview:
+        desc_html: Display public timeline on landing page
+        title: Timeline preview
       setting: Setting
       site_description:
         desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.<br>You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
@@ -185,7 +193,7 @@ en:
         title: Extended site description
       site_terms:
         desc_html: Displayed on terms page<br>You can use HTML tags
-        title: Site Privacy Policy
+        title: Privacy policy
       site_title: Site title
       title: Site Settings
     subscriptions:
@@ -207,6 +215,7 @@ en:
   applications:
     invalid_url: The provided URL is invalid
   auth:
+    agreement_html: By signing up you agree to <a href="%{rules_path}">our terms of service</a> and <a href="%{terms_path}">privacy policy</a>.
     change_password: Security
     delete_account: Delete account
     delete_account_html: If you wish to delete your account, you can <a href="%{path}">proceed here</a>. You will be asked for confirmation.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 8b42415df..d47a5db0e 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -3,22 +3,11 @@ eo:
   about:
     about_mastodon: Mastodon estas <em>senpaga, malfermitkoda</em> socia reto. Ĝi estas <em>sencentra</em> alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la <em>socia reto</em> tute glate.
     about_this: Pri tiu aperaĵo
-    apps: Aplikaĵoj
     business_email: 'Profesia retpoŝt-adreso:'
     contact: Kontakti
     description_headline: Kio estas %{domain}?
     domain_count_after: aliaj aperaĵoj
     domain_count_before: Konektita al
-    features:
-      api: Malfermita API por aplikaĵoj kaj servoj
-      blocks: Kompletaj iloj por bloki kaj kaŝi
-      characters: Po 500 signoj por ĉiu mesaĝo
-      chronology: Tempolinioj laŭtempaj
-      ethics: 'Etike kreita: neniu reklamo, neniu ŝpurado'
-      gifv: Eblo diskonigi etajn videojn kaj GIFV
-      privacy: Videbleco agordita laŭ la mesaĝo
-      public: Publikaj tempolinioj
-    features_headline: Kiel Mastodon estas malsimila
     get_started: Komenci
     links: Ligiloj
     other_instances: Aliaj aperaĵoj
@@ -92,7 +81,7 @@ eo:
       blocking: Listo de blokitoj
       following: Listo de sekvatoj
     upload: Alporti
-  landing_strip_html: <strong>%{name}</strong> estas uzanto en %{link_to_root_path}. Vi povas sekvi tiun aŭ interagi kun tiu, se vi havas konton ie ajn en la Fediverse.
+  landing_strip_html: "<strong>%{name}</strong> estas uzanto en %{link_to_root_path}. Vi povas sekvi tiun aŭ interagi kun tiu, se vi havas konton ie ajn en la Fediverse."
   landing_strip_signup_html: Se vi ne havas, vi povas <a href="%{sign_up_path}">membriĝi ĉi tie.</a>.
   notification_mailer:
     digest:
@@ -105,19 +94,19 @@ eo:
         one: "1 nova sciigo ekde via lasta vizito \U0001F418"
         other: "%{count} novaj sciigoj ekde via lasta vizito \U0001F418"
     favourite:
-      body: '%{name} favoris vian mesaĝon:'
+      body: "%{name} favoris vian mesaĝon:"
       subject: "%{name} favoris vian mesaĝon"
     follow:
       body: "%{name} eksekvis vin:"
       subject: "%{name} eksekvis vin"
     follow_request:
       body: "%{name} petis sekvi vin:"
-      subject: '%{name} petis sekvi vin'
+      subject: "%{name} petis sekvi vin"
     mention:
-      body: '%{name} menciis vin en:'
-      subject: '%{name} menciis vin'
+      body: "%{name} menciis vin en:"
+      subject: "%{name} menciis vin"
     reblog:
-      body: '%{name} diskonigis vian mesaĝon:'
+      body: "%{name} diskonigis vian mesaĝon:"
       subject: "%{name} diskonigis vian mesaĝon"
   pagination:
     next: Sekva
diff --git a/config/locales/es.yml b/config/locales/es.yml
index f587bb4ec..c051c9a08 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3,23 +3,12 @@ es:
   about:
     about_mastodon: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
     about_this: Acerca de esta instancia
-    apps: Apps
     business_email: 'Correo de negocios:'
     closed_registrations: Los registros están actualmente cerrados en esta instancia.
     contact: Contacto
     description_headline: "¿Qué es %{domain}?"
     domain_count_after: otras instancias
     domain_count_before: Conectado a
-    features:
-      api: API pública para aplicaciones y servicios
-      blocks: Moderación de contenido
-      characters: 500 caracteres por publicación
-      chronology: Las historias son cronológicas
-      ethics: 'Diseño etico: sin anuncios, sin rastreos'
-      gifv: Videos cortos y GIFV
-      privacy: Configuraciones de privacidad ajustables
-      public: Historia federada
-    features_headline: Lo que distingue a Mastodon
     get_started: Comenzar
     links: Enlaces
     other_instances: Otras instancias
@@ -93,7 +82,7 @@ es:
       blocking: Lista de bloqueados
       following: Lista de seguidos
     upload: Cargar
-  landing_strip_html: <strong>%{name}</strong> es un usuario en %{link_to_root_path}. Puedes seguirlo(a) o interactuar con el o ella si tienes una cuenta en cualquier parte del fediverse.
+  landing_strip_html: "<strong>%{name}</strong> es un usuario en %{link_to_root_path}. Puedes seguirlo(a) o interactuar con el o ella si tienes una cuenta en cualquier parte del fediverse."
   landing_strip_signup_html: Si no tienes una, puedes <a href="%{sign_up_path}">registrar aquí</a>.
   media_attachments:
     validations:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 515443608..6f0bd0839 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -3,23 +3,12 @@ fa:
   about:
     about_mastodon: ماستدون (Mastodon) یک شبکهٔ اجتماعی <em>آزاد و کدباز</em> است. یک جایگزین <em>غیرمتمرکز</em> برای شبکه‌های تجاری، که نمی‌گذارد ارتباط‌های شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید &mdash; هر سروری که باشد، همچنان می‌توانید با سرورهای دیگر ارتباط داشته باشید. هر کسی می‌تواند سرور ماستدون خود را راه بیندازد و در <em>شبکهٔ اجتماعی</em> سهیم شود.
     about_this: دربارهٔ این سرور
-    apps: برنامه‌ها
     business_email: 'ایمیل کاری:'
     closed_registrations: امکان ثبت نام روی این سرور هم‌اینک فعال نیست.
     contact: تماس
     description_headline: "%{domain} چیست؟"
     domain_count_after: سرور دیگر
     domain_count_before: متصل به
-    features:
-      api: رابط برنامه‌نویسی برای برنامه‌ها و سرویس‌های دیگر
-      blocks: ابزارهای قدرتمند برای مسدود یا بی‌صدا کردن دیگران
-      characters: ۵۰۰ حرف برای هر نوشته
-      chronology: نمایش نوشته‌های دیگران به ترتیب زمانی
-      ethics: 'اخلاق‌مدار: بدون تبلیغات، بدون ردگیری'
-      gifv: تصاویر متحرک و ویدیوهای کوتاه
-      privacy: تنظیمات حریم خصوصی جداگانه برای هر نوشته
-      public: نمایش نوشته‌های عمومی دیگران از همه‌جا
-    features_headline: برگ‌های برندهٔ ماستدون
     get_started: آغاز کنید
     links: پیوندها
     other_instances: سرورهای دیگر
@@ -159,8 +148,6 @@ fa:
           desc_html: وقتی امکان ثبت نام روی سرور فعال نباشد در صفحهٔ اصلی نمایش می‌یابد<br>می‌توانید HTML بنویسید
           title: پیغام برای فعال‌نبودن ثبت نام
         open:
-          disabled: غیرفعال
-          enabled: فعال
           title: امکان ثبت نام
       setting: تنظیمات
       site_description:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c20bf690b..a2488530f 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -3,22 +3,11 @@ fi:
   about:
     about_mastodon: Mastodon on <em>ilmainen, avoimeen lähdekoodiin perustuva</em> sosiaalinen verkosto. <em>Hajautettu</em> vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat &mdash; minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa <em>sosiaaliseen verkkoon</em> saumattomasti.
     about_this: Tietoja tästä palvelimesta
-    apps: Ohjelmat
     business_email: 'Business e-mail:'
     contact: Ota yhteyttä
     description_headline: Mikä on %{domain}?
     domain_count_after: muuhun palvelimeen
     domain_count_before: Yhdistyneenä
-    features:
-      api: Avoin API ohjelmille ja palveluille
-      blocks: Rikkaat esto- ja hiljennystyökalut
-      characters: 500 kirjainta per viesti
-      chronology: Aikajana on kronologisessa järjestyksessä
-      ethics: 'Eettinen suunnittelu: ei mainoksia, ei seurantaa'
-      gifv: GIFV settejä ja lyhyitä videoita
-      privacy: Julkaisukohtainen yksityisyysasetus
-      public: Julkiset aikajanat
-    features_headline: Mikä erottaa Mastodonin muista
     get_started: Aloita käyttö
     links: Linkit
     other_instances: Muut palvelimet
@@ -92,7 +81,7 @@ fi:
       blocking: Estetyt lista
       following: Seuratut lista
     upload: Lähetä
-  landing_strip_html: <strong>%{name}</strong> on käyttäjä domainilla %{link_to_root_path}. Voit seurata tai vuorovaikuttaa heidän kanssaan jos sinulla on tili yleisessä verkossa.
+  landing_strip_html: "<strong>%{name}</strong> on käyttäjä domainilla %{link_to_root_path}. Voit seurata tai vuorovaikuttaa heidän kanssaan jos sinulla on tili yleisessä verkossa."
   landing_strip_signup_html: Jos sinulla ei ole tiliä, voit <a href="%{sign_up_path}">rekisteröityä täällä</a>.
   notification_mailer:
     digest:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index fcf5f6f9e..9eeafaa6e 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3,23 +3,12 @@ fr:
   about:
     about_mastodon: Mastodon est un serveur <em>libre</em> de réseautage social. Alternative <em>décentralisée</em> aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au <em>réseau social</em> de manière transparente.
     about_this: À propos de cette instance
-    apps: Applications
     business_email: Courriel professionnel
     closed_registrations: Les inscriptions sont actuellement fermées sur cette instance.
     contact: Contact
     description_headline: Qu’est-ce que %{domain} ?
     domain_count_after: autres instances
     domain_count_before: Connectés à
-    features:
-      api: API ouverte aux apps et services
-      blocks: Outils complets de bloquage et masquage
-      characters: 500 caractères par post
-      chronology: Fil chronologique
-      ethics: Pas de pubs, pas de pistage
-      gifv: Partage de vidéos et de GIFs
-      privacy: Réglages de confidentialité au niveau des posts
-      public: Fils publics
-    features_headline: Ce qui rend Mastodon différent
     get_started: Rejoindre le réseau
     links: Liens
     other_instances: Autres instances
@@ -48,7 +37,7 @@ fr:
       create:
         name: "%{account_name} a créé une note."
     outbox:
-      name: "Boîte d’envoi de %{account_name}"
+      name: Boîte d’envoi de %{account_name}
       summary: Liste d’activités de %{account_name}
   admin:
     accounts:
@@ -173,8 +162,6 @@ fr:
           desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées<br>Vous pouvez utiliser des balises HTML
           title: Message de fermeture des inscriptions
         open:
-          disabled: Désactivées
-          enabled: Activées
           title: Inscriptions
       setting: Paramètre
       site_description:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ec7d972ec..760ddac00 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3,23 +3,12 @@ he:
   about:
     about_mastodon: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
     about_this: אודות שרת זה
-    apps: ישומים
     business_email: 'דוא"ל עסקי:'
     closed_registrations: הרשמות סגורות לשרת זה לעת עתה.
     contact: צור קשר
     description_headline: מהו %{domain}?
     domain_count_after: שרתים אחרים
     domain_count_before: מחובר אל
-    features:
-      api: API פתוח לישומים ושירותים
-      blocks: כלי חסימה והשתקה חזקים
-      characters: 500 תווים להודעה
-      chronology: הטורים כרונולוגיים
-      ethics: 'תכנון מוסרי: אין פרסומות, אין מעקב'
-      gifv: GIFV וסרטונים קצרים
-      privacy: אפשרויות פרטיוּת נפרדות לכל הודעה
-      public: טורים פומביים
-    features_headline: מה מייחד קהילות מבוססות מסטודון
     get_started: בואו נתחיל
     links: קישורים
     other_instances: שרתים אחרים
@@ -167,8 +156,6 @@ he:
           desc_html: מוצג על הדף הראשי כאשר ההרשמות סגורות<br>ניתן להשתמש בתגיות HTML
           title: מסר סגירת הרשמות
         open:
-          disabled: מבוטל
-          enabled: מופעל
           title: הרשמה פתוחה
       setting: הגדרה
       site_description:
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index f873fc7ed..8297ca629 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -3,23 +3,12 @@ hr:
   about:
     about_mastodon: Mastodon je <em>besplatna, open-source</em> socijalna mreža. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati &mdash; koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreži</em> bez problema.
     about_this: O ovoj instanci
-    apps: Aplikacije
     business_email: 'Poslovni e-mail:'
     closed_registrations: Registracije na ovoj instanci su trenutno zatvorene.
     contact: Kontakt
     description_headline: Što je %{domain}?
     domain_count_after: druge instance
     domain_count_before: Spojen na
-    features:
-      api: Otvoren API za aplikacije i servise
-      blocks: Bogati alati za blokiranje i ušutkivanje
-      characters: 500 znakova po postu
-      chronology: Timelines su kronološke
-      ethics: 'Etički dizajn: bez oglasa, bez praćenja'
-      gifv: GIFV setovi i kratki videi
-      privacy: Granularne postavke privatnosti, po postu
-      public: Javne timelines
-    features_headline: Po čemu se Mastodon razlikuje
     get_started: Započni
     links: Linkovi
     other_instances: Druge instance
@@ -94,7 +83,7 @@ hr:
       following: Lista onih koje slijedim
       muting: Lista utišanih
     upload: Upload
-  landing_strip_html: <strong>%{name}</strong> je korisnik na %{link_to_root_path}. Možeš ih slijediti ili komunicirati s njima ako imaš račun igdje u fediversu.
+  landing_strip_html: "<strong>%{name}</strong> je korisnik na %{link_to_root_path}. Možeš ih slijediti ili komunicirati s njima ako imaš račun igdje u fediversu."
   landing_strip_signup_html: Ako nemaš, možeš se <a href="%{sign_up_path}">registrirati ovdje</a>.
   notification_mailer:
     digest:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index fc4ffd046..4bcd8f2ed 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -3,23 +3,12 @@ id:
   about:
     about_mastodon: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
     about_this: Tentang server ini
-    apps: Apl
     business_email: 'E-mail bisnis:'
     closed_registrations: Pendaftaran untuk server ini sedang ditutup.
     contact: Kontak
     description_headline: Apa itu %{domain}?
     domain_count_after: server lain
     domain_count_before: Terhubung dengan
-    features:
-      api: API terbuka untuk aplikasi dan layanan lain
-      blocks: Aneka ragam fitur blokir dan pembisuan
-      characters: 500 karakter per posting
-      chronology: Linimasa berurutan
-      ethics: 'Desain etis: tanpa iklan, tidak ada pelacakan'
-      gifv: Fitur GIFV dan video pendek
-      privacy: Terperinci, pengaturan privasi per postingan
-      public: Linimasa publik
-    features_headline: Yang berbeda dari Mastodon
     get_started: Mulai
     links: Link
     other_instances: Server lain
@@ -158,8 +147,6 @@ id:
           desc_html: Ditampilkan pada halaman depan saat pendaftaran ditutup<br>Anda bisa menggunakan tag HTML
           title: Pesan penutupan pendaftaran
         open:
-          disabled: Dinonaktifkan
-          enabled: Diaktifkan
           title: Pendaftaran terbuka
       setting: Pengaturan
       site_description:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index db430b0fe..8eb48c303 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -3,23 +3,12 @@ io:
   about:
     about_mastodon: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate.
     about_this: Pri ta instaluro
-    apps: Apliki
     business_email: 'Profesionala retpost-adreso:'
     closed_registrations: Membresko ne nun esas posible en ta instaluro.
     contact: Kontaktar
     description_headline: Quo esas %{domain}?
     domain_count_after: altra instaluri
     domain_count_before: Konektita ad
-    features:
-      api: Apertita API por apliki e servadi
-      blocks: Kompleta utensili por blokusar e celar
-      characters: Til 500 signi por singla mesajo
-      chronology: Tempolinei seguntempa
-      ethics: 'Etike kreita: nula anunco, nula trakado'
-      gifv: Posibleso diskononigar mikra videi e GIFV
-      privacy: Videbleso ajustita segun la mesajo
-      public: Publika tempolinei
-    features_headline: Quale Mastodon esas diferanta
     get_started: Komencar
     links: Ligili
     other_instances: Altra instaluri
@@ -146,8 +135,6 @@ io:
           desc_html: Displayed on frontpage when registrations are closed<br>You can use HTML tags
           title: Closed registration message
         open:
-          disabled: Disabled
-          enabled: Enabled
           title: Open registration
       setting: Setting
       site_description:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a96a459df..5c014c61d 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,23 +3,12 @@ it:
   about:
     about_mastodon: Mastodon è un social network <em>gratuito e open-source</em>. Un'alternativa <em>decentralizzata</em> alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi &mdash; qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del <em>social network</em>.
     about_this: A proposito di questo server
-    apps: Applicazioni
     business_email: 'Email di lavoro:'
     closed_registrations: Al momento le iscrizioni a questo server sono chiuse.
     contact: Contatti
     description_headline: Cos'è %{domain}?
     domain_count_after: altri server
     domain_count_before: Connesso a
-    features:
-      api: API aperto per applicazioni e servizi
-      blocks: Potenti strumenti di blocco e silenziamento
-      characters: 500 caratteri per status
-      chronology: Le timeline sono cronologiche
-      ethics: 'Design etico: niente pubblicità, niente tracking'
-      gifv: Set di GIFV e brevi video
-      privacy: Opzioni di privacy mirate per-post
-      public: Timeline pubbliche
-    features_headline: Cosa rende Mastodon migliore
     get_started: Inizia
     links: Links
     other_instances: Altri server
@@ -93,7 +82,7 @@ it:
       blocking: Lista dei bloccati
       following: Lista dei seguaci
     upload: Carica
-  landing_strip_html: <strong>%{name}</strong> è un utente su %{link_to_root_path}. Puoi seguirlo o interagire con lui se possiedi un account ovunque nel fediverse.
+  landing_strip_html: "<strong>%{name}</strong> è un utente su %{link_to_root_path}. Puoi seguirlo o interagire con lui se possiedi un account ovunque nel fediverse."
   landing_strip_signup_html: Se non possiedi un account, puoi <a href="%{sign_up_path}">iscriverti qui</a>.
   media_attachments:
     validations:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9cb2428f7..5b91aa75d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -3,23 +3,12 @@ ja:
   about:
     about_mastodon: Mastodon は<em>自由でオープンソース</em>なソーシャルネットワークです。商用プラットフォームの代替となる<em>分散型</em>を採用し、あなたのやりとりが一つの会社によって独占されるのを防ぎます。信頼できるインスタンスを選択してください &mdash; どのインスタンスを選んでも、誰とでもやりとりすることができます。 だれでも自分の Mastodon インスタンスを作ることができ、シームレスに<em>ソーシャルネットワーク</em>に参加できます。
     about_this: このインスタンスについて
-    apps: アプリ
     business_email: 'ビジネスメールアドレス:'
     closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。
     contact: 連絡先
     description_headline: "%{domain} とは？"
     domain_count_after: 個のインスタンス
     domain_count_before: 接続中
-    features:
-      api: アプリやその他サービスにAPIを公開
-      blocks: 豊富なブロックやミュート機能
-      characters: 1つの投稿は500文字まで利用可能
-      chronology: 時系列順のタイムライン
-      ethics: 広告もトラッキングもありません
-      gifv: GIFVや短い動画にも対応
-      privacy: 投稿ごとに公開範囲を細かく設定可能
-      public: 公開タイムライン
-    features_headline: Mastodon の特徴
     get_started: 参加する
     links: リンク
     other_instances: 他のインスタンス
@@ -173,8 +162,6 @@ ja:
           desc_html: 新規登録を停止しているときにフロントページに表示されます。<br>HTMLタグが利用可能です。
           title: 新規登録停止時のメッセージ
         open:
-          disabled: 無効
-          enabled: 有効
           title: 新規登録を受け付ける
       setting: 設定
       site_description:
@@ -395,7 +382,7 @@ ja:
       <h2>プライバシーポリシー</h2>
 
       <h3 id="collect">どのような情報を収集するのですか？</h3>
- 
+
       <p>あなたがこのサイトに登録すると、ここで共有された情報を読んだり、書いたり、評価したりして、フォーラムでの情報を集める事ができます。</p>
 
       <p>このサイトに登録する際には、名前とメールアドレスの入力を求めることがあります。ただし、登録をすることなくこのサイトを利用することも可能です。あなたのメールアドレスは、固有のリンクを含んだメールで確認されます。そのリンクにアクセスした場合にメールアドレスを制御することとなります。</p>
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 844e78908..c8ad38d41 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -3,23 +3,12 @@ ko:
   about:
     about_mastodon: Mastodon 은<em>자유로운 오픈 소스</em>소셜 네트워크입니다. 상용 플랫폼의 대체로써 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
     about_this: 이 인스턴스에 대해서
-    apps: 어플리케이션
     business_email: '비즈니스 메일 주소:'
     closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다.
     contact: 연락처
     description_headline: "%{domain} 는 무엇인가요?"
     domain_count_after: 개의 인스턴스
     domain_count_before: 연결됨
-    features:
-      api: 어플리케이션이나 그 외 서비스에 API를 공개
-      blocks: 강력한 차단 및 뮤트 기능
-      characters: 한번에 500자까지 포스팅 가능
-      chronology: 시간 순서의 타임라인
-      ethics: 광고도 트래킹도 없습니다
-      gifv: GIFV나 짧은 동영상도 지원
-      privacy: 각 포스팅마다 공개 범위를 상세히 설정 가능
-      public: 공개 타임라인
-    features_headline: Mastodon 의 특징
     get_started: 참가하기
     links: 링크
     other_instances: 다른 인스턴스
@@ -151,7 +140,7 @@ ko:
       nsfw:
         'false': NSFW 꺼짐
         'true': NSFW 켜짐
-      report: "신고 #%{id}"
+      report: '신고 #%{id}'
       report_contents: 내용
       reported_account: 신고 대상 계정
       reported_by: 신고자
@@ -173,8 +162,6 @@ ko:
           desc_html: 신규 등록을 받지 않을 때 프론트 페이지에 표시됩니다. <br>HTML 태그를 사용할 수 있습니다.
           title: 신규 등록 정지 시 메시지
         open:
-          disabled: 꺼짐
-          enabled: 켜짐
           title: 신규 등록을 받음
       setting: 설정
       site_description:
@@ -301,7 +288,7 @@ ko:
         one: "1건의 새로운 알림 \U0001F418"
         other: "%{count}건의 새로운 알림 \U0001F418"
     favourite:
-      body: '%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다.'
+      body: "%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다."
       subject: "%{name} 님이 내 Toot을 즐겨찾기에 등록했습니다"
     follow:
       body: "%{name} 님이 나를 팔로우 했습니다"
@@ -323,7 +310,7 @@ ko:
     acct: 아이디@도메인을 입력해 주십시오
     missing_resource: 리디렉션 대상을 찾을 수 없습니다
     proceed: 팔로우 하기
-    prompt: '팔로우 하려 하고 있습니다'
+    prompt: 팔로우 하려 하고 있습니다
   sessions:
     activity: 마지막 활동
     browser: 브라우저
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 306ce6b1f..633061b06 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,23 +3,12 @@ nl:
   about:
     about_mastodon: Mastodon is een <em>vrij, gratis en open-source</em> sociaal netwerk. Een <em>gedecentraliseerd</em> alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt &mdash; welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het <em>sociale netwerk</em>.
     about_this: Over deze server
-    apps: Apps
     business_email: 'E-mailadres:'
     closed_registrations: Registreren op deze server is momenteel uitgeschakeld.
     contact: Contact
     description_headline: Wat is %{domain}?
     domain_count_after: andere servers
     domain_count_before: Verbonden met
-    features:
-      api: Open API voor apps en diensten
-      blocks: Uitgebreide blokkeer- en negeerhulpmiddelen
-      characters: 500 tekens per bericht
-      chronology: Tijdlijnen zijn chronologisch
-      ethics: 'Ethisch design: geen advertenties, geen spionage'
-      gifv: GIFV-sets en korte video's
-      privacy: Nauwkeurige privacyinstellingen per toot (bericht)
-      public: Openbare tijdlijnen
-    features_headline: Wat maakt Mastodon anders
     get_started: Beginnen
     links: Links
     other_instances: Andere servers
@@ -73,8 +62,6 @@ nl:
           desc_html: Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld<br>En ook hier kan je HTML gebruiken
           title: Bericht wanneer registratie is uitgeschakeld
         open:
-          disabled: Uitgeschakeld
-          enabled: Ingeschakeld
           title: Open registratie
       setting: Instelling
       site_description:
@@ -89,7 +76,7 @@ nl:
   admin_mailer:
     new_report:
       body: "%{reporter} heeft %{target} gerapporteerd"
-      subject: Nieuwe toots gerapporteerd op %{instance} (#%{id})     
+      subject: Nieuwe toots gerapporteerd op %{instance} (#%{id})
   application_mailer:
     settings: 'E-mailvoorkeuren wijzigen: %{link}'
     signature: Mastodon-meldingen van %{instance}
@@ -131,7 +118,7 @@ nl:
     bad_password_msg: Goed geprobeerd hackers! Ongeldig wachtwoord
     confirm_password: Voer jouw huidige wachtwoord in om jouw identiteit te bevestigen
     description_html: Hierdoor worden alle gegevens van jouw account <strong>permanent, onomkeerbaar</strong> verwijderd en wordt deze gedeactiveerd. Om toekomstige identiteitsdiefstal te voorkomen, kan op deze server jouw gebruikersnaam niet meer gebruikt worden.
-    proceed: Account verwijderen 
+    proceed: Account verwijderen
     success_msg: Jouw account is succesvol verwijderd
     warning_html: We kunnen alleen garanderen dat jouw gegevens op deze server worden verwijderd. Berichten (toots), incl. media, die veel zijn gedeeld laten mogelijk sporen achter. Offline servers en servers die niet meer op jouw updates zijn geabonneerd zullen niet hun databases updaten.
     warning_title: Verwijdering gegevens op andere servers
@@ -177,7 +164,7 @@ nl:
       following: Volglijst
       muting: Negeerlijst
     upload: Uploaden
-  landing_strip_html: <strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt.
+  landing_strip_html: "<strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt."
   landing_strip_signup_html: Als je dat niet hebt, kun je je <a href="%{sign_up_path}">hier registreren</a>.
   notification_mailer:
     digest:
@@ -286,7 +273,7 @@ nl:
     generate_recovery_codes: Herstelcodes genereren
     instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app aanmeldcodes die je bij het aanmelden moet invoeren."
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
-    manual_instructions: 'Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.'
+    manual_instructions: Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
     recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
     setup: Instellen
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 5fd63f121..05714959d 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -3,23 +3,12 @@
   about:
     about_mastodon: Mastodon er et sosialt nettverk laget med <em>fri programvare</em>. Et <em>desentralisert</em> alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på &mdash; uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
     about_this: Om denne instansen
-    apps: Applikasjoner
     business_email: 'Bedriftsepost:'
     closed_registrations: Registreringer er for øyeblikket lukket på denne instansen.
     contact: Kontakt
     description_headline: Hva er %{domain}?
     domain_count_after: andre instanser
     domain_count_before: Koblet til
-    features:
-      api: Åpent API for applikasjoner og tjenester
-      blocks: Rikholdige blokkeringsverktøy
-      characters: 500 tegn per status
-      chronology: Tidslinjer er kronologiske
-      ethics: 'Etisk design: Ingen reklame, ingen sporing'
-      gifv: Støtte for GIFV og korte videoer
-      privacy: Finmaskede personvernsinnstillinger
-      public: Felles tidslinjer
-    features_headline: Hva skiller Mastodon fra andre sosiale nettverk
     get_started: Kom i gang
     links: Lenker
     other_instances: Andre instanser
@@ -160,8 +149,6 @@
           desc_html: Vises på forsiden når registreringer er lukket<br>Du kan bruke HTML-tagger
           title: Melding for lukket registrering
         open:
-          disabled: På
-          enabled: Av
           title: Åpen registrering
       setting: Innstilling
       site_description:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 631133f74..30d5258a5 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -3,23 +3,12 @@ oc:
   about:
     about_mastodon: Mastodon es un malhum social <em>liure e open-source</em>. Una alternativa <em>decentralizada</em> a las platformas comercialas, aquò evita qu’una sola companiá monopolize vòstra comunicacion. Causissètz une servidor que vos fisatz, quina que siague vòstra causida, podètz interagir amb tot lo mond. Qual que siague pòt aver son instància Mastodon e participar al <em>malhum social</em> sens cap de problèmas.
     about_this: A prepaus d’aquesta instància
-    apps: Aplicacions
     business_email: 'Corrièl professional :'
     closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància.
     contact: Contacte
     description_headline: Qué es %{domain} ?
     domain_count_after: autras instàncias
     domain_count_before: Connectat a
-    features:
-      api: API dubèrta per las aplicacions e servicis
-      blocks: Aisinas complètas per blocar e rescondre
-      characters: 500 caractèrs per publicacion
-      chronology: Flux d’actualitat cronologic
-      ethics: 'Ethical design: pas cap de reclama o traçador'
-      gifv: Partatge de GIFs e vidèos cortas
-      privacy: Nivèl de confidencialitat configurable per cada publicacion
-      public: Fluxes d’actualitat publics
-    features_headline: Çò que fa que Mastodon es diferent
     get_started: Venètz al malhum
     links: Ligams
     other_instances: Autras instàncias
@@ -167,8 +156,6 @@ oc:
           desc_html: Afichat sus las pagina d’acuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML
           title: Messatge de barradura de las inscripcions
         open:
-          disabled: Desactivadas
-          enabled: Activadas
           title: Inscripcions
       setting: Paramètre
       site_description:
@@ -220,7 +207,7 @@ oc:
     - dv
     - ds
     abbr_month_names:
-    -
+    - 
     - gen
     - feb
     - mar
@@ -246,7 +233,7 @@ oc:
       long: Lo %e %B de %Y
       short: "%e %b"
     month_names:
-    -
+    - 
     - de genièr
     - de febrièr
     - de març
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 321b1590e..018ff3c7b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3,23 +3,12 @@ pl:
   about:
     about_mastodon: Mastodon jest <em>wolną i otwartą</em> siecią społecznościową, <em>zdecentralizowaną</em> alternatywą dla zamkniętych, komercyjnych platform. Pozwala uniknąć ryzyka monopolizacji Twojej komunikacji przez jedną korporację. Wybierz serwer, któremu ufasz &mdash; nie ograniczy to Twoich możliwości komunikacji z innymi osobami w sieci. Każdy może też uruchomić własną instancję Mastodona i dołączyć do reszty tej <em>sieci społecznościowej</em>.
     about_this: O tej instancji
-    apps: Aplikacje
     business_email: 'Służbowy adres e-mail:'
     closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta.
     contact: Kontakt
     description_headline: Czym jest %{domain}?
     domain_count_after: instancji
     domain_count_before: Serwer połączony z
-    features:
-      api: Otwarte API dla aplikacji i usług
-      blocks: Rozbudowane narzędzia blokowania i ukrywania
-      characters: 500 znaków na wpis
-      chronology: Chronologiczny porządek wyświetlania
-      ethics: 'Etyczne założenia: nie śledzimy, bez reklam'
-      gifv: obsługa GIFV i krótkich wideo
-      privacy: Precyzyjne ustawienia widoczności poszczególnych postów
-      public: Publiczne osie czasu
-    features_headline: Co wyróżnia Mastodona
     get_started: Rozpocznijmy!
     links: Odnośniki
     other_instances: Inne instancje
@@ -48,7 +37,7 @@ pl:
       create:
         name: "%{account_name} utworzył(a) wpis."
     outbox:
-      name: "Skrzynka %{account_name}"
+      name: Skrzynka %{account_name}
       summary: Zbiór aktywności użytkownika %{account_name}.
   admin:
     accounts:
@@ -173,8 +162,6 @@ pl:
           desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji<br>nie jest dostępna. Możesz korzystać z tagów HTML
           title: Wiadomość o nieaktywnej rejestracji
         open:
-          disabled: Nieaktywna
-          enabled: Aktywna
           title: Otwarta rejestracja
       setting: Ustawienie
       site_description:
@@ -198,7 +185,7 @@ pl:
     title: Administracja
   admin_mailer:
     new_report:
-      body: "Użytkownik %{reporter} zgłosił %{target}"
+      body: Użytkownik %{reporter} zgłosił %{target}
       subject: Nowe zgłoszenie na %{instance} (#%{id})
   application_mailer:
     settings: 'Zmień ustawienia powiadamiania: %{link}'
@@ -469,7 +456,7 @@ pl:
       <p>Dokument jest dostępny na licencji CC-BY-SA. Ostatnio modyfikowany 31 maja 2013, przetłumaczony 4 lipca 2017. Tłumaczenie (mimo dołożenia wszelkich starań) może nie być w pełni poprawne.</p>
 
       <p>Tekst bazuje na <a href="https://github.com/discourse/discourse">polityce prywatności Discourse</a>.
-    title: "Zasady korzystania i polityka prywatności %{instance}"
+    title: Zasady korzystania i polityka prywatności %{instance}
   time:
     formats:
       default: "%b %d, %Y, %H:%M"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 973a8d401..fb5e03c8c 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -3,23 +3,12 @@ pt-BR:
   about:
     about_mastodon: Mastodon é um servidor de rede social <em>grátis, e open-source</em>. Uma alternativa <em>descentralizada</em> ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie &mdash; qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na <em>rede social federada</em> sem problemas.
     about_this: Sobre essa instância
-    apps: Aplicações
     business_email: 'Email comercial:'
     closed_registrations: Registros estão fechadas para essa instância.
     contact: Contato
     description_headline: O que é %{domain}?
     domain_count_after: outras instâncias
     domain_count_before: Conectado a
-    features:
-      api: Aberto para API de aplicações e serviços
-      blocks: Bloqueos e ferramentas para mudar
-      characters: 500 caracteres por post
-      chronology: Timeline são cronologicas
-      ethics: 'Design ético: sem propaganda, sem tracking'
-      gifv: GIFV e vídeos curtos
-      privacy: Granular, privacidade setada por post
-      public: Timelines públicas
-    features_headline: O que torna Mastodon diferente
     get_started: Comece aqui
     links: Links
     other_instances: Outras instâncias
@@ -159,8 +148,6 @@ pt-BR:
           desc_html: Mostrar na página inicial quando registros estão fecados<br/>Você pode usar tags HTML
           title: Mensagem de registro fechados
         open:
-          disabled: Desabilitado
-          enabled: Habilitado
           title: Aberto para registro
       setting: Preferências
       site_description:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index dff2898c0..0f59185a7 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -3,23 +3,12 @@ pt:
   about:
     about_mastodon: Mastodon é uma rede social <em>grátis e em código aberto</em>. Uma alternativa <em>descentralizada</em> às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta <em>rede social</em>.
     about_this: Sobre esta instância
-    apps: Aplicações
     business_email: 'Email comercial:'
     closed_registrations: Novos registos estão fechados nesta instância.
     contact: Contacto
     description_headline: O que é o %{domain}?
     domain_count_after: outras instâncias
     domain_count_before: Ligado a
-    features:
-      api: API aberta para aplicações e serviços
-      blocks: Ferramentas para silenciar e bloquear
-      characters: 500 caracteres por post
-      chronology: Timelines cronológicas
-      ethics: 'Design ético: sem públicidade ou tracking'
-      gifv: GIFV e pequenos vídeos
-      privacy: Privacidade granular por post
-      public: Timelines públicas
-    features_headline: O que torna Mastodon diferente
     get_started: Começar
     links: Links
     other_instances: Outras instâncias
@@ -154,8 +143,6 @@ pt:
           desc_html: Mostrar na página inicial quando registos estão encerrados<br/>Podes usar tags HTML
           title: Mensagem de registos encerrados
         open:
-          disabled: Desabilitado
-          enabled: Habilitado
           title: Aceitar novos registos
       setting: Preferências
       site_description:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6321e96eb..414d39dd2 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3,23 +3,12 @@ ru:
   about:
     about_mastodon: Mastodon - это <em>свободная</em> социальная сеть с <em>открытым исходным кодом</em>. Как <em>децентрализованная</em> альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете &mdash; что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в <em>социальной сети</em> совершенно бесшовно.
     about_this: Об этом узле
-    apps: Приложения
     business_email: 'Деловой e-mail:'
     closed_registrations: В данный момент регистрация на этом узле закрыта.
     contact: Связаться
     description_headline: Что такое %{domain}?
     domain_count_after: другими узлами
     domain_count_before: Связан с
-    features:
-      api: Открытый API для приложений и сервисов
-      blocks: Продвинутые инструменты блокирования и глушения
-      characters: 500 символов на пост
-      chronology: Хронологические ленты
-      ethics: 'Этичный дизайн: нет рекламы, нет слежения'
-      gifv: GIFV и короткие видео
-      privacy: Тонкие настройки приватности для каждого поста
-      public: Публичные ленты
-    features_headline: Что выделяет Mastodon
     get_started: Начать
     links: Ссылки
     other_instances: Другие узлы
@@ -141,8 +130,6 @@ ru:
           desc_html: Отображается на титульной странице, когда закрыта регистрация<br>Можно использовать HTML-теги
           title: Сообщение о закрытой регистрации
         open:
-          disabled: Закрыта
-          enabled: Открыта
           title: Открыть регистрацию
       setting: Настройка
       site_description:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 322e5e74b..a71252afe 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -3,23 +3,12 @@ th:
   about:
     about_mastodon: แมสโทดอน เป็น  <em>ดีเซ็นทรัลไลซ์</em><em>ฟรีโอเพ่นซอร์ส</em> โซเชี่ยวเน็ตเวริ์ค.  เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ &mdash; ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับ<em>โซเชี่ยวเน็ตเวิร์ค</em> โดยไม่มีอะไรมาขวางกั้น.
     about_this: เกี่ยวกับอินซะแตนซ์นี้
-    apps: แอ๊ฟ
     business_email: 'อีเมล์ธุรกิจ:'
     closed_registrations: อินซะแตนซ์นี้ปิดรับลงทะเบียนแล้ว.
     contact: ติดต่อ
     description_headline: โดเมนคือ %{domain} ?
     domain_count_after: อินซะแตนซ์อื่นๆ
     domain_count_before: เชื่อมต่อกับ
-    features:
-      api: API เปิดสำหรับ Apps และ Services
-      blocks: มีเครื่องมือสำหรับ Block และ Mute
-      characters: เขียนได้ 500 ตัวอักษรต่อโพสต์
-      chronology: Timelines are chronological
-      ethics: 'ออกแบบด้วยจรรยาบรรณ: ไม่มีโฆษณา, ไม่มีการแทรค'
-      gifv: รองรับภาพ GIFV และ วีดีโอสั้น
-      privacy: Granular, per-post privacy settings
-      public: ไทม์ไลน์สาธารณะ
-    features_headline: What sets Mastodon apart
     get_started: เริ่มกันเลย
     links: ลิงก์
     other_instances: อินซะแตนซ์อื่นๆ
@@ -160,8 +149,6 @@ th:
           desc_html: Displayed on frontpage when registrations are closed<br> ใช้ HTML tags ได้
           title: ปิดข้อความลงทะเบียน
         open:
-          disabled: ปิดการใช้งาน
-          enabled: ปิดใช้งาน
           title: เปิดรับลงทะเบียน
       setting: ตั้งค่า
       site_description:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 0e33e2efe..a8927eaa8 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3,23 +3,12 @@ tr:
   about:
     about_mastodon: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
     about_this: Bu sunucu hakkında
-    apps: Uygulamalar
     business_email: 'İş e-postası:'
     closed_registrations: Bu sunucu şu anda yeni kayıt almamaktadır.
     contact: İletişim
     description_headline: Peki %{domain} nedir?
     domain_count_after: sunucu var.
     domain_count_before: Bağlı olduğu
-    features:
-      api: Uygulama ve servisler için açık API
-      blocks: Zengin blok ve iletişim araçları
-      characters: 500 karakterlik gönderiler
-      chronology: Kronolojik zaman tüneli
-      ethics: 'Etik tasarım: reklam ve izleme yok'
-      gifv: GIFV ve diğer video türleri
-      privacy: Gönderi bazlı gizlilik
-      public: Herkese açık zaman tünelleri
-    features_headline: Mastodon'ı diğerlerinden ayıran nedir?
     get_started: Kayıt ol
     links: Bağlantılar
     other_instances: Diğer sunucular
@@ -159,8 +148,6 @@ tr:
           desc_html: Kayıt alımları kapatıldığında ana sayfada görüntülenecek mesajdır. <br> HTML etiketleri kullanabilirsiniz.
           title: Kayıt alımları kapatılma mesajı
         open:
-          disabled: Kapalı
-          enabled: Açık
           title: Kayıt alımları
       setting: Ayar adı
       site_description:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 1327c1a7b..65f1aabf5 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -3,23 +3,12 @@ uk:
   about:
     about_mastodon: Mastodon - це <em>вільна</em> соціальна мережа з <em>відкритим вихідним кодом</em>. Вона є <em>децентралізованою</em> альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте &mdash; що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в <em>соціальній мережі</em>.
     about_this: Про цю інстанцію
-    apps: Додатки
     business_email: 'Діловий email:'
     closed_registrations: На даний момент реєстрація на цій інстанції закрита.
     contact: Зв'язатися
     description_headline: Що таке %{domain}?
     domain_count_after: іншими інстанціями
     domain_count_before: Зв'язаний з
-    features:
-      api: Відкритий API для додаків та сервісів
-      blocks: Продвинуті інструменти самомодерації
-      characters: 500 символів на пост
-      chronology: Хронологічні стрічки
-      ethics: 'Этичний дизайн: немає реклами, немає стеження'
-      gifv: GIFV та короткі відео
-      privacy: Тонкі налаштування приватності для кожного поста
-      public: Публічні стрічки
-    features_headline: Що виділяє Mastodon
     get_started: Почати
     links: Посилання
     other_instances: Інші інстанції
@@ -141,8 +130,6 @@ uk:
           desc_html: Відображається на титульній сторінці, коли реєстрація закрита <br>Можна використовувати HTML-теги
           title: Повідомлення про закриту реєстрацію
         open:
-          disabled: Закрита
-          enabled: Відкрита
           title: Відкрити реєстрацію
       setting: Налаштування
       site_description:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 6c8e9fc6d..d5d1b672c 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -3,23 +3,12 @@ zh-CN:
   about:
     about_mastodon: Mastodon（长毛象）是一个<em>自由、开放源码</em>的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的<em>社交</em>交流。
     about_this: 关于本实例
-    apps: 应用程序
     business_email: 商业电邮︰
     closed_registrations: 这个实例目前不开放注册 _(:3」∠)_
     contact: 联络
     description_headline: 关于 %{domain}
     domain_count_after: 个其它实例
     domain_count_before: 现已接入
-    features:
-      api: 开放 API，供各式应用程序及服务接入
-      blocks: 完善的封锁用户、静音功能
-      characters: 每篇嘟文最多 500 字
-      chronology: 纯粹按时间排序，不作多余处理
-      ethics: 良心设计︰没有广告，不追踪你的使用行为
-      gifv: 支持显示 GIFV 动图小视频
-      privacy: 可逐篇嘟文设置隐私
-      public: 提供公共时间轴
-    features_headline: 是什么让 Mastodon 与众不同
     get_started: 上手使用
     links: 链接
     other_instances: 其它实例
@@ -166,8 +155,6 @@ zh-CN:
           desc_html: 当本站暂停接受注册时，会显示这个消息。<br/> 可使用 HTML
           title: 暂停注册消息
         open:
-          disabled: 停用
-          enabled: 启用
           title: 开放注册
       setting: 设置
       site_description:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 4d8262c5b..aa9f27912 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -3,23 +3,12 @@ zh-HK:
   about:
     about_mastodon: Mastodon（萬象）是<em>自由、開源</em>的社交網絡。服務站<em>各自獨立而互連</em>，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的<em>網絡交流</em>。
     about_this: 關於本服務站
-    apps: 應用程式
     business_email: 聯絡網站管理者︰
     closed_registrations: 本服務站暫時停止接受登記。
     contact: 聯絡
     description_headline: 關於 %{domain}
     domain_count_after: 個其他服務站
     domain_count_before: 已連接至
-    features:
-      api: 開放 API，供各式應用程式及服務連入
-      blocks: 完善的封鎖用戶、靜音功能
-      characters: 每篇文章最多 500 字
-      chronology: 時間軸忠實按時排序，不多餘處理
-      ethics: 良心設計︰無廣告，不追蹤用戶
-      gifv: 支援顯示 GIFV 短片圖組
-      privacy: 可逐篇文章設定私隱度
-      public: 公共時間軸
-    features_headline: 甚麼讓 Mastodon 與眾不同
     get_started: 立即登記
     links: 連結
     other_instances: 其他服務站
@@ -159,8 +148,6 @@ zh-HK:
           desc_html: 當本站暫停接受註冊時，會顯示這個訊息。<br/> 可使用 HTML
           title: 暫停註冊訊息
         open:
-          disabled: 停用
-          enabled: 啟用
           title: 開放註冊
       setting: 設定
       site_description:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 754175a7a..58caf7848 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -3,23 +3,12 @@ zh-TW:
   about:
     about_mastodon: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的<em>社群網路</em>交流。
     about_this: 關於本服務站
-    apps: 應用程式
     business_email: 商務信箱︰
     closed_registrations: 本服務站暫時停止接受註冊。
     contact: 聯絡我們
     description_headline: 關於 %{domain}
     domain_count_after: 個服務站相連
     domain_count_before: 與其他
-    features:
-      api: 開放 API，供各式應用程式及服務串接
-      blocks: 完善的封鎖使用者、靜音功能
-      characters: 每篇文章最多 500 字
-      chronology: 時間軸按時序顯示文章，不作多餘處理
-      ethics: 良心設計︰沒有廣告，不追蹤您的使用行為
-      gifv: 支援顯示 GIFV 短片
-      privacy: 可逐篇文章調整隱私設定
-      public: 公開時間軸
-    features_headline: Mastodon 與眾不同之處
     get_started: 立即註冊
     links: 連結
     other_instances: 其他服務站
@@ -120,8 +109,6 @@ zh-TW:
           desc_html: 關閉註冊時顯示在首頁的內容，可使用 HTML 標籤。
           title: 關閉註冊訊息
         open:
-          disabled: 停用
-          enabled: 啟用
           title: 開放註冊
       setting: 設定
       site_description:
diff --git a/config/settings.yml b/config/settings.yml
index be2a7a1f8..579ba2929 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -16,6 +16,7 @@ defaults: &defaults
   open_registrations: true
   closed_registrations_message: ''
   open_deletion: true
+  timeline_preview: true
   boost_modal: false
   auto_play_gif: false
   delete_modal: true
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 0e182c755..bd70937e4 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -161,16 +161,12 @@ namespace :mastodon do
   namespace :settings do
     desc 'Open registrations on this instance'
     task open_registrations: :environment do
-      setting = Setting.where(var: 'open_registrations').first
-      setting.value = true
-      setting.save
+      Setting.open_registrations = true
     end
 
     desc 'Close registrations on this instance'
     task close_registrations: :environment do
-      setting = Setting.where(var: 'open_registrations').first
-      setting.value = false
-      setting.save
+      Setting.open_registrations = false
     end
   end
 
diff --git a/spec/requests/localization_spec.rb b/spec/requests/localization_spec.rb
index 2f7a5e91e..f625a93a4 100644
--- a/spec/requests/localization_spec.rb
+++ b/spec/requests/localization_spec.rb
@@ -6,13 +6,13 @@ describe 'Localization' do
   after(:all) do
     I18n.locale = I18n.default_locale
   end
-  
+
   it 'uses a specific region when provided' do
     headers = { 'Accept-Language' => 'zh-HK' }
 
     get "/about", headers: headers
     expect(response.body).to include(
-      I18n.t('about.about_mastodon', locale: 'zh-HK')
+      I18n.t('about.about_mastodon_html', locale: 'zh-HK')
     )
   end
 
@@ -21,7 +21,7 @@ describe 'Localization' do
 
     get "/about", headers: headers
     expect(response.body).to include(
-      I18n.t('about.about_mastodon', locale: 'es')
+      I18n.t('about.about_mastodon_html', locale: 'es')
     )
   end
   it 'falls back to english when locale is missing' do
@@ -29,7 +29,7 @@ describe 'Localization' do
 
     get "/about", headers: headers
     expect(response.body).to include(
-      I18n.t('about.about_mastodon', locale: 'en')
+      I18n.t('about.about_mastodon_html', locale: 'en')
     )
   end
 end
diff --git a/spec/views/about/show.html.haml_spec.rb b/spec/views/about/show.html.haml_spec.rb
index 2c5130d84..c0ead6349 100644
--- a/spec/views/about/show.html.haml_spec.rb
+++ b/spec/views/about/show.html.haml_spec.rb
@@ -10,10 +10,11 @@ describe 'about/show.html.haml', without_verify_partial_doubles: true do
 
   it 'has valid open graph tags' do
     instance_presenter = double(:instance_presenter,
-				site_description: 'something',
-				open_registrations: false,
-				closed_registrations_message: 'yes',
-			       )
+                                site_title: 'something',
+                                site_description: 'something',
+                                version_number: '1.0',
+                                open_registrations: false,
+                                closed_registrations_message: 'yes')
     assign(:instance_presenter, instance_presenter)
     render
 

From f93de3a516d23cddea7cce147d3da3decac85f2f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 11 Jul 2017 17:08:26 +0200
Subject: [PATCH 209/382] Fix #3462 - Require authentication for search API
 (#4155)

This makes it consistent with /api/v1/accounts/search and
previous behaviour has been an oversight.
---
 app/controllers/api/v1/search_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/api/v1/search_controller.rb b/app/controllers/api/v1/search_controller.rb
index 1353682ea..bc5b8e5d4 100644
--- a/app/controllers/api/v1/search_controller.rb
+++ b/app/controllers/api/v1/search_controller.rb
@@ -3,6 +3,9 @@
 class Api::V1::SearchController < Api::BaseController
   RESULTS_LIMIT = 5
 
+  before_action -> { doorkeeper_authorize! :read }
+  before_action :require_user!
+
   respond_to :json
 
   def index

From e6c81a635b99dcec4f8fded00d9451cb876df822 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 11 Jul 2017 17:25:49 +0200
Subject: [PATCH 210/382] Fix #2848 - Rake task to redownload avatars/headers
 (#4156)

Can be filtered by a specific domain
Resolves #2292
---
 app/controllers/admin/accounts_controller.rb |  4 ++--
 app/models/concerns/remotable.rb             | 14 +++++++++++--
 lib/tasks/mastodon.rake                      | 22 +++++++++++++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index ef2f8c4c2..7bceee2cd 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -22,8 +22,8 @@ module Admin
     end
 
     def redownload
-      @account.avatar = @account.avatar_remote_url
-      @account.header = @account.header_remote_url
+      @account.reset_avatar!
+      @account.reset_header!
       @account.save!
 
       redirect_to admin_account_path(@account.id)
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index 08d4fc59c..b4f169649 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -6,8 +6,9 @@ module Remotable
 
   included do
     attachment_definitions.each_key do |attachment_name|
-      attribute_name = "#{attachment_name}_remote_url".to_sym
-      method_name = "#{attribute_name}=".to_sym
+      attribute_name  = "#{attachment_name}_remote_url".to_sym
+      method_name     = "#{attribute_name}=".to_sym
+      alt_method_name = "reset_#{attachment_name}!".to_sym
 
       define_method method_name do |url|
         begin
@@ -35,6 +36,15 @@ module Remotable
           nil
         end
       end
+
+      define_method alt_method_name do
+        url = self[attribute_name]
+
+        return if url.blank?
+
+        self[attribute_name] = ''
+        send(method_name, url)
+      end
     end
   end
 end
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index bd70937e4..b2b352858 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -74,7 +74,7 @@ namespace :mastodon do
   end
 
   namespace :media do
-    desc 'Removes media attachments that have not been assigned to any status for longer than a day'
+    desc 'Removes media attachments that have not been assigned to any status for longer than a day (deprecated)'
     task clear: :environment do
       # No-op
       # This task is now executed via sidekiq-scheduler
@@ -100,6 +100,18 @@ namespace :mastodon do
       MediaAttachment.where(file_file_name: nil).where.not(type: :unknown).in_batches.update_all(type: :unknown)
       Rails.logger.debug 'Done!'
     end
+
+    desc 'Redownload avatars/headers of remote users. Optionally limit to a particular domain with DOMAIN'
+    task redownload_avatars: :environment do
+      accounts = Account.remote
+      accounts = accounts.where(domain: ENV['DOMAIN']) if ENV['DOMAIN'].present?
+
+      accounts.find_each do |account|
+        account.reset_avatar!
+        account.reset_header!
+        account.save
+      end
+    end
   end
 
   namespace :push do
@@ -111,7 +123,7 @@ namespace :mastodon do
       end
     end
 
-    desc 'Re-subscribes to soon expiring PuSH subscriptions'
+    desc 'Re-subscribes to soon expiring PuSH subscriptions (deprecated)'
     task refresh: :environment do
       # No-op
       # This task is now executed via sidekiq-scheduler
@@ -119,13 +131,13 @@ namespace :mastodon do
   end
 
   namespace :feeds do
-    desc 'Clear timelines of inactive users'
+    desc 'Clear timelines of inactive users (deprecated)'
     task clear: :environment do
       # No-op
       # This task is now executed via sidekiq-scheduler
     end
 
-    desc 'Clears all timelines'
+    desc 'Clear all timelines without regenerating them'
     task clear_all: :environment do
       Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
     end
@@ -151,7 +163,7 @@ namespace :mastodon do
       end
     end
 
-    desc 'List all admin users'
+    desc 'List e-mails of all admin users'
     task admins: :environment do
       puts 'Admin user emails:'
       puts User.admins.map(&:email).join("\n")

From 1c6c6b271cb361b75a33bc98c8f26d18ea9af23f Mon Sep 17 00:00:00 2001
From: nightpool <eg1290@gmail.com>
Date: Tue, 11 Jul 2017 12:19:16 -0400
Subject: [PATCH 211/382] Revert "Wrap methods of
 ProcessFeedService::ProcessEntry in classes (#4151)" (#4157)

This reverts commit 425acecfdb15093a265b191120fb2d4e4c4135c4.
---
 app/services/process_feed_service.rb | 433 +++++++++++++--------------
 1 file changed, 208 insertions(+), 225 deletions(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 19ab0c858..c335d2159 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -22,285 +22,268 @@ class ProcessFeedService < BaseService
   class ProcessEntry
     def call(xml, account)
       @account = account
-      @fetched = Activity.new(xml)
+      @xml     = xml
 
-      return unless [:activity, :note, :comment].include?(@fetched.type)
+      return if skip_unsupported_type?
 
-      klass = case @fetched.verb
-              when :post
-                PostActivity
-              when :share
-                ShareActivity
-              when :delete
-                DeletionActivity
-              else
-                return
-              end
-
-      @fetched = klass.new(xml, account)
-      @fetched.perform
+      case verb
+      when :post, :share
+        return create_status
+      when :delete
+        return delete_status
+      end
     rescue ActiveRecord::RecordInvalid => e
       Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
       nil
     end
 
-    class Activity
-      def initialize(xml, account = nil)
-        @xml = xml
-        @account = account
+    private
+
+    def create_status
+      if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
+        Rails.logger.debug "Delete for status #{id} was queued, ignoring"
+        return
       end
 
-      def verb
-        raw = @xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
-        TagManager::VERBS.key(raw)
-      rescue
-        :post
+      status, just_created = nil
+
+      Rails.logger.debug "Creating remote status #{id}"
+
+      if verb == :share
+        original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
+        return nil if original_status.nil?
       end
 
-      def type
-        raw = @xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
-        TagManager::TYPES.key(raw)
-      rescue
-        :activity
-      end
+      ApplicationRecord.transaction do
+        status, just_created = status_from_xml(@xml)
 
-      def id
-        @xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
-      end
+        return if status.nil?
+        return status unless just_created
 
-      def url
-        link = @xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
-        link.nil? ? nil : link['href']
-      end
-
-      private
-
-      def find_status(uri)
-        if TagManager.instance.local_id?(uri)
-          local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
-          return Status.find_by(id: local_id)
+        if verb == :share
+          status.reblog = original_status.reblog? ? original_status.reblog : original_status
         end
 
-        Status.find_by(uri: uri)
+        status.save!
       end
 
-      def redis
-        Redis.current
+      if thread?(@xml) && status.thread.nil?
+        Rails.logger.debug "Trying to attach #{status.id} (#{id(@xml)}) to #{thread(@xml).first}"
+        ThreadResolveWorker.perform_async(status.id, thread(@xml).second)
+      end
+
+      notify_about_mentions!(status) unless status.reblog?
+      notify_about_reblog!(status) if status.reblog? && status.reblog.account.local?
+
+      Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
+
+      LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
+      DistributionWorker.perform_async(status.id)
+
+      status
+    end
+
+    def notify_about_mentions!(status)
+      status.mentions.includes(:account).each do |mention|
+        mentioned_account = mention.account
+        next unless mentioned_account.local?
+        NotifyService.new.call(mentioned_account, mention)
       end
     end
 
-    class CreationActivity < Activity
-      def perform
-        if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
-          Rails.logger.debug "Delete for status #{id} was queued, ignoring"
-          return
-        end
+    def notify_about_reblog!(status)
+      NotifyService.new.call(status.reblog.account, status)
+    end
 
-        Rails.logger.debug "Creating remote status #{id}"
-        # Return early if status already exists in db
-        status = find_status(id)
+    def delete_status
+      Rails.logger.debug "Deleting remote status #{id}"
+      status = Status.find_by(uri: id, account: @account)
 
-        return [status, false] unless status.nil?
+      if status.nil?
+        redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
+      else
+        RemoveStatusService.new.call(status)
+      end
+    end
 
-        return [nil, false] if @account.suspended?
+    def skip_unsupported_type?
+      !([:post, :share, :delete].include?(verb) && [:activity, :note, :comment].include?(type))
+    end
 
-        status = Status.create!(
-          uri: id,
-          url: url,
-          account: @account,
-          reblog: reblog,
-          text: content,
-          spoiler_text: content_warning,
-          created_at: published,
-          reply: thread?,
-          language: content_language,
-          visibility: visibility_scope,
-          conversation: converstation_to_persistent&.first,
-          thread: thread? ? find_status(thread.first) : nil
-        )
+    def shared_status_from_xml(entry)
+      status = find_status(id(entry))
 
-        save_mentions(status)
-        save_hashtags(status)
-        save_media(status)
+      return status unless status.nil?
 
-        if thread? && status.thread.nil?
-          Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
-          ThreadResolveWorker.perform_async(status.id, thread.second)
-        end
+      FetchRemoteStatusService.new.call(url(entry))
+    end
 
-        Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
+    def status_from_xml(entry)
+      # Return early if status already exists in db
+      status = find_status(id(entry))
 
-        LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-        DistributionWorker.perform_async(status.id)
+      return [status, false] unless status.nil?
 
-        [status, true]
+      account = @account
+
+      return [nil, false] if account.suspended?
+
+      status = Status.create!(
+        uri: id(entry),
+        url: url(entry),
+        account: account,
+        text: content(entry),
+        spoiler_text: content_warning(entry),
+        created_at: published(entry),
+        reply: thread?(entry),
+        language: content_language(entry),
+        visibility: visibility_scope(entry),
+        conversation: find_or_create_conversation(entry),
+        thread: thread?(entry) ? find_status(thread(entry).first) : nil
+      )
+
+      mentions_from_xml(status, entry)
+      hashtags_from_xml(status, entry)
+      media_from_xml(status, entry)
+
+      [status, true]
+    end
+
+    def find_or_create_conversation(xml)
+      uri = xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
+      return if uri.nil?
+
+      if TagManager.instance.local_id?(uri)
+        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
+        return Conversation.find_by(id: local_id)
       end
 
-      def content
-        @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
+      Conversation.find_by(uri: uri) || Conversation.create!(uri: uri)
+    end
+
+    def find_status(uri)
+      if TagManager.instance.local_id?(uri)
+        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
+        return Status.find_by(id: local_id)
       end
 
-      def content_language
-        @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
+      Status.find_by(uri: uri)
+    end
+
+    def mentions_from_xml(parent, xml)
+      processed_account_ids = []
+
+      xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
+        next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
+
+        mentioned_account = account_from_href(link['href'])
+
+        next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
+
+        mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
+
+        # So we can skip duplicate mentions
+        processed_account_ids << mentioned_account.id
       end
+    end
 
-      def content_warning
-        @xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
+    def account_from_href(href)
+      url = Addressable::URI.parse(href).normalize
+
+      if TagManager.instance.web_domain?(url.host)
+        Account.find_local(url.path.gsub('/users/', ''))
+      else
+        Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
       end
+    end
 
-      def visibility_scope
-        @xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
-      end
+    def hashtags_from_xml(parent, xml)
+      tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
+      ProcessHashtagsService.new.call(parent, tags)
+    end
 
-      def published
-        @xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
-      end
+    def media_from_xml(parent, xml)
+      do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
 
-      def thread?
-        !@xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
-      end
+      xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
+        next unless link['href']
 
-      def thread
-        thr = @xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
-        [thr['ref'], thr['href']]
-      end
+        media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
+        parsed_url = Addressable::URI.parse(link['href']).normalize
 
-      private
+        next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
 
-      def converstation_to_persistent
-        uri = @xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
-        return if uri.nil?
+        media.save
 
-        if TagManager.instance.local_id?(uri)
-          local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
-          return Conversation.find_by(id: local_id)
-        end
+        next if do_not_download
 
-        found = Conversation.find_by(uri: uri)
-        found ? [found, false] : [Conversation.create!(uri: uri), true]
-      end
-
-      def save_mentions(parent)
-        processed_account_ids = []
-
-        @xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
-          next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
-
-          mentioned_account = account_from_href(link['href'])
-
-          next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
-
-          mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
-
-          # So we can skip duplicate mentions
-          processed_account_ids << mentioned_account.id
-        end
-      end
-
-      def save_hashtags(parent)
-        tags = @xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
-        ProcessHashtagsService.new.call(parent, tags)
-      end
-
-      def save_media(parent)
-        do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
-
-        @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
-          next unless link['href']
-
-          media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
-          parsed_url = Addressable::URI.parse(link['href']).normalize
-
-          next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
-
-          media.save
-
-          next if do_not_download
-
-          begin
-            media.file_remote_url = link['href']
-            media.save!
-          rescue ActiveRecord::RecordInvalid
-            next
-          end
-        end
-      end
-
-      def account_from_href(href)
-        url = Addressable::URI.parse(href).normalize
-
-        if TagManager.instance.web_domain?(url.host)
-          Account.find_local(url.path.gsub('/users/', ''))
-        else
-          Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
+        begin
+          media.file_remote_url = link['href']
+          media.save!
+        rescue ActiveRecord::RecordInvalid
+          next
         end
       end
     end
 
-    class ShareActivity < CreationActivity
-      def perform
-        status, just_created = super
-        NotifyService.new.call(reblog.account, status) if reblog&.account&.local? && just_created
-        status
-      end
-
-      def object
-        @xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)
-      end
-
-      private
-
-      def status
-        reblog && super
-      end
-
-      def reblog
-        return @reblog if defined? @reblog
-
-        original_status = RemoteActivity.new(object).perform
-        @reblog = original_status.reblog? ? original_status.reblog : original_status
-      end
+    def id(xml = @xml)
+      xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
     end
 
-    class PostActivity < CreationActivity
-      def perform
-        status, just_created = super
-
-        if just_created
-          status.mentions.includes(:account).each do |mention|
-            mentioned_account = mention.account
-            next unless mentioned_account.local?
-            NotifyService.new.call(mentioned_account, mention)
-          end
-        end
-
-        status
-      end
-
-      private
-
-      def reblog
-        nil
-      end
+    def verb(xml = @xml)
+      raw = xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
+      TagManager::VERBS.key(raw)
+    rescue
+      :post
     end
 
-    class DeletionActivity < Activity
-      def perform
-        Rails.logger.debug "Deleting remote status #{id}"
-        status = Status.find_by(uri: id, account: @account)
-
-        if status.nil?
-          redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
-        else
-          RemoveStatusService.new.call(status)
-        end
-      end
+    def type(xml = @xml)
+      raw = xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
+      TagManager::TYPES.key(raw)
+    rescue
+      :activity
     end
 
-    class RemoteActivity < Activity
-      def perform
-        find_status(id) || FetchRemoteStatusService.new.call(url)
-      end
+    def url(xml = @xml)
+      link = xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
+      link.nil? ? nil : link['href']
+    end
+
+    def content(xml = @xml)
+      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
+    end
+
+    def content_language(xml = @xml)
+      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
+    end
+
+    def content_warning(xml = @xml)
+      xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
+    end
+
+    def visibility_scope(xml = @xml)
+      xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
+    end
+
+    def published(xml = @xml)
+      xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
+    end
+
+    def thread?(xml = @xml)
+      !xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
+    end
+
+    def thread(xml = @xml)
+      thr = xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
+      [thr['ref'], thr['href']]
+    end
+
+    def account?(xml = @xml)
+      !xml.at_xpath('./xmlns:author', xmlns: TagManager::XMLNS).nil?
+    end
+
+    def redis
+      Redis.current
     end
   end
 end

From b21ab498f84b75288f20a7eb2c6e0ee223481674 Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <n.k@mail.yukimochi.net>
Date: Wed, 12 Jul 2017 02:56:45 +0900
Subject: [PATCH 212/382] Fix media modal prev button behavior. (#4158)

---
 app/javascript/mastodon/features/ui/components/media_modal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index 23f588669..d869fffa6 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -35,7 +35,7 @@ export default class MediaModal extends ImmutablePureComponent {
   }
 
   handlePrevClick = () => {
-    this.setState({ index: (this.getIndex() - 1) % this.props.media.size });
+    this.setState({ index: (this.props.media.size + this.getIndex() - 1) % this.props.media.size });
   }
 
   handleKeyUp = (e) => {

From 1764c32b9e295157b1900b9c66d3cdd76e2d3e0d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Jul 2017 00:39:15 +0200
Subject: [PATCH 213/382] Fix #4067 - Do not make HTTP round-trip when
 resolving local URL (#4160)

---
 app/services/fetch_remote_resource_service.rb | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/services/fetch_remote_resource_service.rb b/app/services/fetch_remote_resource_service.rb
index 5dfa3a0ff..2c1c1f05f 100644
--- a/app/services/fetch_remote_resource_service.rb
+++ b/app/services/fetch_remote_resource_service.rb
@@ -5,6 +5,9 @@ class FetchRemoteResourceService < BaseService
 
   def call(url)
     @url = url
+
+    return process_local_url if local_url?
+
     process_url unless fetched_atom_feed.nil?
   end
 
@@ -38,4 +41,29 @@ class FetchRemoteResourceService < BaseService
   def xml_data
     @_xml_data ||= Nokogiri::XML(body, nil, 'utf-8')
   end
+
+  def local_url?
+    TagManager.instance.local_url?(@url)
+  end
+
+  def process_local_url
+    recognized_params = Rails.application.routes.recognize_path(@url)
+
+    return unless recognized_params[:action] == 'show'
+
+    if recognized_params[:controller] == 'stream_entries'
+      status = StreamEntry.find_by(id: recognized_params[:id])&.status
+      check_local_status(status)
+    elsif recognized_params[:controller] == 'statuses'
+      status = Status.find_by(id: recognized_params[:id])
+      check_local_status(status)
+    elsif recognized_params[:controller] == 'accounts'
+      Account.find_local(recognized_params[:username])
+    end
+  end
+
+  def check_local_status(status)
+    return if status.nil?
+    status if status.public_visibility? || status.unlisted_visibility?
+  end
 end

From 056b5ed72f6d980bceeb49eb249b8365fe8fce66 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Jul 2017 03:24:04 +0200
Subject: [PATCH 214/382] Improve UI of admin site settings (#4163)

---
 app/controllers/admin/settings_controller.rb  |  6 +-
 app/javascript/styles/forms.scss              | 87 +++++++++++++-----
 app/models/form/admin_settings.rb             | 29 ++++++
 app/views/admin/settings/edit.html.haml       | 88 ++++++-------------
 config/initializers/simple_form.rb            |  4 +-
 config/locales/ca.yml                         |  2 -
 config/locales/de.yml                         |  2 -
 config/locales/en.yml                         | 40 ++++-----
 config/locales/fa.yml                         |  2 -
 config/locales/fr.yml                         |  2 -
 config/locales/he.yml                         |  2 -
 config/locales/id.yml                         |  2 -
 config/locales/io.yml                         |  2 -
 config/locales/ja.yml                         |  2 -
 config/locales/ko.yml                         |  2 -
 config/locales/nl.yml                         |  2 -
 config/locales/no.yml                         |  2 -
 config/locales/oc.yml                         |  2 -
 config/locales/pl.yml                         |  8 +-
 config/locales/pt-BR.yml                      |  2 -
 config/locales/pt.yml                         |  2 -
 config/locales/ru.yml                         |  2 -
 config/locales/th.yml                         |  2 -
 config/locales/tr.yml                         |  2 -
 config/locales/uk.yml                         |  2 -
 config/locales/zh-CN.yml                      |  2 -
 config/locales/zh-HK.yml                      |  2 -
 config/locales/zh-TW.yml                      |  2 -
 .../admin/settings_controller_spec.rb         |  8 +-
 29 files changed, 151 insertions(+), 161 deletions(-)
 create mode 100644 app/models/form/admin_settings.rb

diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 29b590d7a..5985d6282 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -22,7 +22,7 @@ module Admin
     ).freeze
 
     def edit
-      @settings = Setting.all_as_records
+      @admin_settings = Form::AdminSettings.new
     end
 
     def update
@@ -38,12 +38,12 @@ module Admin
     private
 
     def settings_params
-      params.permit(ADMIN_SETTINGS)
+      params.require(:form_admin_settings).permit(ADMIN_SETTINGS)
     end
 
     def value_for_update(key, value)
       if BOOLEAN_SETTINGS.include?(key)
-        value == 'true'
+        value == '1'
       else
         value
       end
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index e723b50ff..e1de36d55 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -57,10 +57,7 @@ code {
     }
   }
 
-  .input.file,
-  .input.select,
-  .input.radio_buttons,
-  .input.check_boxes {
+  .input.with_label {
     padding: 15px 0;
     margin-bottom: 0;
 
@@ -71,6 +68,44 @@ code {
       display: block;
       padding-top: 5px;
     }
+
+    &.boolean {
+      padding: initial;
+      margin-bottom: initial;
+
+      .label_input > label {
+        font-family: inherit;
+        font-size: 14px;
+        color: $primary-text-color;
+        display: block;
+        width: auto;
+      }
+
+      label.checkbox {
+        position: relative;
+        padding-left: 25px;
+        flex: 1 1 auto;
+      }
+    }
+  }
+
+  .input.with_block_label {
+    & > label {
+      font-family: inherit;
+      font-size: 16px;
+      color: $primary-text-color;
+      display: block;
+      padding-top: 5px;
+    }
+
+    .hint {
+      margin-bottom: 15px;
+    }
+
+    li {
+      float: left;
+      width: 50%;
+    }
   }
 
   .fields-group {
@@ -106,7 +141,7 @@ code {
     input[type=checkbox] {
       position: absolute;
       left: 0;
-      top: 1px;
+      top: 5px;
       margin: 0;
     }
 
@@ -116,6 +151,29 @@ code {
     }
   }
 
+  .check_boxes {
+    .checkbox {
+      label {
+        font-family: inherit;
+        font-size: 14px;
+        color: $primary-text-color;
+        display: block;
+        width: auto;
+        position: relative;
+        padding-top: 5px;
+        padding-left: 25px;
+        flex: 1 1 auto;
+      }
+
+      input[type=checkbox] {
+        position: absolute;
+        left: 0;
+        top: 5px;
+        margin: 0;
+      }
+    }
+  }
+
   input[type=text],
   input[type=number],
   input[type=email],
@@ -390,25 +448,6 @@ code {
   }
 }
 
-.user_filtered_languages {
-  & > label {
-    font-family: inherit;
-    font-size: 16px;
-    color: $primary-text-color;
-    display: block;
-    padding-top: 5px;
-  }
-
-  .hint {
-    margin-bottom: 15px;
-  }
-
-  li {
-    float: left;
-    width: 50%;
-  }
-}
-
 .post-follow-actions {
   text-align: center;
   color: $ui-primary-color;
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
new file mode 100644
index 000000000..c3a04ba65
--- /dev/null
+++ b/app/models/form/admin_settings.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Form::AdminSettings
+  include ActiveModel::Model
+
+  delegate(
+    :site_contact_username,
+    :site_contact_username=,
+    :site_contact_email,
+    :site_contact_email=,
+    :site_title,
+    :site_title=,
+    :site_description,
+    :site_description=,
+    :site_extended_description,
+    :site_extended_description=,
+    :site_terms,
+    :site_terms=,
+    :open_registrations,
+    :open_registrations=,
+    :closed_registrations_message,
+    :closed_registrations_message=,
+    :open_deletion,
+    :open_deletion=,
+    :timeline_preview,
+    :timeline_preview=,
+    to: Setting
+  )
+end
diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml
index 59192530b..9f8a6640b 100644
--- a/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@ -1,64 +1,32 @@
 - content_for :page_title do
   = t('admin.settings.title')
 
-= form_tag(admin_settings_path, method: :put, class: 'simple_form', style: 'max-width: 100%') do
-  %table.table
-    %thead
-      %tr
-        %th{ width: '40%' }
-          = t('admin.settings.setting')
-        %th
-    %tbody
-      %tr
-        %td
-          %strong= t('admin.settings.contact_information.label')
-        %td= text_field_tag :site_contact_username, @settings['site_contact_username'].value, place_holder: t('admin.settings.contact_information.username')
-      %tr
-        %td
-          %strong= t('admin.accounts.email')
-        %td= text_field_tag :site_contact_email, @settings['site_contact_email'].value, place_holder: t('admin.settings.contact_information.email')
-      %tr
-        %td
-          %strong= t('admin.settings.site_title')
-        %td= text_field_tag :site_title, @settings['site_title'].value
-      %tr
-        %td
-          %strong= t('admin.settings.site_description.title')
-          %p= t('admin.settings.site_description.desc_html')
-        %td= text_area_tag :site_description, @settings['site_description'].value, rows: 8
-      %tr
-        %td
-          %strong= t('admin.settings.site_description_extended.title')
-          %p= t('admin.settings.site_description_extended.desc_html')
-        %td= text_area_tag :site_extended_description, @settings['site_extended_description'].value, rows: 8
-      %tr
-        %td
-          %strong= t('admin.settings.site_terms.title')
-          %p= t('admin.settings.site_terms.desc_html')
-        %td= text_area_tag :site_terms, @settings['site_terms'].value, rows: 8
-      %tr
-        %td
-          %strong= t('admin.settings.registrations.open.title')
-          %p= t('admin.settings.registrations.open.desc_html')
-        %td
-          = select_tag :open_registrations, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['open_registrations'].value)
-      %tr
-        %td
-          %strong= t('admin.settings.registrations.closed_message.title')
-          %p= t('admin.settings.registrations.closed_message.desc_html')
-        %td= text_area_tag :closed_registrations_message, @settings['closed_registrations_message'].value, rows: 8
-      %tr
-        %td
-          %strong= t('admin.settings.registrations.deletion.title')
-          %p= t('admin.settings.registrations.deletion.desc_html')
-        %td
-          = select_tag :open_deletion, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['open_deletion'].value)
-      %tr
-        %td
-          %strong= t('admin.settings.timeline_preview.title')
-          %p= t('admin.settings.timeline_preview.desc_html')
-        %td
-          = select_tag :timeline_preview, options_for_select({ t('simple_form.no') => false, t('simple_form.yes') => true }, @settings['timeline_preview'].value)
+= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
+  .fields-group
+    = f.input :site_title, placeholder: t('admin.settings.site_title')
+    = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 }
+    = f.input :site_contact_username, placeholder: t('admin.settings.contact_information.username')
+    = f.input :site_contact_email, placeholder: t('admin.settings.contact_information.email')
 
-  .simple_form.actions
-    = button_tag t('generic.save_changes'), type: :submit, class: :btn
+  %hr/
+
+  .fields-group
+    = f.input :timeline_preview, as: :boolean, wrapper: :with_label, label: t('admin.settings.timeline_preview.title'), hint: t('admin.settings.timeline_preview.desc_html')
+
+  .fields-group
+    = f.input :open_registrations, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.open.title'), hint: t('admin.settings.registrations.open.desc_html')
+
+  .fields-group
+    = f.input :open_deletion, as: :boolean, wrapper: :with_label, label: t('admin.settings.registrations.deletion.title'), hint: t('admin.settings.registrations.deletion.desc_html')
+
+  .fields-group
+    = f.input :closed_registrations_message, as: :text, wrapper: :with_block_label, label: t('admin.settings.registrations.closed_message.title'), hint: t('admin.settings.registrations.closed_message.desc_html'), input_html: { rows: 8 }
+
+  %hr/
+
+  .fields-group
+    = f.input :site_extended_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description_extended.title'), hint: t('admin.settings.site_description_extended.desc_html'), input_html: { rows: 8 }
+    = f.input :site_terms, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_terms.title'), hint: t('admin.settings.site_terms.desc_html'), input_html: { rows: 8 }
+
+  .actions
+    = f.button :button, t('generic.save_changes'), type: :submit
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index ca7531748..5983918cd 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -50,14 +50,14 @@ SimpleForm.setup do |config|
     # b.use :full_error, wrap_with: { tag: :span, class: :error }
   end
 
-  config.wrappers :with_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+  config.wrappers :with_label, class: [:input, :with_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
     b.use :label_input, wrap_with: { tag: :div, class: :label_input }
     b.use :hint,  wrap_with: { tag: :span, class: :hint }
     b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
-  config.wrappers :with_block_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b|
+  config.wrappers :with_block_label, class: [:input, :with_block_label], hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     b.use :html5
     b.use :label
     b.use :hint, wrap_with: { tag: :span, class: :hint }
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 10c34498b..f63aee3e6 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -155,7 +155,6 @@ ca:
     settings:
       contact_information:
         email: Introduir una adreça de correu electrònic pùblica
-        label: Informació de contacte
         username: Introduir un nom d'usuari
       registrations:
         closed_message:
@@ -163,7 +162,6 @@ ca:
           title: Missatge de registre tancat
         open:
           title: Registre obert
-      setting: Ajust
       site_description:
         desc_html: Es mostra com un paràgraf a la pàgina principal i s'utilitza com una etiqueta meta.<br>Pots utilitzar etiquetes HTML, en particular <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
         title: Descripció del lloc
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2bdb87708..b084aca31 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -129,7 +129,6 @@ de:
     settings:
       contact_information:
         email: Eine öffentliche E-Mail-Adresse angeben
-        label: Kontaktinformationen
         username: Einen Benutzernamen angeben
       registrations:
         closed_message:
@@ -137,7 +136,6 @@ de:
           title: Nachricht über geschlossene Registrierung
         open:
           title: Offene Registrierung
-      setting: Einstellung
       site_description:
         desc_html: Wird als Absatz auf der Frontseite angezeigt und als Meta-Tag benutzt.<br>Du kannst HTML-Tags benutzen, insbesondere <code>&lt;a&gt;</code> und <code>&lt;em&gt;</code>.
         title: Seitenbeschreibung
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e33dde038..c9b5d9ab8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -168,33 +168,31 @@ en:
       view: View
     settings:
       contact_information:
-        email: Enter a public e-mail address
-        label: Contact information
-        username: Enter a username
+        email: Business e-mail
+        username: Contact username
       registrations:
         closed_message:
-          desc_html: Displayed on frontpage when registrations are closed<br>You can use HTML tags
+          desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags
           title: Closed registration message
+        deletion:
+          desc_html: Allow anyone to delete their account
+          title: Open account deletion
         open:
           desc_html: Allow anyone to create an account
           title: Open registration
-        deletion:
-          desc_html: Allow anyone to delete their account
-          title: Open deletion
+      site_description:
+        desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
+        title: Instance description
+      site_description_extended:
+        desc_html: A good place for your code of conduct, rules, guidelines and other things that set your instance apart. You can use HTML tags
+        title: Custom extended information
+      site_terms:
+        desc_html: You can write your own privacy policy, terms of service or other legalese. You can use HTML tags
+        title: Custom terms of service
+      site_title: Instance name
       timeline_preview:
         desc_html: Display public timeline on landing page
         title: Timeline preview
-      setting: Setting
-      site_description:
-        desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.<br>You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
-        title: Site description
-      site_description_extended:
-        desc_html: Displayed on extended information page<br>You can use HTML tags
-        title: Extended site description
-      site_terms:
-        desc_html: Displayed on terms page<br>You can use HTML tags
-        title: Privacy policy
-      site_title: Site title
       title: Site Settings
     subscriptions:
       callback_url: Callback URL
@@ -230,12 +228,12 @@ en:
   authorize_follow:
     error: Unfortunately, there was an error looking up the remote account
     follow: Follow
-    following: 'Success! You are now following:'
     follow_request: 'You have sent a follow request to:'
+    following: 'Success! You are now following:'
     post_follow:
-      web: Go to web
-      return: Return to the user's profile
       close: Or, you can just close this window.
+      return: Return to the user's profile
+      web: Go to web
     prompt_html: 'You (<strong>%{self}</strong>) have requested to follow:'
     title: Follow %{acct}
   datetime:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6f0bd0839..ade76d670 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -141,7 +141,6 @@ fa:
     settings:
       contact_information:
         email: یک نشانی ایمیل عمومی وارد کنید
-        label: اطلاعات تماس
         username: یک نام کاربری وارد کنید
       registrations:
         closed_message:
@@ -149,7 +148,6 @@ fa:
           title: پیغام برای فعال‌نبودن ثبت نام
         open:
           title: امکان ثبت نام
-      setting: تنظیمات
       site_description:
         desc_html: روی صفحهٔ اصلی نمایش می‌یابد و همچنین به عنوان تگ‌های HTML.<br>می‌توانید HTML بنویسید, به‌ویژه <code>&lt;a&gt;</code> و <code>&lt;em&gt;</code>.
         title: دربارهٔ سایت
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9eeafaa6e..c2efd0c85 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -155,7 +155,6 @@ fr:
     settings:
       contact_information:
         email: Entrez une adresse courriel publique
-        label: Informations de contact
         username: Entrez un nom d’utilisateur⋅ice
       registrations:
         closed_message:
@@ -163,7 +162,6 @@ fr:
           title: Message de fermeture des inscriptions
         open:
           title: Inscriptions
-      setting: Paramètre
       site_description:
         desc_html: Affichée sous la forme d’un paragraphe sur la page d’accueil et utilisée comme balise meta.<br>Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
         title: Description du site
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 760ddac00..21f8f1dc4 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -149,7 +149,6 @@ he:
     settings:
       contact_information:
         email: נא להקליד כתובת דוא"ל פומבית
-        label: פרטי התקשרות
         username: נא להכניס שם משתמש
       registrations:
         closed_message:
@@ -157,7 +156,6 @@ he:
           title: מסר סגירת הרשמות
         open:
           title: הרשמה פתוחה
-      setting: הגדרה
       site_description:
         desc_html: מוצג כפסקה על הדף הראשי ומשמש כתגית מטא.<br>ניתן להשתמש בתגיות HTML, ובמיוחד ב־<code>&lt;a&gt;</code> ו־<code>&lt;em&gt;</code>.
         title: תיאור האתר
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 4bcd8f2ed..e3fe96331 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -140,7 +140,6 @@ id:
     settings:
       contact_information:
         email: Masukkan alamat email
-        label: Informasi kontak
         username: Masukkan nama pengguna
       registrations:
         closed_message:
@@ -148,7 +147,6 @@ id:
           title: Pesan penutupan pendaftaran
         open:
           title: Pendaftaran terbuka
-      setting: Pengaturan
       site_description:
         desc_html: Ditampilkan sebagai sebuah paragraf di halaman depan dan digunakan sebagai tag meta.<br>Anda bisa menggunakan tag HTML, khususnya <code>&lt;a&gt;</code> dan <code>&lt;em&gt;</code>.
         title: Deskripsi situs
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 8eb48c303..b587d4bc6 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -128,7 +128,6 @@ io:
     settings:
       contact_information:
         email: Enter a public e-mail address
-        label: Contact information
         username: Enter a username
       registrations:
         closed_message:
@@ -136,7 +135,6 @@ io:
           title: Closed registration message
         open:
           title: Open registration
-      setting: Setting
       site_description:
         desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.<br>You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
         title: Site description
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5b91aa75d..d57fe8da2 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -155,7 +155,6 @@ ja:
     settings:
       contact_information:
         email: 公開するメールアドレスを入力
-        label: 連絡先情報
         username: ユーザー名を入力
       registrations:
         closed_message:
@@ -163,7 +162,6 @@ ja:
           title: 新規登録停止時のメッセージ
         open:
           title: 新規登録を受け付ける
-      setting: 設定
       site_description:
         desc_html: トップページへの表示と meta タグに使用されます。<br>HTMLタグ、特に<code>&lt;a&gt;</code> と <code>&lt;em&gt;</code>が利用可能です。
         title: サイトの説明文
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c8ad38d41..bafc19993 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -155,7 +155,6 @@ ko:
     settings:
       contact_information:
         email: 공개할 메일 주소를 입력
-        label: 연락처 정보
         username: 아이디를 입력
       registrations:
         closed_message:
@@ -163,7 +162,6 @@ ko:
           title: 신규 등록 정지 시 메시지
         open:
           title: 신규 등록을 받음
-      setting: 설정
       site_description:
         desc_html: 탑 페이지와 meta 태그에 사용됩니다.<br>HTML 태그, 예를 들어<code>&lt;a&gt;</code> 태그와 <code>&lt;em&gt;</code> 태그를 사용할 수 있습니다.
         title: 사이트 설명
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 633061b06..dfc58f6b3 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -55,7 +55,6 @@ nl:
     settings:
       contact_information:
         email: Vul een openbaar gebruikt e-mailadres in
-        label: Contactgegevens
         username: Vul een gebruikersnaam in
       registrations:
         closed_message:
@@ -63,7 +62,6 @@ nl:
           title: Bericht wanneer registratie is uitgeschakeld
         open:
           title: Open registratie
-      setting: Instelling
       site_description:
         desc_html: Dit wordt als een alinea op de voorpagina getoond en gebruikt als meta-tag in de paginabron.<br>Je kan HTML gebruiken, zoals <code>&lt;a&gt;</code> en <code>&lt;em&gt;</code>.
         title: Omschrijving Mastodon-server
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 05714959d..004e1ff80 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -142,7 +142,6 @@
     settings:
       contact_information:
         email: Skriv en offentlig e-postadresse
-        label: Kontaktinformasjon
         username: Skriv brukernavn
       registrations:
         closed_message:
@@ -150,7 +149,6 @@
           title: Melding for lukket registrering
         open:
           title: Åpen registrering
-      setting: Innstilling
       site_description:
         desc_html: Vises som et avsnitt på forsiden og brukes som en meta-tagg.<br> Du kan bruke HTML-tagger, spesielt <code>&lt;a&gt;</code> og <code>&lt;em&gt;</code>.
         title: Nettstedsbeskrivelse
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 30d5258a5..91a6ca791 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -149,7 +149,6 @@ oc:
     settings:
       contact_information:
         email: Picatz una adreça de corrièl
-        label: Informacions de contacte
         username: Picatz un nom d’utilizaire
       registrations:
         closed_message:
@@ -157,7 +156,6 @@ oc:
           title: Messatge de barradura de las inscripcions
         open:
           title: Inscripcions
-      setting: Paramètre
       site_description:
         desc_html: Afichada jos la forma de paragrafe sus la pagina d’acuèlh e utilizada coma balisa meta.<br> Podètz utilizar de balisas HTML, coma <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
         title: Descripcion del site
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 018ff3c7b..c6588e846 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -155,7 +155,6 @@ pl:
     settings:
       contact_information:
         email: Wprowadź publiczny adres e-mail
-        label: Informacje kontaktowe
         username: Wprowadź nazwę użytkownika
       registrations:
         closed_message:
@@ -163,7 +162,6 @@ pl:
           title: Wiadomość o nieaktywnej rejestracji
         open:
           title: Otwarta rejestracja
-      setting: Ustawienie
       site_description:
         desc_html: Wyświetlany jako nagłówek na stronie głównej oraz jako meta tag.<br>Możesz korzystać z tagów HTML, w szczególności z <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
         title: Opis strony
@@ -208,12 +206,12 @@ pl:
   authorize_follow:
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
     follow: Śledź
-    following: 'Pomyślnie! Od teraz śledzisz:'
     follow_request: 'Wysłano prośbę o pozwolenie na obserwację:'
+    following: 'Pomyślnie! Od teraz śledzisz:'
     post_follow:
-      web: Przejdź do sieci
-      return: Powróć do strony użytkownika
       close: Ewentualnie, możesz po prostu zamknąć tą stronę.
+      return: Powróć do strony użytkownika
+      web: Przejdź do sieci
     prompt_html: 'Ty (<strong>%{self}</strong>) chcesz śledzić:'
     title: Śledź %{acct}
   datetime:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index fb5e03c8c..355c20d05 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -141,7 +141,6 @@ pt-BR:
     settings:
       contact_information:
         email: Entre um endereço de email público
-        label: Informação de contato
         username: Entre com usuário
       registrations:
         closed_message:
@@ -149,7 +148,6 @@ pt-BR:
           title: Mensagem de registro fechados
         open:
           title: Aberto para registro
-      setting: Preferências
       site_description:
         desc_html: Mostrar como parágrafo e usado como meta tag.<br/>Vôce pode usar tags HTML, em particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
         title: Descrição do site
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 0f59185a7..40be8a6c5 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -136,7 +136,6 @@ pt:
     settings:
       contact_information:
         email: Inserir um endereço de email para tornar público
-        label: Informação de contacto
         username: Insira um nome de utilizador
       registrations:
         closed_message:
@@ -144,7 +143,6 @@ pt:
           title: Mensagem de registos encerrados
         open:
           title: Aceitar novos registos
-      setting: Preferências
       site_description:
         desc_html: Mostrar como parágrafo na página inicial e usado como meta tag.<br/>Podes usar tags HTML, em particular <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
         title: Descrição do site
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 414d39dd2..5cfc2b1ca 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -123,7 +123,6 @@ ru:
     settings:
       contact_information:
         email: Введите публичный e-mail
-        label: Контактная информация
         username: Введите имя пользователя
       registrations:
         closed_message:
@@ -131,7 +130,6 @@ ru:
           title: Сообщение о закрытой регистрации
         open:
           title: Открыть регистрацию
-      setting: Настройка
       site_description:
         desc_html: Отображается в качестве параграфа на титульной странице и используется в качестве мета-тега.<br>Можно использовать HTML-теги, в особенности <code>&lt;a&gt;</code> и <code>&lt;em&gt;</code>.
         title: Описание сайта
diff --git a/config/locales/th.yml b/config/locales/th.yml
index a71252afe..263babdd0 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -142,7 +142,6 @@ th:
     settings:
       contact_information:
         email: กรอกที่อยู่อีเมล์สาธารณะ
-        label: ข้อมูลที่ติดต่อ
         username: กรอกชื่อผู้ใช้
       registrations:
         closed_message:
@@ -150,7 +149,6 @@ th:
           title: ปิดข้อความลงทะเบียน
         open:
           title: เปิดรับลงทะเบียน
-      setting: ตั้งค่า
       site_description:
         desc_html: Displayed as a paragraph on the frontpage and used as a meta tag.<br> ใช้ HTML tags ได้, in particular <code>&lt;a&gt;</code> และ <code>&lt;em&gt;</code>.
         title: คำอธิบายไซต์
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a8927eaa8..e7864cc57 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -141,7 +141,6 @@ tr:
     settings:
       contact_information:
         email: Herkese açık e-posta adresiniz
-        label: İletişim bilgisi
         username: Bir kullanıcı adı giriniz
       registrations:
         closed_message:
@@ -149,7 +148,6 @@ tr:
           title: Kayıt alımları kapatılma mesajı
         open:
           title: Kayıt alımları
-      setting: Ayar adı
       site_description:
         desc_html: Ana sayfada paragraf olarak görüntülenecek bilgidir.<br>Özellikle <code>&lt;a&gt;</code> ve <code>&lt;em&gt;</code> olmak suretiyle HTML etiketlerini kullanabilirsiniz.
         title: Site açıklaması
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 65f1aabf5..129fc5bb7 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -123,7 +123,6 @@ uk:
     settings:
       contact_information:
         email: Введіть публічний email
-        label: Контактна інформація
         username: Введіть ім'я користувача
       registrations:
         closed_message:
@@ -131,7 +130,6 @@ uk:
           title: Повідомлення про закриту реєстрацію
         open:
           title: Відкрити реєстрацію
-      setting: Налаштування
       site_description:
         desc_html: Відображається у якості параграфа на титульній сторінці та використовується у якості мета-тега.<br>Можна використовувати HTML-теги, особливо <code>&lt;a&gt;</code> і <code>&lt;em&gt;</code>.
         title: Опис сайту
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d5d1b672c..650d4bd15 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -148,7 +148,6 @@ zh-CN:
     settings:
       contact_information:
         email: 输入一个公开的电邮地址
-        label: 联系数据
         username: 输入用户名称
       registrations:
         closed_message:
@@ -156,7 +155,6 @@ zh-CN:
           title: 暂停注册消息
         open:
           title: 开放注册
-      setting: 设置
       site_description:
         desc_html: 在首页显示，及在 meta 标签中用作网站介绍。<br>你可以在此使用 HTML 标签，尤其是<code>&lt;a&gt;</code> 和 <code>&lt;em&gt;</code>。
         title: 本站介绍
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index aa9f27912..d2db78be1 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -141,7 +141,6 @@ zh-HK:
     settings:
       contact_information:
         email: 輸入一個公開的電郵地址
-        label: 聯絡資料
         username: 輸入用戶名稱
       registrations:
         closed_message:
@@ -149,7 +148,6 @@ zh-HK:
           title: 暫停註冊訊息
         open:
           title: 開放註冊
-      setting: 設定
       site_description:
         desc_html: 在首頁顯示，及在 meta 標籤使用作網站介紹。<br/> 你可以在此使用 <code>&lt;a&gt;</code> 和 <code>&lt;em&gt;</code> 等 HTML 標籤。
         title: 本站介紹
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 58caf7848..67aa2830f 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -102,7 +102,6 @@ zh-TW:
     settings:
       contact_information:
         email: 請輸入輸入一個公開電子信箱
-        label: 聯絡資訊
         username: 請輸入使用者名稱
       registrations:
         closed_message:
@@ -110,7 +109,6 @@ zh-TW:
           title: 關閉註冊訊息
         open:
           title: 開放註冊
-      setting: 設定
       site_description:
         desc_html: 顯示在首頁並且作為 meta 標籤的短文。<br>可使用 HTML 標籤，包括 <code>&lt;a&gt;</code> 及 <code>&lt;em&gt;</code>。
         title: 網站描述
diff --git a/spec/controllers/admin/settings_controller_spec.rb b/spec/controllers/admin/settings_controller_spec.rb
index d9dde3c92..609bc762b 100644
--- a/spec/controllers/admin/settings_controller_spec.rb
+++ b/spec/controllers/admin/settings_controller_spec.rb
@@ -31,7 +31,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
         it 'cannot create a setting value for a non-admin key' do
           expect(Setting.new_setting_key).to be_blank
 
-          patch :update, params: { new_setting_key: 'New key value' }
+          patch :update, params: { form_admin_settings: { new_setting_key: 'New key value' } }
 
           expect(response).to redirect_to(edit_admin_settings_path)
           expect(Setting.new_setting_key).to be_nil
@@ -40,7 +40,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
         it 'creates a settings value that didnt exist before for eligible key' do
           expect(Setting.site_extended_description).to be_blank
 
-          patch :update, params: { site_extended_description: 'New key value' }
+          patch :update, params: { form_admin_settings: { site_extended_description: 'New key value' } }
 
           expect(response).to redirect_to(edit_admin_settings_path)
           expect(Setting.site_extended_description).to eq 'New key value'
@@ -56,7 +56,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
 
         it 'updates a settings value' do
           Setting.site_title = 'Original'
-          patch :update, params: { site_title: 'New title' }
+          patch :update, params: { form_admin_settings: { site_title: 'New title' } }
 
           expect(response).to redirect_to(edit_admin_settings_path)
           expect(Setting.site_title).to eq 'New title'
@@ -72,7 +72,7 @@ RSpec.describe Admin::SettingsController, type: :controller do
 
         it 'typecasts open_registrations to boolean' do
           Setting.open_registrations = false
-          patch :update, params: { open_registrations: 'true' }
+          patch :update, params: { form_admin_settings: { open_registrations: '1' } }
 
           expect(response).to redirect_to(edit_admin_settings_path)
           expect(Setting.open_registrations).to eq true

From f41590912d5f059a286c2eaa0109ef21747d8b43 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 12 Jul 2017 21:49:17 +0900
Subject: [PATCH 215/382] Fix broken terms for Japanese (#4170)

---
 config/locales/ja.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d57fe8da2..133db1b95 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -402,7 +402,7 @@ ja:
 
       <p>このサービスはあなたの個人情報の入力、送信、またはアクセスに際してあなたの個人情報の安全性を維持するために様々なセキュリティ手段をとっています。</p>
 
-      <h3 id="data-retention>データ保持のポリシーはどのようになっていますか？</h3>
+      <h3 id="data-retention">データ保持のポリシーはどのようになっていますか？</h3>
 
       <p>このサービスはデータ保持に関して次のことを行うよう努めます。:</p>
 

From 43f868de3dd40b30e0d11fbf74452d6253a649f7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 12 Jul 2017 21:50:07 +0900
Subject: [PATCH 216/382] Add Japanese translations for #4163 and #4129 (#4166)

* Add Japanese translations for #4163

* Add Japanese translations for #4129

* top page -> front page
---
 config/locales/ja.yml             | 33 +++++++++++++++++++++----------
 config/locales/simple_form.en.yml |  1 +
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 133db1b95..7cd97a042 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -154,24 +154,31 @@ ja:
       view: 表示
     settings:
       contact_information:
-        email: 公開するメールアドレスを入力
-        username: ユーザー名を入力
+        email: ビジネスメールアドレス
+        username: 連絡先のユーザー名
       registrations:
         closed_message:
-          desc_html: 新規登録を停止しているときにフロントページに表示されます。<br>HTMLタグが利用可能です。
+          desc_html: 新規登録を停止しているときにフロントページに表示されます。HTMLタグが使えます
           title: 新規登録停止時のメッセージ
+        deletion:
+          desc_html: 誰でも自分のアカウントを削除できるようにします
+          title: アカウント削除を受け付ける
         open:
+          desc_html: 誰でも自由にアカウントを作成できるようにします
           title: 新規登録を受け付ける
       site_description:
-        desc_html: トップページへの表示と meta タグに使用されます。<br>HTMLタグ、特に<code>&lt;a&gt;</code> と <code>&lt;em&gt;</code>が利用可能です。
-        title: サイトの説明文
+        desc_html: フロントページへの表示と meta タグに使用される紹介文です。HTMLタグ、特に<code>&lt;a&gt;</code> と <code>&lt;em&gt;</code>が使えます。
+        title: インスタンスの説明
       site_description_extended:
-        desc_html: インスタンスについてのページに表示されます。<br>HTMLタグが利用可能です。
-        title: サイトの詳細な説明
+        desc_html: あなたのインスタンスにおける行動規範やルール、ガイドライン、そのほかの記述をする際に最適な場所です。HTMLタグが使えます
+        title: カスタム詳細説明
       site_terms:
-        desc_html: プライバシーポリシーのページに表示されます。<br>HTMLタグが利用可能です。
-        title: サイトのプライバシーポリシー
-      site_title: サイトのタイトル
+        desc_html: あなたは独自のプライバシーポリシーや利用規約、そのほかの法的根拠を書くことができます。HTMLタグが使えます
+        title: カスタム利用規約
+      site_title: インスタンスの名前
+      timeline_preview:
+        desc_html: ランディングページに公開タイムラインを表示します
+        title: タイムラインプレビュー
       title: サイト設定
     subscriptions:
       callback_url: コールバックURL
@@ -206,6 +213,12 @@ ja:
   authorize_follow:
     error: 残念ながら、リモートアカウントにエラーが発生しました。
     follow: フォロー
+    follow_request: 'あなたは以下のアカウントにフォローリクエストを送信しました:'
+    following: '成功! あなたは現在以下のアカウントをフォローしています:'
+    post_follow:
+      close: またはこのウィンドウを閉じます
+      return: ユーザーのプロフィールに戻る
+      web: Web を開く
     prompt_html: 'あなた（<strong>%{self}</strong>）は以下のアカウントのフォローをリクエストしました:'
     title: "%{acct} をフォロー"
   datetime:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fc5ab5ec8..e3f784a1a 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -27,6 +27,7 @@ en:
         data: Data
         display_name: Display name
         email: E-mail address
+        filtered_languages: Filtered languages
         header: Header
         locale: Language
         locked: Lock account

From 3567ac3d3efd9efcee770a0c4925fe5c86bb4d4f Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 12 Jul 2017 15:53:50 +0200
Subject: [PATCH 217/382] i18n: @e19eefe, @056b5ed + consistency improvement
 (pl) (#4171)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* i18n: @e19eefe (pl)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* i18n: @056b5ed (pl)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

* i18n: Improve consistency (pl)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 app/javascript/mastodon/locales/pl.json | 36 ++++++++---------
 config/locales/pl.yml                   | 52 ++++++++++++++++++-------
 2 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index ac63ec40f..c2288c4c0 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -3,10 +3,10 @@
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.disclaimer": "Ten użytkownik pochodzi z innej instancji. Ta liczba może być większa.",
   "account.edit_profile": "Edytuj profil",
-  "account.follow": "Obserwuj",
-  "account.followers": "Obserwujący",
-  "account.follows": "Obserwacje",
-  "account.follows_you": "Obserwuje cię",
+  "account.follow": "Śledź",
+  "account.followers": "Śledzący",
+  "account.follows": "Śledzeni",
+  "account.follows_you": "Śledzi Cię",
   "account.media": "Media",
   "account.mention": "Wspomnij o @{name}",
   "account.mute": "Wycisz @{name}",
@@ -15,7 +15,7 @@
   "account.requested": "Oczekująca prośba",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
-  "account.unfollow": "Przestań obserwować",
+  "account.unfollow": "Przestań śledzić",
   "account.unmute": "Cofnij wyciszenie @{name}",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.",
@@ -27,7 +27,7 @@
   "column.blocks": "Zablokowani użytkownicy",
   "column.community": "Lokalna oś czasu",
   "column.favourites": "Ulubione",
-  "column.follow_requests": "Prośby o obserwację",
+  "column.follow_requests": "Prośby o śledzenie",
   "column.home": "Strona główna",
   "column.mutes": "Wyciszeni użytkownicy",
   "column.notifications": "Powiadomienia",
@@ -37,9 +37,9 @@
   "column_header.unpin": "Cofnij przypięcie",
   "column_subheading.navigation": "Nawigacja",
   "column_subheading.settings": "Ustawienia",
-  "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto cię obserwuje, może wyświetlać twoje posty przeznaczone tylko dla obserwujących.",
+  "compose_form.lock_disclaimer": "Twoje konto nie jest {locked}. Każdy, kto Cię śledzi, może wyświetlać Twoje posty przeznaczone tylko dla śledzących.",
   "compose_form.lock_disclaimer.lock": "zablokowane",
-  "compose_form.placeholder": "Co ci chodzi po głowie?",
+  "compose_form.placeholder": "Co Ci chodzi po głowie?",
   "compose_form.privacy_disclaimer": "Twój post zostanie dostarczony do użytkowników z {domains}. Czy ufasz {domainsCount, plural, one {temu serwerowi} other {tym serwerom}}? Prywatność postów obowiązuje tylko na instancjach Mastodona. Jeżeli {domains} {domainsCount, plural, one {nie jest instancją Mastodona} other {nie są instancjami Mastodona}}, post może być widoczny dla niewłaściwych osób.",
   "compose_form.publish": "Wyślij",
   "compose_form.publish_loud": "{publish}!",
@@ -67,7 +67,7 @@
   "emoji_button.travel": "Podróże i miejsca",
   "empty_column.community": "Lokalna oś czasu jest pusta. Napisz coś publicznie, aby odbić piłeczkę!",
   "empty_column.hashtag": "Nie ma postów oznaczonych tym hashtagiem. Możesz napisać pierwszy!",
-  "empty_column.home": "Nie obserwujesz nikogo. Odwiedź publiczną oś czasu lub użyj wyszukiwarki, aby znaleźć ciekawych ludzi.",
+  "empty_column.home": "Nie śledzisz nikogo. Odwiedź publiczną oś czasu lub użyj wyszukiwarki, aby znaleźć interesujące Cię profile.",
   "empty_column.home.inactivity": "Strumień jest pusty. Jeżeli nie było Cię tu ostatnio, zostanie on wypełniony wkrótce.",
   "empty_column.home.public_timeline": "publiczna oś czasu",
   "empty_column.notifications": "Nie masz żadnych powiadomień. Rozpocznij interakcje z innymi użytkownikami.",
@@ -93,32 +93,32 @@
   "navigation_bar.community_timeline": "Lokalna oś czasu",
   "navigation_bar.edit_profile": "Edytuj profil",
   "navigation_bar.favourites": "Ulubione",
-  "navigation_bar.follow_requests": "Prośby o obserwację",
+  "navigation_bar.follow_requests": "Prośby o śledzenie",
   "navigation_bar.info": "Szczegółowe informacje",
   "navigation_bar.logout": "Wyloguj",
   "navigation_bar.mutes": "Wyciszeni użytkownicy",
   "navigation_bar.preferences": "Preferencje",
   "navigation_bar.public_timeline": "Oś czasu federacji",
-  "notification.favourite": "{name} dodał twój status do ulubionych",
-  "notification.follow": "{name} zaczął cię obserwować",
+  "notification.favourite": "{name} dodał Twój status do ulubionych",
+  "notification.follow": "{name} zaczął Cię śledzić",
   "notification.mention": "{name} wspomniał o tobie",
-  "notification.reblog": "{name} podbił twój status",
+  "notification.reblog": "{name} podbił Twój status",
   "notifications.clear": "Wyczyść powiadomienia",
   "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?",
   "notifications.column_settings.alert": "Powiadomienia na pulpicie",
   "notifications.column_settings.favourite": "Ulubione:",
-  "notifications.column_settings.follow": "Nowi obserwujący:",
+  "notifications.column_settings.follow": "Nowi śledzący:",
   "notifications.column_settings.mention": "Wspomniali:",
   "notifications.column_settings.reblog": "Podbili:",
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
   "onboarding.done": "Gotowe",
   "onboarding.next": "Dalej",
-  "onboarding.page_five.public_timelines": "Lokalna oś czasu zawiera wszystkie publiczne wpisy z {domain}. Federalna oś czasu wyświetla publiczne wpisy obserwowanych przez członków {domain}. Są to publiczne osie czasu – najlepszy sposób na poznanie nowych osób.",
+  "onboarding.page_five.public_timelines": "Lokalna oś czasu zawiera wszystkie publiczne wpisy z {domain}. Federalna oś czasu wyświetla publiczne wpisy śledzonych przez członków {domain}. Są to publiczne osie czasu – najlepszy sposób na poznanie nowych osób.",
   "onboarding.page_four.home": "Główna oś czasu wyświetla publiczne wpisy.",
   "onboarding.page_four.notifications": "Kolumna powiadomień wyświetla, gdy ktoś dokonuje interakcji z tobą.",
   "onboarding.page_one.federation": "Mastodon jest siecią niezależnych serwerów połączonych w jeden portal społecznościowy. Nazywamy te serwery instancjami.",
-  "onboarding.page_one.handle": "Jesteś na domenie {domain}, więc twój pełny adres to {handle}",
+  "onboarding.page_one.handle": "Jesteś na domenie {domain}, więc Twój pełny adres to {handle}",
   "onboarding.page_one.welcome": "Witamy w Mastodon!",
   "onboarding.page_six.admin": "Administratorem tej instancji jest {admin}.",
   "onboarding.page_six.almost_done": "Prawie gotowe...",
@@ -135,8 +135,8 @@
   "privacy.change": "Dostosuj widoczność postów",
   "privacy.direct.long": "Widoczne tylko dla oznaczonych",
   "privacy.direct.short": "Bezpośrednio",
-  "privacy.private.long": "Widoczne tylko dla obserwujących",
-  "privacy.private.short": "Tylko obserwujący",
+  "privacy.private.long": "Widoczne tylko dla śledzących",
+  "privacy.private.short": "Tylko śledzący",
   "privacy.public.long": "Widoczne na publicznych osiach czasu",
   "privacy.public.short": "Publiczne",
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c6588e846..dc5aa716b 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1,17 +1,30 @@
 ---
 pl:
   about:
-    about_mastodon: Mastodon jest <em>wolną i otwartą</em> siecią społecznościową, <em>zdecentralizowaną</em> alternatywą dla zamkniętych, komercyjnych platform. Pozwala uniknąć ryzyka monopolizacji Twojej komunikacji przez jedną korporację. Wybierz serwer, któremu ufasz &mdash; nie ograniczy to Twoich możliwości komunikacji z innymi osobami w sieci. Każdy może też uruchomić własną instancję Mastodona i dołączyć do reszty tej <em>sieci społecznościowej</em>.
+    about_mastodon_html: Mastodon jest wolną i otwartą siecią społecznościową, zdecentralizowaną alternatywą dla zamkniętych, komercyjnych platform.
     about_this: O tej instancji
     business_email: 'Służbowy adres e-mail:'
-    closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta.
+    closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta. Możesz jednak zarejestrować się na innej instancji, uzyskując dostęp do tej samej sieci.
     contact: Kontakt
     description_headline: Czym jest %{domain}?
     domain_count_after: instancji
     domain_count_before: Serwer połączony z
+    features:
+      humane_approach_body: Nauczeni na błędach innych sieci społecznościowych, Mastodon został zaprojektowany tak, aby uniknąć częstych nadużyć.
+      humane_approach_title: Bardziej ludzkie podejście
+      not_a_product_body: Mastodon nie jest komercyjną siecią. Nie doświadczysz tu reklam, zbierania danych, ani centralnego ośrodka, tak jak w przypadku wielu rozwiązań.
+      not_a_product_title: Jesteś człowiekiem, nie produktem
+      real_conversation_body: Mając do dyspozycji 500 znaków na post, rozdrobnienie zawartości i ostrzeżenia o multimediach, możesz wyrażać siebie na wszystkie możliwe sposoby.
+      real_conversation_title: Zaprojektowany do prawdziwych rozmów
+      within_reach_body: Wiele aplikacji dla Androida, iOS i innych platform dzięki przyjaznemu programistom API sprawia, że możesz utrzymywać kontakt ze znajomymi praktycznie wszędzie.
+      within_reach_title: Zawsze w Twoim zasięgu
+    find_another_instance: Znajdź inną instancję
+    generic_description: "%{domain} jest jednym z serwerów sieci"
     get_started: Rozpocznijmy!
+    hosted_on: Mastodon uruchomiony na %{domain}
+    learn_more: Dowiedz się więcej
     links: Odnośniki
-    other_instances: Inne instancje
+    other_instances: Lista instancji
     source_code: Kod źródłowy
     status_count_after: wpisów
     status_count_before: Są autorami
@@ -19,6 +32,7 @@ pl:
     user_count_after: użytkowników
     user_count_before: Z serwera korzysta
     version: Wersja
+    what_is_mastodon: Czym jest Mastodon?
   accounts:
     follow: Śledź
     followers: Śledzących
@@ -154,24 +168,31 @@ pl:
       view: Wyświetl
     settings:
       contact_information:
-        email: Wprowadź publiczny adres e-mail
-        username: Wprowadź nazwę użytkownika
+        email: Służbowy adres e-mail
+        username: Nazwa użytkownika do kontaktu
       registrations:
         closed_message:
-          desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji<br>nie jest dostępna. Możesz korzystać z tagów HTML
+          desc_html: Wyświetlana na stronie głównej, gdy możliwość otwarej rejestracji nie jest dostępna. Możesz korzystać z tagów HTML
           title: Wiadomość o nieaktywnej rejestracji
+        deletion:
+          desc_html: Pozwól każdemu na usunięcie konta
+          title: Możliwość usunięcia
         open:
+          desc_html: Pozwól każdemu na założenie konta
           title: Otwarta rejestracja
       site_description:
-        desc_html: Wyświetlany jako nagłówek na stronie głównej oraz jako meta tag.<br>Możesz korzystać z tagów HTML, w szczególności z <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
-        title: Opis strony
+        desc_html: Akapit wprowadzający, widoczny na stronie głównej i znacznikach meta. Możesz korzystać z tagów HTML, w szczególności <code>&lt;a&gt;</code> i <code>&lt;em&gt;</code>.
+        title: Opis instancji
       site_description_extended:
-        desc_html: Wyświetlany w rozszerzonych informacjach o stronie<br>Możesz korzystać z tagów HTML
-        title: Extended site description
+        desc_html: Dobre miejsce na zasady użytkowania, wprowadzenie i inne rzeczy, które wyróżniają tą instancję. Możesz korzystać z tagów HTML
+        title: Niestandrdowy opis stronyv
       site_terms:
-        desc_html: Wyświetlana na stronie zasad użytkowania<br>Możesz używać tagów HTML
-        title: Polityka prywatności strony
-      site_title: Tytuł strony
+        desc_html: Miejsce na własną politykę prywatności, zasady użytkowania i inne unormowania prawne. Możesz używać tagów HTML
+        title: Niestandardowe zasady użytkowania
+      site_title: Nazwa instancji
+      timeline_preview:
+        desc_html: Wyświetlaj publiczną oś czasu na stronie widocznej dla niezalogowanych
+        title: Podgląd osi czasu
       title: Ustawienia strony
     subscriptions:
       callback_url: URL zwrotny
@@ -192,6 +213,7 @@ pl:
   applications:
     invalid_url: Ten URL jest nieprawidłowy
   auth:
+    agreement_html: Rejestrując się, oświadczasz, że zapoznałeś się z <a href="%{rules_path}">naszymi zasadami użytkowania</a> i <a href="%{terms_path}">polityką prywatności</a>.
     change_password: Bezpieczeństwo
     delete_account: Usunięcie konta
     delete_account_html: Jeżeli chcesz usunąć konto, <a href="%{path}">przejdź tutaj</a>. Otrzymasz prośbę o potwierdzenie.
@@ -206,7 +228,7 @@ pl:
   authorize_follow:
     error: Niestety, podczas sprawdzania zdalnego konta wystąpił błąd
     follow: Śledź
-    follow_request: 'Wysłano prośbę o pozwolenie na obserwację:'
+    follow_request: 'Wysłano prośbę o pozwolenie na śledzenie:'
     following: 'Pomyślnie! Od teraz śledzisz:'
     post_follow:
       close: Ewentualnie, możesz po prostu zamknąć tą stronę.
@@ -261,7 +283,7 @@ pl:
       one: W trakcie usuwania śledzących z jednej domeny…
       other: W trakcie usuwania śledzących z %{count} domen…
     true_privacy_html: Pamiętaj, że <strong>rzeczywista prywatność może zostać uzyskana wyłącznie dzięki szyfrowaniu end-to-end</strong>.
-    unlocked_warning_html: Każdy może cię śledzić, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować, kto Cię śledzi.
+    unlocked_warning_html: Każdy może Cię śledzić, aby natychmiastowo zobaczyć twoje statusy. %{lock_link} aby móc kontrolować, kto Cię śledzi.
     unlocked_warning_title: Twoje konto nie jest zablokowane
   generic:
     changes_saved_msg: Ustawienia zapisane!

From c45a75ad3419f15d639138ac34c320323367c870 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 12 Jul 2017 22:55:17 +0900
Subject: [PATCH 218/382] Update dependencies for Node.js (2017-07-12) (#4167)

* Update @storybook/addon-actions to version 3.1.8

* Update @storybook/react to version 3.1.8

* Update autoprefixer to version 7.1.2

* Update babel-loader to version 7.1.1

* Update babel-preset-env to version 1.6.0

* Update chai to version 4.1.0

* Update js-yaml to version 3.9.0

* Update jsdom to version 11.1.0

* Update postcss-smart-import to version 0.7.5

* Update sinon to version 2.3.7

* Update substring-trie to version 1.0.1

* Update webpack to version 3.2.0

* Update webpack-manifest-plugin to version 1.1.2

* yarn upgrade

* Upgrade extract-text-webpack-plugin to version 3.0.0

* Upgrade intl-relativeformat to version 2.0.0
---
 package.json |  30 +--
 yarn.lock    | 512 ++++++++++++++++++++++++++-------------------------
 2 files changed, 273 insertions(+), 269 deletions(-)

diff --git a/package.json b/package.json
index 4c5a3f1d9..004c4d1f5 100644
--- a/package.json
+++ b/package.json
@@ -20,10 +20,10 @@
   "private": true,
   "dependencies": {
     "array-includes": "^3.0.3",
-    "autoprefixer": "^7.1.0",
+    "autoprefixer": "^7.1.2",
     "axios": "^0.16.2",
     "babel-core": "^6.25.0",
-    "babel-loader": "^7.1.0",
+    "babel-loader": "^7.1.1",
     "babel-plugin-lodash": "^3.2.11",
     "babel-plugin-react-intl": "^2.3.1",
     "babel-plugin-react-transform": "^2.0.2",
@@ -37,7 +37,7 @@
     "babel-plugin-transform-react-jsx-source": "^6.22.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.6",
     "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-env": "^1.5.2",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "classnames": "^2.2.5",
     "compression-webpack-plugin": "^0.4.0",
@@ -49,7 +49,7 @@
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "express": "^4.15.2",
-    "extract-text-webpack-plugin": "^2.1.2",
+    "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^0.11.2",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
@@ -57,9 +57,9 @@
     "immutable": "^3.8.1",
     "intersection-observer": "^0.3.2",
     "intl": "^1.2.5",
-    "intl-relativeformat": "^1.3.0",
+    "intl-relativeformat": "^2.0.0",
     "is-nan": "^1.2.1",
-    "js-yaml": "^3.8.4",
+    "js-yaml": "^3.9.0",
     "lodash": "^4.17.4",
     "mark-loader": "^0.1.6",
     "marky": "^1.2.0",
@@ -70,7 +70,7 @@
     "path-complete-extname": "^0.1.0",
     "pg": "^6.4.0",
     "postcss-loader": "^2.0.6",
-    "postcss-smart-import": "^0.7.4",
+    "postcss-smart-import": "^0.7.5",
     "precss": "^2.0.0",
     "prop-types": "^15.5.10",
     "punycode": "^2.1.0",
@@ -103,32 +103,32 @@
     "sass-loader": "^6.0.6",
     "stringz": "^0.2.2",
     "style-loader": "^0.18.2",
-    "substring-trie": "^1.0.0",
+    "substring-trie": "^1.0.1",
     "throng": "^4.0.0",
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
     "uws": "^8.14.0",
-    "webpack": "^3.0.0",
+    "webpack": "^3.2.0",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-manifest-plugin": "^1.1.0",
+    "webpack-manifest-plugin": "^1.1.2",
     "webpack-merge": "^4.1.0",
     "websocket.js": "^0.1.12"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^3.1.6",
-    "@storybook/react": "^3.1.6",
+    "@storybook/addon-actions": "^3.1.8",
+    "@storybook/react": "^3.1.8",
     "babel-eslint": "^7.2.3",
-    "chai": "^4.0.1",
+    "chai": "^4.1.0",
     "chai-enzyme": "^0.8.0",
     "enzyme": "^2.9.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jsx-a11y": "^4.0.0",
     "eslint-plugin-react": "^6.10.3",
-    "jsdom": "^11.0.0",
+    "jsdom": "^11.1.0",
     "mocha": "^3.4.1",
     "react-intl-translations-manager": "^5.0.0",
     "react-test-renderer": "^15.6.1",
-    "sinon": "^2.3.5",
+    "sinon": "^2.3.7",
     "webpack-dev-server": "^2.5.1",
     "yargs": "^8.0.2"
   },
diff --git a/yarn.lock b/yarn.lock
index fba802e0a..13c3f4951 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,15 +2,15 @@
 # yarn lockfile v1
 
 
-"@storybook/addon-actions@^3.1.6":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.1.6.tgz#0cbf00ede57ff00d1dfe02e554043d6963940064"
+"@storybook/addon-actions@^3.1.8":
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@storybook/addon-actions/-/addon-actions-3.1.8.tgz#2b6d7aa97530b19965c1010b822f40b130ebbc4d"
   dependencies:
     "@storybook/addons" "^3.1.6"
     deep-equal "^1.0.1"
     json-stringify-safe "^5.0.1"
     prop-types "^15.5.8"
-    react-inspector "^2.0.0"
+    react-inspector "^2.1.1"
     uuid "^3.1.0"
 
 "@storybook/addon-links@^3.1.6":
@@ -44,11 +44,11 @@
     fuse.js "^3.0.1"
     prop-types "^15.5.9"
 
-"@storybook/react@^3.1.6":
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.1.6.tgz#9393bb987ff08ee5f49c4557d12eb84377dee5d2"
+"@storybook/react@^3.1.8":
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@storybook/react/-/react-3.1.8.tgz#4d140c5ae7e9b5eaf627f2071d7324aa38c7af49"
   dependencies:
-    "@storybook/addon-actions" "^3.1.6"
+    "@storybook/addon-actions" "^3.1.8"
     "@storybook/addon-links" "^3.1.6"
     "@storybook/addons" "^3.1.6"
     "@storybook/channel-postmessage" "^3.1.6"
@@ -93,7 +93,7 @@
     url-loader "^0.5.8"
     util-deprecate "^1.0.2"
     uuid "^3.0.1"
-    webpack "^2.5.1"
+    webpack "^2.5.1 || ^3.0.0"
     webpack-dev-middleware "^1.10.2"
     webpack-hot-middleware "^2.18.0"
 
@@ -122,8 +122,8 @@
     redux "^3.6.0"
 
 "@types/node@^6.0.46":
-  version "6.0.78"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.78.tgz#5d4a3f579c1524e01ee21bf474e6fba09198f470"
+  version "6.0.80"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.80.tgz#914a75799605b4609bd9a2918c865ba3c4141367"
 
 abab@^1.0.3:
   version "1.0.3"
@@ -167,8 +167,8 @@ acorn@^4.0.3, acorn@^4.0.4:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
 acorn@^5.0.0, acorn@^5.0.1, acorn@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.1.1.tgz#53fe161111f912ab999ee887a90a0bc52822fd75"
 
 adjust-sourcemap-loader@^1.1.0:
   version "1.1.0"
@@ -195,7 +195,7 @@ airbnb-js-shims@^1.1.1:
     string.prototype.padend "^3.0.0"
     string.prototype.padstart "^3.0.0"
 
-ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
+ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
@@ -211,11 +211,11 @@ ajv@^4.7.0, ajv@^4.9.1:
     json-stable-stringify "^1.0.1"
 
 ajv@^5.0.0, ajv@^5.1.5:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.0.tgz#c1735024c5da2ef75cc190713073d44f098bf486"
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
   dependencies:
     co "^4.6.0"
-    fast-deep-equal "^0.1.0"
+    fast-deep-equal "^1.0.0"
     json-schema-traverse "^0.3.0"
     json-stable-stringify "^1.0.1"
 
@@ -255,6 +255,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.1.0.tgz#09c202d5c917ec23188caa5c9cb9179cd9547750"
+  dependencies:
+    color-convert "^1.0.0"
+
 any-promise@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
@@ -300,8 +306,8 @@ arr-diff@^2.0.0:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
 
 array-equal@^1.0.0:
   version "1.0.0"
@@ -352,8 +358,8 @@ arrify@^1.0.0:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
 asap@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
 
 asn1.js@^4.0.0:
   version "4.9.1"
@@ -409,7 +415,7 @@ async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4, async@^2.1.5:
+async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -434,15 +440,15 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^7.1.0, autoprefixer@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
+autoprefixer@^7.1.1, autoprefixer@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.2.tgz#fbeaf07d48fd878e0682bf7cbeeade728adb2b18"
   dependencies:
-    browserslist "^2.1.3"
-    caniuse-lite "^1.0.30000670"
+    browserslist "^2.1.5"
+    caniuse-lite "^1.0.30000697"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^6.0.1"
+    postcss "^6.0.6"
     postcss-value-parser "^3.2.3"
 
 aws-sign2@~0.6.0:
@@ -640,9 +646,9 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^7.0.0, babel-loader@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.0.tgz#3fbf2581f085774bd9642dca9990e6d6c1491144"
+babel-loader@^7.0.0, babel-loader@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -1080,9 +1086,9 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-preset-env@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.4.0.tgz#c8e02a3bcc7792f23cded68e0355b9d4c28f0f7a"
+babel-preset-env@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1111,12 +1117,13 @@ babel-preset-env@1.4.0:
     babel-plugin-transform-es2015-unicode-regex "^6.22.0"
     babel-plugin-transform-exponentiation-operator "^6.22.0"
     babel-plugin-transform-regenerator "^6.22.0"
-    browserslist "^1.4.0"
+    browserslist "^2.1.2"
     invariant "^2.2.2"
+    semver "^5.3.0"
 
-babel-preset-env@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.5.2.tgz#cd4ae90a6e94b709f97374b33e5f8b983556adef"
+babel-preset-env@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
@@ -1191,8 +1198,8 @@ babel-preset-flow@^6.23.0:
     babel-plugin-transform-flow-strip-types "^6.22.0"
 
 babel-preset-react-app@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.0.0.tgz#f4505092f8bba0f0147c764dc72055fe46ac1416"
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-3.0.1.tgz#8b744cbe47fd57c868e6f913552ceae26ae31860"
   dependencies:
     babel-plugin-dynamic-import-node "1.0.2"
     babel-plugin-syntax-dynamic-import "6.18.0"
@@ -1204,7 +1211,7 @@ babel-preset-react-app@^3.0.0:
     babel-plugin-transform-react-jsx-source "6.22.0"
     babel-plugin-transform-regenerator "6.24.1"
     babel-plugin-transform-runtime "6.23.0"
-    babel-preset-env "1.4.0"
+    babel-preset-env "1.5.2"
     babel-preset-react "6.24.1"
 
 babel-preset-react@6.24.1, babel-preset-react@^6.24.1:
@@ -1404,8 +1411,8 @@ braces@^1.8.2:
     repeat-element "^1.1.2"
 
 brcast@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.0.tgz#9e627ab82209895664c1d6c1f45cd8c43422e3f6"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.1.tgz#4311508f0634a6f5a2465b6cf2db27f06902aaca"
 
 brorand@^1.0.1:
   version "1.1.0"
@@ -1466,14 +1473,14 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.3.6, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.6:
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^2.1.2, browserslist@^2.1.3:
+browserslist@^2.1.2, browserslist@^2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.5.tgz#e882550df3d1cd6d481c1a3e0038f2baf13a4711"
   dependencies:
@@ -1508,9 +1515,9 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-bytes@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.3.0.tgz#d5b680a165b6201739acb611542aabc2d8ceb070"
+bytes@2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.5.0.tgz#4c9423ea2d252c270c41b2bdefeff9bb6b62c06a"
 
 caller-path@^0.1.0:
   version "0.1.0"
@@ -1559,12 +1566,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000696"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000696.tgz#e71f5c61e1f96c7a3af4e791ac5db55e11737604"
+  version "1.0.30000700"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000700.tgz#97cfc483865eea8577dc7a3674929b9abf553095"
 
-caniuse-lite@^1.0.30000670, caniuse-lite@^1.0.30000684:
-  version "1.0.30000696"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000696.tgz#30f2695d2a01a0dfd779a26ab83f4d134b3da5cc"
+caniuse-lite@^1.0.30000684, caniuse-lite@^1.0.30000697:
+  version "1.0.30000700"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000700.tgz#6084871ec75c6fa62327de97622514f95d9db26a"
 
 case-sensitive-paths-webpack-plugin@^2.0.0:
   version "2.1.1"
@@ -1588,9 +1595,9 @@ chai-enzyme@^0.8.0:
     html "^1.0.0"
     react-element-to-jsx-string "^5.0.0"
 
-chai@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.0.2.tgz#2f7327c4de6f385dd7787999e2ab02697a32b83b"
+chai@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chai/-/chai-4.1.0.tgz#331a0391b55c3af8740ae9c3b7458bc1c3805e6d"
   dependencies:
     assertion-error "^1.0.1"
     check-error "^1.0.1"
@@ -1609,6 +1616,14 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.0.1.tgz#dbec49436d2ae15f536114e76d14656cdbc0f44d"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 check-error@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -1650,10 +1665,11 @@ chokidar@^1.4.3, chokidar@^1.6.0:
     fsevents "^1.0.0"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.3.tgz#eeabf194419ce900da3018c207d212f2a6df0a07"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
   dependencies:
     inherits "^2.0.1"
+    safe-buffer "^5.0.1"
 
 circular-json@^0.3.1:
   version "0.3.1"
@@ -1713,8 +1729,8 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 coa@~1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.3.tgz#1b54a5e1dcf77c990455d4deea98c564416dc893"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
   dependencies:
     q "^1.1.2"
 
@@ -1726,7 +1742,7 @@ collapse-white-space@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c"
 
-color-convert@^1.3.0:
+color-convert@^1.0.0, color-convert@^1.3.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
   dependencies:
@@ -1775,10 +1791,8 @@ commander@2.9.0:
     graceful-readlink ">= 1.0.0"
 
 commander@^2.8.1, commander@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.10.0.tgz#e1f5d3245de246d1a5ca04702fa1ad1bd7e405fe"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
 common-tags@^1.4.0:
   version "1.4.0"
@@ -1790,11 +1804,11 @@ commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
 
-complex.js@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.1.tgz#ea90c7a05aeceaf3a376d2c0f6a78421727d6879"
+complex.js@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/complex.js/-/complex.js-2.0.4.tgz#d8e7cfb9652d1e853e723386421c1a0ca7a48373"
 
-compressible@~2.0.8:
+compressible@~2.0.10:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.10.tgz#feda1c7f7617912732b29bf8cf26252a20b9eecd"
   dependencies:
@@ -1810,15 +1824,16 @@ compression-webpack-plugin@^0.4.0:
     node-zopfli "^2.0.0"
 
 compression@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.6.2.tgz#cceb121ecc9d09c52d7ad0c3350ea93ddd402bc3"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.0.tgz#030c9f198f1643a057d776a738e922da4373012d"
   dependencies:
     accepts "~1.3.3"
-    bytes "2.3.0"
-    compressible "~2.0.8"
-    debug "~2.2.0"
+    bytes "2.5.0"
+    compressible "~2.0.10"
+    debug "2.6.8"
     on-headers "~1.0.1"
-    vary "~1.1.0"
+    safe-buffer "5.1.1"
+    vary "~1.1.1"
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -1984,8 +1999,8 @@ cryptiles@2.x.x:
     boom "2.x.x"
 
 crypto-browserify@^3.11.0:
-  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
+  version "3.11.1"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.1.tgz#948945efc6757a400d6e5e5af47194d10064279f"
   dependencies:
     browserify-cipher "^1.0.0"
     browserify-sign "^4.0.0"
@@ -2176,19 +2191,13 @@ debug@~0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-decimal.js@7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-7.1.1.tgz#1adcad7d70d7a91c426d756f1eb6566c3be6cbcf"
+decimal.js@7.2.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-7.2.3.tgz#6434c3b8a8c375780062fc633d0d2bbdb264cc78"
 
 deep-eql@^2.0.1:
   version "2.0.2"
@@ -2281,10 +2290,14 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
-diff@3.2.0, diff@^3.1.0:
+diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
+diff@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.0.tgz#056695150d7aa93237ca7e378ac3b1682b7963b9"
+
 diffie-hellman@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
@@ -2357,13 +2370,20 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domutils@1.5.1, domutils@^1.5.1:
+domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
   dependencies:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^1.5.1:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.6.2.tgz#1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
 dot-prop@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.1.1.tgz#a8493f0b7b5eeec82525b5c7587fa7de7ca859c1"
@@ -2401,8 +2421,8 @@ ejs@^2.5.6:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.14:
-  version "1.3.14"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.14.tgz#64af0f9efd3c3c6acd57d71f83b49ca7ee9c4b43"
+  version "1.3.15"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.15.tgz#08397934891cbcfaebbd18b82a95b5a481138369"
 
 element-class@^0.2.0:
   version "0.2.2"
@@ -2421,8 +2441,8 @@ elliptic@^6.0.0:
     minimalistic-crypto-utils "^1.0.0"
 
 emoji-regex@^6.1.0:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.2.tgz#a30b6fee353d406d96cfb9fa765bdc82897eff6e"
+  version "6.4.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.3.tgz#6ac2ac58d4b78def5e39b33fcbf395688af3076c"
 
 emojione-picker@^2.2.1:
   version "2.2.1"
@@ -2454,9 +2474,9 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-enhanced-resolve@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz#9f4b626f577245edcf4b2ad83d86e17f4f421dec"
+enhanced-resolve@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-3.3.0.tgz#950964ecc7f0332a42321b673b38dc8ff15535b3"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -2671,7 +2691,11 @@ esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
-esprima@^3.1.1, esprima@~3.1.0:
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
@@ -2806,12 +2830,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
+extract-text-webpack-plugin@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
   dependencies:
-    async "^2.1.2"
-    loader-utils "^1.0.2"
+    async "^2.4.1"
+    loader-utils "^1.1.0"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -2819,9 +2843,9 @@ extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
-fast-deep-equal@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz#5c6f4599aba6b333ee3342e2ed978672f1001f8d"
+fast-deep-equal@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz#96256a3bc975595eb36d82e9929d060d893439ff"
 
 fast-levenshtein@~2.0.4:
   version "2.0.6"
@@ -2999,9 +3023,9 @@ forwarded@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.0.tgz#19ef9874c4ae1c297bcf078fde63a09b66a84363"
 
-fraction.js@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.0.tgz#73974e2f8b51ef709536d624cc90782e2bb61274"
+fraction.js@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.0.2.tgz#0eae896626f334b1bde763371347a83b5575d7f0"
 
 fresh@0.5.0:
   version "0.5.0"
@@ -3050,12 +3074,12 @@ function-bind@^1.0.2, function-bind@^1.1.0:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
 function.prototype.name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.0.tgz#5f523ca64e491a5f95aba80cc1e391080a14482e"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.0.1.tgz#39aeab26bbf8ab669b7142965d50ea0965d93d7b"
   dependencies:
     define-properties "^1.1.2"
     function-bind "^1.1.0"
-    is-callable "^1.1.2"
+    is-callable "^1.1.3"
 
 fuse.js@^3.0.1:
   version "3.0.5"
@@ -3133,8 +3157,8 @@ glamor@^2.20.25:
     prop-types "^15.5.8"
 
 glamorous@^3.22.1:
-  version "3.23.4"
-  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-3.23.4.tgz#a1e5f8045c332850105777dea4d3b21c5bdc4796"
+  version "3.23.5"
+  resolved "https://registry.yarnpkg.com/glamorous/-/glamorous-3.23.5.tgz#49f613a29f64cdee80948679c66dbcd4084e5fd5"
   dependencies:
     brcast "^2.0.0"
     fast-memoize "^2.2.7"
@@ -3287,8 +3311,8 @@ hash-base@^2.0.0:
     inherits "^2.0.1"
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.2.tgz#bf5c887825cfe40b9efde7bf11bd2db26e6bf01b"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
@@ -3436,10 +3460,14 @@ hyphenate-style-name@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz#31160a36930adaf1fc04c6074f7eb41465d4ec4b"
 
-iconv-lite@0.4.13, iconv-lite@~0.4.13:
+iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
+iconv-lite@~0.4.13:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.18.tgz#23d8656b16aae6742ac29732ea8f0336a4789cf2"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -3503,7 +3531,7 @@ ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
-inline-style-prefixer@^3.0.2:
+inline-style-prefixer@^3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-3.0.6.tgz#b27fe309b4168a31eaf38c8e8c60ab9e7c11731f"
   dependencies:
@@ -3560,12 +3588,24 @@ intl-messageformat@1.3.0, intl-messageformat@^1.3.0:
   dependencies:
     intl-messageformat-parser "1.2.0"
 
+intl-messageformat@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-2.0.0.tgz#3d56982583425aee23b76c8b985fb9b0aae5be3c"
+  dependencies:
+    intl-messageformat-parser "1.2.0"
+
 intl-relativeformat@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz#893dc7076fccd380cf091a2300c380fa57ace45b"
   dependencies:
     intl-messageformat "1.3.0"
 
+intl-relativeformat@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/intl-relativeformat/-/intl-relativeformat-2.0.0.tgz#d6ba9dc6c625819bc0abdb1d4e238138b7488f26"
+  dependencies:
+    intl-messageformat "^2.0.0"
+
 intl@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/intl/-/intl-1.2.5.tgz#82244a2190c4e419f8371f5aa34daa3420e2abde"
@@ -3612,7 +3652,7 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.2, is-callable@^1.1.3:
+is-callable@^1.1.1, is-callable@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
 
@@ -3730,10 +3770,10 @@ is-plain-obj@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
 
 is-plain-object@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.3.tgz#c15bf3e4b66b62d72efaf2925848663ecbc619b6"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   dependencies:
-    isobject "^3.0.0"
+    isobject "^3.0.1"
 
 is-posix-bracket@^0.1.0:
   version "0.1.1"
@@ -3811,9 +3851,9 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isobject@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.0.tgz#39565217f3661789e8a0a0c080d5f7e6bc46e1a0"
+isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
 isomorphic-fetch@^2.1.1:
   version "2.2.1"
@@ -3826,20 +3866,24 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
+javascript-natural-sort@0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59"
+
 js-base64@^2.1.8, js-base64@^2.1.9:
   version "2.1.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
 
 js-tokens@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.8.4:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.4.tgz#520b4564f86573ba96662af85a8cafa7b4b5a6f6"
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.9.0.tgz#4ffbbf25c2ac963b8299dc74da7e3740de1c18ce"
   dependencies:
     argparse "^1.0.7"
-    esprima "^3.1.1"
+    esprima "^4.0.0"
 
 js-yaml@~3.7.0:
   version "3.7.0"
@@ -3852,9 +3896,9 @@ jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
-jsdom@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.0.0.tgz#1ee507cb2c0b16c875002476b1a8557d951353e5"
+jsdom@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.1.0.tgz#6c48d7a48ffc5c300283c312904d15da8360509b"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3865,7 +3909,7 @@ jsdom@^11.0.0:
     cssstyle ">= 0.2.37 < 0.3.0"
     escodegen "^1.6.1"
     html-encoding-sniffer "^1.0.1"
-    nwmatcher ">= 1.3.9 < 2.0.0"
+    nwmatcher "^1.4.1"
     parse5 "^3.0.2"
     pn "^1.0.0"
     request "^2.79.0"
@@ -3875,7 +3919,7 @@ jsdom@^11.0.0:
     tough-cookie "^2.3.2"
     webidl-conversions "^4.0.0"
     whatwg-encoding "^1.0.1"
-    whatwg-url "^4.3.0"
+    whatwg-url "^6.1.0"
     xml-name-validator "^2.0.1"
 
 jsesc@^1.3.0:
@@ -4015,15 +4059,6 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
 loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -4268,14 +4303,15 @@ math-expression-evaluator@^1.2.14:
   resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
 
 mathjs@^3.11.5:
-  version "3.13.3"
-  resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-3.13.3.tgz#39135ea761f57c083da43638248e3f640727e290"
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/mathjs/-/mathjs-3.14.2.tgz#bb79b7dc878b7f586ce408ab067a9a42db2e7a2d"
   dependencies:
-    complex.js "2.0.1"
-    decimal.js "7.1.1"
-    fraction.js "4.0.0"
+    complex.js "2.0.4"
+    decimal.js "7.2.3"
+    fraction.js "4.0.2"
+    javascript-natural-sort "0.7.1"
     seed-random "2.2.0"
-    tiny-emitter "1.0.2"
+    tiny-emitter "2.0.0"
     typed-function "0.10.5"
 
 media-typer@0.3.0:
@@ -4343,7 +4379,11 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-"mime-db@>= 1.27.0 < 2", mime-db@~1.27.0:
+"mime-db@>= 1.27.0 < 2":
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.29.0.tgz#48d26d235589651704ac5916ca06001914266878"
+
+mime-db@~1.27.0:
   version "1.27.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
@@ -4353,10 +4393,14 @@ mime-types@^2.1.12, mime-types@~2.1.11, mime-types@~2.1.15, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
-mime@1.3.4, mime@1.3.x, mime@^1.3.4:
+mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
+mime@1.3.x, mime@^1.3.4:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
+
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -4426,10 +4470,6 @@ mocha@^3.4.1:
     mkdirp "0.5.1"
     supports-color "3.1.2"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
 ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
@@ -4648,7 +4688,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-"nwmatcher@>= 1.3.9 < 2.0.0":
+nwmatcher@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.1.tgz#7ae9b07b0ea804db7e25f05cb5fe4097d4e4949f"
 
@@ -5373,7 +5413,7 @@ postcss-sass@^0.1.0:
     mathjs "^3.11.5"
     postcss "^5.2.6"
 
-postcss-scss@^1.0.0:
+postcss-scss@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-1.0.2.tgz#ff45cf3354b879ee89a4eb68680f46ac9bb14f94"
   dependencies:
@@ -5407,16 +5447,16 @@ postcss-simple-vars@^4.0.0:
   dependencies:
     postcss "^6.0.1"
 
-postcss-smart-import@^0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/postcss-smart-import/-/postcss-smart-import-0.7.4.tgz#50cfb3d9a49b70a61f911451bc24d841f8dbf200"
+postcss-smart-import@^0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/postcss-smart-import/-/postcss-smart-import-0.7.5.tgz#df9a9c6dd60d916e5e0670d1c57d03af5d3dcc31"
   dependencies:
     babel-runtime "^6.23.0"
     lodash "^4.17.4"
     object-assign "^4.1.1"
-    postcss "^6.0.1"
+    postcss "^6.0.6"
     postcss-sass "^0.1.0"
-    postcss-scss "^1.0.0"
+    postcss-scss "^1.0.2"
     postcss-value-parser "^3.3.0"
     promise-each "^2.2.0"
     read-cache "^1.0.0"
@@ -5461,13 +5501,13 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.3.tgz#b7f565b3d956fbb8565ca7c1e239d0506e427d8b"
+postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.2, postcss@^6.0.3, postcss@^6.0.6:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.6.tgz#bba4d58e884fc78c840d1539e10eddaabb8f73bd"
   dependencies:
-    chalk "^1.1.3"
+    chalk "^2.0.1"
     source-map "^0.5.6"
-    supports-color "^4.0.0"
+    supports-color "^4.1.0"
 
 postgres-array@~1.0.0:
   version "1.0.2"
@@ -5604,10 +5644,14 @@ q@^1.1.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
-qs@6.4.0, qs@^6.4.0, qs@~6.4.0:
+qs@6.4.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
+qs@^6.4.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.0.tgz#8d04954d364def3efc55b5a0793e1e2c8b1e6e49"
+
 query-string@^4.1.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
@@ -5740,9 +5784,9 @@ react-immutable-pure-component@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-1.0.0.tgz#761d27b1497c5af64d2d2454e17b26ce7c9cda88"
 
-react-inspector@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.0.0.tgz#c945932f2c2bf2fab7873c6e07d83881404b9313"
+react-inspector@^2.0.0, react-inspector@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/react-inspector/-/react-inspector-2.1.1.tgz#2e68030d7ef0811a012f167258dd84232fd5ead1"
   dependencies:
     babel-runtime "^6.23.0"
     is-dom "^1.0.9"
@@ -5871,11 +5915,11 @@ react-simple-dropdown@^3.0.0:
     prop-types "^15.5.8"
 
 react-split-pane@^0.1.63:
-  version "0.1.63"
-  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.63.tgz#fadb3960cc659911dd05ffbc88acee4be9f53583"
+  version "0.1.64"
+  resolved "https://registry.yarnpkg.com/react-split-pane/-/react-split-pane-0.1.64.tgz#725029b9fcb51059aa82f2b8622832473849f559"
   dependencies:
-    inline-style-prefixer "^3.0.2"
-    prop-types "^15.5.8"
+    inline-style-prefixer "^3.0.6"
+    prop-types "^15.5.10"
     react-style-proptype "^3.0.0"
 
 react-stubber@^1.0.0:
@@ -5939,8 +5983,8 @@ react-toggle@^4.0.1:
     classnames "^2.2.5"
 
 react-virtualized@^9.7.4:
-  version "9.8.0"
-  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.8.0.tgz#7c1fe9b723ce39a1c4916cabe1c4f1bda5dbc04b"
+  version "9.9.0"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.9.0.tgz#799a6f23819eeb82860d59b82fad33d1d420325e"
   dependencies:
     babel-runtime "^6.11.6"
     classnames "^2.2.3"
@@ -5995,15 +6039,15 @@ read-pkg@^2.0.0:
     path-type "^2.0.0"
 
 readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.2.9:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.2.tgz#5a04df05e4f57fe3f0dc68fdd11dc5c97c7e6f4d"
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    safe-buffer "~5.1.0"
-    string_decoder "~1.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
 readdirp@^2.0.0:
@@ -6322,7 +6366,7 @@ safe-buffer@5.0.1, safe-buffer@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0:
+safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
@@ -6503,9 +6547,9 @@ signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
 
-sinon@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.5.tgz#9a2fc0ff8d526da716f30953aa2c65d518917f6c"
+sinon@^2.3.7:
+  version "2.3.7"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-2.3.7.tgz#1451614a2eaab05bb4d876c1335cd40132ec5127"
   dependencies:
     diff "^3.1.0"
     formatio "1.2.0"
@@ -6568,10 +6612,6 @@ source-list-map@^0.1.7, source-list-map@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
 
-source-list-map@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1"
-
 source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
@@ -6752,7 +6792,7 @@ string_decoder@^0.10.25:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.0:
+string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -6822,9 +6862,9 @@ style-loader@^0.18.2:
     loader-utils "^1.0.2"
     schema-utils "^0.3.0"
 
-substring-trie@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.0.tgz#5a7ecb83aefcca7b3720f7897cf69e97023be143"
+substring-trie@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/substring-trie/-/substring-trie-1.0.1.tgz#1a5f07f774a91524eb067cb318dd4f3a3037bee0"
 
 sugarss@^1.0.0:
   version "1.0.0"
@@ -6848,9 +6888,9 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.0.0.tgz#33a7c680aa512c9d03ef929cacbb974d203d2790"
+supports-color@^4.0.0, supports-color@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.0.tgz#ad986dc7eb2315d009b4d77c8169c2231a684037"
   dependencies:
     has-flag "^2.0.0"
 
@@ -6946,9 +6986,9 @@ timers-browserify@^2.0.2:
   dependencies:
     setimmediate "^1.0.4"
 
-tiny-emitter@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-1.0.2.tgz#8e49470d3f55f89e247210368a6bb9fb51aa1601"
+tiny-emitter@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.0.tgz#bad327adb1804b42a231afa741532bd884cd09ad"
 
 tiny-queue@^0.2.1:
   version "0.2.1"
@@ -7035,7 +7075,7 @@ ua-parser-js@^0.7.9:
   version "0.7.13"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.13.tgz#cd9dd2f86493b3f44dbeeef3780fda74c5ee14be"
 
-uglify-js@^2.8.27, uglify-js@^2.8.29:
+uglify-js@^2.8.29:
   version "2.8.29"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
   dependencies:
@@ -7048,7 +7088,7 @@ uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-uglifyjs-webpack-plugin@^0.4.4:
+uglifyjs-webpack-plugin@^0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
   dependencies:
@@ -7163,7 +7203,7 @@ value-equal@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.1.tgz#c220a304361fce6994dbbedaa3c7e1a1b895871d"
 
-vary@~1.1.0, vary@~1.1.1:
+vary@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
@@ -7203,11 +7243,7 @@ wbuf@^1.1.0, wbuf@^1.7.2:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-
-webidl-conversions@^4.0.0:
+webidl-conversions@^4.0.0, webidl-conversions@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
@@ -7263,17 +7299,17 @@ webpack-dev-server@^2.5.1:
     yargs "^6.0.0"
 
 webpack-hot-middleware@^2.18.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.2.tgz#84dee643f037c3d59c9de142548430371aa8d3b2"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
     querystring "^0.2.0"
     strip-ansi "^3.0.0"
 
-webpack-manifest-plugin@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.1.0.tgz#6b6c718aade8a2537995784b46bd2e9836057caa"
+webpack-manifest-plugin@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-1.1.2.tgz#e9d9967f4f739ee25380ca57de7f9417c5bea029"
   dependencies:
     fs-extra "^0.30.0"
     lodash ">=3.5 <5"
@@ -7291,13 +7327,6 @@ webpack-sources@^0.1.0:
     source-list-map "~0.1.7"
     source-map "~0.5.3"
 
-webpack-sources@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
-  dependencies:
-    source-list-map "^1.1.1"
-    source-map "~0.5.3"
-
 webpack-sources@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.0.1.tgz#c7356436a4d13123be2e2426a05d1dad9cbe65cf"
@@ -7305,42 +7334,16 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-webpack@^2.5.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.6.1.tgz#2e0457f0abb1ac5df3ab106c69c672f236785f07"
-  dependencies:
-    acorn "^5.0.0"
-    acorn-dynamic-import "^2.0.0"
-    ajv "^4.7.0"
-    ajv-keywords "^1.1.1"
-    async "^2.1.2"
-    enhanced-resolve "^3.0.0"
-    interpret "^1.0.0"
-    json-loader "^0.5.4"
-    json5 "^0.5.1"
-    loader-runner "^2.3.0"
-    loader-utils "^0.2.16"
-    memory-fs "~0.4.1"
-    mkdirp "~0.5.0"
-    node-libs-browser "^2.0.0"
-    source-map "^0.5.3"
-    supports-color "^3.1.0"
-    tapable "~0.2.5"
-    uglify-js "^2.8.27"
-    watchpack "^1.3.1"
-    webpack-sources "^0.2.3"
-    yargs "^6.0.0"
-
-webpack@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.0.0.tgz#ee9bcebf21247f7153cb410168cab45e3a59d4d7"
+"webpack@^2.5.1 || ^3.0.0", webpack@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"
   dependencies:
     acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^5.1.5"
     ajv-keywords "^2.0.0"
     async "^2.1.2"
-    enhanced-resolve "^3.0.0"
+    enhanced-resolve "^3.3.0"
     escope "^3.6.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
@@ -7353,7 +7356,7 @@ webpack@^3.0.0:
     source-map "^0.5.3"
     supports-color "^3.1.0"
     tapable "~0.2.5"
-    uglifyjs-webpack-plugin "^0.4.4"
+    uglifyjs-webpack-plugin "^0.4.6"
     watchpack "^1.3.1"
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
@@ -7384,12 +7387,13 @@ whatwg-fetch@>=0.10.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
-whatwg-url@^4.3.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.8.0.tgz#d2981aa9148c1e00a41c5a6131166ab4683bbcc0"
+whatwg-url@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.1.0.tgz#5fc8279b93d75483b9ced8b26239854847a18578"
   dependencies:
+    lodash.sortby "^4.7.0"
     tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
+    webidl-conversions "^4.0.1"
 
 whet.extend@~0.9.9:
   version "0.9.9"

From 5abb3d815025675d1493da4f8c6e4dda4a6672e9 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Thu, 13 Jul 2017 03:51:44 +0900
Subject: [PATCH 219/382] Rerender modal on property changes (#4175)

Render function for BundleContainer must not be methods.
React doesn't know dependency of the method, so they won't rerender on property updates.

In this case, when you close modal and open another modal immediately,
old modal will be open instead of new one.
---
 .../mastodon/features/ui/components/modal_root.js      | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 085299038..4240871a7 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -54,12 +54,6 @@ export default class ModalRoot extends React.PureComponent {
     return { opacity: spring(0), scale: spring(0.98) };
   }
 
-  renderModal = (SpecificComponent) => {
-    const { props, onClose } = this.props;
-
-    return <SpecificComponent {...props} onClose={onClose} />;
-  }
-
   renderLoading = () => {
     return <ModalLoading />;
   }
@@ -95,7 +89,9 @@ export default class ModalRoot extends React.PureComponent {
               <div key={key} style={{ pointerEvents: visible ? 'auto' : 'none' }}>
                 <div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} />
                 <div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}>
-                  <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>{this.renderModal}</BundleContainer>
+                  <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading} error={this.renderError} renderDelay={200}>
+                    {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />}
+                  </BundleContainer>
                 </div>
               </div>
             ))}

From e48d3bfd01c4bdeb36d39bbdf13b6873e3444179 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Jul 2017 01:47:23 +0200
Subject: [PATCH 220/382] Fix #1010 - When spoiler text is set, enforce
 sensitivity too (#4176)

---
 app/models/status.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/status.rb b/app/models/status.rb
index 791d96df1..edf805336 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -124,6 +124,7 @@ class Status < ApplicationRecord
   before_validation :set_reblog
   before_validation :set_visibility
   before_validation :set_conversation
+  before_validation :set_sensitivity
 
   class << self
     def not_in_filtered_languages(account)
@@ -250,6 +251,10 @@ class Status < ApplicationRecord
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
   end
 
+  def set_sensitivity
+    self.sensitive = sensitive || spoiler_text.present?
+  end
+
   def set_conversation
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply
 

From 880a5eb25cc62d2181b34a21985addee847cbb49 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 13 Jul 2017 03:12:25 +0200
Subject: [PATCH 221/382] Fix boolean columns sometimes having a null value
 (#4162)

* Fix boolean columns sometimes having a null value

* Fix wrong value being set instead of null
---
 app/models/domain_block.rb                     |  2 +-
 app/models/import.rb                           |  2 +-
 app/models/status.rb                           |  5 +++--
 app/models/user.rb                             |  4 ++--
 db/migrate/20170711225116_fix_null_booleans.rb | 17 +++++++++++++++++
 db/schema.rb                                   | 14 +++++++-------
 6 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 db/migrate/20170711225116_fix_null_booleans.rb

diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 99dae9c1d..f26e8183f 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -8,7 +8,7 @@
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
 #  severity     :integer          default("silence")
-#  reject_media :boolean
+#  reject_media :boolean          default(FALSE), not null
 #
 
 class DomainBlock < ApplicationRecord
diff --git a/app/models/import.rb b/app/models/import.rb
index 8c6253d49..815e02589 100644
--- a/app/models/import.rb
+++ b/app/models/import.rb
@@ -6,7 +6,7 @@
 #  id                :integer          not null, primary key
 #  account_id        :integer          not null
 #  type              :integer          not null
-#  approved          :boolean
+#  approved          :boolean          default(FALSE), not null
 #  created_at        :datetime         not null
 #  updated_at        :datetime         not null
 #  data_file_name    :string
diff --git a/app/models/status.rb b/app/models/status.rb
index edf805336..65db7579a 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -12,12 +12,12 @@
 #  in_reply_to_id         :integer
 #  reblog_of_id           :integer
 #  url                    :string
-#  sensitive              :boolean          default(FALSE)
+#  sensitive              :boolean          default(FALSE), not null
 #  visibility             :integer          default("public"), not null
 #  in_reply_to_account_id :integer
 #  application_id         :integer
 #  spoiler_text           :text             default(""), not null
-#  reply                  :boolean          default(FALSE)
+#  reply                  :boolean          default(FALSE), not null
 #  favourites_count       :integer          default(0), not null
 #  reblogs_count          :integer          default(0), not null
 #  language               :string
@@ -249,6 +249,7 @@ class Status < ApplicationRecord
 
   def set_visibility
     self.visibility = (account.locked? ? :private : :public) if visibility.nil?
+    self.sensitive  = false if sensitive.nil?
   end
 
   def set_sensitivity
diff --git a/app/models/user.rb b/app/models/user.rb
index c80115a08..86e578225 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,7 +17,7 @@
 #  last_sign_in_at           :datetime
 #  current_sign_in_ip        :inet
 #  last_sign_in_ip           :inet
-#  admin                     :boolean          default(FALSE)
+#  admin                     :boolean          default(FALSE), not null
 #  confirmation_token        :string
 #  confirmed_at              :datetime
 #  confirmation_sent_at      :datetime
@@ -27,7 +27,7 @@
 #  encrypted_otp_secret_iv   :string
 #  encrypted_otp_secret_salt :string
 #  consumed_timestep         :integer
-#  otp_required_for_login    :boolean
+#  otp_required_for_login    :boolean          default(FALSE), not null
 #  last_emailed_at           :datetime
 #  otp_backup_codes          :string           is an Array
 #  filtered_languages        :string           default([]), not null, is an Array
diff --git a/db/migrate/20170711225116_fix_null_booleans.rb b/db/migrate/20170711225116_fix_null_booleans.rb
new file mode 100644
index 000000000..5b319471d
--- /dev/null
+++ b/db/migrate/20170711225116_fix_null_booleans.rb
@@ -0,0 +1,17 @@
+class FixNullBooleans < ActiveRecord::Migration[5.1]
+  def change
+    change_column_default :domain_blocks, :reject_media, false
+    change_column_null :domain_blocks, :reject_media, false, false
+
+    change_column_default :imports, :approved, false
+    change_column_null :imports, :approved, false, false
+
+    change_column_null :statuses, :sensitive, false, false
+    change_column_null :statuses, :reply, false, false
+
+    change_column_null :users, :admin, false, false
+
+    change_column_default :users, :otp_required_for_login, false
+    change_column_null :users, :otp_required_for_login, false, false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 159704c6a..0d5c73e2e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170625140443) do
+ActiveRecord::Schema.define(version: 20170711225116) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -89,7 +89,7 @@ ActiveRecord::Schema.define(version: 20170625140443) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.integer "severity", default: 0
-    t.boolean "reject_media"
+    t.boolean "reject_media", default: false, null: false
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true
   end
 
@@ -121,7 +121,7 @@ ActiveRecord::Schema.define(version: 20170625140443) do
   create_table "imports", id: :serial, force: :cascade do |t|
     t.integer "account_id", null: false
     t.integer "type", null: false
-    t.boolean "approved"
+    t.boolean "approved", default: false, null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "data_file_name"
@@ -281,12 +281,12 @@ ActiveRecord::Schema.define(version: 20170625140443) do
     t.bigint "in_reply_to_id"
     t.bigint "reblog_of_id"
     t.string "url"
-    t.boolean "sensitive", default: false
+    t.boolean "sensitive", default: false, null: false
     t.integer "visibility", default: 0, null: false
     t.integer "in_reply_to_account_id"
     t.integer "application_id"
     t.text "spoiler_text", default: "", null: false
-    t.boolean "reply", default: false
+    t.boolean "reply", default: false, null: false
     t.integer "favourites_count", default: 0, null: false
     t.integer "reblogs_count", default: 0, null: false
     t.string "language"
@@ -350,7 +350,7 @@ ActiveRecord::Schema.define(version: 20170625140443) do
     t.datetime "last_sign_in_at"
     t.inet "current_sign_in_ip"
     t.inet "last_sign_in_ip"
-    t.boolean "admin", default: false
+    t.boolean "admin", default: false, null: false
     t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
@@ -360,7 +360,7 @@ ActiveRecord::Schema.define(version: 20170625140443) do
     t.string "encrypted_otp_secret_iv"
     t.string "encrypted_otp_secret_salt"
     t.integer "consumed_timestep"
-    t.boolean "otp_required_for_login"
+    t.boolean "otp_required_for_login", default: false, null: false
     t.datetime "last_emailed_at"
     t.string "otp_backup_codes", array: true
     t.string "filtered_languages", default: [], null: false, array: true

From c29c20ab3cda3d4b752c67868925c1fe99d0ac71 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Thu, 13 Jul 2017 21:49:57 +0900
Subject: [PATCH 222/382] Add background color for spoiler input, like toot
 textarea (#4181)

---
 app/javascript/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 8d0350eb6..45dd9f914 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1748,6 +1748,7 @@
   width: 100%;
   margin: 0;
   color: $ui-base-color;
+  background: $simple-background-color;
   padding: 10px;
   font-family: inherit;
   font-size: 14px;
@@ -1770,7 +1771,6 @@
 
 .autosuggest-textarea__textarea {
   min-height: 100px;
-  background: $simple-background-color;
   border-radius: 4px 4px 0 0;
   padding-bottom: 0;
   padding-right: 10px + 22px;

From c2753fdfb471209fe7f2cdb8844e049207af8ba3 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Fri, 14 Jul 2017 02:31:33 +0900
Subject: [PATCH 223/382] Make tag search case insensitive again (#4184)

---
 app/models/tag.rb                                     |  2 +-
 ...20170713112503_make_tag_search_case_insensitive.rb | 11 +++++++++++
 db/schema.rb                                          |  4 ++--
 spec/models/tag_spec.rb                               |  9 +++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20170713112503_make_tag_search_case_insensitive.rb

diff --git a/app/models/tag.rb b/app/models/tag.rb
index 08e3c1b03..a14e2cc98 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -23,7 +23,7 @@ class Tag < ApplicationRecord
   class << self
     def search_for(term, limit = 5)
       pattern = sanitize_sql_like(term) + '%'
-      Tag.where('name like ?', pattern).order(:name).limit(limit)
+      Tag.where('lower(name) like lower(?)', pattern).order(:name).limit(limit)
     end
   end
 end
diff --git a/db/migrate/20170713112503_make_tag_search_case_insensitive.rb b/db/migrate/20170713112503_make_tag_search_case_insensitive.rb
new file mode 100644
index 000000000..33ed6c005
--- /dev/null
+++ b/db/migrate/20170713112503_make_tag_search_case_insensitive.rb
@@ -0,0 +1,11 @@
+class MakeTagSearchCaseInsensitive < ActiveRecord::Migration[5.1]
+  def up
+    remove_index :tags, name: :hashtag_search_index
+    execute 'CREATE INDEX hashtag_search_index ON tags (lower(name) text_pattern_ops);'
+  end
+
+  def down
+    remove_index :tags, name: :hashtag_search_index
+    execute 'CREATE INDEX hashtag_search_index ON tags (name text_pattern_ops);'
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0d5c73e2e..d6e572703 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170711225116) do
+ActiveRecord::Schema.define(version: 20170713112503) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -332,7 +332,7 @@ ActiveRecord::Schema.define(version: 20170711225116) do
     t.string "name", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index "name text_pattern_ops", name: "hashtag_search_index"
+    t.index "lower((name)::text) text_pattern_ops", name: "hashtag_search_index"
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
 
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 7c574eabe..555474c44 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -27,6 +27,15 @@ RSpec.describe Tag, type: :model do
       expect(results).to eq [tag]
     end
 
+    it 'finds tag records in case insensitive' do
+      tag = Fabricate(:tag, name: "MATCH")
+      _miss_tag = Fabricate(:tag, name: "miss")
+
+      results = Tag.search_for("match")
+
+      expect(results).to eq [tag]
+    end
+
     it 'finds the exact matching tag as the first item' do
       similar_tag = Fabricate(:tag, name: "matchlater")
       tag = Fabricate(:tag, name: "match")

From 0c7c188c459117770ac1f74f70a9e65ed2be606f Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 13 Jul 2017 22:15:32 +0200
Subject: [PATCH 224/382] Web Push Notifications (#3243)

* feat: Register push subscription

* feat: Notify when mentioned

* feat: Boost, favourite, reply, follow, follow request

* feat: Notification interaction

* feat: Handle change of public key

* feat: Unsubscribe if things go wrong

* feat: Do not send normal notifications if push is enabled

* feat: Focus client if open

* refactor: Move push logic to WebPushSubscription

* feat: Better title and body

* feat: Localize messages

* chore: Fix lint errors

* feat: Settings

* refactor: Lazy load

* fix: Check if push settings exist

* feat: Device-based preferences

* refactor: Simplify logic

* refactor: Pull request feedback

* refactor: Pull request feedback

* refactor: Create /api/web/push_subscriptions endpoint

* feat: Spec PushSubscriptionController

* refactor: WebPushSubscription => Web::PushSubscription

* feat: Spec Web::PushSubscription

* feat: Display first media attachment

* feat: Support direction

* fix: Stuff broken while rebasing

* refactor: Integration with session activations

* refactor: Cleanup

* refactor: Simplify implementation

* feat: Set VAPID keys via environment

* chore: Comments

* fix: Crash when no alerts

* fix: Set VAPID keys in testing environment

* fix: Follow link

* feat: Notification actions

* fix: Delete previous subscription

* chore: Temporary logs

* refactor: Move migration to a later date

* fix: Fetch the correct session activation and misc bugs

* refactor: Move migration to a later date

* fix: Remove follow request (no notifications)

* feat: Send administrator contact to push service

* feat: Set time-to-live

* fix: Do not show sensitive images

* fix: Reducer crash in error handling

* feat: Add badge

* chore: Fix lint error

* fix: Checkbox label overlap

* fix: Check for payload support

* fix: Rename action "type" (crash in latest Chrome)

* feat: Action to expand notification

* fix: Lint errors

* fix: Unescape notification body

* fix: Do not allow boosting if the status is hidden

* feat: Add VAPID keys to the production sample environment

* fix: Strip HTML tags from status

* refactor: Better error messages

* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)

* fix: Error when target_status is nil

* fix: Handle lack of image

* fix: Delete reference to invalid subscriptions

* feat: Better error handling

* fix: Unescape HTML characters after tags are striped

* refactor: Simpify code

* fix: Modify to work with #4091

* Sort strings alphabetically

* i18n: Updated Polish translation

it annoys me that it's not fully localized :P

* refactor: Use current_session in PushSubscriptionController

* fix: Rebase mistake

* fix: Set cacheName to mastodon

* refactor: Pull request feedback

* refactor: Remove logging statements

* chore(yarn): Fix conflicts with master

* chore(yarn): Copy latest from master

* chore(yarn): Readd offline-plugin

* refactor: Use save! and update!

* refactor: Send notifications async

* fix: Allow retry when push fails

* fix: Save track for failed pushes

* fix: Minify sw.js

* fix: Remove account_id from fabricator
---
 .env.production.sample                        |  11 +
 .gitignore                                    |   1 +
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 +
 .../api/web/push_subscriptions_controller.rb  |  39 ++++
 app/controllers/home_controller.rb            |   1 +
 .../mastodon/actions/push_notifications.js    |  52 +++++
 .../components/column_settings.js             |  23 ++-
 .../components/setting_toggle.js              |   4 +-
 .../containers/column_settings_container.js   |   9 +-
 app/javascript/mastodon/main.js               |   8 +
 app/javascript/mastodon/reducers/index.js     |   2 +
 .../mastodon/reducers/push_notifications.js   |  51 +++++
 .../mastodon/service_worker/entry.js          |   1 +
 .../service_worker/web_push_notifications.js  |  86 ++++++++
 .../mastodon/web_push_subscription.js         | 109 ++++++++++
 app/javascript/styles/components.scss         |   8 +-
 app/javascript/styles/rtl.scss                |   4 +
 app/models/session_activation.rb              |  12 ++
 app/models/user.rb                            |   4 +
 app/models/web/push_subscription.rb           | 190 ++++++++++++++++++
 app/presenters/initial_state_presenter.rb     |   2 +-
 app/serializers/initial_state_serializer.rb   |   2 +-
 app/services/notify_service.rb                |   5 +
 app/views/home/index.html.haml                |   1 +
 app/workers/web_push_notification_worker.rb   |  27 +++
 config/environments/development.rb            |   5 +
 config/environments/test.rb                   |   5 +
 config/initializers/vapid.rb                  |  17 ++
 config/locales/en.yml                         |  15 ++
 config/locales/pl.yml                         |  15 ++
 config/routes.rb                              |   5 +
 config/webpack/production.js                  |  14 ++
 ...713175513_create_web_push_subscriptions.rb |  12 ++
 ...ush_subscription_to_session_activations.rb |   5 +
 db/schema.rb                                  |  12 +-
 package.json                                  |   1 +
 public/badge.png                              | Bin 0 -> 31156 bytes
 .../web/push_subscriptions_controller_spec.rb |  81 ++++++++
 .../web_push_subscription_fabricator.rb       |   5 +
 spec/models/web/push_subscription_spec.rb     |  28 +++
 yarn.lock                                     |  25 ++-
 42 files changed, 890 insertions(+), 14 deletions(-)
 create mode 100644 app/controllers/api/web/push_subscriptions_controller.rb
 create mode 100644 app/javascript/mastodon/actions/push_notifications.js
 create mode 100644 app/javascript/mastodon/reducers/push_notifications.js
 create mode 100644 app/javascript/mastodon/service_worker/entry.js
 create mode 100644 app/javascript/mastodon/service_worker/web_push_notifications.js
 create mode 100644 app/javascript/mastodon/web_push_subscription.js
 create mode 100644 app/models/web/push_subscription.rb
 create mode 100644 app/workers/web_push_notification_worker.rb
 create mode 100644 config/initializers/vapid.rb
 create mode 100644 db/migrate/20170713175513_create_web_push_subscriptions.rb
 create mode 100644 db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
 create mode 100644 public/badge.png
 create mode 100644 spec/controllers/api/web/push_subscriptions_controller_spec.rb
 create mode 100644 spec/fabricators/web_push_subscription_fabricator.rb
 create mode 100644 spec/models/web/push_subscription_spec.rb

diff --git a/.env.production.sample b/.env.production.sample
index 394cdedfe..faefa2482 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -31,6 +31,17 @@ PAPERCLIP_SECRET=
 SECRET_KEY_BASE=
 OTP_SECRET=
 
+# VAPID keys (used for push notifications
+# You can generate the keys using the following command (first is the private key, second is the public one)
+# You should only generate this once per instance. If you later decide to change it, all push subscription will
+# be invalidated, requiring the users to access the website again to resubscribe.
+#
+# ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;"
+#
+# For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
+VAPID_PRIVATE_KEY=
+VAPID_PUBLIC_KEY=
+
 # Registrations
 # Single user mode will disable registrations and redirect frontpage to the first profile
 # SINGLE_USER_MODE=true
diff --git a/.gitignore b/.gitignore
index 38ebc934f..868a84368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ public/system
 public/assets
 public/packs
 public/packs-test
+public/sw.js
 .env
 .env.production
 node_modules/
diff --git a/Gemfile b/Gemfile
index b52685cba..988b4d6b9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,6 +64,7 @@ gem 'statsd-instrument', '~> 2.1'
 gem 'twitter-text', '~> 1.14'
 gem 'tzinfo-data', '~> 1.2017'
 gem 'webpacker', '~> 2.0'
+gem 'webpush'
 
 group :development, :test do
   gem 'fabrication', '~> 2.16'
diff --git a/Gemfile.lock b/Gemfile.lock
index de0d6a107..5599e1db1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,6 +181,7 @@ GEM
     hashdiff (0.3.4)
     highline (1.7.8)
     hiredis (0.6.1)
+    hkdf (0.3.0)
     htmlentities (4.3.4)
     http (2.2.2)
       addressable (~> 2.3)
@@ -209,6 +210,7 @@ GEM
     jmespath (1.3.1)
     json (2.1.0)
     jsonapi-renderer (0.1.2)
+    jwt (1.5.6)
     kaminari (1.0.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.0.1)
@@ -475,6 +477,9 @@ GEM
       activesupport (>= 4.2)
       multi_json (~> 1.2)
       railties (>= 4.2)
+    webpush (0.3.2)
+      hkdf (~> 0.2)
+      jwt
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -573,6 +578,7 @@ DEPENDENCIES
   uglifier (~> 3.2)
   webmock (~> 3.0)
   webpacker (~> 2.0)
+  webpush
 
 RUBY VERSION
    ruby 2.4.1p111
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
new file mode 100644
index 000000000..8425db7b4
--- /dev/null
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class Api::Web::PushSubscriptionsController < Api::BaseController
+  respond_to :json
+
+  before_action :require_user!
+
+  def create
+    params.require(:data).require(:endpoint)
+    params.require(:data).require(:keys).require([:auth, :p256dh])
+
+    active_session = current_session
+
+    unless active_session.web_push_subscription.nil?
+      active_session.web_push_subscription.destroy!
+      active_session.update!(web_push_subscription: nil)
+    end
+
+    web_subscription = ::Web::PushSubscription.create!(
+      endpoint: params[:data][:endpoint],
+      key_p256dh: params[:data][:keys][:p256dh],
+      key_auth: params[:data][:keys][:auth]
+    )
+
+    active_session.update!(web_push_subscription: web_subscription)
+
+    render json: web_subscription.as_payload
+  end
+
+  def update
+    params.require([:id, :data])
+
+    web_subscription = ::Web::PushSubscription.find(params[:id])
+
+    web_subscription.update!(data: params[:data])
+
+    render json: web_subscription.as_payload
+  end
+end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 8a8b9ec76..1585bc810 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -22,6 +22,7 @@ class HomeController < ApplicationController
   def initial_state_params
     {
       settings: Web::Setting.find_by(user: current_user)&.data || {},
+      push_subscription: current_account.user.web_push_subscription(current_session),
       current_account: current_account,
       token: current_session.token,
       admin: Account.find_local(Setting.site_contact_username),
diff --git a/app/javascript/mastodon/actions/push_notifications.js b/app/javascript/mastodon/actions/push_notifications.js
new file mode 100644
index 000000000..55661d2b0
--- /dev/null
+++ b/app/javascript/mastodon/actions/push_notifications.js
@@ -0,0 +1,52 @@
+import axios from 'axios';
+
+export const SET_BROWSER_SUPPORT = 'PUSH_NOTIFICATIONS_SET_BROWSER_SUPPORT';
+export const SET_SUBSCRIPTION = 'PUSH_NOTIFICATIONS_SET_SUBSCRIPTION';
+export const CLEAR_SUBSCRIPTION = 'PUSH_NOTIFICATIONS_CLEAR_SUBSCRIPTION';
+export const ALERTS_CHANGE = 'PUSH_NOTIFICATIONS_ALERTS_CHANGE';
+
+export function setBrowserSupport (value) {
+  return {
+    type: SET_BROWSER_SUPPORT,
+    value,
+  };
+}
+
+export function setSubscription (subscription) {
+  return {
+    type: SET_SUBSCRIPTION,
+    subscription,
+  };
+}
+
+export function clearSubscription () {
+  return {
+    type: CLEAR_SUBSCRIPTION,
+  };
+}
+
+export function changeAlerts(key, value) {
+  return dispatch => {
+    dispatch({
+      type: ALERTS_CHANGE,
+      key,
+      value,
+    });
+
+    dispatch(saveSettings());
+  };
+}
+
+export function saveSettings() {
+  return (_, getState) => {
+    const state = getState().get('push_notifications');
+    const subscription = state.get('subscription');
+    const alerts = state.get('alerts');
+
+    axios.put(`/api/web/push_subscriptions/${subscription.get('id')}`, {
+      data: {
+        alerts,
+      },
+    });
+  };
+}
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 260594894..31cac5bc7 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -9,18 +9,27 @@ export default class ColumnSettings extends React.PureComponent {
 
   static propTypes = {
     settings: ImmutablePropTypes.map.isRequired,
+    pushSettings: ImmutablePropTypes.map.isRequired,
     onChange: PropTypes.func.isRequired,
     onSave: PropTypes.func.isRequired,
     onClear: PropTypes.func.isRequired,
   };
 
+  onPushChange = (key, checked) => {
+    this.props.onChange(['push', ...key], checked);
+  }
+
   render () {
-    const { settings, onChange, onClear } = this.props;
+    const { settings, pushSettings, onChange, onClear } = this.props;
 
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr  = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
 
+    const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
+    const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
+    const pushMeta = showPushSettings && <FormattedMessage id='notifications.column_settings.push_meta' defaultMessage='This device' />;
+
     return (
       <div>
         <div className='column-settings__row'>
@@ -30,7 +39,8 @@ export default class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
+          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'follow']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
           <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'follow']} onChange={onChange} label={showStr} />
           <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'follow']} onChange={onChange} label={soundStr} />
         </div>
@@ -38,7 +48,8 @@ export default class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favourites:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
+          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'favourite']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
           <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'favourite']} onChange={onChange} label={showStr} />
           <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
         </div>
@@ -46,7 +57,8 @@ export default class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
+          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'mention']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
           <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'mention']} onChange={onChange} label={showStr} />
           <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'mention']} onChange={onChange} label={soundStr} />
         </div>
@@ -54,7 +66,8 @@ export default class ColumnSettings extends React.PureComponent {
         <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
 
         <div className='column-settings__row'>
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
+          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
+          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'reblog']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
           <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={showStr} />
           <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
         </div>
diff --git a/app/javascript/mastodon/features/notifications/components/setting_toggle.js b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
index 510820358..be1ff91d6 100644
--- a/app/javascript/mastodon/features/notifications/components/setting_toggle.js
+++ b/app/javascript/mastodon/features/notifications/components/setting_toggle.js
@@ -10,6 +10,7 @@ export default class SettingToggle extends React.PureComponent {
     settings: ImmutablePropTypes.map.isRequired,
     settingKey: PropTypes.array.isRequired,
     label: PropTypes.node.isRequired,
+    meta: PropTypes.node,
     onChange: PropTypes.func.isRequired,
   }
 
@@ -18,13 +19,14 @@ export default class SettingToggle extends React.PureComponent {
   }
 
   render () {
-    const { prefix, settings, settingKey, label } = this.props;
+    const { prefix, settings, settingKey, label, meta } = this.props;
     const id = ['setting-toggle', prefix, ...settingKey].filter(Boolean).join('-');
 
     return (
       <div className='setting-toggle'>
         <Toggle id={id} checked={settings.getIn(settingKey)} onChange={this.onChange} />
         <label htmlFor={id} className='setting-toggle__label'>{label}</label>
+        {meta && <span className='setting-meta__label'>{meta}</span>}
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
index b139d4615..d4ead7881 100644
--- a/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
+++ b/app/javascript/mastodon/features/notifications/containers/column_settings_container.js
@@ -3,6 +3,7 @@ import { defineMessages, injectIntl } from 'react-intl';
 import ColumnSettings from '../components/column_settings';
 import { changeSetting, saveSettings } from '../../../actions/settings';
 import { clearNotifications } from '../../../actions/notifications';
+import { changeAlerts as changePushNotifications, saveSettings as savePushNotificationSettings } from '../../../actions/push_notifications';
 import { openModal } from '../../../actions/modal';
 
 const messages = defineMessages({
@@ -12,16 +13,22 @@ const messages = defineMessages({
 
 const mapStateToProps = state => ({
   settings: state.getIn(['settings', 'notifications']),
+  pushSettings: state.get('push_notifications'),
 });
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
 
   onChange (key, checked) {
-    dispatch(changeSetting(['notifications', ...key], checked));
+    if (key[0] === 'push') {
+      dispatch(changePushNotifications(key.slice(1), checked));
+    } else {
+      dispatch(changeSetting(['notifications', ...key], checked));
+    }
   },
 
   onSave () {
     dispatch(saveSettings());
+    dispatch(savePushNotificationSettings());
   },
 
   onClear () {
diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index d7ffa8ea6..d2c9d1c94 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -29,6 +29,14 @@ function main() {
     const props = JSON.parse(mountNode.getAttribute('data-props'));
 
     ReactDOM.render(<Mastodon {...props} />, mountNode);
+    if (process.env.NODE_ENV === 'production') {
+      // avoid offline in dev mode because it's harder to debug
+      const OfflinePluginRuntime = require('offline-plugin/runtime');
+      const WebPushSubscription = require('./web_push_subscription');
+
+      OfflinePluginRuntime.install();
+      WebPushSubscription.register();
+    }
     perf.stop('main()');
   });
 }
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
index 919345f16..3aaf259c2 100644
--- a/app/javascript/mastodon/reducers/index.js
+++ b/app/javascript/mastodon/reducers/index.js
@@ -10,6 +10,7 @@ import accounts_counters from './accounts_counters';
 import statuses from './statuses';
 import relationships from './relationships';
 import settings from './settings';
+import push_notifications from './push_notifications';
 import status_lists from './status_lists';
 import cards from './cards';
 import reports from './reports';
@@ -32,6 +33,7 @@ const reducers = {
   statuses,
   relationships,
   settings,
+  push_notifications,
   cards,
   reports,
   contexts,
diff --git a/app/javascript/mastodon/reducers/push_notifications.js b/app/javascript/mastodon/reducers/push_notifications.js
new file mode 100644
index 000000000..31a40d246
--- /dev/null
+++ b/app/javascript/mastodon/reducers/push_notifications.js
@@ -0,0 +1,51 @@
+import { STORE_HYDRATE } from '../actions/store';
+import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION, ALERTS_CHANGE } from '../actions/push_notifications';
+import Immutable from 'immutable';
+
+const initialState = Immutable.Map({
+  subscription: null,
+  alerts: new Immutable.Map({
+    follow: false,
+    favourite: false,
+    reblog: false,
+    mention: false,
+  }),
+  isSubscribed: false,
+  browserSupport: false,
+});
+
+export default function push_subscriptions(state = initialState, action) {
+  switch(action.type) {
+  case STORE_HYDRATE: {
+    const push_subscription = action.state.get('push_subscription');
+
+    if (push_subscription) {
+      return state
+        .set('subscription', new Immutable.Map({
+          id: push_subscription.get('id'),
+          endpoint: push_subscription.get('endpoint'),
+        }))
+        .set('alerts', push_subscription.get('alerts') || initialState.get('alerts'))
+        .set('isSubscribed', true);
+    }
+
+    return state;
+  }
+  case SET_SUBSCRIPTION:
+    return state
+      .set('subscription', new Immutable.Map({
+        id: action.subscription.id,
+        endpoint: action.subscription.endpoint,
+      }))
+      .set('alerts', new Immutable.Map(action.subscription.alerts))
+      .set('isSubscribed', true);
+  case SET_BROWSER_SUPPORT:
+    return state.set('browserSupport', action.value);
+  case CLEAR_SUBSCRIPTION:
+    return initialState;
+  case ALERTS_CHANGE:
+    return state.setIn(action.key, action.value);
+  default:
+    return state;
+  }
+};
diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js
new file mode 100644
index 000000000..364b67066
--- /dev/null
+++ b/app/javascript/mastodon/service_worker/entry.js
@@ -0,0 +1 @@
+import './web_push_notifications';
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
new file mode 100644
index 000000000..1708aa9f7
--- /dev/null
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -0,0 +1,86 @@
+const handlePush = (event) => {
+  const options = event.data.json();
+
+  options.body = options.data.nsfw || options.data.content;
+  options.image = options.image || undefined; // Null results in a network request (404)
+  options.timestamp = options.timestamp && new Date(options.timestamp);
+
+  const expandAction = options.data.actions.find(action => action.todo === 'expand');
+
+  if (expandAction) {
+    options.actions = [expandAction];
+    options.hiddenActions = options.data.actions.filter(action => action !== expandAction);
+
+    options.data.hiddenImage = options.image;
+    options.image = undefined;
+  } else {
+    options.actions = options.data.actions;
+  }
+
+  event.waitUntil(self.registration.showNotification(options.title, options));
+};
+
+const cloneNotification = (notification) => {
+  const clone = {  };
+
+  for(var k in notification) {
+    clone[k] = notification[k];
+  }
+
+  return clone;
+};
+
+const expandNotification = (notification) => {
+  const nextNotification = cloneNotification(notification);
+
+  nextNotification.body = notification.data.content;
+  nextNotification.image = notification.data.hiddenImage;
+  nextNotification.actions = notification.data.actions.filter(action => action.todo !== 'expand');
+
+  return self.registration.showNotification(nextNotification.title, nextNotification);
+};
+
+const makeRequest = (notification, action) =>
+  fetch(action.action, {
+    headers: {
+      'Authorization': `Bearer ${notification.data.access_token}`,
+      'Content-Type': 'application/json',
+    },
+    method: action.method,
+    credentials: 'include',
+  });
+
+const removeActionFromNotification = (notification, action) => {
+  const actions = notification.actions.filter(act => act.action !== action.action);
+
+  const nextNotification = cloneNotification(notification);
+
+  nextNotification.actions = actions;
+
+  return self.registration.showNotification(nextNotification.title, nextNotification);
+};
+
+const handleNotificationClick = (event) => {
+  const reactToNotificationClick = new Promise((resolve, reject) => {
+    if (event.action) {
+      const action = event.notification.data.actions.find(({ action }) => action === event.action);
+
+      if (action.todo === 'expand') {
+        resolve(expandNotification(event.notification));
+      } else if (action.todo === 'request') {
+        resolve(makeRequest(event.notification, action)
+          .then(() => removeActionFromNotification(event.notification, action)));
+      } else {
+        reject(`Unknown action: ${action.todo}`);
+      }
+    } else {
+      event.notification.close();
+      resolve(self.clients.openWindow(event.notification.data.url));
+    }
+  });
+
+  event.waitUntil(reactToNotificationClick);
+};
+
+self.addEventListener('push', handlePush);
+self.addEventListener('notificationclick', handleNotificationClick);
diff --git a/app/javascript/mastodon/web_push_subscription.js b/app/javascript/mastodon/web_push_subscription.js
new file mode 100644
index 000000000..391d3bcec
--- /dev/null
+++ b/app/javascript/mastodon/web_push_subscription.js
@@ -0,0 +1,109 @@
+import axios from 'axios';
+import { store } from './containers/mastodon';
+import { setBrowserSupport, setSubscription, clearSubscription } from './actions/push_notifications';
+
+// Taken from https://www.npmjs.com/package/web-push
+const urlBase64ToUint8Array = (base64String) => {
+  const padding = '='.repeat((4 - base64String.length % 4) % 4);
+  const base64 = (base64String + padding)
+    .replace(/\-/g, '+')
+    .replace(/_/g, '/');
+
+  const rawData = window.atob(base64);
+  const outputArray = new Uint8Array(rawData.length);
+
+  for (let i = 0; i < rawData.length; ++i) {
+    outputArray[i] = rawData.charCodeAt(i);
+  }
+  return outputArray;
+};
+
+const getApplicationServerKey = () => document.querySelector('[name="applicationServerKey"]').getAttribute('content');
+
+const getRegistration = () => navigator.serviceWorker.ready;
+
+const getPushSubscription = (registration) =>
+  registration.pushManager.getSubscription()
+    .then(subscription => ({ registration, subscription }));
+
+const subscribe = (registration) =>
+  registration.pushManager.subscribe({
+    userVisibleOnly: true,
+    applicationServerKey: urlBase64ToUint8Array(getApplicationServerKey()),
+  });
+
+const unsubscribe = ({ registration, subscription }) =>
+  subscription ? subscription.unsubscribe().then(() => registration) : registration;
+
+const sendSubscriptionToBackend = (subscription) =>
+  axios.post('/api/web/push_subscriptions', {
+    data: subscription,
+  }).then(response => response.data);
+
+// Last one checks for payload support: https://web-push-book.gauntface.com/chapter-06/01-non-standards-browsers/#no-payload
+const supportsPushNotifications = ('serviceWorker' in navigator && 'PushManager' in window && 'getKey' in PushSubscription.prototype);
+
+export function register () {
+  store.dispatch(setBrowserSupport(supportsPushNotifications));
+
+  if (supportsPushNotifications) {
+    if (!getApplicationServerKey()) {
+      // eslint-disable-next-line no-console
+      console.error('The VAPID public key is not set. You will not be able to receive Web Push Notifications.');
+      return;
+    }
+
+    getRegistration()
+      .then(getPushSubscription)
+      .then(({ registration, subscription }) => {
+        if (subscription !== null) {
+          // We have a subscription, check if it is still valid
+          const currentServerKey = (new Uint8Array(subscription.options.applicationServerKey)).toString();
+          const subscriptionServerKey = urlBase64ToUint8Array(getApplicationServerKey()).toString();
+          const serverEndpoint = store.getState().getIn(['push_notifications', 'subscription', 'endpoint']);
+
+          // If the VAPID public key did not change and the endpoint corresponds
+          // to the endpoint saved in the backend, the subscription is valid
+          if (subscriptionServerKey === currentServerKey && subscription.endpoint === serverEndpoint) {
+            return subscription;
+          } else {
+            // Something went wrong, try to subscribe again
+            return unsubscribe({ registration, subscription }).then(subscribe).then(sendSubscriptionToBackend);
+          }
+        }
+
+        // No subscription, try to subscribe
+        return subscribe(registration).then(sendSubscriptionToBackend);
+      })
+      .then(subscription => {
+        // If we got a PushSubscription (and not a subscription object from the backend)
+        // it means that the backend subscription is valid (and was set during hydration)
+        if (!(subscription instanceof PushSubscription)) {
+          store.dispatch(setSubscription(subscription));
+        }
+      })
+      .catch(error => {
+        if (error.code === 20 && error.name === 'AbortError') {
+          // eslint-disable-next-line no-console
+          console.warn('Your browser supports Web Push Notifications, but does not seem to implement the VAPID protocol.');
+        } else if (error.code === 5 && error.name === 'InvalidCharacterError') {
+          // eslint-disable-next-line no-console
+          console.error('The VAPID public key seems to be invalid:', getApplicationServerKey());
+        }
+
+        // Clear alerts and hide UI settings
+        store.dispatch(clearSubscription());
+
+        try {
+          getRegistration()
+            .then(getPushSubscription)
+            .then(unsubscribe);
+        } catch (e) {
+
+        }
+      });
+  } else {
+    // eslint-disable-next-line no-console
+    console.warn('Your browser does not support Web Push Notifications.');
+  }
+}
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 45dd9f914..02602afa4 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2352,7 +2352,8 @@ button.icon-button.active i.fa-retweet {
   line-height: 24px;
 }
 
-.setting-toggle__label {
+.setting-toggle__label,
+.setting-meta__label {
   color: $ui-primary-color;
   display: inline-block;
   margin-bottom: 14px;
@@ -2360,6 +2361,11 @@ button.icon-button.active i.fa-retweet {
   vertical-align: middle;
 }
 
+.setting-meta__label {
+  color: $ui-primary-color;
+  float: right;
+}
+
 .empty-column-indicator,
 .error-column {
   color: lighten($ui-base-color, 20%);
diff --git a/app/javascript/styles/rtl.scss b/app/javascript/styles/rtl.scss
index a91d0d72a..4966fbc21 100644
--- a/app/javascript/styles/rtl.scss
+++ b/app/javascript/styles/rtl.scss
@@ -45,6 +45,10 @@ body.rtl {
     margin-right: 8px;
   }
 
+  .setting-meta__label {
+    float: left;
+  }
+
   .status__avatar {
     left: auto;
     right: 10px;
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb
index 887e3e3bd..7eb16af8f 100644
--- a/app/models/session_activation.rb
+++ b/app/models/session_activation.rb
@@ -3,6 +3,17 @@
 #
 # Table name: session_activations
 #
+#  id                       :integer          not null, primary key
+#  user_id                  :integer          not null
+#  session_id               :string           not null
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  user_agent               :string           default(""), not null
+#  ip                       :inet
+#  access_token_id          :integer
+#  web_push_subscription_id :integer
+#
+
 #  id              :integer          not null, primary key
 #  user_id         :integer          not null
 #  session_id      :string           not null
@@ -15,6 +26,7 @@
 
 class SessionActivation < ApplicationRecord
   belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy
+  belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy
 
   delegate :token,
            to: :access_token,
diff --git a/app/models/user.rb b/app/models/user.rb
index 86e578225..a63b1da7f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -113,6 +113,10 @@ class User < ApplicationRecord
     session_activations.active? id
   end
 
+  def web_push_subscription(session)
+    session.web_push_subscription.nil? ? nil : session.web_push_subscription.as_payload
+  end
+
   protected
 
   def send_devise_notification(notification, *args)
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
new file mode 100644
index 000000000..4440706a6
--- /dev/null
+++ b/app/models/web/push_subscription.rb
@@ -0,0 +1,190 @@
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: web_push_subscriptions
+#
+#  id         :integer          not null, primary key
+#  endpoint   :string           not null
+#  key_p256dh :string           not null
+#  key_auth   :string           not null
+#  data       :json
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+
+class Web::PushSubscription < ApplicationRecord
+  include RoutingHelper
+  include StreamEntriesHelper
+  include ActionView::Helpers::TranslationHelper
+  include ActionView::Helpers::SanitizeHelper
+
+  has_one :session_activation
+
+  before_create :send_welcome_notification
+
+  def push(notification)
+    return unless pushable? notification
+
+    name = display_name notification.from_account
+    title = title_str(name, notification)
+    body = body_str notification
+    dir = dir_str body
+    url = url_str notification
+    image = image_str notification
+    actions = actions_arr notification
+
+    access_token = actions.empty? ? nil : find_or_create_access_token(notification).token
+    nsfw = notification.target_status.nil? || notification.target_status.spoiler_text.empty? ? nil : notification.target_status.spoiler_text
+
+    # TODO: Make sure that the payload does not exceed 4KB - Webpush::PayloadTooLarge
+    # TODO: Queue the requests - Webpush::TooManyRequests
+    Webpush.payload_send(
+      message: JSON.generate(
+        title: title,
+        dir: dir,
+        image: image,
+        badge: full_asset_url('badge.png'),
+        tag: notification.id,
+        timestamp: notification.created_at,
+        icon: notification.from_account.avatar_static_url,
+        data: {
+          content: decoder.decode(strip_tags(body)),
+          nsfw: nsfw.nil? ? nil : decoder.decode(strip_tags(nsfw)),
+          url: url,
+          actions: actions,
+          access_token: access_token,
+        }
+      ),
+      endpoint: endpoint,
+      p256dh: key_p256dh,
+      auth: key_auth,
+      vapid: {
+        # subject: "mailto:#{Setting.site_contact_email}",
+        private_key: Rails.configuration.x.vapid_private_key,
+        public_key: Rails.configuration.x.vapid_public_key,
+      },
+      ttl: 40 * 60 * 60 # 48 hours
+    )
+  end
+
+  def as_payload
+    payload = {
+      id: id,
+      endpoint: endpoint,
+    }
+
+    payload[:alerts] = data['alerts'] if data && data.key?('alerts')
+
+    payload
+  end
+
+  private
+
+  def title_str(name, notification)
+    case notification.type
+    when :mention then translate('push_notifications.mention.title', name: name)
+    when :follow then translate('push_notifications.follow.title', name: name)
+    when :favourite then translate('push_notifications.favourite.title', name: name)
+    when :reblog then translate('push_notifications.reblog.title', name: name)
+    end
+  end
+
+  def body_str(notification)
+    case notification.type
+    when :mention then notification.target_status.text
+    when :follow then notification.from_account.note
+    when :favourite then notification.target_status.text
+    when :reblog then notification.target_status.text
+    end
+  end
+
+  def url_str(notification)
+    case notification.type
+    when :mention then web_url("statuses/#{notification.target_status.id}")
+    when :follow then web_url("accounts/#{notification.from_account.id}")
+    when :favourite then web_url("statuses/#{notification.target_status.id}")
+    when :reblog then web_url("statuses/#{notification.target_status.id}")
+    end
+  end
+
+  def actions_arr(notification)
+    actions =
+      case notification.type
+      when :mention then [
+        {
+          title: translate('push_notifications.mention.action_favourite'),
+          icon: full_asset_url('emoji/2764.png'),
+          todo: 'request',
+          method: 'POST',
+          action: "/api/v1/statuses/#{notification.target_status.id}/favourite",
+        },
+      ]
+      else []
+      end
+
+    should_hide = notification.type.equal?(:mention) && !notification.target_status.nil? && (notification.target_status.sensitive || !notification.target_status.spoiler_text.empty?)
+    can_boost = notification.type.equal?(:mention) && !notification.target_status.nil? && !notification.target_status.hidden?
+
+    if should_hide
+      actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('emoji/1f441.png'), todo: 'expand', action: 'expand')
+    end
+
+    if can_boost
+      actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('emoji/1f504.png'), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" }
+    end
+
+    actions
+  end
+
+  def image_str(notification)
+    return nil if notification.target_status.nil? || notification.target_status.media_attachments.empty?
+
+    full_asset_url(notification.target_status.media_attachments.first.file.url(:small))
+  end
+
+  def dir_str(body)
+    rtl?(body) ? 'rtl' : 'ltr'
+  end
+
+  def pushable?(notification)
+    data && data.key?('alerts') && data['alerts'][notification.type.to_s]
+  end
+
+  def send_welcome_notification
+    Webpush.payload_send(
+      message: JSON.generate(
+        title: translate('push_notifications.subscribed.title'),
+        icon: full_asset_url('android-chrome-192x192.png'),
+        badge: full_asset_url('badge.png'),
+        data: {
+          content: translate('push_notifications.subscribed.body'),
+          actions: [],
+          url: web_url('notifications'),
+        }
+      ),
+      endpoint: endpoint,
+      p256dh: key_p256dh,
+      auth: key_auth,
+      vapid: {
+        # subject: "mailto:#{Setting.site_contact_email}",
+        private_key: Rails.configuration.x.vapid_private_key,
+        public_key: Rails.configuration.x.vapid_public_key,
+      },
+      ttl: 5 * 60 # 5 minutes
+    )
+  end
+
+  def find_or_create_access_token(notification)
+    Doorkeeper::AccessToken.find_or_create_for(
+      Doorkeeper::Application.find_by(superapp: true),
+      notification.account.user.id,
+      Doorkeeper::OAuth::Scopes.from_string('read write follow'),
+      Doorkeeper.configuration.access_token_expires_in,
+      Doorkeeper.configuration.refresh_token_enabled?
+    )
+  end
+
+  def decoder
+    @decoder ||= HTMLEntities.new
+  end
+end
diff --git a/app/presenters/initial_state_presenter.rb b/app/presenters/initial_state_presenter.rb
index 75fef28a8..9507aad4a 100644
--- a/app/presenters/initial_state_presenter.rb
+++ b/app/presenters/initial_state_presenter.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class InitialStatePresenter < ActiveModelSerializers::Model
-  attributes :settings, :token, :current_account, :admin
+  attributes :settings, :push_subscription, :token, :current_account, :admin
 end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 6751c9411..704d29a57 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -2,7 +2,7 @@
 
 class InitialStateSerializer < ActiveModel::Serializer
   attributes :meta, :compose, :accounts,
-             :media_attachments, :settings
+             :media_attachments, :settings, :push_subscription
 
   def meta
     store = {
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 407d385ea..0ab61b634 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -61,6 +61,11 @@ class NotifyService < BaseService
     @notification.save!
     return unless @notification.browserable?
     Redis.current.publish("timeline:#{@recipient.id}", Oj.dump(event: :notification, payload: InlineRenderer.render(@notification, @recipient, :notification)))
+    send_push_notifications
+  end
+
+  def send_push_notifications
+    WebPushNotificationWorker.perform_async(@recipient.id, @notification.id)
   end
 
   def send_email
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 71dcb54c6..13ca9ea79 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,4 +1,5 @@
 - content_for :header_tags do
+  %meta{name: 'applicationServerKey', content: Rails.configuration.x.vapid_public_key}
   %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
 
   = javascript_pack_tag 'application', integrity: true, crossorigin: 'anonymous'
diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
new file mode 100644
index 000000000..0568a3e02
--- /dev/null
+++ b/app/workers/web_push_notification_worker.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class WebPushNotificationWorker
+  include Sidekiq::Worker
+
+  sidekiq_options backtrace: true
+
+  def perform(recipient_id, notification_id)
+    recipient = Account.find(recipient_id)
+    notification = Notification.find(notification_id)
+
+    sessions_with_subscriptions = recipient.user.session_activations.reject { |session| session.web_push_subscription.nil? }
+
+    sessions_with_subscriptions.each do |session|
+      begin
+        session.web_push_subscription.push(notification)
+      rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
+        # Subscription expiration is not currently implemented in any browser
+        session.web_push_subscription.destroy!
+        session.web_push_subscription = nil
+        session.save!
+      rescue Webpush::PayloadTooLarge => e
+        Rails.logger.error(e)
+      end
+    end
+  end
+end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 406fa970b..4c60965c8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -31,6 +31,11 @@ Rails.application.configure do
     config.logger = ActiveSupport::TaggedLogging.new(logger)
   end
 
+  # Generate random VAPID keys
+  vapid_key = Webpush.generate_key
+  config.x.vapid_private_key = vapid_key.private_key
+  config.x.vapid_public_key = vapid_key.public_key
+
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
diff --git a/config/environments/test.rb b/config/environments/test.rb
index bde69eba1..e68cb156d 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -40,6 +40,11 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
+  # Generate random VAPID keys
+  vapid_key = Webpush.generate_key
+  config.x.vapid_private_key = vapid_key.private_key
+  config.x.vapid_public_key = vapid_key.public_key
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 end
diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb
new file mode 100644
index 000000000..74e07377c
--- /dev/null
+++ b/config/initializers/vapid.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+Rails.application.configure do
+
+  # You can generate the keys using the following command (first is the private key, second is the public one)
+  # You should only generate this once per instance. If you later decide to change it, all push subscription will
+  # be invalidated, requiring the users to access the website again to resubscribe.
+  #
+  # ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;"
+  #
+  # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
+
+  if Rails.env.production?
+    config.x.vapid_private_key = ENV['VAPID_PRIVATE_KEY']
+    config.x.vapid_public_key = ENV['VAPID_PUBLIC_KEY']
+  end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c9b5d9ab8..79efddfad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -335,6 +335,21 @@ en:
     next: Next
     prev: Prev
     truncate: "&hellip;"
+  push_notifications:
+    favourite:
+      title: "%{name} favourited your status"
+    follow:
+      title: "%{name} is now following you"
+    mention:
+      action_boost: 'Boost'
+      action_expand: 'Show more'
+      action_favourite: 'Favourite'
+      title: "%{name} mentioned you"
+    reblog:
+      title: "%{name} boosted your status"
+    subscribed:
+      body: "You can now receive push notifications."
+      title: "Subscription registered!"
   remote_follow:
     acct: Enter your username@domain you want to follow from
     missing_resource: Could not find the required redirect URL for your account
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index dc5aa716b..f9d69745f 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -339,6 +339,21 @@ pl:
     next: Następna
     prev: Poprzednia
     truncate: "&hellip;"
+  push_notifications:
+    favourite:
+      title: "%{name} dodał Twój status do ulubionych"
+    follow:
+      title: "%{name} zaczął Cię śledzić"
+    mention:
+      action_boost: 'Podbij'
+      action_expand: 'Pokaż więcej'
+      action_favourite: 'Dodaj do ulubionych'
+      title: "%{name} wspomniał o Tobie"
+    reblog:
+      title: "%{name} podbił Twój status"
+    subscribed:
+      body: "Otrzymujesz teraz powiadomienia push."
+      title: "Zarejestrowano subskrypcję!"
   remote_follow:
     acct: Podaj swój adres (nazwa@domena), z którego chcesz śledzić
     missing_resource: Nie udało się znaleźć adresu przekierowania z Twojej domeny
diff --git a/config/routes.rb b/config/routes.rb
index 963fedcb4..9171d02d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -206,6 +206,11 @@ Rails.application.routes.draw do
 
     namespace :web do
       resource :settings, only: [:update]
+      resources :push_subscriptions, only: [:create] do
+        member do
+          put :update
+        end
+      end
     end
   end
 
diff --git a/config/webpack/production.js b/config/webpack/production.js
index 303fca81b..4592db89e 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -5,6 +5,9 @@ const merge = require('webpack-merge');
 const CompressionPlugin = require('compression-webpack-plugin');
 const sharedConfig = require('./shared.js');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
+const OfflinePlugin = require('offline-plugin');
+const { publicPath } = require('./configuration.js');
+const path = require('path');
 
 module.exports = merge(sharedConfig, {
   output: { filename: '[name]-[chunkhash].js' },
@@ -39,5 +42,16 @@ module.exports = merge(sharedConfig, {
       openAnalyzer: false,
       logLevel: 'silent', // do not bother Webpacker, who runs with --json and parses stdout
     }),
+    new OfflinePlugin({
+      publicPath: publicPath, // sw.js must be served from the root to avoid scope issues
+      caches: { }, // do not cache things, we only use it for push notifications for now
+      ServiceWorker: {
+        entry: path.join(__dirname, '../../app/javascript/mastodon/service_worker/entry.js'),
+        cacheName: 'mastodon',
+        output: '../sw.js',
+        publicPath: '/sw.js',
+        minify: true,
+      },
+    }),
   ],
 });
diff --git a/db/migrate/20170713175513_create_web_push_subscriptions.rb b/db/migrate/20170713175513_create_web_push_subscriptions.rb
new file mode 100644
index 000000000..4e5c2ba00
--- /dev/null
+++ b/db/migrate/20170713175513_create_web_push_subscriptions.rb
@@ -0,0 +1,12 @@
+class CreateWebPushSubscriptions < ActiveRecord::Migration[5.1]
+  def change
+    create_table :web_push_subscriptions do |t|
+      t.string :endpoint, null: false
+      t.string :key_p256dh, null: false
+      t.string :key_auth, null: false
+      t.json :data
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb b/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
new file mode 100644
index 000000000..d69cdfa50
--- /dev/null
+++ b/db/migrate/20170713190709_add_web_push_subscription_to_session_activations.rb
@@ -0,0 +1,5 @@
+class AddWebPushSubscriptionToSessionActivations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :session_activations, :web_push_subscription_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d6e572703..b2c59a0f6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170713112503) do
+ActiveRecord::Schema.define(version: 20170713190709) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -258,6 +258,7 @@ ActiveRecord::Schema.define(version: 20170713112503) do
     t.string "user_agent", default: "", null: false
     t.inet "ip"
     t.integer "access_token_id"
+    t.integer "web_push_subscription_id"
     t.index ["session_id"], name: "index_session_activations_on_session_id", unique: true
     t.index ["user_id"], name: "index_session_activations_on_user_id"
   end
@@ -371,6 +372,15 @@ ActiveRecord::Schema.define(version: 20170713112503) do
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
+  create_table "web_push_subscriptions", force: :cascade do |t|
+    t.string "endpoint", null: false
+    t.string "key_p256dh", null: false
+    t.string "key_auth", null: false
+    t.json "data"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "web_settings", id: :serial, force: :cascade do |t|
     t.integer "user_id"
     t.json "data"
diff --git a/package.json b/package.json
index 004c4d1f5..1aaa243c8 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "node-sass": "^4.5.2",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
+    "offline-plugin": "^4.8.3",
     "path-complete-extname": "^0.1.0",
     "pg": "^6.4.0",
     "postcss-loader": "^2.0.6",
diff --git a/public/badge.png b/public/badge.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc1f42dca135ab028fbf3194a74329eb7c5103ee
GIT binary patch
literal 31156
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
XmIvNiJ9t$G00000NkvXXu0mjfv<>6{

literal 0
HcmV?d00001

diff --git a/spec/controllers/api/web/push_subscriptions_controller_spec.rb b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
new file mode 100644
index 000000000..871176a07
--- /dev/null
+++ b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Api::Web::PushSubscriptionsController do
+  render_views
+
+  let(:user) { Fabricate(:user) }
+
+  let(:create_payload) do
+    {
+      data: {
+        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
+        keys: {
+          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
+          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+        },
+      }
+    }
+  end
+
+  let(:alerts_payload) do
+    {
+      data: {
+        alerts: {
+          follow: true,
+          favourite: false,
+          reblog: true,
+          mention: false,
+        }
+      }
+    }
+  end
+
+  describe 'POST #create' do
+    it 'saves push subscriptions' do
+      sign_in(user)
+
+      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
+
+      post :create, format: :json, params: create_payload
+
+      user.reload
+
+      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint])
+
+      expect(push_subscription['endpoint']).to eq(create_payload[:data][:endpoint])
+      expect(push_subscription['key_p256dh']).to eq(create_payload[:data][:keys][:p256dh])
+      expect(push_subscription['key_auth']).to eq(create_payload[:data][:keys][:auth])
+    end
+
+    it 'sends welcome notification' do
+      sign_in(user)
+
+      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
+
+      post :create, format: :json, params: create_payload
+    end
+  end
+
+  describe 'PUT #update' do
+    it 'changes alert settings' do
+      sign_in(user)
+
+      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
+
+      post :create, format: :json, params: create_payload
+
+      alerts_payload[:id] = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint]).id
+
+      put :update, format: :json, params: alerts_payload
+
+      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint])
+
+      expect(push_subscription.data['follow']).to eq(alerts_payload[:data][:follow])
+      expect(push_subscription.data['favourite']).to eq(alerts_payload[:data][:favourite])
+      expect(push_subscription.data['reblog']).to eq(alerts_payload[:data][:reblog])
+      expect(push_subscription.data['mention']).to eq(alerts_payload[:data][:mention])
+    end
+  end
+end
diff --git a/spec/fabricators/web_push_subscription_fabricator.rb b/spec/fabricators/web_push_subscription_fabricator.rb
new file mode 100644
index 000000000..72d11b77c
--- /dev/null
+++ b/spec/fabricators/web_push_subscription_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:web_push_subscription) do
+  endpoint   Faker::Internet.url
+  key_p256dh Faker::Internet.password
+  key_auth   Faker::Internet.password
+end
diff --git a/spec/models/web/push_subscription_spec.rb b/spec/models/web/push_subscription_spec.rb
new file mode 100644
index 000000000..574da55ac
--- /dev/null
+++ b/spec/models/web/push_subscription_spec.rb
@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+RSpec.describe Web::PushSubscription, type: :model do
+  let(:alerts) { { mention: true, reblog: false, follow: true, follow_request: false, favourite: true } }
+  let(:payload_no_alerts) { Web::PushSubscription.new(id: 1, endpoint: 'a', key_p256dh: 'c', key_auth: 'd').as_payload }
+  let(:payload_alerts) { Web::PushSubscription.new(id: 1, endpoint: 'a', key_p256dh: 'c', key_auth: 'd', data: { alerts: alerts }).as_payload }
+  let(:push_subscription) { Web::PushSubscription.new(data: { alerts: alerts }) }
+
+  describe '#as_payload' do
+    it 'only returns id and endpoint' do
+      expect(payload_no_alerts.keys).to eq [:id, :endpoint]
+    end
+
+    it 'returns alerts if set' do
+      expect(payload_alerts.keys).to eq [:id, :endpoint, :alerts]
+    end
+  end
+
+  describe '#pushable?' do
+    it 'obeys alert settings' do
+      expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'Mention'))).to eq true
+      expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'Status'))).to eq false
+      expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'Follow'))).to eq true
+      expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'FollowRequest'))).to eq false
+      expect(push_subscription.send(:pushable?, Notification.new(activity_type: 'Favourite'))).to eq true
+    end
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index 13c3f4951..812a0721a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2209,7 +2209,7 @@ deep-equal@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
 
-deep-extend@~0.4.0:
+deep-extend@^0.4.0, deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
 
@@ -2416,7 +2416,7 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.6:
+ejs@^2.3.4, ejs@^2.5.6:
   version "2.5.6"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.6.tgz#479636bfa3fe3b1debd52087f0acb204b4f19c88"
 
@@ -4059,6 +4059,15 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
+loader-utils@0.2.x:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
 loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
@@ -4419,7 +4428,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
@@ -4760,6 +4769,16 @@ obuf@^1.0.0, obuf@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.1.tgz#104124b6c602c6796881a042541d36db43a5264e"
 
+offline-plugin@^4.8.3:
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/offline-plugin/-/offline-plugin-4.8.3.tgz#9e95bd342ea2ac836b001b81f204c40638694d6c"
+  dependencies:
+    deep-extend "^0.4.0"
+    ejs "^2.3.4"
+    loader-utils "0.2.x"
+    minimatch "^3.0.3"
+    slash "^1.0.0"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"

From a9a0c854e1df8fbc682eeb059fc68e8dbdbb5bde Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 13 Jul 2017 22:18:18 +0200
Subject: [PATCH 225/382] fix(components/media_modal): Style issues (#4187)

---
 .../components/extended_video_player.js       |  4 +++-
 .../features/ui/components/media_modal.js     | 20 +++++++++----------
 app/javascript/styles/components.scss         |  8 ++++++++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/javascript/mastodon/components/extended_video_player.js b/app/javascript/mastodon/components/extended_video_player.js
index 4c62fa7b3..b38a4b8ff 100644
--- a/app/javascript/mastodon/components/extended_video_player.js
+++ b/app/javascript/mastodon/components/extended_video_player.js
@@ -5,6 +5,8 @@ export default class ExtendedVideoPlayer extends React.PureComponent {
 
   static propTypes = {
     src: PropTypes.string.isRequired,
+    width: PropTypes.number,
+    height: PropTypes.number,
     time: PropTypes.number,
     controls: PropTypes.bool.isRequired,
     muted: PropTypes.bool.isRequired,
@@ -30,7 +32,7 @@ export default class ExtendedVideoPlayer extends React.PureComponent {
 
   render () {
     return (
-      <div className='extended-video-player'>
+      <div className='extended-video-player' style={{ width: this.props.width, height: this.props.height }}>
         <video
           ref={this.setRef}
           src={this.props.src}
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index d869fffa6..dcc9becd3 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.js
+++ b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -65,8 +65,6 @@ export default class MediaModal extends ImmutablePureComponent {
     const { media, intl, onClose } = this.props;
 
     const index = this.getIndex();
-    const attachment = media.get(index);
-    const url = attachment.get('url');
 
     let leftNav, rightNav, content;
 
@@ -77,16 +75,18 @@ export default class MediaModal extends ImmutablePureComponent {
       rightNav = <div role='button' tabIndex='0' className='modal-container__nav  modal-container__nav--right' onClick={this.handleNextClick}><i className='fa fa-fw fa-chevron-right' /></div>;
     }
 
-    if (attachment.get('type') === 'image') {
-      content = media.map((image) => {
-        const width  = image.getIn(['meta', 'original', 'width']) || null;
-        const height = image.getIn(['meta', 'original', 'height']) || null;
+    content = media.map((image) => {
+      const width  = image.getIn(['meta', 'original', 'width']) || null;
+      const height = image.getIn(['meta', 'original', 'height']) || null;
 
+      if (image.get('type') === 'image') {
         return <ImageLoader previewSrc={image.get('preview_url')} src={image.get('url')} width={width} height={height} key={image.get('preview_url')} />;
-      }).toArray();
-    } else if (attachment.get('type') === 'gifv') {
-      content = <ExtendedVideoPlayer src={url} muted controls={false} />;
-    }
+      } else if (image.get('type') === 'gifv') {
+        return <ExtendedVideoPlayer src={image.get('url')} muted controls={false} width={width} height={height} key={image.get('preview_url')} />;
+      }
+
+      return null;
+    }).toArray();
 
     return (
       <div className='modal-root__modal media-modal'>
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 02602afa4..bcf7ba4e0 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2957,6 +2957,7 @@ button.icon-button.active i.fa-retweet {
   max-height: 80vh;
   position: relative;
 
+  .extended-video-player,
   img,
   canvas,
   video {
@@ -2966,6 +2967,13 @@ button.icon-button.active i.fa-retweet {
     height: auto;
   }
 
+  .extended-video-player,
+  video {
+    display: flex;
+    width: 80vw;
+    height: 80vh;
+  }
+
   img,
   canvas {
     display: block;

From a9067167bb368b1692bdd1ceea216b9215275ee2 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 14 Jul 2017 00:49:01 +0200
Subject: [PATCH 226/382] Improve swiping (#4188)

* feat(components/columns_area): Toggle animation settings

* fix(components/media_modal): Center non-visible views

* fix(components/media_modal): Check for null

* refactor(columns_area): Better logic
---
 .../features/ui/components/columns_area.js    | 20 +++++++++++++------
 app/javascript/styles/components.scss         |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index cbc185a7d..ef9a15522 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -32,12 +32,19 @@ export default class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
+  componentDidUpdate() {
+    this.lastIndex = getIndex(this.context.router.history.location.pathname);
+  }
+
   handleSwipe = (index) => {
-    window.requestAnimationFrame(() => {
-      window.requestAnimationFrame(() => {
-        this.context.router.history.push(getLink(index));
-      });
-    });
+    this.pendingIndex = index;
+  }
+
+  handleAnimationEnd = () => {
+    if (typeof this.pendingIndex === 'number') {
+      this.context.router.history.push(getLink(this.pendingIndex));
+      this.pendingIndex = null;
+    }
   }
 
   renderView = (link, index) => {
@@ -68,10 +75,11 @@ export default class ColumnsArea extends ImmutablePureComponent {
     const { columns, children, singleColumn } = this.props;
 
     const columnIndex = getIndex(this.context.router.history.location.pathname);
+    const shouldAnimate = Math.abs(this.lastIndex - columnIndex) === 1;
 
     if (singleColumn) {
       return columnIndex !== -1 ? (
-        <ReactSwipeableViews index={columnIndex} onChangeIndex={this.handleSwipe} animateTransitions={false} style={{ height: '100%' }}>
+        <ReactSwipeableViews index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
           {links.map(this.renderView)}
         </ReactSwipeableViews>
       ) : <div className='columns-area'>{children}</div>;
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index bcf7ba4e0..0face646d 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1312,6 +1312,8 @@
 }
 
 .react-swipeable-view-container > * {
+  display: flex;
+  align-items: center;
   height: 100%;
 }
 

From eeb5923e89c1b9040df37db8709e3450713c6019 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Fri, 14 Jul 2017 08:59:34 +0900
Subject: [PATCH 227/382] Add object-fit polyfill for Edge (#4182)

---
 .postcssrc.yml                             |  1 +
 app/javascript/mastodon/extra_polyfills.js |  3 +
 app/javascript/mastodon/load_polyfills.js  |  5 +-
 package.json                               |  2 +
 yarn.lock                                  | 66 +++++++++++++++++++++-
 5 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/.postcssrc.yml b/.postcssrc.yml
index 220fe0bb9..efffb39ba 100644
--- a/.postcssrc.yml
+++ b/.postcssrc.yml
@@ -6,3 +6,4 @@ plugins:
       - last 2 versions
       - IE >= 11
       - iOS >= 9
+  postcss-object-fit-images: {}
diff --git a/app/javascript/mastodon/extra_polyfills.js b/app/javascript/mastodon/extra_polyfills.js
index 546b693b1..3acc55abd 100644
--- a/app/javascript/mastodon/extra_polyfills.js
+++ b/app/javascript/mastodon/extra_polyfills.js
@@ -1,2 +1,5 @@
 import 'intersection-observer';
 import 'requestidlecallback';
+import objectFitImages  from 'object-fit-images';
+
+objectFitImages();
diff --git a/app/javascript/mastodon/load_polyfills.js b/app/javascript/mastodon/load_polyfills.js
index bc5468595..df7889118 100644
--- a/app/javascript/mastodon/load_polyfills.js
+++ b/app/javascript/mastodon/load_polyfills.js
@@ -20,11 +20,12 @@ function loadPolyfills() {
   );
 
   // Latest version of Firefox and Safari do not have IntersectionObserver.
-  // Edge does not have requestIdleCallback.
+  // Edge does not have requestIdleCallback and object-fit CSS property.
   // This avoids shipping them all the polyfills.
   const needsExtraPolyfills = !(
     window.IntersectionObserver &&
-    window.requestIdleCallback
+    window.requestIdleCallback &&
+    'object-fit' in (new Image()).style
   );
 
   return Promise.all([
diff --git a/package.json b/package.json
index 1aaa243c8..5ad576dad 100644
--- a/package.json
+++ b/package.json
@@ -67,10 +67,12 @@
     "node-sass": "^4.5.2",
     "npmlog": "^4.1.2",
     "object-assign": "^4.1.1",
+    "object-fit-images": "^3.2.3",
     "offline-plugin": "^4.8.3",
     "path-complete-extname": "^0.1.0",
     "pg": "^6.4.0",
     "postcss-loader": "^2.0.6",
+    "postcss-object-fit-images": "^1.1.2",
     "postcss-smart-import": "^0.7.5",
     "precss": "^2.0.0",
     "prop-types": "^15.5.10",
diff --git a/yarn.lock b/yarn.lock
index 812a0721a..56a9f7798 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2030,12 +2030,38 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
+css-font-size-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz#854875ace9aca6a8d2ee0d345a44aae9bb6db6cb"
+
+css-font-stretch-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz#50cee9b9ba031fb5c952d4723139f1e107b54b10"
+
+css-font-style-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz#5c3532813f63b4a1de954d13cea86ab4333409e4"
+
+css-font-weight-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz#9bc04671ac85bc724b574ef5d3ac96b0d604fd97"
+
+css-global-keywords@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-global-keywords/-/css-global-keywords-1.0.1.tgz#72a9aea72796d019b1d2a3252de4e5aaa37e4a69"
+
 css-in-js-utils@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/css-in-js-utils/-/css-in-js-utils-1.0.3.tgz#9ac7e02f763cf85d94017666565ed68a5b5f3215"
   dependencies:
     hyphenate-style-name "^1.0.2"
 
+css-list-helpers@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-list-helpers/-/css-list-helpers-1.0.1.tgz#fff57192202db83240c41686f919e449a7024f7d"
+  dependencies:
+    tcomb "^2.5.0"
+
 css-loader@^0.28.1, css-loader@^0.28.4:
   version "0.28.4"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.4.tgz#6cf3579192ce355e8b38d5f42dd7a1f2ec898d0f"
@@ -2072,6 +2098,10 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
+css-system-font-keywords@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz#85c6f086aba4eb32c571a3086affc434b84823ed"
+
 css-what@2.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
@@ -4713,6 +4743,10 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
+object-fit-images@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.3.tgz#4089f6d0070a3b5563d3c1ab6f1b28d61331f0ac"
+
 object-is@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
@@ -4896,6 +4930,20 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
+parse-css-font@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/parse-css-font/-/parse-css-font-2.0.2.tgz#7b60b060705a25a9b90b7f0ed493e5823248a652"
+  dependencies:
+    css-font-size-keywords "^1.0.0"
+    css-font-stretch-keywords "^1.0.1"
+    css-font-style-keywords "^1.0.1"
+    css-font-weight-keywords "^1.0.0"
+    css-global-keywords "^1.0.1"
+    css-list-helpers "^1.0.1"
+    css-system-font-keywords "^1.0.0"
+    tcomb "^2.5.0"
+    unquote "^1.1.0"
+
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -5381,6 +5429,14 @@ postcss-normalize-url@^3.0.7:
     postcss "^5.0.14"
     postcss-value-parser "^3.2.3"
 
+postcss-object-fit-images@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-object-fit-images/-/postcss-object-fit-images-1.1.2.tgz#8b773043db14672ef6cd6f2cb1f0d8b26a9f573b"
+  dependencies:
+    parse-css-font "^2.0.2"
+    postcss "^5.0.16"
+    quote "^0.4.0"
+
 postcss-ordered-values@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
@@ -5694,6 +5750,10 @@ querystringify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-1.0.0.tgz#6286242112c5b712fa654e526652bf6a13ff05cb"
 
+quote@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/quote/-/quote-0.4.0.tgz#10839217f6c1362b89194044d29b233fd7f32f01"
+
 raf@^3.1.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/raf/-/raf-3.3.2.tgz#0c13be0b5b49b46f76d6669248d527cf2b02fe27"
@@ -6973,7 +7033,7 @@ tar@^2.0.0, tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-tcomb@^2.5.1:
+tcomb@^2.5.0, tcomb@^2.5.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tcomb/-/tcomb-2.7.0.tgz#10d62958041669a5d53567b9a4ee8cde22b1c2b0"
 
@@ -7147,6 +7207,10 @@ unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 
+unquote@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.0.tgz#98e1fc608b6b854c75afb1b95afc099ba69d942f"
+
 urix@^0.1.0, urix@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

From 27b2355738482a2e470281136bfe902ad6c78db8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 03:51:17 +0200
Subject: [PATCH 228/382] Fix #3904 - Adjustable time period for
 mastodon:media:remove_remote via NUM_DAYS (#4191)

---
 lib/tasks/mastodon.rake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index b2b352858..1b05ece33 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -85,9 +85,11 @@ namespace :mastodon do
       MediaAttachment.where(account: Account.silenced).find_each(&:destroy)
     end
 
-    desc 'Remove cached remote media attachments that are older than a week'
+    desc 'Remove cached remote media attachments that are older than NUM_DAYS. By default 7 (week)'
     task remove_remote: :environment do
-      MediaAttachment.where.not(remote_url: '').where('created_at < ?', 1.week.ago).find_each do |media|
+      time_ago = ENV.fetch('NUM_DAYS') { 7 }.to_i.days.ago
+
+      MediaAttachment.where.not(remote_url: '').where('created_at < ?', time_ago).find_each do |media|
         media.file.destroy
         media.type = :unknown
         media.save

From a49be27145a858a51e1b9104b0ebc5f63a03b81b Mon Sep 17 00:00:00 2001
From: masarakki <masaki182@gmail.com>
Date: Fri, 14 Jul 2017 18:02:49 +0900
Subject: [PATCH 229/382] add validation to tag name (#4194)

---
 app/models/tag.rb       |  5 +++--
 spec/models/tag_spec.rb | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/models/tag.rb b/app/models/tag.rb
index a14e2cc98..0fa08e157 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -12,9 +12,10 @@
 class Tag < ApplicationRecord
   has_and_belongs_to_many :statuses
 
-  HASHTAG_RE = /(?:^|[^\/\)\w])#([[:word:]_]*[[:alpha:]_][[:word:]_]*)/i
+  HASHTAG_NAME_RE = '[[:word:]_]*[[:alpha:]_][[:word:]_]*'
+  HASHTAG_RE = /(?:^|[^\/\)\w])#(#{HASHTAG_NAME_RE})/i
 
-  validates :name, presence: true, uniqueness: true
+  validates :name, presence: true, uniqueness: true, format: { with: /\A#{HASHTAG_NAME_RE}\z/i }
 
   def to_param
     name
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 555474c44..f727fa1dd 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -1,6 +1,24 @@
 require 'rails_helper'
 
 RSpec.describe Tag, type: :model do
+  describe 'validations' do
+    it 'invalid with #' do
+      expect(Tag.new(name: '#hello_world')).to_not be_valid
+    end
+
+    it 'invalid with .' do
+      expect(Tag.new(name: '.abcdef123')).to_not be_valid
+    end
+
+    it 'invalid with spaces' do
+      expect(Tag.new(name: 'hello world')).to_not be_valid
+    end
+
+    it 'valid with ａｅｓｔｈｅｔｉｃ' do
+      expect(Tag.new(name: 'ａｅｓｔｈｅｔｉｃ')).to be_valid
+    end
+  end
+
   describe 'HASHTAG_RE' do
     subject { Tag::HASHTAG_RE }
 

From 87b96f8d339ff7998fc9a357f979f86cc38ad33e Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 14 Jul 2017 18:03:01 +0900
Subject: [PATCH 230/382] Add Japanese translations for #3243 (#4192)

---
 app/javascript/mastodon/locales/ar.json         |  3 +++
 app/javascript/mastodon/locales/bg.json         |  3 +++
 app/javascript/mastodon/locales/ca.json         |  3 +++
 app/javascript/mastodon/locales/de.json         |  3 +++
 .../mastodon/locales/defaultMessages.json       | 17 +++++++++++++++++
 app/javascript/mastodon/locales/en.json         |  3 +++
 app/javascript/mastodon/locales/eo.json         |  3 +++
 app/javascript/mastodon/locales/es.json         |  3 +++
 app/javascript/mastodon/locales/fa.json         |  3 +++
 app/javascript/mastodon/locales/fi.json         |  3 +++
 app/javascript/mastodon/locales/fr.json         |  3 +++
 app/javascript/mastodon/locales/he.json         |  3 +++
 app/javascript/mastodon/locales/hr.json         |  3 +++
 app/javascript/mastodon/locales/hu.json         |  3 +++
 app/javascript/mastodon/locales/id.json         |  3 +++
 app/javascript/mastodon/locales/io.json         |  3 +++
 app/javascript/mastodon/locales/it.json         |  3 +++
 app/javascript/mastodon/locales/ja.json         |  3 +++
 app/javascript/mastodon/locales/ko.json         |  3 +++
 app/javascript/mastodon/locales/nl.json         |  3 +++
 app/javascript/mastodon/locales/no.json         |  3 +++
 app/javascript/mastodon/locales/oc.json         |  3 +++
 app/javascript/mastodon/locales/pl.json         |  3 +++
 app/javascript/mastodon/locales/pt-BR.json      |  3 +++
 app/javascript/mastodon/locales/pt.json         |  3 +++
 app/javascript/mastodon/locales/ru.json         |  3 +++
 app/javascript/mastodon/locales/th.json         |  3 +++
 app/javascript/mastodon/locales/tr.json         |  3 +++
 app/javascript/mastodon/locales/uk.json         |  3 +++
 app/javascript/mastodon/locales/zh-CN.json      |  3 +++
 app/javascript/mastodon/locales/zh-HK.json      |  3 +++
 app/javascript/mastodon/locales/zh-TW.json      |  3 +++
 config/locales/ja.yml                           | 15 +++++++++++++++
 33 files changed, 125 insertions(+)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 6992e7e0f..7b890ce64 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "المُفَضَّلة :",
   "notifications.column_settings.follow": "متابعُون جُدُد :",
   "notifications.column_settings.mention": "الإشارات :",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "الترقيّات:",
   "notifications.column_settings.show": "إعرِضها في عمود",
   "notifications.column_settings.sound": "أصدر صوتا",
@@ -147,6 +149,7 @@
   "report.target": "إبلاغ",
   "search.placeholder": "ابحث",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "تعذرت ترقية هذا المنشور",
   "status.delete": "إحذف",
   "status.favourite": "أضف إلى المفضلة",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 7a56e1446..0cf6bf3ac 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Предпочитани:",
   "notifications.column_settings.follow": "Нови последователи:",
   "notifications.column_settings.mention": "Споменавания:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Споделяния:",
   "notifications.column_settings.show": "Покажи в колона",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Търсене",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Изтриване",
   "status.favourite": "Предпочитани",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index b2673915a..1e44d6fa5 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorits:",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.mention": "Mencions:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Mostrar en la columna",
   "notifications.column_settings.sound": "Reproduïr so",
@@ -147,6 +149,7 @@
   "report.target": "Informes",
   "search.placeholder": "Cercar",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Aquesta publicació no pot ser retootejada",
   "status.delete": "Esborrar",
   "status.favourite": "Favorit",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 4b62403c3..f73011e73 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorisierungen:",
   "notifications.column_settings.follow": "Neue Folgende:",
   "notifications.column_settings.mention": "Erwähnungen:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
   "notifications.column_settings.show": "In der Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
@@ -147,6 +149,7 @@
   "report.target": "Melden",
   "search.placeholder": "Suche",
   "search_results.total": "{count, number} {count, plural, one {Ergebnis} other {Ergebnisse}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Löschen",
   "status.favourite": "Favorisieren",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 7c1522299..aaa558c0e 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -861,6 +861,14 @@
         "defaultMessage": "Play sound",
         "id": "notifications.column_settings.sound"
       },
+      {
+        "defaultMessage": "Push notifications",
+        "id": "notifications.column_settings.push"
+      },
+      {
+        "defaultMessage": "This device",
+        "id": "notifications.column_settings.push_meta"
+      },
       {
         "defaultMessage": "New followers:",
         "id": "notifications.column_settings.follow"
@@ -936,6 +944,15 @@
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "A look inside...",
+        "id": "standalone.public_title"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/standalone/public_timeline/index.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 778f33269..15afe2309 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting {target}",
   "search.placeholder": "Search",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
   "status.favourite": "Favourite",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 2648a6840..4f9e26c25 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoroj:",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.mention": "Mencioj:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolono",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Serĉi",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Forigi",
   "status.favourite": "Favori",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index c42930380..64ba78716 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.mention": "Menciones:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Retoots:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Buscar",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Borrar",
   "status.favourite": "Favorito",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index c9f1888b5..306937cc2 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "پسندیده‌ها:",
   "notifications.column_settings.follow": "پیگیران تازه:",
   "notifications.column_settings.mention": "نام‌بردن‌ها:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "بازبوق‌ها:",
   "notifications.column_settings.show": "نمایش در ستون",
   "notifications.column_settings.sound": "پخش صدا",
@@ -147,6 +149,7 @@
   "report.target": "گزارش‌دادن",
   "search.placeholder": "جستجو",
   "search_results.total": "{count, number} {count, plural, one {نتیجه} other {نتیجه}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "این نوشته را نمی‌شود بازبوقید",
   "status.delete": "پاک‌کردن",
   "status.favourite": "پسندیدن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index b836d2f5d..1b17fb155 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Tykkäyksiä:",
   "notifications.column_settings.follow": "Uusia seuraajia:",
   "notifications.column_settings.mention": "Mainintoja:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Buusteja:",
   "notifications.column_settings.show": "Näytä sarakkeessa",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Hae",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Poista",
   "status.favourite": "Tykkää",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index eaa01638c..ea69532dd 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonn⋅é⋅s :",
   "notifications.column_settings.mention": "Mentions :",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Émettre un son",
@@ -147,6 +149,7 @@
   "report.target": "Signalement",
   "search.placeholder": "Rechercher",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.delete": "Effacer",
   "status.favourite": "Ajouter aux favoris",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 98c7ea021..8b63bd26b 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "מחובבים:",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.mention": "פניות:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
@@ -147,6 +149,7 @@
   "report.target": "דיווח",
   "search.placeholder": "חיפוש",
   "search_results.total": "{count, number} {count, plural, one {תוצאה} other {תוצאות}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "לא ניתן להדהד הודעה זו",
   "status.delete": "מחיקה",
   "status.favourite": "חיבוב",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index fdf5c11c0..165e3088f 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoriti:",
   "notifications.column_settings.follow": "Novi sljedbenici:",
   "notifications.column_settings.mention": "Spominjanja:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Prikaži u stupcu",
   "notifications.column_settings.sound": "Sviraj zvuk",
@@ -147,6 +149,7 @@
   "report.target": "Prijavljivanje",
   "search.placeholder": "Traži",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Ovaj post ne može biti podignut",
   "status.delete": "Obriši",
   "status.favourite": "Označi omiljenim",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index baf762c8d..71dcce505 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Keresés",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Törlés",
   "status.favourite": "Kedvenc",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 6f6d688e9..0c21877d8 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorit:",
   "notifications.column_settings.follow": "Pengikut baru:",
   "notifications.column_settings.mention": "Balasan:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boost:",
   "notifications.column_settings.show": "Tampilkan dalam kolom",
   "notifications.column_settings.sound": "Mainkan suara",
@@ -147,6 +149,7 @@
   "report.target": "Melaporkan",
   "search.placeholder": "Pencarian",
   "search_results.total": "{count} {count, plural, one {hasil} other {hasil}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Hapus",
   "status.favourite": "Difavoritkan",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 25e0adc8a..788d09f34 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorati:",
   "notifications.column_settings.follow": "Nova sequanti:",
   "notifications.column_settings.mention": "Mencioni:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Repeti:",
   "notifications.column_settings.show": "Montrar en kolumno",
   "notifications.column_settings.sound": "Plear sono",
@@ -147,6 +149,7 @@
   "report.target": "Denuncante",
   "search.placeholder": "Serchez",
   "search_results.total": "{count, number} {count, plural, one {rezulto} other {rezulti}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Efacar",
   "status.favourite": "Favorizar",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 4881b0f08..9176bfaaf 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Apprezzati:",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.mention": "Menzioni:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Post condivisi:",
   "notifications.column_settings.show": "Mostra in colonna",
   "notifications.column_settings.sound": "Riproduci suono",
@@ -147,6 +149,7 @@
   "report.target": "Invio la segnalazione",
   "search.placeholder": "Cerca",
   "search_results.total": "{count} {count, plural, one {risultato} other {risultati}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Elimina",
   "status.favourite": "Apprezzato",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f62072852..a686cdc03 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "お気に入り",
   "notifications.column_settings.follow": "新しいフォロワー",
   "notifications.column_settings.mention": "返信",
+  "notifications.column_settings.push": "プッシュ通知",
+  "notifications.column_settings.push_meta": "このデバイス",
   "notifications.column_settings.reblog": "ブースト",
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
@@ -147,6 +149,7 @@
   "report.target": "問題のユーザー",
   "search.placeholder": "検索",
   "search_results.total": "{count, number}件の結果",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.delete": "削除",
   "status.favourite": "お気に入り",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 5e1aaac85..0b47cc990 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "즐겨찾기",
   "notifications.column_settings.follow": "새 팔로워",
   "notifications.column_settings.mention": "답글",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "부스트",
   "notifications.column_settings.show": "컬럼에 표시",
   "notifications.column_settings.sound": "효과음 재생",
@@ -147,6 +149,7 @@
   "report.target": "문제가 된 사용자",
   "search.placeholder": "검색",
   "search_results.total": "{count, number}건의 결과",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "이 포스트는 부스트 할 수 없습니다",
   "status.delete": "삭제",
   "status.favourite": "즐겨찾기",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 479d157f3..cf6a8bd31 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.mention": "Vermeldingen:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
@@ -147,6 +149,7 @@
   "report.target": "Rapporteren van",
   "search.placeholder": "Zoeken",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.favourite": "Favoriet",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 4bbf14938..1f4082d7b 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Likt:",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.mention": "Nevnt:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Fremhevet:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spill lyd",
@@ -147,6 +149,7 @@
   "report.target": "Rapporterer",
   "search.placeholder": "Søk",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultater}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Denne posten kan ikke fremheves",
   "status.delete": "Slett",
   "status.favourite": "Lik",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 2c119ef41..dc6dd5e32 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favorits :",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.mention": "Mencions :",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Partatges :",
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
@@ -147,6 +149,7 @@
   "report.target": "Senhalar {target}",
   "search.placeholder": "Recercar",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
   "status.delete": "Escafar",
   "status.favourite": "Apondre als favorits",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index c2288c4c0..233d61995 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.follow": "Nowi śledzący:",
   "notifications.column_settings.mention": "Wspomniali:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Podbili:",
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
@@ -147,6 +149,7 @@
   "report.target": "Zgłaszanie {target}",
   "search.placeholder": "Szukaj",
   "search_results.total": "{count, number} {count, plural, one {wynik} more {wyniki}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Ten post nie może zostać podbity",
   "status.delete": "Usuń",
   "status.favourite": "Ulubione",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b199a39ce..cf2b911f2 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.mention": "Menções:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Partilhas:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
@@ -147,6 +149,7 @@
   "report.target": "Denunciar",
   "search.placeholder": "Pesquisar",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Eliminar",
   "status.favourite": "Adicionar aos favoritos",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index b199a39ce..cf2b911f2 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoritos:",
   "notifications.column_settings.follow": "Novos seguidores:",
   "notifications.column_settings.mention": "Menções:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Partilhas:",
   "notifications.column_settings.show": "Mostrar nas colunas",
   "notifications.column_settings.sound": "Reproduzir som",
@@ -147,6 +149,7 @@
   "report.target": "Denunciar",
   "search.placeholder": "Pesquisar",
   "search_results.total": "{count, number} {count, plural, one {resultado} other {resultados}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Eliminar",
   "status.favourite": "Adicionar aos favoritos",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index f9f48a48d..942a13ede 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Нравится:",
   "notifications.column_settings.follow": "Новые подписчики:",
   "notifications.column_settings.mention": "Упоминания:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Продвижения:",
   "notifications.column_settings.show": "Показывать в колонке",
   "notifications.column_settings.sound": "Проигрывать звук",
@@ -147,6 +149,7 @@
   "report.target": "Жалуемся на",
   "search.placeholder": "Поиск",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результата} many {результатов} other {результатов}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Этот статус не может быть продвинут",
   "status.delete": "Удалить",
   "status.favourite": "Нравится",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 8a39beacb..e9e96c14f 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favourites:",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.mention": "Mentions:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "Search",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "This post cannot be boosted",
   "status.delete": "Delete",
   "status.favourite": "Favourite",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 203e4a09e..adfa79cd9 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Favoriler:",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.mention": "Bahsedilenler:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Boost’lar:",
   "notifications.column_settings.show": "Bildirimlerde göster",
   "notifications.column_settings.sound": "Ses çal",
@@ -147,6 +149,7 @@
   "report.target": "Raporlama",
   "search.placeholder": "Ara",
   "search_results.total": "{count, number} {count, plural, one {sonuç} other {sonuçlar}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Bu gönderi boost edilemez",
   "status.delete": "Sil",
   "status.favourite": "Favorilere ekle",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index c0f4a8dbb..435067281 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "Вподобане:",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.mention": "Сповіщення:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "Передмухи:",
   "notifications.column_settings.show": "Показати в колонці",
   "notifications.column_settings.sound": "Відтворювати звук",
@@ -147,6 +149,7 @@
   "report.target": "Скаржимося на",
   "search.placeholder": "Пошук",
   "search_results.total": "{count, number} {count, plural, one {результат} few {результати} many {результатів} other {результатів}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Цей допис не може бути передмухнутий",
   "status.delete": "Видалити",
   "status.favourite": "Подобається",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 998e1c8da..0f2c1fcec 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "你的嘟文被赞：",
   "notifications.column_settings.follow": "关注你：",
   "notifications.column_settings.mention": "提及你：",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "你的嘟文被转嘟：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
@@ -147,6 +149,7 @@
   "report.target": "Reporting",
   "search.placeholder": "搜索",
   "search_results.total": "{count, number} {count, plural, one {result} other {results}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "没法转嘟这条嘟文啦……",
   "status.delete": "删除",
   "status.favourite": "赞",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 1079d5429..c0b4cfce9 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "喜歡你的文章:",
   "notifications.column_settings.follow": "關注你:",
   "notifications.column_settings.mention": "提及你:",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "轉推你的文章:",
   "notifications.column_settings.show": "在通知欄顯示",
   "notifications.column_settings.sound": "播放音效",
@@ -147,6 +149,7 @@
   "report.target": "舉報",
   "search.placeholder": "搜尋",
   "search_results.total": "{count, number} 項結果",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "這篇文章無法被轉推",
   "status.delete": "刪除",
   "status.favourite": "喜歡",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 6240b8879..772cc691c 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -109,6 +109,8 @@
   "notifications.column_settings.favourite": "最愛：",
   "notifications.column_settings.follow": "新的關注者：",
   "notifications.column_settings.mention": "提到：",
+  "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.push_meta": "This device",
   "notifications.column_settings.reblog": "轉推：",
   "notifications.column_settings.show": "顯示在欄位中",
   "notifications.column_settings.sound": "播放音效",
@@ -147,6 +149,7 @@
   "report.target": "通報中",
   "search.placeholder": "搜尋",
   "search_results.total": "{count, number} 項結果",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "此貼文無法轉推",
   "status.delete": "刪除",
   "status.favourite": "喜愛",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7cd97a042..37d82a205 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -320,6 +320,21 @@ ja:
     next: 次
     prev: 前
     truncate: "&hellip;"
+  push_notifications:
+    favourite:
+      title: あなたのトゥートが %{name} さんにお気に入り登録されました
+    follow:
+      title: '%{name} さんにフォローされました'
+    mention:
+      action_boost: ブースト
+      action_expand: もっと見る
+      action_favourite: お気に入り
+      title: '%{name} さんから返信がありました'
+    reblog:
+      title: あなたのトゥートが %{name} さんにブーストされました
+    subscribed:
+      body: あなたはプッシュ通知を受け取ることが出来ます
+      title: Subscription が登録されました
   remote_follow:
     acct: あなたの ユーザー名@ドメイン を入力してください
     missing_resource: リダイレクト先が見つかりませんでした

From 9008ab340712fafa6c26862138f5acbbc958bc9a Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 14 Jul 2017 18:08:56 +0900
Subject: [PATCH 231/382] Do not load unnecessary script files (#4193)

---
 app/javascript/mastodon/main.js  | 12 +++---------
 app/javascript/mastodon/ready.js |  7 +++++++
 app/javascript/packs/about.js    | 24 ++++++++++++++++++++++++
 app/javascript/packs/public.js   | 17 ++---------------
 app/views/about/show.html.haml   |  7 +++----
 5 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 app/javascript/mastodon/ready.js
 create mode 100644 app/javascript/packs/about.js

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index d2c9d1c94..1f8ebb721 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,12 +1,6 @@
-const perf = require('./performance');
+import ready from './ready';
 
-function onDomContentLoaded(callback) {
-  if (document.readyState !== 'loading') {
-    callback();
-  } else {
-    document.addEventListener('DOMContentLoaded', callback);
-  }
-}
+const perf = require('./performance');
 
 function main() {
   perf.start('main()');
@@ -24,7 +18,7 @@ function main() {
     }
   }
 
-  onDomContentLoaded(() => {
+  ready(() => {
     const mountNode = document.getElementById('mastodon');
     const props = JSON.parse(mountNode.getAttribute('data-props'));
 
diff --git a/app/javascript/mastodon/ready.js b/app/javascript/mastodon/ready.js
new file mode 100644
index 000000000..dd543910b
--- /dev/null
+++ b/app/javascript/mastodon/ready.js
@@ -0,0 +1,7 @@
+export default function ready(loaded) {
+  if (['interactive', 'complete'].includes(document.readyState)) {
+    loaded();
+  } else {
+    document.addEventListener('DOMContentLoaded', loaded);
+  }
+}
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js
new file mode 100644
index 000000000..7b8ab5e5d
--- /dev/null
+++ b/app/javascript/packs/about.js
@@ -0,0 +1,24 @@
+import TimelineContainer from '../mastodon/containers/timeline_container';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import loadPolyfills from '../mastodon/load_polyfills';
+import ready from '../mastodon/ready';
+
+require.context('../images/', true);
+
+function loaded() {
+  const mountNode = document.getElementById('mastodon-timeline');
+
+  if (mountNode !== null) {
+    const props = JSON.parse(mountNode.getAttribute('data-props'));
+    ReactDOM.render(<TimelineContainer {...props} />, mountNode);
+  }
+}
+
+function main() {
+  ready(loaded);
+}
+
+loadPolyfills().then(main).catch(error => {
+  console.error(error);
+});
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 0b00da39d..6e6ba3476 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -4,9 +4,7 @@ import { delegate } from 'rails-ujs';
 import emojify from '../mastodon/emoji';
 import { getLocale } from '../mastodon/locales';
 import loadPolyfills from '../mastodon/load_polyfills';
-import TimelineContainer from '../mastodon/containers/timeline_container';
-import React from 'react';
-import ReactDOM from 'react-dom';
+import ready from '../mastodon/ready';
 
 require.context('../images/', true);
 
@@ -39,21 +37,10 @@ function loaded() {
     const datetime = new Date(content.getAttribute('datetime'));
     content.textContent = relativeFormat.format(datetime);;
   });
-
-  const mountNode = document.getElementById('mastodon-timeline');
-
-  if (mountNode !== null) {
-    const props = JSON.parse(mountNode.getAttribute('data-props'));
-    ReactDOM.render(<TimelineContainer {...props} />, mountNode);
-  }
 }
 
 function main() {
-  if (['interactive', 'complete'].includes(document.readyState)) {
-    loaded();
-  } else {
-    document.addEventListener('DOMContentLoaded', loaded);
-  }
+  ready(loaded);
 
   delegate(document, '.video-player video', 'click', ({ target }) => {
     if (target.paused) {
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index f75f87c99..fd468bba0 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -1,11 +1,10 @@
-- content_for :header_tags do
-  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
-  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
-
 - content_for :page_title do
   = site_hostname
 
 - content_for :header_tags do
+  %script#initial-state{ type: 'application/json' }!= json_escape(@initial_state_json)
+  = javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
+
   %meta{ property: 'og:site_name', content: site_title }/
   %meta{ property: 'og:url', content: about_url }/
   %meta{ property: 'og:type', content: 'website' }/

From 489d1624777d86b710bd4f467857a7e7c3bd3128 Mon Sep 17 00:00:00 2001
From: Albert ARIBAUD <aaribaud@users.noreply.github.com>
Date: Fri, 14 Jul 2017 12:12:16 +0200
Subject: [PATCH 232/382] fr.json: replace "silencer" with "masquer" (#4196)

"Silencer" as a verb does not exist in French. A good and valid replacement is "masquer".
---
 app/javascript/mastodon/locales/fr.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index ea69532dd..b6605295b 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -29,7 +29,7 @@
   "column.favourites": "Favoris",
   "column.follow_requests": "Demandes de suivi",
   "column.home": "Accueil",
-  "column.mutes": "Comptes silencés",
+  "column.mutes": "Comptes masqués",
   "column.notifications": "Notifications",
   "column.public": "Fil public global",
   "column_back_button.label": "Retour",
@@ -52,9 +52,9 @@
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Confirmez vous la suppression de ce pouet ?",
   "confirmations.domain_block.confirm": "Masquer le domaine entier",
-  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou silenciations ciblés sont suffisants et préférables.",
-  "confirmations.mute.confirm": "Silencer",
-  "confirmations.mute.message": "Confirmez vous la silenciation {name} ?",
+  "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables.",
+  "confirmations.mute.confirm": "Masquer",
+  "confirmations.mute.message": "Confirmez vous le masquage de {name} ?",
   "emoji_button.activity": "Activités",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Boire et manger",
@@ -96,7 +96,7 @@
   "navigation_bar.follow_requests": "Demandes de suivi",
   "navigation_bar.info": "Plus d’informations",
   "navigation_bar.logout": "Déconnexion",
-  "navigation_bar.mutes": "Comptes silencés",
+  "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.preferences": "Préférences",
   "navigation_bar.public_timeline": "Fil public global",
   "notification.favourite": "{name} a ajouté à ses favoris :",

From 0fa9dd85273fed7f5412b9b1be21d8db7c5ed7bb Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 14 Jul 2017 19:13:43 +0900
Subject: [PATCH 233/382] Add Rake task for generate VAPID key (#4195)

* Add Rake task for generate VAPID key

* edit config/initializers/vapid.rb
---
 .env.production.sample       | 2 +-
 config/initializers/vapid.rb | 2 +-
 lib/tasks/mastodon.rake      | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.env.production.sample b/.env.production.sample
index faefa2482..eb1c5a48f 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -36,7 +36,7 @@ OTP_SECRET=
 # You should only generate this once per instance. If you later decide to change it, all push subscription will
 # be invalidated, requiring the users to access the website again to resubscribe.
 #
-# ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;"
+# Generate with `rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
 #
 # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
 VAPID_PRIVATE_KEY=
diff --git a/config/initializers/vapid.rb b/config/initializers/vapid.rb
index 74e07377c..618f5a3fb 100644
--- a/config/initializers/vapid.rb
+++ b/config/initializers/vapid.rb
@@ -6,7 +6,7 @@ Rails.application.configure do
   # You should only generate this once per instance. If you later decide to change it, all push subscription will
   # be invalidated, requiring the users to access the website again to resubscribe.
   #
-  # ruby -e "require 'webpush'; vapid_key = Webpush.generate_key; puts vapid_key.private_key; puts vapid_key.public_key;"
+  # Generate with `rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
   #
   # For more information visit https://rossta.net/blog/using-the-web-push-api-with-vapid.html
 
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 1b05ece33..010139e91 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -184,6 +184,15 @@ namespace :mastodon do
     end
   end
 
+  namespace :webpush do
+    desc 'Generate VAPID key'
+    task generate_vapid_key: :environment do
+      vapid_key = Webpush.generate_key
+      puts "VAPID_PRIVATE_KEY=#{vapid_key.private_key}"
+      puts "VAPID_PUBLIC_KEY=#{vapid_key.public_key}"
+    end
+  end
+
   namespace :maintenance do
     desc 'Update counter caches'
     task update_counter_caches: :environment do

From 37430a340170a6b22e3ace44ad66ada756fa58a4 Mon Sep 17 00:00:00 2001
From: Albert ARIBAUD <aaribaud@users.noreply.github.com>
Date: Fri, 14 Jul 2017 13:55:40 +0200
Subject: [PATCH 234/382] fr: replace "silencer" with "masquer" throughout
 (#4197)

* fr.json: replace "silencer" with "masquer"

"Silencer" as a verb does not exist in French. A good and valid replacement is "masquer".

* FR translation: use "masquer" for "silence"
---
 config/locales/fr.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c2efd0c85..cba217651 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -61,7 +61,7 @@ fr:
       media_attachments: Fichiers médias
       moderation:
         all: Tous
-        silenced: Muets
+        silenced: Masqués
         suspended: Suspendus
         title: Modération
       most_recent_activity: Dernière activité
@@ -85,11 +85,11 @@ fr:
         created_reports: Signalements créés par ce compte
         report: signalement
         targeted_reports: Signalements créés visant ce compte
-      silence: Rendre muet
+      silence: Masquer
       statuses: Statuts
       subscribe: S’abonner
       title: Comptes
-      undo_silenced: Annuler le silence
+      undo_silenced: Démasquer
       undo_suspension: Annuler la suspension
       unsubscribe: Se désabonner
       username: Nom d’utilisateur⋅ice
@@ -104,13 +104,13 @@ fr:
         hint: Le blocage de domaine n’empêchera pas la création de comptes dans la base de données, mais il appliquera automatiquement et rétrospectivement des méthodes de modération spécifiques sur ces comptes.
         severity:
           desc_html: "<strong>Silence</strong> rendra les messages des comptes concernés invisibles à ceux qui ne les suivent pas. <strong>Suspend</strong> supprimera tout le contenu des comptes concernés, les médias, et les données du profil."
-          silence: Muet
+          silence: Masqué
           suspend: Suspendre
         title: Nouveau blocage de domaine
       reject_media: Fichiers média rejetés
       reject_media_hint: Supprime localement les fichiers média stockés et refuse d’en télécharger ultérieurement. Ne concerne pas les suspensions.
       severities:
-        silence: Rendre muet
+        silence: Masquer
         suspend: Suspendre
       severity: Séverité
       show:
@@ -118,7 +118,7 @@ fr:
           one: Un compte affecté dans la base de données
           other: "%{count} comptes affectés dans la base de données"
         retroactive:
-          silence: Annuler le silence sur tous les comptes existants pour ce domaine
+          silence: Annuler le masquage sur tous les comptes existants pour ce domaine
           suspend: Annuler la suspension sur tous les comptes existants pour ce domaine
         title: Annuler le blocage de domaine pour %{domain}
         undo: Annuler
@@ -145,7 +145,7 @@ fr:
       reported_account: Compte signalé
       reported_by: Signalé par
       resolved: Résolus
-      silence_account: Rendre le compte muet
+      silence_account: Masquer le compte
       status: Statut
       suspend_account: Suspendre le compte
       target: Cible

From 999170d898fbe98e634f827580695c0615370f75 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Fri, 14 Jul 2017 14:41:13 +0200
Subject: [PATCH 235/382] =?UTF-8?q?i18n:=20fediwers=20=E2=80=BA=20fediwers?=
 =?UTF-8?q?um=20(pl)=20(#4198)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 config/locales/pl.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f9d69745f..9ee6c0540 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -300,7 +300,7 @@ pl:
       following: Lista śledzonych
       muting: Lista wyciszonych
     upload: Załaduj
-  landing_strip_html: "<strong>%{name}</strong> ma konto na %{link_to_root_path}. Możesz je śledzić i wejść z nim w interakcję jeśli masz konto gdziekolwiek w Fediwersie."
+  landing_strip_html: "<strong>%{name}</strong> ma konto na %{link_to_root_path}. Możesz je śledzić i wejść z nim w interakcję jeśli masz konto gdziekolwiek w Fediwersum."
   landing_strip_signup_html: Jeśli jeszcze go nie masz, możesz <a href="%{sign_up_path}">stworzyć konto</a>.
   media_attachments:
     validations:

From c42092ba7ad1cbf78ca8463b6525ec2b7efbdd92 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 16:41:02 +0200
Subject: [PATCH 236/382] Add option to opt out of search engines on public
 profile/status pages (#4199)

---
 app/controllers/settings/preferences_controller.rb | 1 +
 app/lib/user_settings_decorator.rb                 | 5 +++++
 app/models/user.rb                                 | 4 ++++
 app/views/accounts/show.html.haml                  | 3 +++
 app/views/follower_accounts/index.html.haml        | 3 +++
 app/views/following_accounts/index.html.haml       | 3 +++
 app/views/layouts/embedded.html.haml               | 2 ++
 app/views/settings/preferences/show.html.haml      | 3 +++
 app/views/stream_entries/show.html.haml            | 3 +++
 config/locales/simple_form.en.yml                  | 2 ++
 config/settings.yml                                | 1 +
 11 files changed, 30 insertions(+)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index cac5b0ba8..a3f5a008b 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -39,6 +39,7 @@ class Settings::PreferencesController < ApplicationController
       :setting_delete_modal,
       :setting_auto_play_gif,
       :setting_system_font_ui,
+      :setting_noindex,
       notification_emails: %i(follow follow_request reblog favourite mention digest),
       interactions: %i(must_be_follower must_be_following)
     )
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index e0e92b19d..c5da18029 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -23,6 +23,7 @@ class UserSettingsDecorator
     user.settings['delete_modal'] = delete_modal_preference
     user.settings['auto_play_gif'] = auto_play_gif_preference
     user.settings['system_font_ui'] = system_font_ui_preference
+    user.settings['noindex'] = noindex_preference
   end
 
   def merged_notification_emails
@@ -57,6 +58,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_auto_play_gif'
   end
 
+  def noindex_preference
+    boolean_cast_setting 'setting_noindex'
+  end
+
   def boolean_cast_setting(key)
     settings[key] == '1'
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index a63b1da7f..becf0018f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -99,6 +99,10 @@ class User < ApplicationRecord
     settings.system_font_ui
   end
 
+  def setting_noindex
+    settings.noindex
+  end
+
   def activate_session(request)
     session_activations.activate(session_id: SecureRandom.hex,
                                  user_agent: request.user_agent,
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index a19049103..7ed634e5d 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -2,6 +2,9 @@
   = display_name(@account)
 
 - content_for :header_tags do
+  - if @account.user&.setting_noindex
+    %meta{ name: 'robots', content: 'noindex' }/
+
   %link{ rel: 'salmon', href: api_salmon_url(@account.id) }/
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_url(@account, format: 'atom') }/
 
diff --git a/app/views/follower_accounts/index.html.haml b/app/views/follower_accounts/index.html.haml
index 89c7f3a29..738b31638 100644
--- a/app/views/follower_accounts/index.html.haml
+++ b/app/views/follower_accounts/index.html.haml
@@ -2,6 +2,9 @@
   = t('accounts.people_who_follow', name: display_name(@account))
 
 - content_for :header_tags do
+  - if @account.user&.setting_noindex
+    %meta{ name: 'robots', content: 'noindex' }/
+
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
 = render 'accounts/header', account: @account
diff --git a/app/views/following_accounts/index.html.haml b/app/views/following_accounts/index.html.haml
index 6f0de7590..9637c689f 100644
--- a/app/views/following_accounts/index.html.haml
+++ b/app/views/following_accounts/index.html.haml
@@ -2,6 +2,9 @@
   = t('accounts.people_followed_by', name: display_name(@account))
 
 - content_for :header_tags do
+  - if @account.user&.setting_noindex
+    %meta{ name: 'robots', content: 'noindex' }/
+
   = render 'accounts/og', account: @account, url: account_followers_url(@account, only_path: false)
 
 = render 'accounts/header', account: @account
diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml
index 4826f32f7..46dab2d0f 100644
--- a/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@ -2,6 +2,8 @@
 %html{ lang: I18n.locale }
   %head
     %meta{ charset: 'utf-8' }/
+    %meta{ name: 'robots', content: 'noindex' }/
+
     = stylesheet_pack_tag 'common', media: 'all'
     = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 56a261ab6..3b5d90942 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -40,6 +40,9 @@
       = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following, as: :boolean, wrapper: :with_label
 
+  .fields-group
+    = f.input :setting_noindex, as: :boolean, wrapper: :with_label
+
   .fields-group
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index d01e82af8..80ea30eb1 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -1,4 +1,7 @@
 - content_for :header_tags do
+  - if @account.user&.setting_noindex
+    %meta{ name: 'robots', content: 'noindex' }/
+
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/
   %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: account_stream_entry_url(@account, @stream_entry), format: 'json') }/
 
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index e3f784a1a..fbaf0ff68 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -12,6 +12,7 @@ en:
         note:
           one: <span class="note-counter">1</span> character left
           other: <span class="note-counter">%{count}</span> characters left
+        setting_noindex: Affects your public profile and status pages
       imports:
         data: CSV file exported from another Mastodon instance
       sessions:
@@ -41,6 +42,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_system_font_ui: Use system's default font
+        setting_noindex: Opt-out of search engine indexing
         severity: Severity
         type: Import type
         username: Username
diff --git a/config/settings.yml b/config/settings.yml
index 579ba2929..d239fb6a6 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -21,6 +21,7 @@ defaults: &defaults
   auto_play_gif: false
   delete_modal: true
   system_font_ui: false
+  noindex: false
   notification_emails:
     follow: false
     reblog: false

From e2685ccc81f04e1a63a97af80686bf85027418a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 19:47:53 +0200
Subject: [PATCH 237/382] Fix #4149, fix #1199 - Store emojis as unicode
 (#4189)

- Use unicode when selecting emoji through picker
- Convert shortcodes to unicode when storing text input server-side
- Do not convert shortcodes in JS anymore
---
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  4 ++-
 app/helpers/emoji_helper.rb                   | 19 ++++++++++
 app/javascript/mastodon/actions/compose.js    |  7 ++--
 app/javascript/mastodon/emoji.js              | 24 ++-----------
 .../compose/components/compose_form.js        |  3 +-
 .../components/emoji_picker_dropdown.js       |  5 +--
 app/javascript/mastodon/reducers/compose.js   |  2 +-
 app/javascript/styles/components.scss         |  1 +
 app/models/account.rb                         | 10 ++++++
 app/models/status.rb                          |  6 +++-
 app/services/post_status_service.rb           |  2 ++
 spec/helpers/emoji_helper_spec.rb             | 15 ++++++++
 spec/helpers/routing_helper.rb                |  5 ---
 spec/javascript/components/emojify.test.js    | 36 -------------------
 15 files changed, 69 insertions(+), 71 deletions(-)
 create mode 100644 app/helpers/emoji_helper.rb
 create mode 100644 spec/helpers/emoji_helper_spec.rb
 delete mode 100644 spec/helpers/routing_helper.rb

diff --git a/Gemfile b/Gemfile
index 988b4d6b9..531d01ae0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
 gem 'doorkeeper', '~> 4.2'
 gem 'fast_blank', '~> 1.0'
+gem 'gemoji', '~> 3.0'
 gem 'goldfinger', '~> 1.2'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5599e1db1..83202189d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,9 +106,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    charlock_holmes (0.7.3)
     case_transform (0.2)
       activesupport
+    charlock_holmes (0.7.3)
     chunky_png (1.3.8)
     cld3 (3.1.3)
       ffi (>= 1.1.0, < 1.10.0)
@@ -163,6 +163,7 @@ GEM
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
+    gemoji (3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     goldfinger (1.2.0)
@@ -518,6 +519,7 @@ DEPENDENCIES
   faker (~> 1.7)
   fast_blank (~> 1.0)
   fuubar (~> 2.2)
+  gemoji (~> 3.0)
   goldfinger (~> 1.2)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)
diff --git a/app/helpers/emoji_helper.rb b/app/helpers/emoji_helper.rb
new file mode 100644
index 000000000..c1595851f
--- /dev/null
+++ b/app/helpers/emoji_helper.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module EmojiHelper
+  EMOJI_PATTERN = /(?<=[^[:alnum:]:]|\n|^):([\w+-]+):(?=[^[:alnum:]:]|$)/x
+
+  def emojify(text)
+    return text if text.blank?
+
+    text.gsub(EMOJI_PATTERN) do |match|
+      emoji = Emoji.find_by_alias($1) # rubocop:disable Rails/DynamicFindBy,Style/PerlBackrefs
+
+      if emoji
+        emoji.raw
+      else
+        match
+      end
+    end
+  end
+end
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 647a52b93..9f05a53e9 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -2,8 +2,6 @@ import api from '../api';
 
 import { updateTimeline } from './timelines';
 
-import * as emojione from 'emojione';
-
 export const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
 export const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
 export const COMPOSE_SUBMIT_SUCCESS  = 'COMPOSE_SUBMIT_SUCCESS';
@@ -73,11 +71,14 @@ export function mentionCompose(account, router) {
 
 export function submitCompose() {
   return function (dispatch, getState) {
-    const status = emojione.shortnameToUnicode(getState().getIn(['compose', 'text'], ''));
+    const status = getState().getIn(['compose', 'text'], '');
+
     if (!status || !status.length) {
       return;
     }
+
     dispatch(submitComposeRequest());
+
     api(getState).post('/api/v1/statuses', {
       status,
       in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index 7043d5f3a..ed2180cd1 100644
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -6,36 +6,18 @@ const trie = new Trie(Object.keys(emojione.jsEscapeMap));
 
 function emojify(str) {
   // This walks through the string from start to end, ignoring any tags (<p>, <br>, etc.)
-  // and replacing valid shortnames like :smile: and :wink: as well as unicode strings
+  // and replacing valid unicode strings
   // that _aren't_ within tags with an <img> version.
-  // The goal is to be the same as an emojione.regShortNames/regUnicode replacement, but faster.
+  // The goal is to be the same as an emojione.regUnicode replacement, but faster.
   let i = -1;
   let insideTag = false;
-  let insideShortname = false;
-  let shortnameStartIndex = -1;
   let match;
   while (++i < str.length) {
     const char = str.charAt(i);
-    if (insideShortname && char === ':') {
-      const shortname = str.substring(shortnameStartIndex, i + 1);
-      if (shortname in emojione.emojioneList) {
-        const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
-        const alt = emojione.convert(unicode.toUpperCase());
-        const replacement = `<img draggable="false" class="emojione" alt="${alt}" title="${shortname}" src="/emoji/${unicode}.svg" />`;
-        str = str.substring(0, shortnameStartIndex) + replacement + str.substring(i + 1);
-        i += (replacement.length - shortname.length - 1); // jump ahead the length we've added to the string
-      } else {
-        i--; // stray colon, try again
-      }
-      insideShortname = false;
-    } else if (insideTag && char === '>') {
+    if (insideTag && char === '>') {
       insideTag = false;
     } else if (char === '<') {
       insideTag = true;
-      insideShortname = false;
-    } else if (!insideTag && char === ':') {
-      insideShortname = true;
-      shortnameStartIndex = i;
     } else if (!insideTag && (match = trie.search(str.substring(i)))) {
       const unicodeStr = match;
       if (unicodeStr in emojione.jsEscapeMap) {
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index f7eeedc69..f07552947 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -136,7 +136,8 @@ export default class ComposeForm extends ImmutablePureComponent {
 
   handleEmojiPick = (data) => {
     const position     = this.autosuggestTextarea.textarea.selectionStart;
-    this._restoreCaret = position + data.shortname.length + 1;
+    const emojiChar    = String.fromCodePoint(parseInt(data.unicode, 16));
+    this._restoreCaret = position + emojiChar.length + 1;
     this.props.onPickEmoji(position, data);
   }
 
diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index 83c66a5d5..acc584f20 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -109,11 +109,12 @@ export default class EmojiPickerDropdown extends React.PureComponent {
       <Dropdown ref={this.setRef} className='emoji-picker__dropdown' onShow={this.onShowDropdown} onHide={this.onHideDropdown}>
         <DropdownTrigger className='emoji-button' title={intl.formatMessage(messages.emoji)}>
           <img
-            draggable='false'
             className={`emojione ${active && loading ? 'pulse-loading' : ''}`}
-            alt='🙂' src='/emoji/1f602.svg'
+            alt='🙂'
+            src='/emoji/1f602.svg'
           />
         </DropdownTrigger>
+
         <DropdownContent className='dropdown__left'>
           {
             this.state.active && !this.state.loading &&
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index a92b5aa23..ea3b78b67 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -118,7 +118,7 @@ const insertSuggestion = (state, position, token, completion) => {
 };
 
 const insertEmoji = (state, position, emojiData) => {
-  const emoji = emojiData.shortname;
+  const emoji = String.fromCodePoint(parseInt(emojiData.unicode, 16));
 
   return state.withMutations(map => {
     map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`);
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 0face646d..0420a2bed 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2708,6 +2708,7 @@ button.icon-button.active i.fa-retweet {
   margin-left: 2px;
   width: 24px;
   outline: 0;
+  cursor: pointer;
 
   &:active,
   &:focus {
diff --git a/app/models/account.rb b/app/models/account.rb
index 2b54cee5f..7243cb1a5 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -47,6 +47,7 @@ class Account < ApplicationRecord
   include AccountInteractions
   include Attachmentable
   include Remotable
+  include EmojiHelper
 
   # Local users
   has_one :user, inverse_of: :account
@@ -240,9 +241,18 @@ class Account < ApplicationRecord
 
   before_create :generate_keys
   before_validation :normalize_domain
+  before_validation :prepare_contents, if: :local?
 
   private
 
+  def prepare_contents
+    display_name&.strip!
+    note&.strip!
+
+    self.display_name = emojify(display_name)
+    self.note         = emojify(note)
+  end
+
   def generate_keys
     return unless local?
 
diff --git a/app/models/status.rb b/app/models/status.rb
index 65db7579a..24eaf7071 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -29,6 +29,7 @@ class Status < ApplicationRecord
   include Streamable
   include Cacheable
   include StatusThreadingConcern
+  include EmojiHelper
 
   enum visibility: [:public, :unlisted, :private, :direct], _suffix: :visibility
 
@@ -120,7 +121,7 @@ class Status < ApplicationRecord
     !sensitive? && media_attachments.any?
   end
 
-  before_validation :prepare_contents
+  before_validation :prepare_contents, if: :local?
   before_validation :set_reblog
   before_validation :set_visibility
   before_validation :set_conversation
@@ -241,6 +242,9 @@ class Status < ApplicationRecord
   def prepare_contents
     text&.strip!
     spoiler_text&.strip!
+
+    self.text         = emojify(text)
+    self.spoiler_text = emojify(spoiler_text)
   end
 
   def set_reblog
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 2e6fbb5c3..951a38e19 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -21,6 +21,7 @@ class PostStatusService < BaseService
 
     media  = validate_media!(options[:media_ids])
     status = nil
+
     ApplicationRecord.transaction do
       status = account.statuses.create!(text: text,
                                         thread: in_reply_to,
@@ -31,6 +32,7 @@ class PostStatusService < BaseService
                                         application: options[:application])
       attach_media(status, media)
     end
+
     process_mentions_service.call(status)
     process_hashtags_service.call(status)
 
diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
new file mode 100644
index 000000000..1eedfb719
--- /dev/null
+++ b/spec/helpers/emoji_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe EmojiHelper, type: :helper do
+  describe '#emojify' do
+    it 'converts shortcodes to unicode' do
+      text = ':book: Book'
+      expect(emojify(text)).to eq '📖 Book'
+    end
+
+    it 'does not convert shortcodes that are part of a string into unicode' do
+      text = ':see_no_evil::hear_no_evil::speak_no_evil:'
+      expect(emojify(text)).to eq text
+    end
+  end
+end
diff --git a/spec/helpers/routing_helper.rb b/spec/helpers/routing_helper.rb
deleted file mode 100644
index 3cd397397..000000000
--- a/spec/helpers/routing_helper.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe RoutingHelper, type: :helper do
-
-end
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
index 3e8b25af9..e165b4519 100644
--- a/spec/javascript/components/emojify.test.js
+++ b/spec/javascript/components/emojify.test.js
@@ -2,32 +2,6 @@ import { expect } from 'chai';
 import emojify from '../../../app/javascript/mastodon/emoji';
 
 describe('emojify', () => {
-  it('does a basic emojify', () => {
-    expect(emojify(':smile:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />');
-  });
-
-  it('does a double emojify', () => {
-    expect(emojify(':smile: and :wink:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /> and <img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
-  });
-
-  it('works with random colons', () => {
-    expect(emojify(':smile: : :wink:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /> : <img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
-    expect(emojify(':smile::::wink:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />::<img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
-    expect(emojify(':smile:::::wink:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" />:::<img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
-  });
-
-  it('works with tags', () => {
-    expect(emojify('<p>:smile:</p>')).to.equal(
-      '<p><img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /></p>');
-    expect(emojify('<p>:smile:</p> and <p>:wink:</p>')).to.equal(
-      '<p><img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /></p> and <p><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" /></p>');
-  });
-
   it('ignores unknown shortcodes', () => {
     expect(emojify(':foobarbazfake:')).to.equal(':foobarbazfake:');
   });
@@ -46,11 +20,6 @@ describe('emojify', () => {
     expect(emojify(':smile')).to.equal(':smile');
   });
 
-  it('does two emoji next to each other', () => {
-    expect(emojify(':smile::wink:')).to.equal(
-      '<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" />');
-  });
-
   it('does unicode', () => {
     expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
       '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":family_wwbb:" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
@@ -72,12 +41,7 @@ describe('emojify', () => {
       'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> bar');
   });
 
-  it('does mixed unicode and shortnames', () => {
-    expect(emojify(':smile:#\uFE0F\u20E3:wink:\u2757')).to.equal('<img draggable="false" class="emojione" alt="😄" title=":smile:" src="/emoji/1f604.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /><img draggable="false" class="emojione" alt="😉" title=":wink:" src="/emoji/1f609.svg" /><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
-  });
-
   it('ignores unicode inside of tags', () => {
     expect(emojify('<p data-foo="\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66"></p>')).to.equal('<p data-foo="\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66"></p>');
   });
-
 });

From 8d224ad23bca8d4923e230e5495ee60197e44c3b Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 15 Jul 2017 02:57:49 +0900
Subject: [PATCH 238/382] Follow renaming of microformats2 gem (#4203)

---
 Gemfile                                          | 2 +-
 Gemfile.lock                                     | 4 ++--
 spec/views/stream_entries/show.html.haml_spec.rb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 531d01ae0..5d5ddfae1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,7 +79,7 @@ group :test do
   gem 'capybara', '~> 2.14'
   gem 'climate_control', '~> 0.2'
   gem 'faker', '~> 1.7'
-  gem 'microformats2', '~> 3.0'
+  gem 'microformats', '~> 4.0'
   gem 'rails-controller-testing', '~> 1.0'
   gem 'rspec-sidekiq', '~> 3.0'
   gem 'simplecov', '~> 0.14', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 83202189d..daef3e1ad 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,7 +242,7 @@ GEM
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
-    microformats2 (3.1.0)
+    microformats (4.0.7)
       json
       nokogiri
     mime-types (3.1)
@@ -533,7 +533,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3)
   link_header (~> 0.0)
   lograge (~> 0.5)
-  microformats2 (~> 3.0)
+  microformats (~> 4.0)
   mime-types (~> 3.1)
   nokogiri (~> 1.7)
   oj (~> 3.0)
diff --git a/spec/views/stream_entries/show.html.haml_spec.rb b/spec/views/stream_entries/show.html.haml_spec.rb
index cc380e6ea..6cc3b117a 100644
--- a/spec/views/stream_entries/show.html.haml_spec.rb
+++ b/spec/views/stream_entries/show.html.haml_spec.rb
@@ -27,7 +27,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
 
     render
 
-    mf2 = Microformats2.parse(rendered)
+    mf2 = Microformats.parse(rendered)
 
     expect(mf2.entry.name.to_s).to eq status.text
     expect(mf2.entry.url.to_s).not_to be_empty
@@ -53,7 +53,7 @@ describe 'stream_entries/show.html.haml', without_verify_partial_doubles: true d
 
     render
 
-    mf2 = Microformats2.parse(rendered)
+    mf2 = Microformats.parse(rendered)
 
     expect(mf2.entry.name.to_s).to eq reply.text
     expect(mf2.entry.url.to_s).not_to be_empty

From c1f201c49a007e5c0740c00651e549a7b0416b05 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 14 Jul 2017 20:30:12 +0200
Subject: [PATCH 239/382] =?UTF-8?q?=F0=9F=8E=84=F0=9F=94=A8=20Force=20tree?=
 =?UTF-8?q?=20shake=20emojione=20(#4202)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(yarn): Install babel-plugin-preval as development dependency

* feat(babel): Add preval as a plugin

* feat(emojione_light): Prevaled module what tree-shaked emojione

* refactor(emoji): Use emojione_light

* feat: Preload emojione_picker bundle

* fix(emojione_light): Do not use Object.entries

* fix(emojify): Update tests

* chore(emojione_light): Remove silly ascii art
---
 .babelrc                                   |  3 ++-
 app/javascript/mastodon/emoji.js           | 15 ++++++---------
 app/javascript/mastodon/emojione_light.js  | 11 +++++++++++
 app/views/layouts/application.html.haml    |  1 +
 package.json                               |  1 +
 spec/javascript/components/emojify.test.js | 16 ++++++++--------
 yarn.lock                                  | 12 ++++++++++--
 7 files changed, 39 insertions(+), 20 deletions(-)
 create mode 100644 app/javascript/mastodon/emojione_light.js

diff --git a/.babelrc b/.babelrc
index 19968964e..de922f389 100644
--- a/.babelrc
+++ b/.babelrc
@@ -22,7 +22,8 @@
       {
         "messagesDir": "./build/messages"
       }
-    ]
+    ],
+    "preval"
   ],
   "env": {
     "development": {
diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index ed2180cd1..1de41f572 100644
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -1,8 +1,7 @@
-import emojione from 'emojione';
+import { unicodeToFilename } from './emojione_light';
 import Trie from 'substring-trie';
 
-const mappedUnicode = emojione.mapUnicodeToShort();
-const trie = new Trie(Object.keys(emojione.jsEscapeMap));
+const trie = new Trie(Object.keys(unicodeToFilename));
 
 function emojify(str) {
   // This walks through the string from start to end, ignoring any tags (<p>, <br>, etc.)
@@ -20,12 +19,10 @@ function emojify(str) {
       insideTag = true;
     } else if (!insideTag && (match = trie.search(str.substring(i)))) {
       const unicodeStr = match;
-      if (unicodeStr in emojione.jsEscapeMap) {
-        const unicode  = emojione.jsEscapeMap[unicodeStr];
-        const short    = mappedUnicode[unicode];
-        const filename = emojione.emojioneList[short].fname;
-        const alt      = emojione.convert(unicode.toUpperCase());
-        const replacement =  `<img draggable="false" class="emojione" alt="${alt}" title="${short}" src="/emoji/${filename}.svg" />`;
+      if (unicodeStr in unicodeToFilename) {
+        const filename = unicodeToFilename[unicodeStr];
+        const alt      = unicodeStr;
+        const replacement =  `<img draggable="false" class="emojione" alt="${alt}" src="/emoji/${filename}.svg" />`;
         str = str.substring(0, i) + replacement + str.substring(i + unicodeStr.length);
         i += (replacement.length - unicodeStr.length); // jump ahead the length we've added to the string
       }
diff --git a/app/javascript/mastodon/emojione_light.js b/app/javascript/mastodon/emojione_light.js
new file mode 100644
index 000000000..c75e10a98
--- /dev/null
+++ b/app/javascript/mastodon/emojione_light.js
@@ -0,0 +1,11 @@
+// @preval
+// Force tree shaking on emojione by exposing just a subset of its functionality
+
+const emojione = require('emojione');
+
+const mappedUnicode = emojione.mapUnicodeToShort();
+
+module.exports.unicodeToFilename = Object.keys(emojione.jsEscapeMap)
+  .map(unicodeStr => [unicodeStr, mappedUnicode[emojione.jsEscapeMap[unicodeStr]]])
+  .map(([unicodeStr, shortCode]) => ({ [unicodeStr]: emojione.emojioneList[shortCode].fname }))
+  .reduce((x, y) => Object.assign(x, y), { });
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index ef97fb127..82b20810a 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -27,6 +27,7 @@
     = javascript_pack_tag 'features/notifications', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
     = javascript_pack_tag 'features/community_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
     = javascript_pack_tag 'features/public_timeline', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
+    = javascript_pack_tag 'emojione_picker', integrity: true, crossorigin: 'anonymous', rel: 'preload', as: 'script'
 
     = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
     = csrf_meta_tags
diff --git a/package.json b/package.json
index 5ad576dad..20224796f 100644
--- a/package.json
+++ b/package.json
@@ -121,6 +121,7 @@
     "@storybook/addon-actions": "^3.1.8",
     "@storybook/react": "^3.1.8",
     "babel-eslint": "^7.2.3",
+    "babel-plugin-preval": "^1.3.2",
     "chai": "^4.1.0",
     "chai-enzyme": "^0.8.0",
     "enzyme": "^2.9.1",
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
index e165b4519..2874bb56d 100644
--- a/spec/javascript/components/emojify.test.js
+++ b/spec/javascript/components/emojify.test.js
@@ -22,23 +22,23 @@ describe('emojify', () => {
 
   it('does unicode', () => {
     expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
-      '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":family_wwbb:" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
+      '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
     expect(emojify('\uD83D\uDC68\uD83D\uDC69\uD83D\uDC67\uD83D\uDC67')).to.equal(
-      '<img draggable="false" class="emojione" alt="👨👩👧👧" title=":family_mwgg:" src="/emoji/1f468-1f469-1f467-1f467.svg" />');
-    expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('<img draggable="false" class="emojione" alt="👩👩👦" title=":family_wwb:" src="/emoji/1f469-1f469-1f466.svg" />');
+      '<img draggable="false" class="emojione" alt="👨👩👧👧" src="/emoji/1f468-1f469-1f467-1f467.svg" />');
+    expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('<img draggable="false" class="emojione" alt="👩👩👦" src="/emoji/1f469-1f469-1f466.svg" />');
     expect(emojify('\u2757')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" />');
   });
 
   it('does multiple unicode', () => {
     expect(emojify('\u2757 #\uFE0F\u20E3')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" />');
     expect(emojify('\u2757#\uFE0F\u20E3')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" />');
     expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" />');
     expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).to.equal(
-      'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> bar');
+      'foo <img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" /> bar');
   });
 
   it('ignores unicode inside of tags', () => {
diff --git a/yarn.lock b/yarn.lock
index 56a9f7798..defd8599f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -681,6 +681,14 @@ babel-plugin-lodash@^3.2.11:
     glob "^7.1.1"
     lodash "^4.17.2"
 
+babel-plugin-preval@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-preval/-/babel-plugin-preval-1.3.2.tgz#44192e6e97b58661bf2c5bcae90bba2a366e0134"
+  dependencies:
+    babel-core "^6.25.0"
+    babylon "^6.17.4"
+    require-from-string "^1.2.1"
+
 babel-plugin-react-docgen@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-react-docgen/-/babel-plugin-react-docgen-1.5.0.tgz#0339717ad51f4a5ce4349330b8266ea5a56f53b4"
@@ -1312,7 +1320,7 @@ babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1, babel-types@^6.25
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.17.0, babylon@^6.17.2:
+babylon@^6.17.0, babylon@^6.17.2, babylon@^6.17.4:
   version "6.17.4"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a"
 
@@ -6335,7 +6343,7 @@ require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
-require-from-string@^1.1.0:
+require-from-string@^1.1.0, require-from-string@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
 

From 1618b68bfa740ed655ac45d7d5f4f46fed6c8c62 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 20:41:49 +0200
Subject: [PATCH 240/382] HTTP signatures (#4146)

* Add Request class with HTTP signature generator

Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06

* Add HTTP signature verification concern

* Add test for SignatureVerification concern

* Add basic test for Request class

* Make PuSH subscribe/unsubscribe requests use new Request class

Accidentally fix lease_seconds not being set and sent properly, and
change the new minimum subscription duration to 1 day

* Make all PuSH workers use new Request class

* Make Salmon sender use new Request class

* Make FetchLinkService use new Request class

* Make FetchAtomService use the new Request class

* Make Remotable use the new Request class

* Make ResolveRemoteAccountService use the new Request class

* Add more tests

* Allow +-30 seconds window for signed request to remain valid

* Disable time window validation for signed requests, restore 7 days
as PuSH subscription duration (which was previous default due to a bug)
---
 app/controllers/accounts_controller.rb        |  1 +
 .../api/subscriptions_controller.rb           |  2 +-
 .../concerns/signature_verification.rb        | 87 +++++++++++++++++++
 app/controllers/stream_entries_controller.rb  |  1 +
 app/helpers/http_helper.rb                    | 17 ----
 app/lib/provider_discovery.rb                 |  4 +-
 app/lib/request.rb                            | 70 +++++++++++++++
 app/models/account.rb                         |  2 +-
 app/models/concerns/remotable.rb              |  3 +-
 app/models/subscription.rb                    |  4 +-
 app/services/fetch_atom_service.rb            |  8 +-
 app/services/fetch_link_card_service.rb       |  6 +-
 .../resolve_remote_account_service.rb         |  3 +-
 app/services/send_interaction_service.rb      | 14 ++-
 app/services/subscribe_service.rb             | 48 +++++++---
 app/services/unsubscribe_service.rb           | 31 +++++--
 .../pubsubhubbub/confirmation_worker.rb       | 12 ++-
 app/workers/pubsubhubbub/delivery_worker.rb   | 11 ++-
 .../concerns/signature_verification_spec.rb   | 74 ++++++++++++++++
 spec/helpers/http_helper_spec.rb              | 13 ---
 spec/lib/request_spec.rb                      | 54 ++++++++++++
 .../pubsubhubbub/confirmation_worker_spec.rb  |  2 +-
 .../pubsubhubbub/delivery_worker_spec.rb      |  2 +-
 23 files changed, 379 insertions(+), 90 deletions(-)
 create mode 100644 app/controllers/concerns/signature_verification.rb
 delete mode 100644 app/helpers/http_helper.rb
 create mode 100644 app/lib/request.rb
 create mode 100644 spec/controllers/concerns/signature_verification_spec.rb
 delete mode 100644 spec/helpers/http_helper_spec.rb
 create mode 100644 spec/lib/request_spec.rb

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 11402ab79..69b520df1 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -2,6 +2,7 @@
 
 class AccountsController < ApplicationController
   include AccountControllerConcern
+  include SignatureVerification
 
   def show
     respond_to do |format|
diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb
index d3ea98676..89007f3d6 100644
--- a/app/controllers/api/subscriptions_controller.rb
+++ b/app/controllers/api/subscriptions_controller.rb
@@ -42,7 +42,7 @@ class Api::SubscriptionsController < Api::BaseController
   end
 
   def lease_seconds_or_default
-    (params['hub.lease_seconds'] || 86_400).to_i.seconds
+    (params['hub.lease_seconds'] || 1.day).to_i.seconds
   end
 
   def set_account
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
new file mode 100644
index 000000000..abe845d93
--- /dev/null
+++ b/app/controllers/concerns/signature_verification.rb
@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+# Implemented according to HTTP signatures (Draft 6)
+# <https://tools.ietf.org/html/draft-cavage-http-signatures-06>
+module SignatureVerification
+  extend ActiveSupport::Concern
+
+  def signed_request?
+    request.headers['Signature'].present?
+  end
+
+  def signed_request_account
+    return @signed_request_account if defined?(@signed_request_account)
+
+    unless signed_request?
+      @signed_request_account = nil
+      return
+    end
+
+    raw_signature    = request.headers['Signature']
+    signature_params = {}
+
+    raw_signature.split(',').each do |part|
+      parsed_parts = part.match(/([a-z]+)="([^"]+)"/i)
+      next if parsed_parts.nil? || parsed_parts.size != 3
+      signature_params[parsed_parts[1]] = parsed_parts[2]
+    end
+
+    if incompatible_signature?(signature_params)
+      @signed_request_account = nil
+      return
+    end
+
+    account = ResolveRemoteAccountService.new.call(signature_params['keyId'].gsub(/\Aacct:/, ''))
+
+    if account.nil?
+      @signed_request_account = nil
+      return
+    end
+
+    signature             = Base64.decode64(signature_params['signature'])
+    compare_signed_string = build_signed_string(signature_params['headers'])
+
+    if account.keypair.public_key.verify(OpenSSL::Digest::SHA256.new, signature, compare_signed_string)
+      @signed_request_account = account
+      @signed_request_account
+    else
+      @signed_request_account = nil
+    end
+  end
+
+  private
+
+  def build_signed_string(signed_headers)
+    signed_headers = 'date' if signed_headers.blank?
+
+    signed_headers.split(' ').map do |signed_header|
+      if signed_header == Request::REQUEST_TARGET
+        "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+      else
+        "#{signed_header}: #{request.headers[to_header_name(signed_header)]}"
+      end
+    end.join("\n")
+  end
+
+  def matches_time_window?
+    begin
+      time_sent = DateTime.httpdate(request.headers['Date'])
+    rescue ArgumentError
+      return false
+    end
+
+    (Time.now.utc - time_sent).abs <= 30
+  end
+
+  def to_header_name(name)
+    name.split(/-/).map(&:capitalize).join('-')
+  end
+
+  def incompatible_signature?(signature_params)
+    signature_params['keyId'].blank? ||
+      signature_params['signature'].blank? ||
+      signature_params['algorithm'].blank? ||
+      signature_params['algorithm'] != 'rsa-sha256' ||
+      !signature_params['keyId'].start_with?('acct:')
+  end
+end
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index 314d59619..54a435238 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -2,6 +2,7 @@
 
 class StreamEntriesController < ApplicationController
   include Authorization
+  include SignatureVerification
 
   layout 'public'
 
diff --git a/app/helpers/http_helper.rb b/app/helpers/http_helper.rb
deleted file mode 100644
index e39a52da0..000000000
--- a/app/helpers/http_helper.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module HttpHelper
-  def http_client(options = {})
-    timeout = { write: 10, connect: 10, read: 10 }.merge(options)
-
-    HTTP.headers(user_agent: user_agent)
-        .timeout(:per_operation, timeout)
-        .follow
-  end
-
-  private
-
-  def user_agent
-    @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +http://#{Rails.configuration.x.local_domain}/)"
-  end
-end
diff --git a/app/lib/provider_discovery.rb b/app/lib/provider_discovery.rb
index 6d48cae2f..5e02e6806 100644
--- a/app/lib/provider_discovery.rb
+++ b/app/lib/provider_discovery.rb
@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
 class ProviderDiscovery < OEmbed::ProviderDiscovery
-  extend HttpHelper
-
   class << self
     def discover_provider(url, options = {})
-      res    = http_client.get(url)
+      res    = Request.new(:get, url).perform
       format = options[:format]
 
       raise OEmbed::NotFound, url if res.code != 200 || res.mime_type != 'text/html'
diff --git a/app/lib/request.rb b/app/lib/request.rb
new file mode 100644
index 000000000..e73c5ac20
--- /dev/null
+++ b/app/lib/request.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+class Request
+  REQUEST_TARGET = '(request-target)'
+
+  include RoutingHelper
+
+  def initialize(verb, url, options = {})
+    @verb    = verb
+    @url     = Addressable::URI.parse(url).normalize
+    @options = options
+    @headers = {}
+
+    set_common_headers!
+  end
+
+  def on_behalf_of(account)
+    raise ArgumentError unless account.local?
+    @account = account
+  end
+
+  def add_headers(new_headers)
+    @headers.merge!(new_headers)
+  end
+
+  def perform
+    http_client.headers(headers).public_send(@verb, @url.to_s, @options)
+  end
+
+  def headers
+    (@account ? @headers.merge('Signature' => signature) : @headers).without(REQUEST_TARGET)
+  end
+
+  private
+
+  def set_common_headers!
+    @headers[REQUEST_TARGET] = "#{@verb} #{@url.path}"
+    @headers['User-Agent']   = user_agent
+    @headers['Host']         = @url.host
+    @headers['Date']         = Time.now.utc.httpdate
+  end
+
+  def signature
+    key_id    = @account.to_webfinger_s
+    algorithm = 'rsa-sha256'
+    signature = Base64.strict_encode64(@account.keypair.sign(OpenSSL::Digest::SHA256.new, signed_string))
+
+    "keyId=\"#{key_id}\",algorithm=\"#{algorithm}\",headers=\"#{signed_headers}\",signature=\"#{signature}\""
+  end
+
+  def signed_string
+    @headers.map { |key, value| "#{key.downcase}: #{value}" }.join("\n")
+  end
+
+  def signed_headers
+    @headers.keys.join(' ').downcase
+  end
+
+  def user_agent
+    @user_agent ||= "#{HTTP::Request::USER_AGENT} (Mastodon/#{Mastodon::Version}; +#{root_url})"
+  end
+
+  def timeout
+    { write: 10, connect: 10, read: 10 }
+  end
+
+  def http_client
+    HTTP.timeout(:per_operation, timeout).follow
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 7243cb1a5..58b0a1086 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -130,7 +130,7 @@ class Account < ApplicationRecord
   end
 
   def subscription(webhook_url)
-    OStatus2::Subscription.new(remote_url, secret: secret, lease_seconds: 86_400 * 30, webhook: webhook_url, hub: hub_url)
+    OStatus2::Subscription.new(remote_url, secret: secret, lease_seconds: 30.days.seconds, webhook: webhook_url, hub: hub_url)
   end
 
   def save_with_optional_media!
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb
index b4f169649..1bd87a642 100644
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 module Remotable
-  include HttpHelper
   extend ActiveSupport::Concern
 
   included do
@@ -20,7 +19,7 @@ module Remotable
         return if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty? || self[attribute_name] == url
 
         begin
-          response = http_client.get(url)
+          response = Request.new(:get, url).perform
 
           return if response.code != 200
 
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index 35a228df0..d9d5024a9 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -16,8 +16,8 @@
 #
 
 class Subscription < ApplicationRecord
-  MIN_EXPIRATION = 7.days.seconds.to_i
-  MAX_EXPIRATION = 30.days.seconds.to_i
+  MIN_EXPIRATION = 1.day.to_i
+  MAX_EXPIRATION = 30.days.to_i
 
   belongs_to :account, required: true
 
diff --git a/app/services/fetch_atom_service.rb b/app/services/fetch_atom_service.rb
index d430b22e9..3ac441e3e 100644
--- a/app/services/fetch_atom_service.rb
+++ b/app/services/fetch_atom_service.rb
@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
 class FetchAtomService < BaseService
-  include HttpHelper
-
   def call(url)
     return if url.blank?
 
-    response = http_client.head(url)
+    response = Request.new(:head, url).perform
 
     Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
 
-    response = http_client.get(url) if response.code == 405
+    response = Request.new(:get, url).perform if response.code == 405
 
     Rails.logger.debug "Remote status GET request returned code #{response.code}"
 
@@ -49,6 +47,6 @@ class FetchAtomService < BaseService
   end
 
   def fetch(url)
-    http_client.get(url).to_s
+    Request.new(:get, url).perform.to_s
   end
 end
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 6ef3abb66..20c85e0ea 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class FetchLinkCardService < BaseService
-  include HttpHelper
-
   URL_PATTERN = %r{https?://\S+}
 
   def call(status)
@@ -13,7 +11,7 @@ class FetchLinkCardService < BaseService
 
     url  = url.to_s
     card = PreviewCard.where(status: status).first_or_initialize(status: status, url: url)
-    res  = http_client.head(url)
+    res  = Request.new(:head, url).perform
 
     return if res.code != 200 || res.mime_type != 'text/html'
 
@@ -80,7 +78,7 @@ class FetchLinkCardService < BaseService
   end
 
   def attempt_opengraph(card, url)
-    response = http_client.get(url)
+    response = Request.new(:get, url).perform
 
     return if response.code != 200 || response.mime_type != 'text/html'
 
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
index 362d0df98..d2dfda824 100644
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@@ -2,7 +2,6 @@
 
 class ResolveRemoteAccountService < BaseService
   include OStatus2::MagicKey
-  include HttpHelper
 
   DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0'
 
@@ -79,7 +78,7 @@ class ResolveRemoteAccountService < BaseService
   end
 
   def get_feed(url)
-    response = http_client(write: 20, connect: 20, read: 50).get(Addressable::URI.parse(url).normalize)
+    response = Request.new(:get, url).perform
     raise Goldfinger::Error, "Feed attempt failed for #{url}: HTTP #{response.code}" unless response.code == 200
     [response.to_s, Nokogiri::XML(response)]
   end
diff --git a/app/services/send_interaction_service.rb b/app/services/send_interaction_service.rb
index 34c8f9e34..ef38a748b 100644
--- a/app/services/send_interaction_service.rb
+++ b/app/services/send_interaction_service.rb
@@ -12,13 +12,23 @@ class SendInteractionService < BaseService
 
     return if block_notification?
 
-    envelope = salmon.pack(@xml, @source_account.keypair)
-    delivery = salmon.post(@target_account.salmon_url, envelope)
+    delivery = build_request.perform
+
     raise "Delivery failed for #{target_account.salmon_url}: HTTP #{delivery.code}" unless delivery.code > 199 && delivery.code < 300
   end
 
   private
 
+  def build_request
+    request = Request.new(:post, @target_account.salmon_url, body: envelope)
+    request.add_headers('Content-Type' => 'application/magic-envelope+xml')
+    request
+  end
+
+  def envelope
+    salmon.pack(@xml, @source_account.keypair)
+  end
+
   def block_notification?
     DomainBlock.blocked?(@target_account.domain)
   end
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb
index 1e7984a7f..f58067038 100644
--- a/app/services/subscribe_service.rb
+++ b/app/services/subscribe_service.rb
@@ -2,34 +2,54 @@
 
 class SubscribeService < BaseService
   def call(account)
-    account.secret = SecureRandom.hex
+    @account        = account
+    @account.secret = SecureRandom.hex
+    @response       = build_request.perform
 
-    subscription = account.subscription(api_subscription_url(account.id))
-    response     = subscription.subscribe
-
-    if response_failed_permanently?(response)
+    if response_failed_permanently?
       # We're not allowed to subscribe. Fail and move on.
-      account.secret = ''
-      account.save!
-    elsif response_successful?(response)
+      @account.secret = ''
+      @account.save!
+    elsif response_successful?
       # The subscription will be confirmed asynchronously.
-      account.save!
+      @account.save!
     else
       # The response was either a 429 rate limit, or a 5xx error.
       # We need to retry at a later time. Fail loudly!
-      raise "Subscription attempt failed for #{account.acct} (#{account.hub_url}): HTTP #{response.code}"
+      raise "Subscription attempt failed for #{@account.acct} (#{@account.hub_url}): HTTP #{@response.code}"
     end
   end
 
   private
 
+  def build_request
+    request = Request.new(:post, @account.hub_url, form: subscription_params)
+    request.on_behalf_of(some_local_account) if some_local_account
+    request
+  end
+
+  def subscription_params
+    {
+      'hub.topic': @account.remote_url,
+      'hub.mode': 'subscribe',
+      'hub.callback': api_subscription_url(@account.id),
+      'hub.verify': 'async',
+      'hub.secret': @account.secret,
+      'hub.lease_seconds': 7.days.seconds,
+    }
+  end
+
+  def some_local_account
+    @some_local_account ||= Account.local.first
+  end
+
   # Any response in the 3xx or 4xx range, except for 429 (rate limit)
-  def response_failed_permanently?(response)
-    (response.status.redirect? || response.status.client_error?) && !response.status.too_many_requests?
+  def response_failed_permanently?
+    (@response.status.redirect? || @response.status.client_error?) && !@response.status.too_many_requests?
   end
 
   # Any response in the 2xx range
-  def response_successful?(response)
-    response.status.success?
+  def response_successful?
+    @response.status.success?
   end
 end
diff --git a/app/services/unsubscribe_service.rb b/app/services/unsubscribe_service.rb
index 6db8dbdc4..c2f022d7d 100644
--- a/app/services/unsubscribe_service.rb
+++ b/app/services/unsubscribe_service.rb
@@ -2,17 +2,30 @@
 
 class UnsubscribeService < BaseService
   def call(account)
-    subscription = account.subscription(api_subscription_url(account.id))
-    response = subscription.unsubscribe
+    @account  = account
+    @response = build_request.perform
 
-    unless response.status.success?
-      Rails.logger.debug "PuSH unsubscribe for #{account.acct} failed: #{response.status}"
-    end
+    Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success?
 
-    account.secret = ''
-    account.subscription_expires_at = nil
-    account.save!
+    @account.secret = ''
+    @account.subscription_expires_at = nil
+    @account.save!
   rescue HTTP::Error, OpenSSL::SSL::SSLError
-    Rails.logger.debug "PuSH subscription request for #{account.acct} could not be made due to HTTP or SSL error"
+    Rails.logger.debug "PuSH subscription request for #{@account.acct} could not be made due to HTTP or SSL error"
+  end
+
+  private
+
+  def build_request
+    Request.new(:post, @account.hub_url, form: subscription_params)
+  end
+
+  def subscription_params
+    {
+      'hub.topic': @account.remote_url,
+      'hub.mode': 'unsubscribe',
+      'hub.callback': api_subscription_url(@account.id),
+      'hub.verify': 'async',
+    }
   end
 end
diff --git a/app/workers/pubsubhubbub/confirmation_worker.rb b/app/workers/pubsubhubbub/confirmation_worker.rb
index 9186c5d7d..e1ccfb99c 100644
--- a/app/workers/pubsubhubbub/confirmation_worker.rb
+++ b/app/workers/pubsubhubbub/confirmation_worker.rb
@@ -60,9 +60,7 @@ class Pubsubhubbub::ConfirmationWorker
   end
 
   def callback_get_with_params
-    HTTP.headers(user_agent: 'Mastodon/PubSubHubbub')
-        .timeout(:per_operation, write: 20, connect: 20, read: 50)
-        .get(subscription.callback_url, params: callback_params)
+    Request.new(:get, subscription.callback_url, params: callback_params).perform
   end
 
   def callback_response_body
@@ -71,10 +69,10 @@ class Pubsubhubbub::ConfirmationWorker
 
   def callback_params
     {
-      'hub.topic' => account_url(subscription.account, format: :atom),
-      'hub.mode' => mode,
-      'hub.challenge' => challenge,
-      'hub.lease_seconds' => subscription.lease_seconds,
+      'hub.topic': account_url(subscription.account, format: :atom),
+      'hub.mode': mode,
+      'hub.challenge': challenge,
+      'hub.lease_seconds': subscription.lease_seconds,
     }
   end
 
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
index 981838f33..05d160cf7 100644
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ b/app/workers/pubsubhubbub/delivery_worker.rb
@@ -33,9 +33,9 @@ class Pubsubhubbub::DeliveryWorker
   end
 
   def callback_post_payload
-    HTTP.timeout(:per_operation, write: 50, connect: 20, read: 50)
-        .headers(headers)
-        .post(subscription.callback_url, body: payload)
+    request = Request.new(:post, subscription.callback_url, body: payload)
+    request.add_headers(headers)
+    request.perform
   end
 
   def blocked_domain?
@@ -48,13 +48,12 @@ class Pubsubhubbub::DeliveryWorker
 
   def headers
     {
-      'User-Agent' => 'Mastodon/PubSubHubbub',
       'Content-Type' => 'application/atom+xml',
-      'Link' => link_headers,
+      'Link' => link_header,
     }.merge(signature_headers.to_h)
   end
 
-  def link_headers
+  def link_header
     LinkHeader.new([hub_link_header, self_link_header]).to_s
   end
 
diff --git a/spec/controllers/concerns/signature_verification_spec.rb b/spec/controllers/concerns/signature_verification_spec.rb
new file mode 100644
index 000000000..b371795ab
--- /dev/null
+++ b/spec/controllers/concerns/signature_verification_spec.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ApplicationController, type: :controller do
+  controller do
+    include SignatureVerification
+
+    def success
+      head 200
+    end
+
+    def alternative_success
+      head 200
+    end
+  end
+
+  before do
+    routes.draw { get 'success' => 'anonymous#success' }
+  end
+
+  context 'without signature header' do
+    before do
+      get :success
+    end
+
+    describe '#signed_request?' do
+      it 'returns false' do
+        expect(controller.signed_request?).to be false
+      end
+    end
+
+    describe '#signed_request_account' do
+      it 'returns nil' do
+        expect(controller.signed_request_account).to be_nil
+      end
+    end
+  end
+
+  context 'with signature header' do
+    let!(:author) { Fabricate(:account) }
+
+    before do
+      get :success
+
+      fake_request = Request.new(:get, request.url)
+      fake_request.on_behalf_of(author)
+
+      request.headers.merge!(fake_request.headers)
+    end
+
+    describe '#signed_request?' do
+      it 'returns true' do
+        expect(controller.signed_request?).to be true
+      end
+    end
+
+    describe '#signed_request_account' do
+      it 'returns an account' do
+        expect(controller.signed_request_account).to eq author
+      end
+
+      it 'returns nil when path does not match' do
+        request.path = '/alternative-path'
+        expect(controller.signed_request_account).to be_nil
+      end
+
+      it 'returns nil when method does not match' do
+        post :success
+        expect(controller.signed_request_account).to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/helpers/http_helper_spec.rb b/spec/helpers/http_helper_spec.rb
deleted file mode 100644
index b8e31b8e6..000000000
--- a/spec/helpers/http_helper_spec.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe HttpHelper do
-  describe 'http_client' do
-    it 'returns HTTP::Client with default options' do
-      options = helper.http_client.default_options
-      expect(options.headers['User-Agent']).to match /.+ \(Mastodon\/.+;\ \+http:\/\/cb6e6126\.ngrok\.io\/\)/
-      expect(options.timeout_options).to eq read_timeout: 10, write_timeout: 10, connect_timeout: 10
-    end
-  end
-end
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
new file mode 100644
index 000000000..782f14b18
--- /dev/null
+++ b/spec/lib/request_spec.rb
@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe Request do
+  subject { Request.new(:get, 'http://example.com') }
+
+  describe '#headers' do
+    it 'returns user agent' do
+      expect(subject.headers['User-Agent']).to be_present
+    end
+
+    it 'returns the date header' do
+      expect(subject.headers['Date']).to be_present
+    end
+
+    it 'returns the host header' do
+      expect(subject.headers['Host']).to be_present
+    end
+
+    it 'does not return virtual request-target header' do
+      expect(subject.headers['(request-target)']).to be_nil
+    end
+  end
+
+  describe '#on_behalf_of' do
+    it 'when used, adds signature header' do
+      subject.on_behalf_of(Fabricate(:account))
+      expect(subject.headers['Signature']).to be_present
+    end
+  end
+
+  describe '#add_headers' do
+    it 'adds headers to the request' do
+      subject.add_headers('Test' => 'Foo')
+      expect(subject.headers['Test']).to eq 'Foo'
+    end
+  end
+
+  describe '#perform' do
+    before do
+      stub_request(:get, 'http://example.com')
+      subject.perform
+    end
+
+    it 'executes a HTTP request' do
+      expect(a_request(:get, 'http://example.com')).to have_been_made.once
+    end
+
+    it 'sets headers' do
+      expect(a_request(:get, 'http://example.com').with(headers: subject.headers)).to have_been_made
+    end
+  end
+end
diff --git a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
index 1199d5801..8f66b4520 100644
--- a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
+++ b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
@@ -83,6 +83,6 @@ describe Pubsubhubbub::ConfirmationWorker do
   end
 
   def http_headers
-    { 'Connection' => 'close', 'Host' => 'example.com', 'User-Agent' => 'Mastodon/PubSubHubbub' }
+    { 'Connection' => 'close', 'Host' => 'example.com', 'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)' }
   end
 end
diff --git a/spec/workers/pubsubhubbub/delivery_worker_spec.rb b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
index 081dfa41c..a83245786 100644
--- a/spec/workers/pubsubhubbub/delivery_worker_spec.rb
+++ b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
@@ -59,7 +59,7 @@ describe Pubsubhubbub::DeliveryWorker do
         'Content-Type' => 'application/atom+xml',
         'Host' => 'example.com',
         'Link' => "<https://#{Rails.configuration.x.local_domain}/api/push>; rel=\"hub\", <https://#{Rails.configuration.x.local_domain}/users/#{subscription.account.username}.atom>; rel=\"self\"",
-        'User-Agent' => 'Mastodon/PubSubHubbub',
+        'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)',
       }.tap do |basic|
         known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload)
         basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret?

From 1896a154f5f5edd4f94c58e5c69dd70ebc728e3d Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sat, 15 Jul 2017 03:44:53 +0900
Subject: [PATCH 241/382] Fix response of unreblog/unfavourite APIs (#4204)

Both APIs process asynchronously, so reblogged/favourited fields in the response should be set to `false` manually.
---
 app/controllers/api/v1/statuses/favourites_controller.rb | 2 +-
 app/controllers/api/v1/statuses/reblogs_controller.rb    | 2 +-
 app/presenters/status_relationships_presenter.rb         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb
index 4c4b0c160..35f8a48cd 100644
--- a/app/controllers/api/v1/statuses/favourites_controller.rb
+++ b/app/controllers/api/v1/statuses/favourites_controller.rb
@@ -19,7 +19,7 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
 
     UnfavouriteWorker.perform_async(current_user.account_id, @status.id)
 
-    render json: @status, serializer: REST::StatusSerializer
+    render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, favourites_map: @favourites_map)
   end
 
   private
diff --git a/app/controllers/api/v1/statuses/reblogs_controller.rb b/app/controllers/api/v1/statuses/reblogs_controller.rb
index f7f4b5a5c..634af474f 100644
--- a/app/controllers/api/v1/statuses/reblogs_controller.rb
+++ b/app/controllers/api/v1/statuses/reblogs_controller.rb
@@ -20,7 +20,7 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
     authorize status_for_destroy, :unreblog?
     RemovalWorker.perform_async(status_for_destroy.id)
 
-    render json: @status, serializer: REST::StatusSerializer
+    render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, reblogs_map: @reblogs_map)
   end
 
   private
diff --git a/app/presenters/status_relationships_presenter.rb b/app/presenters/status_relationships_presenter.rb
index caf00791a..03294015f 100644
--- a/app/presenters/status_relationships_presenter.rb
+++ b/app/presenters/status_relationships_presenter.rb
@@ -3,7 +3,7 @@
 class StatusRelationshipsPresenter
   attr_reader :reblogs_map, :favourites_map, :mutes_map
 
-  def initialize(statuses, current_account_id = nil)
+  def initialize(statuses, current_account_id = nil, reblogs_map: {}, favourites_map: {}, mutes_map: {})
     if current_account_id.nil?
       @reblogs_map    = {}
       @favourites_map = {}
@@ -11,9 +11,9 @@ class StatusRelationshipsPresenter
     else
       status_ids       = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
       conversation_ids = statuses.compact.map(&:conversation_id).compact.uniq
-      @reblogs_map     = Status.reblogs_map(status_ids, current_account_id)
-      @favourites_map  = Status.favourites_map(status_ids, current_account_id)
-      @mutes_map       = Status.mutes_map(conversation_ids, current_account_id)
+      @reblogs_map     = Status.reblogs_map(status_ids, current_account_id).merge(reblogs_map)
+      @favourites_map  = Status.favourites_map(status_ids, current_account_id).merge(favourites_map)
+      @mutes_map       = Status.mutes_map(conversation_ids, current_account_id).merge(mutes_map)
     end
   end
 end

From 72bd73f605a7253daf445f76425da3182a1f669c Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 14 Jul 2017 22:31:25 +0200
Subject: [PATCH 242/382] Small style fixes (#4206)

* fix(components/media_modal): Center horizontally in Firefox

* fix(components/status_list): Do not remove load more button
---
 app/javascript/mastodon/components/load_more.js   | 9 ++++++++-
 app/javascript/mastodon/components/status_list.js | 6 +-----
 app/javascript/styles/components.scss             | 1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/components/load_more.js b/app/javascript/mastodon/components/load_more.js
index 2996d4dc8..e2fe1fed7 100644
--- a/app/javascript/mastodon/components/load_more.js
+++ b/app/javascript/mastodon/components/load_more.js
@@ -6,11 +6,18 @@ export default class LoadMore extends React.PureComponent {
 
   static propTypes = {
     onClick: PropTypes.func,
+    visible: PropTypes.bool,
+  }
+
+  static defaultProps = {
+    visible: true,
   }
 
   render() {
+    const { visible } = this.props;
+
     return (
-      <button className='load-more' onClick={this.props.onClick}>
+      <button className='load-more' disabled={!visible} style={{ opacity: visible ? 1 : 0 }} onClick={this.props.onClick}>
         <FormattedMessage id='status.load_more' defaultMessage='Load more' />
       </button>
     );
diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 5bc46e8ee..86e8386bd 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -101,13 +101,9 @@ export default class StatusList extends ImmutablePureComponent {
   render () {
     const { statusIds, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
 
-    let loadMore       = null;
+    const loadMore     = <LoadMore visible={!isLoading && statusIds.size > 0 && hasMore} onClick={this.handleLoadMore} />;
     let scrollableArea = null;
 
-    if (!isLoading && statusIds.size > 0 && hasMore) {
-      loadMore = <LoadMore onClick={this.handleLoadMore} />;
-    }
-
     if (isLoading || statusIds.size > 0 || !emptyMessage) {
       scrollableArea = (
         <div className='scrollable' ref={this.setRef}>
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 0420a2bed..fc797a508 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1314,6 +1314,7 @@
 .react-swipeable-view-container > * {
   display: flex;
   align-items: center;
+  justify-content: center;
   height: 100%;
 }
 

From de397f3bc1f1c7e632d0db0754711beb6ce04664 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 22:31:38 +0200
Subject: [PATCH 243/382] Fix subsequent replies to unresolved status not being
 filtered from home (#4190)

Resolves #4177 - smaller changeset
---
 app/lib/feed_manager.rb       | 7 ++++---
 spec/lib/feed_manager_spec.rb | 7 +++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index c507f2636..b1ae11084 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -93,7 +93,7 @@ class FeedManager
   end
 
   def filter_from_home?(status, receiver_id)
-    return true if status.reply? && status.in_reply_to_id.nil?
+    return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
 
     check_for_mutes = [status.account_id]
     check_for_mutes.concat([status.reblog.account_id]) if status.reblog?
@@ -120,12 +120,13 @@ class FeedManager
   end
 
   def filter_from_mentions?(status, receiver_id)
+    return true if receiver_id == status.account_id
+
     check_for_blocks = [status.account_id]
     check_for_blocks.concat(status.mentions.pluck(:account_id))
     check_for_blocks.concat([status.in_reply_to_account]) if status.reply? && !status.in_reply_to_account_id.nil?
 
-    should_filter   = receiver_id == status.account_id                                                                                   # Filter if I'm mentioning myself
-    should_filter ||= Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any?                                     # or it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked
+    should_filter   = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any?                                     # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked
     should_filter ||= (status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists?) # of if the account is silenced and I'm not following them
 
     should_filter
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 4bdc96866..22439cf35 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -81,6 +81,13 @@ RSpec.describe FeedManager do
         expect(FeedManager.instance.filter?(:home, reply, bob.id)).to be true
       end
 
+      it 'returns true for the second reply by followee to a non-federated status' do
+        reply        = Fabricate(:status, text: 'Reply 1', reply: true, account: alice)
+        second_reply = Fabricate(:status, text: 'Reply 2', thread: reply, account: alice)
+        bob.follow!(alice)
+        expect(FeedManager.instance.filter?(:home, second_reply, bob.id)).to be true
+      end
+
       it 'returns false for status by followee mentioning another account' do
         bob.follow!(alice)
         status = PostStatusService.new.call(alice, 'Hey @jeff')

From cd9b2ab2f70b6c1da5d0abeaa88eecdfc1b41f78 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 14 Jul 2017 23:01:20 +0200
Subject: [PATCH 244/382] Fix #2672 - Connect signed PuSH subscription requests
 to instance domain (#4205)

* Fix #2672 - Connect signed PuSH subscription requests to instance domain

Resolves #2739

* Fix return of locate_subscription

* Fix tests
---
 app/controllers/api/push_controller.rb           |  8 +++++++-
 app/models/subscription.rb                       |  2 +-
 app/services/pubsubhubbub/subscribe_service.rb   | 16 +++++++++++++---
 app/workers/pubsubhubbub/distribution_worker.rb  |  8 ++++----
 ...20170714184731_add_domain_to_subscriptions.rb |  5 +++++
 db/schema.rb                                     |  3 ++-
 spec/controllers/api/push_controller_spec.rb     |  1 +
 7 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20170714184731_add_domain_to_subscriptions.rb

diff --git a/app/controllers/api/push_controller.rb b/app/controllers/api/push_controller.rb
index 951867140..e04d19125 100644
--- a/app/controllers/api/push_controller.rb
+++ b/app/controllers/api/push_controller.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Api::PushController < Api::BaseController
+  include SignatureVerification
+
   def update
     response, status = process_push_request
     render plain: response, status: status
@@ -11,7 +13,7 @@ class Api::PushController < Api::BaseController
   def process_push_request
     case hub_mode
     when 'subscribe'
-      Pubsubhubbub::SubscribeService.new.call(account_from_topic, hub_callback, hub_secret, hub_lease_seconds)
+      Pubsubhubbub::SubscribeService.new.call(account_from_topic, hub_callback, hub_secret, hub_lease_seconds, verified_domain)
     when 'unsubscribe'
       Pubsubhubbub::UnsubscribeService.new.call(account_from_topic, hub_callback)
     else
@@ -57,6 +59,10 @@ class Api::PushController < Api::BaseController
     TagManager.instance.web_domain?(hub_topic_domain)
   end
 
+  def verified_domain
+    return signed_request_account.domain if signed_request_account
+  end
+
   def hub_topic_domain
     hub_topic_uri.host + (hub_topic_uri.port ? ":#{hub_topic_uri.port}" : '')
   end
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
index d9d5024a9..bf643c1f9 100644
--- a/app/models/subscription.rb
+++ b/app/models/subscription.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 # == Schema Information
 #
 # Table name: subscriptions
@@ -13,6 +12,7 @@
 #  created_at                  :datetime         not null
 #  updated_at                  :datetime         not null
 #  last_successful_delivery_at :datetime
+#  domain                      :string
 #
 
 class Subscription < ApplicationRecord
diff --git a/app/services/pubsubhubbub/subscribe_service.rb b/app/services/pubsubhubbub/subscribe_service.rb
index eeb7ab258..2dba05b12 100644
--- a/app/services/pubsubhubbub/subscribe_service.rb
+++ b/app/services/pubsubhubbub/subscribe_service.rb
@@ -3,13 +3,15 @@
 class Pubsubhubbub::SubscribeService < BaseService
   URL_PATTERN = /\A#{URI.regexp(%w(http https))}\z/
 
-  attr_reader :account, :callback, :secret, :lease_seconds
+  attr_reader :account, :callback, :secret,
+              :lease_seconds, :domain
 
-  def call(account, callback, secret, lease_seconds)
+  def call(account, callback, secret, lease_seconds, verified_domain = nil)
     @account       = account
     @callback      = Addressable::URI.parse(callback).normalize.to_s
     @secret        = secret
     @lease_seconds = lease_seconds
+    @domain        = verified_domain
 
     process_subscribe
   end
@@ -56,6 +58,14 @@ class Pubsubhubbub::SubscribeService < BaseService
   end
 
   def locate_subscription
-    Subscription.where(account: account, callback_url: callback).first_or_create!(account: account, callback_url: callback)
+    subscription = Subscription.find_by(account: account, callback_url: callback)
+
+    if subscription.nil?
+      subscription = Subscription.new(account: account, callback_url: callback)
+    end
+
+    subscription.domain = domain
+    subscription.save!
+    subscription
   end
 end
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index b41cec90d..7592354cc 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -35,16 +35,16 @@ class Pubsubhubbub::DistributionWorker
     @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
     @domains = @account.followers.domains
 
-    Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url) }) do |subscription|
+    Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription|
       [subscription.id, @payload]
     end
   end
 
   def active_subscriptions
-    Subscription.where(account: @account).active.select('id, callback_url')
+    Subscription.where(account: @account).active.select('id, callback_url, domain')
   end
 
-  def allowed_to_receive?(callback_url)
-    @domains.include?(Addressable::URI.parse(callback_url).host)
+  def allowed_to_receive?(callback_url, domain)
+    (!domain.nil? && @domains.include?(domain)) || @domains.include?(Addressable::URI.parse(callback_url).host)
   end
 end
diff --git a/db/migrate/20170714184731_add_domain_to_subscriptions.rb b/db/migrate/20170714184731_add_domain_to_subscriptions.rb
new file mode 100644
index 000000000..7c01a64f5
--- /dev/null
+++ b/db/migrate/20170714184731_add_domain_to_subscriptions.rb
@@ -0,0 +1,5 @@
+class AddDomainToSubscriptions < ActiveRecord::Migration[5.1]
+  def change
+    add_column :subscriptions, :domain, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b2c59a0f6..5ec78a7c9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170713190709) do
+ActiveRecord::Schema.define(version: 20170714184731) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -326,6 +326,7 @@ ActiveRecord::Schema.define(version: 20170713190709) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.datetime "last_successful_delivery_at"
+    t.string "domain"
     t.index ["account_id", "callback_url"], name: "index_subscriptions_on_account_id_and_callback_url", unique: true
   end
 
diff --git a/spec/controllers/api/push_controller_spec.rb b/spec/controllers/api/push_controller_spec.rb
index 18bfa70e5..647698bd1 100644
--- a/spec/controllers/api/push_controller_spec.rb
+++ b/spec/controllers/api/push_controller_spec.rb
@@ -21,6 +21,7 @@ RSpec.describe Api::PushController, type: :controller do
           'https://callback.host/api',
           'as1234df',
           '3600',
+          nil
         )
         expect(response).to have_http_status(:success)
       end

From 3fbf1bf35acf89d1e397fa2e632529bf5105fe02 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 15 Jul 2017 00:49:34 +0200
Subject: [PATCH 245/382] Fix #3773 - Pin favourites column (#4201)

---
 .../features/favourited_statuses/index.js     | 64 +++++++++++++------
 .../features/ui/components/columns_area.js    |  3 +-
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/app/javascript/mastodon/features/favourited_statuses/index.js b/app/javascript/mastodon/features/favourited_statuses/index.js
index 8cef6a1e4..d9ad9bc1f 100644
--- a/app/javascript/mastodon/features/favourited_statuses/index.js
+++ b/app/javascript/mastodon/features/favourited_statuses/index.js
@@ -2,11 +2,11 @@ import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
-import LoadingIndicator from '../../components/loading_indicator';
 import { fetchFavouritedStatuses, expandFavouritedStatuses } from '../../actions/favourites';
 import Column from '../ui/components/column';
+import ColumnHeader from '../../components/column_header';
+import { addColumn, removeColumn, moveColumn } from '../../actions/columns';
 import StatusList from '../../components/status_list';
-import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -16,8 +16,6 @@ const messages = defineMessages({
 
 const mapStateToProps = state => ({
   statusIds: state.getIn(['status_lists', 'favourites', 'items']),
-  loaded: state.getIn(['status_lists', 'favourites', 'loaded']),
-  me: state.getIn(['meta', 'me']),
 });
 
 @connect(mapStateToProps)
@@ -27,34 +25,64 @@ export default class Favourites extends ImmutablePureComponent {
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     statusIds: ImmutablePropTypes.list.isRequired,
-    loaded: PropTypes.bool,
     intl: PropTypes.object.isRequired,
-    me: PropTypes.number.isRequired,
+    columnId: PropTypes.string,
+    multiColumn: PropTypes.bool,
   };
 
   componentWillMount () {
     this.props.dispatch(fetchFavouritedStatuses());
   }
 
+  handlePin = () => {
+    const { columnId, dispatch } = this.props;
+
+    if (columnId) {
+      dispatch(removeColumn(columnId));
+    } else {
+      dispatch(addColumn('FAVOURITES', {}));
+    }
+  }
+
+  handleMove = (dir) => {
+    const { columnId, dispatch } = this.props;
+    dispatch(moveColumn(columnId, dir));
+  }
+
+  handleHeaderClick = () => {
+    this.column.scrollTop();
+  }
+
+  setRef = c => {
+    this.column = c;
+  }
+
   handleScrollToBottom = () => {
     this.props.dispatch(expandFavouritedStatuses());
   }
 
   render () {
-    const { loaded, intl } = this.props;
-
-    if (!loaded) {
-      return (
-        <Column>
-          <LoadingIndicator />
-        </Column>
-      );
-    }
+    const { intl, statusIds, columnId, multiColumn } = this.props;
+    const pinned = !!columnId;
 
     return (
-      <Column icon='star' heading={intl.formatMessage(messages.heading)}>
-        <ColumnBackButtonSlim />
-        <StatusList {...this.props} scrollKey='favourited_statuses' onScrollToBottom={this.handleScrollToBottom} />
+      <Column ref={this.setRef}>
+        <ColumnHeader
+          icon='star'
+          title={intl.formatMessage(messages.heading)}
+          onPin={this.handlePin}
+          onMove={this.handleMove}
+          onClick={this.handleHeaderClick}
+          pinned={pinned}
+          multiColumn={multiColumn}
+        />
+
+        <StatusList
+          trackScroll={!pinned}
+          statusIds={statusIds}
+          scrollKey={`favourited_statuses-${columnId}`}
+          onScrollToBottom={this.handleScrollToBottom}
+        />
       </Column>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index ef9a15522..ae3f9261b 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -9,7 +9,7 @@ import { links, getIndex, getLink } from './tabs_bar';
 import BundleContainer from '../containers/bundle_container';
 import ColumnLoading from './column_loading';
 import BundleColumnError from './bundle_column_error';
-import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline } from '../../ui/util/async-components';
+import { Compose, Notifications, HomeTimeline, CommunityTimeline, PublicTimeline, HashtagTimeline, FavouritedStatuses } from '../../ui/util/async-components';
 
 const componentMap = {
   'COMPOSE': Compose,
@@ -18,6 +18,7 @@ const componentMap = {
   'PUBLIC': PublicTimeline,
   'COMMUNITY': CommunityTimeline,
   'HASHTAG': HashtagTimeline,
+  'FAVOURITES': FavouritedStatuses,
 };
 
 export default class ColumnsArea extends ImmutablePureComponent {

From 8c45cd0e3683b528b65f416681c8272d5650f32d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 15 Jul 2017 03:01:39 +0200
Subject: [PATCH 246/382] Improve ActivityPub representations (#3844)

* Improve webfinger templates and make tests more flexible

* Clean up AS2 representation of actor

* Refactor outbox

* Create activities representation

* Add representations of followers/following collections, do not redirect /users/:username route if format is empty

* Remove unused translations

* ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better
URL/URI generation

* Add ActivityPub::TagManager#to

* Represent all attachments as Document instead of Image/Video specifically
(Because for remote ones we may not know for sure)

Add mentions and hashtags representation to AP notes

* Add AP-resolvable hashtag URIs

* Use ActiveModelSerializers for ActivityPub

* Clean up unused translations

* Separate route for object and activity

* Adjust cc/to matrices

* Add to/cc to activities, ensure announce activity embeds target status and
not the wrapper status, add "id" to all collections
---
 app/controllers/accounts_controller.rb        |   4 +-
 .../activitypub/outboxes_controller.rb        |  28 ++++
 .../api/activitypub/activities_controller.rb  |  27 ---
 .../api/activitypub/notes_controller.rb       |  19 ---
 .../api/activitypub/outbox_controller.rb      |  69 --------
 .../follower_accounts_controller.rb           |  20 +++
 .../following_accounts_controller.rb          |  20 +++
 app/controllers/statuses_controller.rb        |  18 +-
 app/controllers/tags_controller.rb            |  22 ++-
 .../activitystreams2_builder_helper.rb        |   8 -
 app/lib/activitypub/adapter.rb                |  13 ++
 app/lib/activitypub/tag_manager.rb            |  69 ++++++++
 .../activitypub/collection_presenter.rb       |   5 +
 .../activitypub/activity_serializer.rb        |  27 +++
 .../activitypub/actor_serializer.rb           |  53 ++++++
 .../activitypub/collection_serializer.rb      |  26 +++
 .../activitypub/note_serializer.rb            | 106 ++++++++++++
 app/views/accounts/show.activitystreams2.rabl |   9 -
 .../activitypub/base.activitystreams2.rabl    |   1 -
 .../intransient.activitystreams2.rabl         |   3 -
 .../types/announce.activitystreams2.rabl      |   3 -
 .../types/collection.activitystreams2.rabl    |   3 -
 .../types/create.activitystreams2.rabl        |   3 -
 .../types/note.activitystreams2.rabl          |   3 -
 .../ordered_collection.activitystreams2.rabl  |   3 -
 ...ered_collection_page.activitystreams2.rabl |   3 -
 .../types/person.activitystreams2.rabl        |   3 -
 .../_show_status.activitystreams2.rabl        |   4 -
 ...show_status_announce.activitystreams2.rabl |   8 -
 .../show_status_create.activitystreams2.rabl  |   8 -
 .../notes/show.activitystreams2.rabl          |  11 --
 .../outbox/show.activitystreams2.rabl         |  12 --
 .../outbox/show_page.activitystreams2.rabl    |  16 --
 app/views/well_known/webfinger/show.json.rabl |   6 +-
 app/views/well_known/webfinger/show.xml.ruby  |   5 +-
 config/initializers/inflections.rb            |   2 +
 config/initializers/mime_types.rb             |   5 +-
 config/locales/ca.yml                         |   9 -
 config/locales/en.yml                         |   9 -
 config/locales/fa.yml                         |   9 -
 config/locales/fr.yml                         |   9 -
 config/locales/he.yml                         |   9 -
 config/locales/id.yml                         |   9 -
 config/locales/ja.yml                         |   9 -
 config/locales/ko.yml                         |   9 -
 config/locales/no.yml                         |   9 -
 config/locales/oc.yml                         |   9 -
 config/locales/pl.yml                         |   9 -
 config/locales/pt-BR.yml                      |   9 -
 config/locales/pt.yml                         |   9 -
 config/locales/th.yml                         |   9 -
 config/locales/tr.yml                         |   9 -
 config/locales/zh-CN.yml                      |   9 -
 config/locales/zh-HK.yml                      |   9 -
 config/routes.rb                              |  16 +-
 spec/controllers/accounts_controller_spec.rb  |   2 +-
 .../activitypub/activities_controller_spec.rb |  69 --------
 .../api/activitypub/notes_controller_spec.rb  |  73 --------
 .../api/activitypub/outbox_controller_spec.rb | 156 ------------------
 .../well_known/webfinger_controller_spec.rb   |  39 ++---
 .../activitystreams2_builder_helper_spec.rb   |  15 --
 61 files changed, 443 insertions(+), 725 deletions(-)
 create mode 100644 app/controllers/activitypub/outboxes_controller.rb
 delete mode 100644 app/controllers/api/activitypub/activities_controller.rb
 delete mode 100644 app/controllers/api/activitypub/notes_controller.rb
 delete mode 100644 app/controllers/api/activitypub/outbox_controller.rb
 delete mode 100644 app/helpers/activitystreams2_builder_helper.rb
 create mode 100644 app/lib/activitypub/adapter.rb
 create mode 100644 app/lib/activitypub/tag_manager.rb
 create mode 100644 app/presenters/activitypub/collection_presenter.rb
 create mode 100644 app/serializers/activitypub/activity_serializer.rb
 create mode 100644 app/serializers/activitypub/actor_serializer.rb
 create mode 100644 app/serializers/activitypub/collection_serializer.rb
 create mode 100644 app/serializers/activitypub/note_serializer.rb
 delete mode 100644 app/views/accounts/show.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/base.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/intransient.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/announce.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/collection.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/create.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/note.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/ordered_collection.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
 delete mode 100644 app/views/activitypub/types/person.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/activities/_show_status.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/notes/show.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/outbox/show.activitystreams2.rabl
 delete mode 100644 app/views/api/activitypub/outbox/show_page.activitystreams2.rabl
 delete mode 100644 spec/controllers/api/activitypub/activities_controller_spec.rb
 delete mode 100644 spec/controllers/api/activitypub/notes_controller_spec.rb
 delete mode 100644 spec/controllers/api/activitypub/outbox_controller_spec.rb
 delete mode 100644 spec/helpers/activitystreams2_builder_helper_spec.rb

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 69b520df1..a95aabf1d 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -16,7 +16,9 @@ class AccountsController < ApplicationController
         render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a))
       end
 
-      format.activitystreams2
+      format.json do
+        render json: @account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter
+      end
     end
   end
 
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
new file mode 100644
index 000000000..6a58ccf24
--- /dev/null
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class ActivityPub::OutboxesController < Api::BaseController
+  before_action :set_account
+
+  def show
+    @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id])
+    @statuses = cache_collection(@statuses, Status)
+
+    render json: outbox_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
+  end
+
+  private
+
+  def set_account
+    @account = Account.find_local!(params[:account_username])
+  end
+
+  def outbox_presenter
+    ActivityPub::CollectionPresenter.new(
+      id: account_outbox_url(@account),
+      type: :ordered,
+      current: account_outbox_url(@account),
+      size: @account.statuses_count,
+      items: @statuses
+    )
+  end
+end
diff --git a/app/controllers/api/activitypub/activities_controller.rb b/app/controllers/api/activitypub/activities_controller.rb
deleted file mode 100644
index a880ee92f..000000000
--- a/app/controllers/api/activitypub/activities_controller.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class Api::ActivityPub::ActivitiesController < Api::BaseController
-  include Authorization
-
-  # before_action :set_follow, only: [:show_follow]
-  before_action :set_status, only: [:show_status]
-
-  respond_to :activitystreams2
-
-  # Show a status in AS2 format, as either an Announce (reblog) or a Create (post) activity.
-  def show_status
-    authorize @status, :show?
-
-    if @status.reblog?
-      render :show_status_announce
-    else
-      render :show_status_create
-    end
-  end
-
-  private
-
-  def set_status
-    @status = Status.find(params[:id])
-  end
-end
diff --git a/app/controllers/api/activitypub/notes_controller.rb b/app/controllers/api/activitypub/notes_controller.rb
deleted file mode 100644
index 96652b879..000000000
--- a/app/controllers/api/activitypub/notes_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-class Api::ActivityPub::NotesController < Api::BaseController
-  include Authorization
-
-  before_action :set_status
-
-  respond_to :activitystreams2
-
-  def show
-    authorize @status, :show?
-  end
-
-  private
-
-  def set_status
-    @status = Status.find(params[:id])
-  end
-end
diff --git a/app/controllers/api/activitypub/outbox_controller.rb b/app/controllers/api/activitypub/outbox_controller.rb
deleted file mode 100644
index 1af04cb54..000000000
--- a/app/controllers/api/activitypub/outbox_controller.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-class Api::ActivityPub::OutboxController < Api::BaseController
-  before_action :set_account
-
-  respond_to :activitystreams2
-
-  def show
-    if params[:max_id] || params[:since_id]
-      show_outbox_page
-    else
-      show_base_outbox
-    end
-  end
-
-  private
-
-  def show_base_outbox
-    @statuses = Status.as_outbox_timeline(@account)
-    @statuses = cache_collection(@statuses)
-
-    set_maps(@statuses)
-
-    set_first_last_page(@statuses)
-
-    render :show
-  end
-
-  def show_outbox_page
-    all_statuses = Status.as_outbox_timeline(@account)
-    @statuses = all_statuses.paginate_by_max_id(limit_param(DEFAULT_STATUSES_LIMIT), params[:max_id], params[:since_id])
-
-    all_statuses = cache_collection(all_statuses)
-    @statuses = cache_collection(@statuses)
-
-    set_maps(@statuses)
-
-    set_first_last_page(all_statuses)
-
-    @next_page_url = api_activitypub_outbox_url(pagination_params(max_id: @statuses.last.id))    unless @statuses.empty?
-    @prev_page_url = api_activitypub_outbox_url(pagination_params(since_id: @statuses.first.id)) unless @statuses.empty?
-
-    @paginated = @next_page_url || @prev_page_url
-    @part_of_url = api_activitypub_outbox_url
-
-    set_pagination_headers(@next_page_url, @prev_page_url)
-
-    render :show_page
-  end
-
-  def cache_collection(raw)
-    super(raw, Status)
-  end
-
-  def set_account
-    @account = Account.find(params[:id])
-  end
-
-  def set_first_last_page(statuses) # rubocop:disable Style/AccessorMethodName
-    return if statuses.empty?
-
-    @first_page_url = api_activitypub_outbox_url(max_id: statuses.first.id + 1)
-    @last_page_url = api_activitypub_outbox_url(since_id: statuses.last.id - 1)
-  end
-
-  def pagination_params(core_params)
-    params.permit(:local, :limit).merge(core_params)
-  end
-end
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index 1e7c7c406..e58c5ad46 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -5,5 +5,25 @@ class FollowerAccountsController < ApplicationController
 
   def index
     @follows = Follow.where(target_account: @account).recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:account)
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
+      end
+    end
+  end
+
+  private
+
+  def collection_presenter
+    ActivityPub::CollectionPresenter.new(
+      id: account_followers_url(@account),
+      type: :ordered,
+      current: account_followers_url(@account),
+      size: @account.followers_count,
+      items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) }
+    )
   end
 end
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index f4488eef5..69f29cd70 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -5,5 +5,25 @@ class FollowingAccountsController < ApplicationController
 
   def index
     @follows = Follow.where(account: @account).recent.page(params[:page]).per(FOLLOW_PER_PAGE).preload(:target_account)
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
+      end
+    end
+  end
+
+  private
+
+  def collection_presenter
+    ActivityPub::CollectionPresenter.new(
+      id: account_following_index_url(@account),
+      type: :ordered,
+      current: account_following_index_url(@account),
+      size: @account.following_count,
+      items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) }
+    )
   end
 end
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 59c9d0a87..8e0ce0ec3 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -11,10 +11,22 @@ class StatusesController < ApplicationController
   before_action :check_account_suspension
 
   def show
-    @ancestors   = @status.reply? ? cache_collection(@status.ancestors(current_account), Status) : []
-    @descendants = cache_collection(@status.descendants(current_account), Status)
+    respond_to do |format|
+      format.html do
+        @ancestors   = @status.reply? ? cache_collection(@status.ancestors(current_account), Status) : []
+        @descendants = cache_collection(@status.descendants(current_account), Status)
 
-    render 'stream_entries/show'
+        render 'stream_entries/show'
+      end
+
+      format.json do
+        render json: @status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter
+      end
+    end
+  end
+
+  def activity
+    render json: @status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter
   end
 
   private
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 53149edf0..8bcce9e13 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -5,7 +5,27 @@ class TagsController < ApplicationController
 
   def show
     @tag      = Tag.find_by!(name: params[:id].downcase)
-    @statuses = @tag.nil? ? [] : Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(20, params[:max_id])
+    @statuses = Status.as_tag_timeline(@tag, current_account, params[:local]).paginate_by_max_id(20, params[:max_id])
     @statuses = cache_collection(@statuses, Status)
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
+      end
+    end
+  end
+
+  private
+
+  def collection_presenter
+    ActivityPub::CollectionPresenter.new(
+      id: tag_url(@tag),
+      type: :ordered,
+      current: tag_url(@tag),
+      size: @tag.statuses.count,
+      items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
+    )
   end
 end
diff --git a/app/helpers/activitystreams2_builder_helper.rb b/app/helpers/activitystreams2_builder_helper.rb
deleted file mode 100644
index 717b470f0..000000000
--- a/app/helpers/activitystreams2_builder_helper.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module Activitystreams2BuilderHelper
-  # Gets a usable name for an account, using display name or username.
-  def account_name(account)
-    account.display_name.presence || account.username
-  end
-end
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb
new file mode 100644
index 000000000..0a70207bc
--- /dev/null
+++ b/app/lib/activitypub/adapter.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
+  def self.default_key_transform
+    :camel_lower
+  end
+
+  def serializable_hash(options = nil)
+    options = serialization_options(options)
+    serialized_hash = { '@context': 'https://www.w3.org/ns/activitystreams' }.merge(ActiveModelSerializers::Adapter::Attributes.new(serializer, instance_options).serializable_hash(options))
+    self.class.transform_key_casing!(serialized_hash, instance_options)
+  end
+end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
new file mode 100644
index 000000000..ec42bcad3
--- /dev/null
+++ b/app/lib/activitypub/tag_manager.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+class ActivityPub::TagManager
+  include Singleton
+  include RoutingHelper
+
+  COLLECTIONS = {
+    public: 'https://www.w3.org/ns/activitystreams#Public',
+  }.freeze
+
+  def url_for(target)
+    return target.url if target.respond_to?(:local?) && !target.local?
+
+    case target.object_type
+    when :person
+      short_account_url(target)
+    when :note, :comment, :activity
+      short_account_status_url(target.account, target)
+    end
+  end
+
+  def uri_for(target)
+    return target.uri if target.respond_to?(:local?) && !target.local?
+
+    case target.object_type
+    when :person
+      account_url(target)
+    when :note, :comment, :activity
+      account_status_url(target.account, target)
+    end
+  end
+
+  # Primary audience of a status
+  # Public statuses go out to primarily the public collection
+  # Unlisted and private statuses go out primarily to the followers collection
+  # Others go out only to the people they mention
+  def to(status)
+    case status.visibility
+    when 'public'
+      [COLLECTIONS[:public]]
+    when 'unlisted', 'private'
+      [account_followers_url(status.account)]
+    when 'direct'
+      status.mentions.map { |mention| uri_for(mention.account) }
+    end
+  end
+
+  # Secondary audience of a status
+  # Public statuses go out to followers as well
+  # Unlisted statuses go to the public as well
+  # Both of those and private statuses also go to the people mentioned in them
+  # Direct ones don't have a secondary audience
+  def cc(status)
+    cc = []
+
+    case status.visibility
+    when 'public'
+      cc << account_followers_url(status.account)
+    when 'unlisted'
+      cc << COLLECTIONS[:public]
+    end
+
+    cc.concat(status.mentions.map { |mention| uri_for(mention.account) }) unless status.direct_visibility?
+
+    cc
+  end
+end
diff --git a/app/presenters/activitypub/collection_presenter.rb b/app/presenters/activitypub/collection_presenter.rb
new file mode 100644
index 000000000..6bae2955e
--- /dev/null
+++ b/app/presenters/activitypub/collection_presenter.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model
+  attributes :id, :type, :current, :size, :items
+end
diff --git a/app/serializers/activitypub/activity_serializer.rb b/app/serializers/activitypub/activity_serializer.rb
new file mode 100644
index 000000000..69e2160c5
--- /dev/null
+++ b/app/serializers/activitypub/activity_serializer.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActivitySerializer < ActiveModel::Serializer
+  attributes :id, :type, :actor, :to, :cc
+
+  has_one :proper, key: :object, serializer: ActivityPub::NoteSerializer
+
+  def id
+    [ActivityPub::TagManager.instance.uri_for(object), '/activity'].join
+  end
+
+  def type
+    object.reblog? ? 'Announce' : 'Create'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def to
+    ActivityPub::TagManager.instance.to(object)
+  end
+
+  def cc
+    ActivityPub::TagManager.instance.cc(object)
+  end
+end
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
new file mode 100644
index 000000000..56806152e
--- /dev/null
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActorSerializer < ActiveModel::Serializer
+  include RoutingHelper
+
+  attributes :id, :type, :following, :followers,
+             :inbox, :outbox, :preferred_username,
+             :name, :summary, :icon, :image
+
+  def id
+    account_url(object)
+  end
+
+  def type
+    'Person'
+  end
+
+  def following
+    account_following_index_url(object)
+  end
+
+  def followers
+    account_followers_url(object)
+  end
+
+  def inbox
+    nil
+  end
+
+  def outbox
+    account_outbox_url(object)
+  end
+
+  def preferred_username
+    object.username
+  end
+
+  def name
+    object.display_name
+  end
+
+  def summary
+    Formatter.instance.simplified_format(object)
+  end
+
+  def icon
+    full_asset_url(object.avatar.url(:original))
+  end
+
+  def image
+    full_asset_url(object.header.url(:original))
+  end
+end
diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb
new file mode 100644
index 000000000..baaba7654
--- /dev/null
+++ b/app/serializers/activitypub/collection_serializer.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class ActivityPub::CollectionSerializer < ActiveModel::Serializer
+  def self.serializer_for(model, options)
+    return ActivityPub::ActivitySerializer if model.class.name == 'Status'
+    super
+  end
+
+  attributes :id, :type, :total_items,
+             :current
+
+  has_many :items, key: :ordered_items
+
+  def type
+    case object.type
+    when :ordered
+      'OrderedCollection'
+    else
+      'Collection'
+    end
+  end
+
+  def total_items
+    object.size
+  end
+end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
new file mode 100644
index 000000000..ffdc6175d
--- /dev/null
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+class ActivityPub::NoteSerializer < ActiveModel::Serializer
+  attributes :id, :type, :summary, :content,
+             :in_reply_to, :published, :url,
+             :actor, :to, :cc, :sensitive
+
+  has_many :media_attachments, key: :attachment
+  has_many :virtual_tags, key: :tag
+
+  def id
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+
+  def type
+    'Note'
+  end
+
+  def summary
+    object.spoiler_text.presence
+  end
+
+  def content
+    Formatter.instance.format(object)
+  end
+
+  def in_reply_to
+    ActivityPub::TagManager.instance.uri_for(object.thread) if object.reply?
+  end
+
+  def published
+    object.created_at.iso8601
+  end
+
+  def url
+    ActivityPub::TagManager.instance.url_for(object)
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def to
+    ActivityPub::TagManager.instance.to(object)
+  end
+
+  def cc
+    ActivityPub::TagManager.instance.cc(object)
+  end
+
+  def virtual_tags
+    object.mentions + object.tags
+  end
+
+  class MediaAttachmentSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :type, :media_type, :url
+
+    def type
+      'Document'
+    end
+
+    def media_type
+      object.file_content_type
+    end
+
+    def url
+      object.local? ? full_asset_url(object.file.url(:original, false)) : object.remote_url
+    end
+  end
+
+  class MentionSerializer < ActiveModel::Serializer
+    attributes :type, :href, :name
+
+    def type
+      'Mention'
+    end
+
+    def href
+      ActivityPub::TagManager.instance.uri_for(object.account)
+    end
+
+    def name
+      "@#{object.account.acct}"
+    end
+  end
+
+  class TagSerializer < ActiveModel::Serializer
+    include RoutingHelper
+
+    attributes :type, :href, :name
+
+    def type
+      'Hashtag'
+    end
+
+    def href
+      tag_url(object)
+    end
+
+    def name
+      "##{object.name}"
+    end
+  end
+end
diff --git a/app/views/accounts/show.activitystreams2.rabl b/app/views/accounts/show.activitystreams2.rabl
deleted file mode 100644
index 2c0a4ad3a..000000000
--- a/app/views/accounts/show.activitystreams2.rabl
+++ /dev/null
@@ -1,9 +0,0 @@
-extends 'activitypub/types/person.activitystreams2.rabl'
-
-object @account
-
-attributes display_name: :name, username: :preferredUsername, note: :summary
-
-node(:icon)   { |account| full_asset_url(account.avatar.url(:original)) }
-node(:image)  { |account| full_asset_url(account.header.url(:original)) }
-node(:outbox) { |account| api_activitypub_outbox_url(account.id) }
diff --git a/app/views/activitypub/base.activitystreams2.rabl b/app/views/activitypub/base.activitystreams2.rabl
deleted file mode 100644
index c5e94997a..000000000
--- a/app/views/activitypub/base.activitystreams2.rabl
+++ /dev/null
@@ -1 +0,0 @@
-node(:'@context') { 'https://www.w3.org/ns/activitystreams' }
diff --git a/app/views/activitypub/intransient.activitystreams2.rabl b/app/views/activitypub/intransient.activitystreams2.rabl
deleted file mode 100644
index 968e451c2..000000000
--- a/app/views/activitypub/intransient.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/base.activitystreams2.rabl'
-
-node(:id) { request.original_url }
diff --git a/app/views/activitypub/types/announce.activitystreams2.rabl b/app/views/activitypub/types/announce.activitystreams2.rabl
deleted file mode 100644
index 4a29aa134..000000000
--- a/app/views/activitypub/types/announce.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.activitystreams2.rabl'
-
-node(:type) { 'Announce' }
diff --git a/app/views/activitypub/types/collection.activitystreams2.rabl b/app/views/activitypub/types/collection.activitystreams2.rabl
deleted file mode 100644
index cc0e532b7..000000000
--- a/app/views/activitypub/types/collection.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.activitystreams2.rabl'
-
-node(:type) { 'Collection' }
diff --git a/app/views/activitypub/types/create.activitystreams2.rabl b/app/views/activitypub/types/create.activitystreams2.rabl
deleted file mode 100644
index e41a056a7..000000000
--- a/app/views/activitypub/types/create.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.activitystreams2.rabl'
-
-node(:type) { 'Create' }
diff --git a/app/views/activitypub/types/note.activitystreams2.rabl b/app/views/activitypub/types/note.activitystreams2.rabl
deleted file mode 100644
index 39c74d4ba..000000000
--- a/app/views/activitypub/types/note.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.activitystreams2.rabl'
-
-node(:type) { 'Note' }
diff --git a/app/views/activitypub/types/ordered_collection.activitystreams2.rabl b/app/views/activitypub/types/ordered_collection.activitystreams2.rabl
deleted file mode 100644
index 2cda6f4d0..000000000
--- a/app/views/activitypub/types/ordered_collection.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/types/collection.activitystreams2.rabl'
-
-node(:type) { 'OrderedCollection' }
diff --git a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl b/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
deleted file mode 100644
index 9937d11e9..000000000
--- a/app/views/activitypub/types/ordered_collection_page.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
-
-node(:type) { 'OrderedCollectionPage' }
diff --git a/app/views/activitypub/types/person.activitystreams2.rabl b/app/views/activitypub/types/person.activitystreams2.rabl
deleted file mode 100644
index 487a60791..000000000
--- a/app/views/activitypub/types/person.activitystreams2.rabl
+++ /dev/null
@@ -1,3 +0,0 @@
-extends 'activitypub/intransient.activitystreams2.rabl'
-
-node(:type) { 'Person' }
diff --git a/app/views/api/activitypub/activities/_show_status.activitystreams2.rabl b/app/views/api/activitypub/activities/_show_status.activitystreams2.rabl
deleted file mode 100644
index 472bf5dbd..000000000
--- a/app/views/api/activitypub/activities/_show_status.activitystreams2.rabl
+++ /dev/null
@@ -1,4 +0,0 @@
-object @status
-
-node(:actor)     { |status| TagManager.instance.url_for(status.account) }
-node(:published) { |status| status.created_at.to_time.xmlschema }
\ No newline at end of file
diff --git a/app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl b/app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl
deleted file mode 100644
index 44ac1ba2f..000000000
--- a/app/views/api/activitypub/activities/show_status_announce.activitystreams2.rabl
+++ /dev/null
@@ -1,8 +0,0 @@
-extends 'activitypub/types/announce.activitystreams2.rabl'
-extends 'api/activitypub/activities/_show_status.activitystreams2.rabl'
-
-object @status
-
-node(:name)   { |status| t('activitypub.activity.announce.name', account_name: account_name(status.account)) }
-node(:url)    { |status| TagManager.instance.url_for(status) }
-node(:object) { |status| api_activitypub_status_url(status.reblog_of_id) }
diff --git a/app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl b/app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl
deleted file mode 100644
index ff4d39eca..000000000
--- a/app/views/api/activitypub/activities/show_status_create.activitystreams2.rabl
+++ /dev/null
@@ -1,8 +0,0 @@
-extends 'activitypub/types/create.activitystreams2.rabl'
-extends 'api/activitypub/activities/_show_status.activitystreams2.rabl'
-
-object @status
-
-node(:name)   { |status| t('activitypub.activity.create.name', account_name: account_name(status.account)) }
-node(:url)    { |status| TagManager.instance.url_for(status) }
-node(:object) { |status| api_activitypub_note_url(status) }
diff --git a/app/views/api/activitypub/notes/show.activitystreams2.rabl b/app/views/api/activitypub/notes/show.activitystreams2.rabl
deleted file mode 100644
index d962f4438..000000000
--- a/app/views/api/activitypub/notes/show.activitystreams2.rabl
+++ /dev/null
@@ -1,11 +0,0 @@
-extends 'activitypub/types/note.activitystreams2.rabl'
-
-object @status
-
-attributes :content
-
-node(:name)         { |status| status.content }
-node(:url)          { |status| TagManager.instance.url_for(status) }
-node(:attributedTo) { |status| TagManager.instance.url_for(status.account) }
-node(:inReplyTo)    { |status| api_activitypub_note_url(status.thread) } if @status.thread
-node(:published)    { |status| status.created_at.to_time.xmlschema }
diff --git a/app/views/api/activitypub/outbox/show.activitystreams2.rabl b/app/views/api/activitypub/outbox/show.activitystreams2.rabl
deleted file mode 100644
index 273b15e82..000000000
--- a/app/views/api/activitypub/outbox/show.activitystreams2.rabl
+++ /dev/null
@@ -1,12 +0,0 @@
-extends 'activitypub/types/ordered_collection.activitystreams2.rabl'
-
-object @account
-
-node(:totalItems) { @statuses.count }
-node(:current)    { @first_page_url } if @first_page_url
-node(:first)      { @first_page_url } if @first_page_url
-node(:last)       { @last_page_url } if @last_page_url
-
-node(:name)       { |account| t('activitypub.outbox.name', account_name: account_name(account)) }
-node(:summary)    { |account| t('activitypub.outbox.summary', account_name: account_name(account)) }
-node(:updated)    { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema }
diff --git a/app/views/api/activitypub/outbox/show_page.activitystreams2.rabl b/app/views/api/activitypub/outbox/show_page.activitystreams2.rabl
deleted file mode 100644
index b6433ccf2..000000000
--- a/app/views/api/activitypub/outbox/show_page.activitystreams2.rabl
+++ /dev/null
@@ -1,16 +0,0 @@
-extends 'activitypub/types/ordered_collection_page.activitystreams2.rabl'
-
-object @account
-
-node(:items) do
-  @statuses.map { |status| api_activitypub_status_url(status) }
-end
-
-node(:next)       { @next_page_url } if @next_page_url
-node(:prev)       { @prev_page_url } if @prev_page_url
-node(:current)    { @first_page_url } if @first_page_url
-node(:first)      { @first_page_url } if @first_page_url
-node(:last)       { @last_page_url } if @last_page_url
-node(:partOf)     { @part_of_url } if @part_of_url
-
-node(:updated)    { |account| (@statuses.empty? ? account.created_at.to_time : @statuses.first.updated_at.to_time).xmlschema }
diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl
index 123d1d11a..af11cd207 100644
--- a/app/views/well_known/webfinger/show.json.rabl
+++ b/app/views/well_known/webfinger/show.json.rabl
@@ -3,14 +3,14 @@ object @account
 node(:subject) { @canonical_account_uri }
 
 node(:aliases) do
-  [TagManager.instance.url_for(@account), TagManager.instance.uri_for(@account)]
+  [short_account_url(@account), account_url(@account)]
 end
 
 node(:links) do
   [
-    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account) },
+    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: account_url(@account) },
     { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
-    { rel: 'self', type: 'application/activity+json', href: TagManager.instance.url_for(@account) },
+    { rel: 'self', type: 'application/activity+json', href: account_url(@account) },
     { rel: 'salmon', href: api_salmon_url(@account.id) },
     { rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}" },
     { rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}" },
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
index fc0ab5b84..844742d68 100644
--- a/app/views/well_known/webfinger/show.xml.ruby
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -1,10 +1,11 @@
 Nokogiri::XML::Builder.new do |xml|
   xml.XRD(xmlns: 'http://docs.oasis-open.org/ns/xri/xrd-1.0') do
     xml.Subject @canonical_account_uri
-    xml.Alias TagManager.instance.url_for(@account)
-    xml.Alias TagManager.instance.uri_for(@account)
+    xml.Alias short_account_url(@account)
+    xml.Alias account_url(@account)
     xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account))
     xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
+    xml.Link(rel: 'self', type: 'application/activity+json', href: account_url(@account))
     xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))
     xml.Link(rel: 'magic-public-key', href: "data:application/magic-public-key,#{@magic_key}")
     xml.Link(rel: 'http://ostatus.org/schema/1.0/subscribe', template: "#{authorize_follow_url}?acct={uri}")
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index a7b1ef690..26275d092 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -14,4 +14,6 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'StatsD'
   inflect.acronym 'OEmbed'
   inflect.acronym 'ActivityPub'
+  inflect.acronym 'PubSubHubbub'
+  inflect.acronym 'ActivityStreams'
 end
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index b1b73c846..30e91ad63 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,5 +1,4 @@
 # Be sure to restart your server when you modify this file.
 
-Mime::Type.register "application/json",           :json, %w( text/x-json application/jsonrequest application/jrd+json )
-Mime::Type.register "text/xml",                   :xml,  %w( application/xml application/atom+xml application/xrd+xml )
-Mime::Type.register "application/activity+json",  :activitystreams2
+Mime::Type.register 'application/json', :json, %w(text/x-json application/jsonrequest application/jrd+json application/activity+json)
+Mime::Type.register 'text/xml',         :xml,  %w(application/xml application/atom+xml application/xrd+xml)
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index f63aee3e6..0ba893a12 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -30,15 +30,6 @@ ca:
     remote_follow: Seguir
     reserved_username: El nom d'usuari està reservat
     unfollow: Deixar de seguir
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} shared an activity."
-      create:
-        name: "%{account_name} created a note."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: A collection of activities from user %{account_name}.
   admin:
     accounts:
       are_you_sure: Estàs segur?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 79efddfad..be1f15e25 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -44,15 +44,6 @@ en:
     remote_follow: Remote follow
     reserved_username: The username is reserved
     unfollow: Unfollow
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} shared an activity."
-      create:
-        name: "%{account_name} created a note."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: A collection of activities from user %{account_name}.
   admin:
     accounts:
       are_you_sure: Are you sure?
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ade76d670..218d859bb 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -29,15 +29,6 @@ fa:
     posts: نوشته
     remote_follow: پیگیری غیرمستقیم
     unfollow: پایان پیگیری
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} فعالیتی آغاز کرد."
-      create:
-        name: "%{account_name} یادداشتی نوشت."
-    outbox:
-      name: صندوق خروجی %{account_name}
-      summary: مجموعه‌ای از فعالیت‌های کاربر %{account_name}.
   admin:
     accounts:
       are_you_sure: آیا مطمئن هستید؟
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index cba217651..65e681b20 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -30,15 +30,6 @@ fr:
     remote_follow: Suivre à distance
     reserved_username: Ce nom d’utilisateur⋅ice est réservé
     unfollow: Ne plus suivre
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} a partagé une activité."
-      create:
-        name: "%{account_name} a créé une note."
-    outbox:
-      name: Boîte d’envoi de %{account_name}
-      summary: Liste d’activités de %{account_name}
   admin:
     accounts:
       are_you_sure: Êtes-vous certain⋅e ?
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 21f8f1dc4..251b6914e 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -29,15 +29,6 @@ he:
     posts: הודעות
     remote_follow: מעקב מרחוק
     unfollow: הפסקת מעקב
-  activitypub:
-    activity:
-      announce:
-        name: הודעה שותפה על ידי %{account_name}.
-      create:
-        name: הודעה חדשה מאת %{account_name}.
-    outbox:
-      name: תיבת הדוא"ל היוצא של %{account_name}
-      summary: אוסף הפעילויות של %{account_name}.
   admin:
     accounts:
       are_you_sure: בטוח?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e3fe96331..7bda52c78 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -29,15 +29,6 @@ id:
     posts: Postingan
     remote_follow: Mengikuti
     unfollow: Berhenti mengikuti
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} membagikan aktivitas."
-      create:
-        name: "%{account_name} membuat catatan."
-    outbox:
-      name: "%{account_name} Outbox"
-      summary: Koleksi aktivitas dari pengguna %{account_name}.
   admin:
     accounts:
       are_you_sure: Anda yakin?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 37d82a205..fda87526d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -30,15 +30,6 @@ ja:
     remote_follow: リモートフォロー
     reserved_username: このユーザー名は予約されています。
     unfollow: フォロー解除
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} さんがアクティビティをシェアしました"
-      create:
-        name: "%{account_name} さんがノートを作成しました"
-    outbox:
-      name: "%{account_name} さんの送信トレイ"
-      summary: "%{account_name} さんからのアクティビティコレクション"
   admin:
     accounts:
       are_you_sure: 本当に実行しますか?
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index bafc19993..c7c310cfe 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -30,15 +30,6 @@ ko:
     remote_follow: 리모트 팔로우
     reserved_username: 이 아이디는 예약되어 있습니다.
     unfollow: 팔로우 해제
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} 님이 액티비티를 공유했습니다"
-      create:
-        name: "%{account_name} 님이 노트를 작성했습니다"
-    outbox:
-      name: "%{account_name} 님의 송신함"
-      summary: "%{account_name} 님의 액티비티 모음"
   admin:
     accounts:
       are_you_sure: 정말로 실행하시겠습니까?
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 004e1ff80..cf94524d2 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -29,15 +29,6 @@
     posts: Poster
     remote_follow: Følg fra andre instanser
     unfollow: Avfølg
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} delte en aktivitet."
-      create:
-        name: "%{account_name} laget en aktivitet."
-    outbox:
-      name: "%{account_name} sin utboks"
-      summary: En samling aktiviteter fra brukeren %{account_name}.
   admin:
     accounts:
       are_you_sure: Er du sikker?
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 91a6ca791..2eb85be58 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -29,15 +29,6 @@ oc:
     posts: Estatuts
     remote_follow: Sègre a distància
     unfollow: Quitar de sègre
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} a partejat una activitat."
-      create:
-        name: "%{account_name} a creat una nòta."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: A collection of activities from user %{account_name}.
   admin:
     accounts:
       are_you_sure: Sètz segur ?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9ee6c0540..6f2831670 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -44,15 +44,6 @@ pl:
     remote_follow: Zdalne śledzenie
     reserved_username: Ta nazwa użytkownika jest zarezerwowana.
     unfollow: Przestań śledzić
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} udostępnił(a) aktywność."
-      create:
-        name: "%{account_name} utworzył(a) wpis."
-    outbox:
-      name: Skrzynka %{account_name}
-      summary: Zbiór aktywności użytkownika %{account_name}.
   admin:
     accounts:
       are_you_sure: Jesteś tego pewien?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 355c20d05..5ba763ae4 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -29,15 +29,6 @@ pt-BR:
     posts: Posts
     remote_follow: Acesso remoto
     unfollow: Unfollow
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} compartilhou uma atividade."
-      create:
-        name: "%{account_name} criou uma nota."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: Uma coleção de atividades do usuário %{account_name}.
   admin:
     accounts:
       are_you_sure: Você tem certeza?
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 40be8a6c5..346fcdda8 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -29,15 +29,6 @@ pt:
     posts: Posts
     remote_follow: Seguir remotamente
     unfollow: Deixar de seguir
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} anunciou uma atividade."
-      create:
-        name: "%{account_name} criou uma nota."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: Uma coleção de atividades do usuário %{account_name}.
   admin:
     accounts:
       are_you_sure: Tens a certeza?
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 263babdd0..17eb96110 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -29,15 +29,6 @@ th:
     posts: โพสต์
     remote_follow: Remote follow
     unfollow: เลิกติดตาม
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} แชร์กิจกรรม."
-      create:
-        name: "%{account_name} สร้างโน๊ต."
-    outbox:
-      name: "%{account_name}'s Outbox"
-      summary: รวมกิจกรรมของผู้ใช้ %{account_name}.
   admin:
     accounts:
       are_you_sure: แน่ใจนะ?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e7864cc57..bb83991cd 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -29,15 +29,6 @@ tr:
     posts: Gönderiler
     remote_follow: Uzaktan takip et
     unfollow: Takibi bırak
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} bir aktivite paylaştı."
-      create:
-        name: "%{account_name} bir not oluşturdu."
-    outbox:
-      name: "%{account_name}'in Gönderdikleri"
-      summary: "%{account_name}'den gelen aktiviteler."
   admin:
     accounts:
       are_you_sure: Emin misiniz?
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 650d4bd15..0526ec1ba 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -29,15 +29,6 @@ zh-CN:
     posts: 嘟文
     remote_follow: 跨站关注
     unfollow: 取消关注
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} 分享了一个活动。"
-      create:
-        name: "%{account_name} 创建了一个记事。"
-    outbox:
-      name: "%{account_name} 的集合"
-      summary: "%{account_name} 的活动集合"
   admin:
     accounts:
       are_you_sure: 你确定吗？
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index d2db78be1..06f9ab63d 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -29,15 +29,6 @@ zh-HK:
     posts: 文章
     remote_follow: 跨站關注
     unfollow: 取消關注
-  activitypub:
-    activity:
-      announce:
-        name: "%{account_name} 分享了一項活動。"
-      create:
-        name: "%{account_name} 新增了一篇筆記。"
-    outbox:
-      name: "%{account_name} 的活動"
-      summary: "%{account_name} 分享的活動列表。"
   admin:
     accounts:
       are_you_sure: 你確定嗎？
diff --git a/config/routes.rb b/config/routes.rb
index 9171d02d4..dda3534eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,7 +26,7 @@ Rails.application.routes.draw do
     confirmations:      'auth/confirmations',
   }
 
-  get '/users/:username', to: redirect('/@%{username}'), constraints: { format: :html }
+  get '/users/:username', to: redirect('/@%{username}'), constraints: lambda { |req| req.format.nil? }
 
   resources :accounts, path: 'users', only: [:show], param: :username do
     resources :stream_entries, path: 'updates', only: [:show] do
@@ -38,10 +38,17 @@ Rails.application.routes.draw do
     get :remote_follow,  to: 'remote_follow#new'
     post :remote_follow, to: 'remote_follow#create'
 
+    resources :statuses, only: [:show] do
+      member do
+        get :activity
+      end
+    end
+
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
     resource :follow, only: [:create], controller: :account_follow
     resource :unfollow, only: [:create], controller: :account_unfollow
+    resource :outbox, only: [:show], module: :activitypub
   end
 
   get '/@:username', to: 'accounts#show', as: :short_account
@@ -119,13 +126,6 @@ Rails.application.routes.draw do
     # OEmbed
     get '/oembed', to: 'oembed#show', as: :oembed
 
-    # ActivityPub
-    namespace :activitypub do
-      get '/users/:id/outbox', to: 'outbox#show', as: :outbox
-      get '/statuses/:id', to: 'activities#show_status', as: :status
-      resources :notes, only: [:show]
-    end
-
     # JSON / REST API
     namespace :v1 do
       resources :statuses, only: [:create, :show, :destroy] do
diff --git a/spec/controllers/accounts_controller_spec.rb b/spec/controllers/accounts_controller_spec.rb
index 447e2dd53..d61c8c9bd 100644
--- a/spec/controllers/accounts_controller_spec.rb
+++ b/spec/controllers/accounts_controller_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe AccountsController, type: :controller do
 
     context 'activitystreams2' do
       before do
-        get :show, params: { username: alice.username }, format: 'activitystreams2'
+        get :show, params: { username: alice.username }, format: 'json'
       end
 
       it 'assigns @account' do
diff --git a/spec/controllers/api/activitypub/activities_controller_spec.rb b/spec/controllers/api/activitypub/activities_controller_spec.rb
deleted file mode 100644
index 07df28ac2..000000000
--- a/spec/controllers/api/activitypub/activities_controller_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Api::ActivityPub::ActivitiesController, type: :controller do
-  render_views
-
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
-
-  describe 'GET #show' do
-    describe 'normal status' do
-      public_status = nil
-
-      before do
-        public_status = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-
-        @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show_status, params: { id: public_status.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns http success' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('type' => 'Create')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'Create')
-        expect(json_data).to include('object' => api_activitypub_note_url(public_status))
-        expect(json_data).to include('url' => TagManager.instance.url_for(public_status))
-      end
-    end
-
-    describe 'reblog' do
-      original = nil
-      reblog = nil
-
-      before do
-        original = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-        reblog = Fabricate(:status, account: user.account, reblog_of_id: original.id, visibility: :public)
-
-        @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show_status, params: { id: reblog.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns http success' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('type' => 'Announce')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'Announce')
-        expect(json_data).to include('object' => api_activitypub_status_url(original))
-        expect(json_data).to include('url' => TagManager.instance.url_for(reblog))
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/activitypub/notes_controller_spec.rb b/spec/controllers/api/activitypub/notes_controller_spec.rb
deleted file mode 100644
index a0f05dc65..000000000
--- a/spec/controllers/api/activitypub/notes_controller_spec.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Api::ActivityPub::NotesController, type: :controller do
-  render_views
-
-  let(:user_alice)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
-  let(:user_bob)  { Fabricate(:user, account: Fabricate(:account, username: 'bob')) }
-
-  describe 'GET #show' do
-    describe 'normal status' do
-      public_status = nil
-
-      before do
-        public_status = Fabricate(:status, account: user_alice.account, text: 'Hello world', visibility: :public)
-
-        @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show, params: { id: public_status.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns http success' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('type' => 'Note')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('name' => 'Hello world')
-        expect(json_data).to include('content' => 'Hello world')
-        expect(json_data).to include('published')
-        expect(json_data).to include('url' => TagManager.instance.url_for(public_status))
-      end
-    end
-
-    describe 'reply' do
-      original = nil
-      reply = nil
-
-      before do
-        original = Fabricate(:status, account: user_alice.account, text: 'Hello world', visibility: :public)
-        reply = Fabricate(:status, account: user_bob.account, text: 'Hello world', in_reply_to_id: original.id, visibility: :public)
-
-        @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show, params: { id: reply.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns http success' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('type' => 'Note')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('name' => 'Hello world')
-        expect(json_data).to include('content' => 'Hello world')
-        expect(json_data).to include('published')
-        expect(json_data).to include('url' => TagManager.instance.url_for(reply))
-        expect(json_data).to include('inReplyTo' => api_activitypub_note_url(original))
-      end
-    end
-  end
-end
diff --git a/spec/controllers/api/activitypub/outbox_controller_spec.rb b/spec/controllers/api/activitypub/outbox_controller_spec.rb
deleted file mode 100644
index 049cf451d..000000000
--- a/spec/controllers/api/activitypub/outbox_controller_spec.rb
+++ /dev/null
@@ -1,156 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Api::ActivityPub::OutboxController, type: :controller do
-  render_views
-
-  let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
-
-  describe 'GET #show' do
-    before do
-      @request.headers['ACCEPT'] = 'application/activity+json'
-    end
-
-    describe 'collection with small number of statuses' do
-      public_status = nil
-
-      before do
-        public_status = Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
-
-        get :show, params: { id: user.account.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns AS2 JSON body' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'OrderedCollection')
-        expect(json_data).to include('totalItems' => 1)
-        expect(json_data).to include('current')
-        expect(json_data).to include('first')
-        expect(json_data).to include('last')
-      end
-    end
-
-    describe 'collection with large number of statuses' do
-      before do
-        30.times do
-          Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-        end
-
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
-
-        get :show, params: { id: user.account.id }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns AS2 JSON body' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'OrderedCollection')
-        expect(json_data).to include('totalItems' => 30)
-        expect(json_data).to include('current')
-        expect(json_data).to include('first')
-        expect(json_data).to include('last')
-      end
-    end
-
-    describe 'page with small number of statuses' do
-      statuses = []
-
-      before do
-        5.times do
-          statuses << Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-        end
-
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
-
-        get :show, params: { id: user.account.id, max_id: statuses.last.id + 1 }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns AS2 JSON body' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'OrderedCollectionPage')
-        expect(json_data).to include('partOf')
-        expect(json_data).to include('items')
-        expect(json_data['items'].length).to eq(5)
-        expect(json_data).to include('prev')
-        expect(json_data).to include('next')
-        expect(json_data).to include('current')
-        expect(json_data).to include('first')
-        expect(json_data).to include('last')
-      end
-    end
-
-    describe 'page with large number of statuses' do
-      statuses = []
-
-      before do
-        30.times do
-          statuses << Fabricate(:status, account: user.account, text: 'Hello world', visibility: :public)
-        end
-
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :private)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :unlisted)
-        Fabricate(:status, account: user.account, text: 'Hello world', visibility: :direct)
-
-        get :show, params: { id: user.account.id, max_id: statuses.last.id + 1 }
-      end
-
-      it 'returns http success' do
-        expect(response).to have_http_status(:success)
-      end
-
-      it 'sets Content-Type header to AS2' do
-        expect(response.header['Content-Type']).to include 'application/activity+json'
-      end
-
-      it 'returns AS2 JSON body' do
-        json_data = JSON.parse(response.body)
-        expect(json_data).to include('@context' => 'https://www.w3.org/ns/activitystreams')
-        expect(json_data).to include('id' => @request.url)
-        expect(json_data).to include('type' => 'OrderedCollectionPage')
-        expect(json_data).to include('partOf')
-        expect(json_data).to include('items')
-        expect(json_data['items'].length).to eq(20)
-        expect(json_data).to include('prev')
-        expect(json_data).to include('next')
-        expect(json_data).to include('current')
-        expect(json_data).to include('first')
-        expect(json_data).to include('last')
-      end
-    end
-  end
-end
diff --git a/spec/controllers/well_known/webfinger_controller_spec.rb b/spec/controllers/well_known/webfinger_controller_spec.rb
index 3699efb56..466f87c45 100644
--- a/spec/controllers/well_known/webfinger_controller_spec.rb
+++ b/spec/controllers/well_known/webfinger_controller_spec.rb
@@ -9,7 +9,7 @@ describe WellKnown::WebfingerController, type: :controller do
     end
 
     before do
-      alice.private_key = <<PEM
+      alice.private_key = <<-PEM
 -----BEGIN RSA PRIVATE KEY-----
 MIICXQIBAAKBgQDHgPoPJlrfMZrVcuF39UbVssa8r4ObLP3dYl9Y17Mgp5K4mSYD
 R/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0MbSjWqpOsgntRPJiFuj3hai2
@@ -27,7 +27,7 @@ FTX8IvYBNTbpEttc1VCf/0ccnNpfb0CrFNSPWxRj7t7D
 -----END RSA PRIVATE KEY-----
 PEM
 
-      alice.public_key = <<PEM
+      alice.public_key = <<-PEM
 -----BEGIN PUBLIC KEY-----
 MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHgPoPJlrfMZrVcuF39UbVssa8
 r4ObLP3dYl9Y17Mgp5K4mSYDR/Y2ag58tSi6ar2zM3Ze3QYsNfTq0NqN1g89eAu0
@@ -48,29 +48,23 @@ PEM
     it 'returns JSON when account can be found' do
       get :show, params: { resource: alice.to_webfinger_s }, format: :json
 
+      json = body_as_json
+
       expect(response).to have_http_status(:success)
       expect(response.content_type).to eq 'application/jrd+json'
-      expect(response.body).to eq "{\"subject\":\"acct:alice@cb6e6126.ngrok.io\",\"aliases\":[\"https://cb6e6126.ngrok.io/@alice\",\"https://cb6e6126.ngrok.io/users/alice\"],\"links\":[{\"rel\":\"http://webfinger.net/rel/profile-page\",\"type\":\"text/html\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"http://schemas.google.com/g/2010#updates-from\",\"type\":\"application/atom+xml\",\"href\":\"https://cb6e6126.ngrok.io/users/alice.atom\"},{\"rel\":\"self\",\"type\":\"application/activity+json\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"salmon\",\"href\":\"#{api_salmon_url(alice.id)}\"},{\"rel\":\"magic-public-key\",\"href\":\"data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB\"},{\"rel\":\"http://ostatus.org/schema/1.0/subscribe\",\"template\":\"https://cb6e6126.ngrok.io/authorize_follow?acct={uri}\"}]}"
+      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
+      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
     end
 
     it 'returns JSON when account can be found' do
       get :show, params: { resource: alice.to_webfinger_s }, format: :xml
 
+      xml = Nokogiri::XML(response.body)
+
       expect(response).to have_http_status(:success)
       expect(response.content_type).to eq 'application/xrd+xml'
-      expect(response.body).to eq <<"XML"
-<?xml version="1.0"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Subject>acct:alice@cb6e6126.ngrok.io</Subject>
-  <Alias>https://cb6e6126.ngrok.io/@alice</Alias>
-  <Alias>https://cb6e6126.ngrok.io/users/alice</Alias>
-  <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="https://cb6e6126.ngrok.io/@alice"/>
-  <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="https://cb6e6126.ngrok.io/users/alice.atom"/>
-  <Link rel="salmon" href="#{api_salmon_url(alice.id)}"/>
-  <Link rel="magic-public-key" href="data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB"/>
-  <Link rel="http://ostatus.org/schema/1.0/subscribe" template="https://cb6e6126.ngrok.io/authorize_follow?acct={uri}"/>
-</XRD>
-XML
+      expect(xml.at_xpath('//xmlns:Subject').content).to eq 'acct:alice@cb6e6126.ngrok.io'
+      expect(xml.xpath('//xmlns:Alias').map(&:content)).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
     end
 
     it 'returns http not found when account cannot be found' do
@@ -80,19 +74,22 @@ XML
     end
 
     it 'returns JSON when account can be found with alternate domains' do
-      Rails.configuration.x.alternate_domains = ["foo.org"]
-      username, domain = alice.to_webfinger_s.split("@")
+      Rails.configuration.x.alternate_domains = ['foo.org']
+      username, = alice.to_webfinger_s.split('@')
 
       get :show, params: { resource: "#{username}@foo.org" }, format: :json
 
+      json = body_as_json
+
       expect(response).to have_http_status(:success)
       expect(response.content_type).to eq 'application/jrd+json'
-      expect(response.body).to eq "{\"subject\":\"acct:alice@cb6e6126.ngrok.io\",\"aliases\":[\"https://cb6e6126.ngrok.io/@alice\",\"https://cb6e6126.ngrok.io/users/alice\"],\"links\":[{\"rel\":\"http://webfinger.net/rel/profile-page\",\"type\":\"text/html\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"http://schemas.google.com/g/2010#updates-from\",\"type\":\"application/atom+xml\",\"href\":\"https://cb6e6126.ngrok.io/users/alice.atom\"},{\"rel\":\"self\",\"type\":\"application/activity+json\",\"href\":\"https://cb6e6126.ngrok.io/@alice\"},{\"rel\":\"salmon\",\"href\":\"#{api_salmon_url(alice.id)}\"},{\"rel\":\"magic-public-key\",\"href\":\"data:application/magic-public-key,RSA.x4D6DyZa3zGa1XLhd_VG1bLGvK-Dmyz93WJfWNezIKeSuJkmA0f2NmoOfLUoumq9szN2Xt0GLDX06tDajdYPPXgLtDG0o1qqTrIJ7UTyYhbo94Wotl9iJvEwa5IjP1Mn00YJ_KvFrzKCm15PC7up6r-NtHsqoYS8X1KAqcbnptU=.AQAB\"},{\"rel\":\"http://ostatus.org/schema/1.0/subscribe\",\"template\":\"https://cb6e6126.ngrok.io/authorize_follow?acct={uri}\"}]}"
+      expect(json[:subject]).to eq 'acct:alice@cb6e6126.ngrok.io'
+      expect(json[:aliases]).to include('https://cb6e6126.ngrok.io/@alice', 'https://cb6e6126.ngrok.io/users/alice')
     end
 
     it 'returns http not found when account can not be found with alternate domains' do
-      Rails.configuration.x.alternate_domains = ["foo.org"]
-      username, domain = alice.to_webfinger_s.split("@")
+      Rails.configuration.x.alternate_domains = ['foo.org']
+      username, = alice.to_webfinger_s.split('@')
 
       get :show, params: { resource: "#{username}@bar.org" }, format: :json
 
diff --git a/spec/helpers/activitystreams2_builder_helper_spec.rb b/spec/helpers/activitystreams2_builder_helper_spec.rb
deleted file mode 100644
index 612ce6ad2..000000000
--- a/spec/helpers/activitystreams2_builder_helper_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe Activitystreams2BuilderHelper, type: :helper do
-  it 'returns display name if present' do
-    account = Fabricate(:account, display_name: 'display name', username: 'username')
-    expect(account_name(account)).to eq 'display name'
-  end
-
-  it 'returns username if display name is not present' do
-    account = Fabricate(:account, display_name: '', username: 'username')
-    expect(account_name(account)).to eq 'username'
-  end
-end

From bd915d9398816fd1fb44645eb6d7e2c9df0e6388 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sat, 15 Jul 2017 19:47:43 +0900
Subject: [PATCH 247/382] Move babel-plugin-preval to dependencies (#4209)

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20224796f..aede6df2e 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "babel-core": "^6.25.0",
     "babel-loader": "^7.1.1",
     "babel-plugin-lodash": "^3.2.11",
+    "babel-plugin-preval": "^1.3.2",
     "babel-plugin-react-intl": "^2.3.1",
     "babel-plugin-react-transform": "^2.0.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
@@ -121,7 +122,6 @@
     "@storybook/addon-actions": "^3.1.8",
     "@storybook/react": "^3.1.8",
     "babel-eslint": "^7.2.3",
-    "babel-plugin-preval": "^1.3.2",
     "chai": "^4.1.0",
     "chai-enzyme": "^0.8.0",
     "enzyme": "^2.9.1",

From 05cd37097c134d559550adca6cd17cf7578be94b Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sat, 15 Jul 2017 17:24:35 +0200
Subject: [PATCH 248/382] Optimize uri normalization (#4212)

* Add dependency on idn-ruby to speed up URI normalization

* Use normalized_host instead of normalize.host when applicable

When we are only interested in the normalized host, calling normalized_host
avoids normalizing the other components of the URI as well as creating a
new object
---
 Gemfile                                     | 1 +
 Gemfile.lock                                | 2 ++
 app/lib/tag_manager.rb                      | 2 +-
 app/services/concerns/author_extractor.rb   | 2 +-
 app/services/fetch_remote_status_service.rb | 4 ++--
 app/workers/pubsubhubbub/delivery_worker.rb | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d5ddfae1..a6c2b2d65 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,6 +36,7 @@ gem 'htmlentities', '~> 4.3'
 gem 'http', '~> 2.2'
 gem 'http_accept_language', '~> 2.1'
 gem 'httplog', '~> 0.99'
+gem 'idn-ruby', require: 'idn'
 gem 'kaminari', '~> 1.0'
 gem 'link_header', '~> 0.0'
 gem 'mime-types', '~> 3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index daef3e1ad..f637c9bbe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,6 +208,7 @@ GEM
       parser (>= 2.2.3.0)
       rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
+    idn-ruby (0.1.0)
     jmespath (1.3.1)
     json (2.1.0)
     jsonapi-renderer (0.1.2)
@@ -528,6 +529,7 @@ DEPENDENCIES
   http_accept_language (~> 2.1)
   httplog (~> 0.99)
   i18n-tasks (~> 0.9)
+  idn-ruby
   kaminari (~> 1.0)
   letter_opener (~> 1.4)
   letter_opener_web (~> 1.3)
diff --git a/app/lib/tag_manager.rb b/app/lib/tag_manager.rb
index f1a2234dc..5f87a2a48 100644
--- a/app/lib/tag_manager.rb
+++ b/app/lib/tag_manager.rb
@@ -70,7 +70,7 @@ class TagManager
 
     uri = Addressable::URI.new
     uri.host = domain.gsub(/[\/]/, '')
-    uri.normalize.host
+    uri.normalized_host
   end
 
   def same_acct?(canonical, needle)
diff --git a/app/services/concerns/author_extractor.rb b/app/services/concerns/author_extractor.rb
index 00fe1c663..867d6dc25 100644
--- a/app/services/concerns/author_extractor.rb
+++ b/app/services/concerns/author_extractor.rb
@@ -14,7 +14,7 @@ module AuthorExtractor
 
       return nil if username.blank? || uri.blank?
 
-      domain = Addressable::URI.parse(uri).normalize.host
+      domain = Addressable::URI.parse(uri).normalized_host
       acct   = "#{username}@#{domain}"
     end
 
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
index 4cfd33d90..6ac31e4d8 100644
--- a/app/services/fetch_remote_status_service.rb
+++ b/app/services/fetch_remote_status_service.rb
@@ -24,7 +24,7 @@ class FetchRemoteStatusService < BaseService
     xml.encoding = 'utf-8'
 
     account = author_from_xml(xml.at_xpath('/xmlns:entry', xmlns: TagManager::XMLNS))
-    domain  = Addressable::URI.parse(url).normalize.host
+    domain  = Addressable::URI.parse(url).normalized_host
 
     return nil unless !account.nil? && confirmed_domain?(domain, account)
 
@@ -39,6 +39,6 @@ class FetchRemoteStatusService < BaseService
   end
 
   def confirmed_domain?(domain, account)
-    account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url).normalize.host).zero?
+    account.domain.nil? || domain.casecmp(account.domain).zero? || domain.casecmp(Addressable::URI.parse(account.remote_url).normalized_host).zero?
   end
 end
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
index 05d160cf7..2e1101b93 100644
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ b/app/workers/pubsubhubbub/delivery_worker.rb
@@ -43,7 +43,7 @@ class Pubsubhubbub::DeliveryWorker
   end
 
   def host
-    Addressable::URI.parse(subscription.callback_url).normalize.host
+    Addressable::URI.parse(subscription.callback_url).normalized_host
   end
 
   def headers

From 695439775eacea081c7257aabab39d0ec6b492dc Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 16 Jul 2017 00:25:04 +0900
Subject: [PATCH 249/382] Fix column swiping (#4211)

This fixes broken behavior and enable animation only on swiping.
---
 .../features/ui/components/columns_area.js      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index ae3f9261b..515c377b9 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -33,8 +33,22 @@ export default class ColumnsArea extends ImmutablePureComponent {
     children: PropTypes.node,
   };
 
+  state = {
+    shouldAnimate: false,
+  }
+
+  componentWillReceiveProps() {
+    this.setState({ shouldAnimate: false });
+  }
+
+  componentDidMount() {
+    this.lastIndex = getIndex(this.context.router.history.location.pathname);
+    this.setState({ shouldAnimate: true });
+  }
+
   componentDidUpdate() {
     this.lastIndex = getIndex(this.context.router.history.location.pathname);
+    this.setState({ shouldAnimate: true });
   }
 
   handleSwipe = (index) => {
@@ -74,9 +88,10 @@ export default class ColumnsArea extends ImmutablePureComponent {
 
   render () {
     const { columns, children, singleColumn } = this.props;
+    const { shouldAnimate } = this.state;
 
     const columnIndex = getIndex(this.context.router.history.location.pathname);
-    const shouldAnimate = Math.abs(this.lastIndex - columnIndex) === 1;
+    this.pendingIndex = null;
 
     if (singleColumn) {
       return columnIndex !== -1 ? (

From 35b868eeca3f9000d9de0ec232ad93f430563448 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 16 Jul 2017 11:40:56 +0900
Subject: [PATCH 250/382] Install libidn with Docker (#4219)

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 97a691393..8cd374481 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
  && apk -U upgrade \
  && apk add -t build-dependencies \
     build-base \
+    libidn-dev \
     libxml2-dev \
     libxslt-dev \
     postgresql-dev \
@@ -27,6 +28,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
     git \
     icu-dev \
     imagemagick@edge \
+    libidn \
     libpq \
     libxml2 \
     libxslt \

From a6328fc1b17984af71efb9a1214437c8cdc5dfea Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 16 Jul 2017 10:28:55 +0200
Subject: [PATCH 251/382] Minor ActivityPub JSON fixes (#4214)

- Objects must have attributedTo instead of actor
- The current attribute belongs to CollectionPage, not Collection
---
 app/controllers/activitypub/outboxes_controller.rb   | 1 -
 app/controllers/follower_accounts_controller.rb      | 1 -
 app/controllers/following_accounts_controller.rb     | 1 -
 app/controllers/tags_controller.rb                   | 1 -
 app/presenters/activitypub/collection_presenter.rb   | 2 +-
 app/serializers/activitypub/collection_serializer.rb | 3 +--
 app/serializers/activitypub/note_serializer.rb       | 4 ++--
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index 6a58ccf24..30b91f370 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -20,7 +20,6 @@ class ActivityPub::OutboxesController < Api::BaseController
     ActivityPub::CollectionPresenter.new(
       id: account_outbox_url(@account),
       type: :ordered,
-      current: account_outbox_url(@account),
       size: @account.statuses_count,
       items: @statuses
     )
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index e58c5ad46..5edb4d67c 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -21,7 +21,6 @@ class FollowerAccountsController < ApplicationController
     ActivityPub::CollectionPresenter.new(
       id: account_followers_url(@account),
       type: :ordered,
-      current: account_followers_url(@account),
       size: @account.followers_count,
       items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.account) }
     )
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 69f29cd70..7cafe5fda 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -21,7 +21,6 @@ class FollowingAccountsController < ApplicationController
     ActivityPub::CollectionPresenter.new(
       id: account_following_index_url(@account),
       type: :ordered,
-      current: account_following_index_url(@account),
       size: @account.following_count,
       items: @follows.map { |f| ActivityPub::TagManager.instance.uri_for(f.target_account) }
     )
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 8bcce9e13..2cd85e185 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -23,7 +23,6 @@ class TagsController < ApplicationController
     ActivityPub::CollectionPresenter.new(
       id: tag_url(@tag),
       type: :ordered,
-      current: tag_url(@tag),
       size: @tag.statuses.count,
       items: @statuses.map { |s| ActivityPub::TagManager.instance.uri_for(s) }
     )
diff --git a/app/presenters/activitypub/collection_presenter.rb b/app/presenters/activitypub/collection_presenter.rb
index 6bae2955e..631d87cd0 100644
--- a/app/presenters/activitypub/collection_presenter.rb
+++ b/app/presenters/activitypub/collection_presenter.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model
-  attributes :id, :type, :current, :size, :items
+  attributes :id, :type, :size, :items
 end
diff --git a/app/serializers/activitypub/collection_serializer.rb b/app/serializers/activitypub/collection_serializer.rb
index baaba7654..d01dead28 100644
--- a/app/serializers/activitypub/collection_serializer.rb
+++ b/app/serializers/activitypub/collection_serializer.rb
@@ -6,8 +6,7 @@ class ActivityPub::CollectionSerializer < ActiveModel::Serializer
     super
   end
 
-  attributes :id, :type, :total_items,
-             :current
+  attributes :id, :type, :total_items
 
   has_many :items, key: :ordered_items
 
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index ffdc6175d..4c13f8e59 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -3,7 +3,7 @@
 class ActivityPub::NoteSerializer < ActiveModel::Serializer
   attributes :id, :type, :summary, :content,
              :in_reply_to, :published, :url,
-             :actor, :to, :cc, :sensitive
+             :attributed_to, :to, :cc, :sensitive
 
   has_many :media_attachments, key: :attachment
   has_many :virtual_tags, key: :tag
@@ -36,7 +36,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
     ActivityPub::TagManager.instance.url_for(object)
   end
 
-  def actor
+  def attributed_to
     ActivityPub::TagManager.instance.uri_for(object.account)
   end
 

From d1c3e35d3fe707b916e428c376fa0d89e4824ec5 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Sun, 16 Jul 2017 18:52:11 +0900
Subject: [PATCH 252/382] Fix style settings for images in media modal (#4220)

* Shrink too wide single image modal

Fix too wide react-swipeable-view-container

Fix 0067f80 shrinking all react-swipeable-view-container

Change to apply max-width of react-swipeable-view-container only under media-modal.

Fix b30b03b just a typo

* Centering contents in image-loader

Centering small img, canvas, and video in image-loader.
---
 app/javascript/styles/components.scss | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index fc797a508..1c4c97f18 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1143,8 +1143,8 @@
     top: 0;
     left: 0;
     right: 0;
-    width: 100%;
-    height: 100%;
+    max-width: 100%;
+    max-height: 100%;
     background-image: none;
   }
 
@@ -2967,8 +2967,9 @@ button.icon-button.active i.fa-retweet {
   video {
     max-width: 80vw;
     max-height: 80vh;
-    width: 100%;
+    width: auto;
     height: auto;
+    margin: auto;
   }
 
   .extended-video-player,
@@ -2984,6 +2985,10 @@ button.icon-button.active i.fa-retweet {
     background: url('../images/void.png') repeat;
     object-fit: contain;
   }
+
+  .react-swipeable-view-container {
+    max-width: 80vw;
+  }
 }
 
 .media-modal__close {

From 033f970af379ab07499ceb864100a295d9721090 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 16 Jul 2017 21:02:03 +0900
Subject: [PATCH 253/382] Don't mention default post privacy on hints for
 locked accounts (#4222)

"defaults post privacy to followers-only" only means...

* default value of `visibility` param on post API
* default value for web UI privacy setting (i.e. it will be overridden if they once updated)

...so, many users won't see an effect of it.
---
 config/locales/simple_form.en.yml | 2 +-
 config/locales/simple_form.ja.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index fbaf0ff68..476ccc773 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -8,7 +8,7 @@ en:
           one: <span class="name-counter">1</span> character left
           other: <span class="name-counter">%{count}</span> characters left
         header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px
-        locked: Requires you to manually approve followers and defaults post privacy to followers-only
+        locked: Requires you to manually approve followers
         note:
           one: <span class="note-counter">1</span> character left
           other: <span class="note-counter">%{count}</span> characters left
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 9342398a8..74cf91de4 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -6,7 +6,7 @@ ja:
         avatar: 2MBまでのPNGやGIF、JPGが利用可能です。120x120pxまで縮小されます。
         display_name: あと<span class="name-counter">%{count}</span>文字入力できます。
         header: 2MBまでのPNGやGIF、JPGが利用可能です。 700x335pxまで縮小されます。
-        locked: フォロワーを手動で承認する必要があります。デフォルトではトゥートの公開範囲はフォロワーのみです。
+        locked: フォロワーを手動で承認する必要があります。
         note: あと<span class="note-counter">%{count}</span>文字入力できます。
       imports:
         data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい

From 1cceefce330f7a47590a1914bbd7e404080996b0 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Mon, 17 Jul 2017 03:01:21 +0900
Subject: [PATCH 254/382] Check table existence on prepare_for_foreign_keys
 (#4225)

* Check table existence on prepare_for_foreign_keys

* Remove trailing whitespace
---
 lib/tasks/mastodon.rake | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 010139e91..bceeeaf01 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -232,9 +232,16 @@ namespace :mastodon do
     task prepare_for_foreign_keys: :environment do
       # All the deletes:
       ActiveRecord::Base.connection.execute('DELETE FROM statuses USING statuses s LEFT JOIN accounts a ON a.id = s.account_id WHERE statuses.id = s.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM account_domain_blocks USING account_domain_blocks adb LEFT JOIN accounts a ON a.id = adb.account_id WHERE account_domain_blocks.id = adb.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN accounts a ON a.id = cm.account_id WHERE conversation_mutes.id = cm.id AND a.id IS NULL')
-      ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN conversations c ON c.id = cm.conversation_id WHERE conversation_mutes.id = cm.id AND c.id IS NULL')
+
+      if ActiveRecord::Base.connection.table_exists? :account_domain_blocks
+        ActiveRecord::Base.connection.execute('DELETE FROM account_domain_blocks USING account_domain_blocks adb LEFT JOIN accounts a ON a.id = adb.account_id WHERE account_domain_blocks.id = adb.id AND a.id IS NULL')
+      end
+
+      if ActiveRecord::Base.connection.table_exists? :conversation_mutes
+        ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN accounts a ON a.id = cm.account_id WHERE conversation_mutes.id = cm.id AND a.id IS NULL')
+        ActiveRecord::Base.connection.execute('DELETE FROM conversation_mutes USING conversation_mutes cm LEFT JOIN conversations c ON c.id = cm.conversation_id WHERE conversation_mutes.id = cm.id AND c.id IS NULL')
+      end
+
       ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN accounts a ON a.id = f.account_id WHERE favourites.id = f.id AND a.id IS NULL')
       ActiveRecord::Base.connection.execute('DELETE FROM favourites USING favourites f LEFT JOIN statuses s ON s.id = f.status_id WHERE favourites.id = f.id AND s.id IS NULL')
       ActiveRecord::Base.connection.execute('DELETE FROM blocks USING blocks b LEFT JOIN accounts a ON a.id = b.account_id WHERE blocks.id = b.id AND a.id IS NULL')

From a3202fd51e240050a12ddf1170e3e6e2b1532bbf Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 16 Jul 2017 23:48:35 +0200
Subject: [PATCH 255/382] Add SMTP_TLS variable for configuring TLS when server
 uses non-standard port (#4227)

---
 config/environments/production.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index d9c9da684..f1351e378 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -85,6 +85,7 @@ Rails.application.configure do
     :ca_file              => ENV['SMTP_CA_FILE'].presence,
     :openssl_verify_mode  => ENV['SMTP_OPENSSL_VERIFY_MODE'],
     :enable_starttls_auto => ENV['SMTP_ENABLE_STARTTLS_AUTO'] || true,
+    :tls                  => ENV['SMTP_TLS'].presence,
   }
 
   config.action_mailer.delivery_method = ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp').to_sym

From a47c2e88909b87392f041a75d43624f14470fd71 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 17 Jul 2017 02:37:27 +0200
Subject: [PATCH 256/382] Add public key declaration to actors (#4215)

---
 app/serializers/activitypub/actor_serializer.rb |  6 ++++++
 .../activitypub/public_key_serializer.rb        | 17 +++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 app/serializers/activitypub/public_key_serializer.rb

diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb
index 56806152e..f5e626d73 100644
--- a/app/serializers/activitypub/actor_serializer.rb
+++ b/app/serializers/activitypub/actor_serializer.rb
@@ -7,6 +7,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
              :inbox, :outbox, :preferred_username,
              :name, :summary, :icon, :image
 
+  has_one :public_key, serializer: ActivityPub::PublicKeySerializer
+
   def id
     account_url(object)
   end
@@ -50,4 +52,8 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   def image
     full_asset_url(object.header.url(:original))
   end
+
+  def public_key
+    object
+  end
 end
diff --git a/app/serializers/activitypub/public_key_serializer.rb b/app/serializers/activitypub/public_key_serializer.rb
new file mode 100644
index 000000000..38e9e93ba
--- /dev/null
+++ b/app/serializers/activitypub/public_key_serializer.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class ActivityPub::PublicKeySerializer < ActiveModel::Serializer
+  attributes :id, :owner, :public_key_pem
+
+  def id
+    [ActivityPub::TagManager.instance.uri_for(object), '#main-key'].join
+  end
+
+  def owner
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+
+  def public_key_pem
+    object.public_key
+  end
+end

From b15f790221cdccaac04abfb9a0115823fbad883f Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 17 Jul 2017 17:23:28 +0900
Subject: [PATCH 257/382] Require images in common.js (#4232)

---
 app/javascript/mastodon/main.js | 2 --
 app/javascript/packs/common.js  | 2 ++
 app/javascript/packs/public.js  | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index 1f8ebb721..cc422c109 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -8,8 +8,6 @@ function main() {
   const React = require('react');
   const ReactDOM = require('react-dom');
 
-  require.context('../images/', true);
-
   if (window.history && history.replaceState) {
     const { pathname, search, hash } = window.location;
     const path = pathname + search + hash;
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js
index a0cb91ae4..ba7053f1f 100644
--- a/app/javascript/packs/common.js
+++ b/app/javascript/packs/common.js
@@ -4,4 +4,6 @@ import { start } from 'rails-ujs';
 require('font-awesome/css/font-awesome.css');
 require('mastodon-application-style');
 
+require.context('../images/', true);
+
 start();
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 6e6ba3476..371e0f445 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -6,8 +6,6 @@ import { getLocale } from '../mastodon/locales';
 import loadPolyfills from '../mastodon/load_polyfills';
 import ready from '../mastodon/ready';
 
-require.context('../images/', true);
-
 const { localeData } = getLocale();
 localeData.forEach(IntlRelativeFormat.__addLocaleData);
 

From 902c5cf7cafcd08caaf4fc75bd3fbfe41e5a9ad7 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 17 Jul 2017 10:24:53 +0200
Subject: [PATCH 258/382] i18n: update (pl) (#4233)

* i18n: update (pl)

* Update pl.yml
---
 config/locales/pl.yml             | 2 +-
 config/locales/simple_form.pl.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 6f2831670..98cfe1b77 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -10,7 +10,7 @@ pl:
     domain_count_after: instancji
     domain_count_before: Serwer połączony z
     features:
-      humane_approach_body: Nauczeni na błędach innych sieci społecznościowych, Mastodon został zaprojektowany tak, aby uniknąć częstych nadużyć.
+      humane_approach_body: Nauczeni na błędach innych sieci społecznościowych, zaprojektowaliśmy Mastodona tak, aby uniknąć częstych nadużyć.
       humane_approach_title: Bardziej ludzkie podejście
       not_a_product_body: Mastodon nie jest komercyjną siecią. Nie doświadczysz tu reklam, zbierania danych, ani centralnego ośrodka, tak jak w przypadku wielu rozwiązań.
       not_a_product_title: Jesteś człowiekiem, nie produktem
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index e4c4d7c8c..5553c75e3 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -10,7 +10,7 @@ pl:
           one: Pozostał <span class="name-counter">1</span> znak.
           other: Pozostało <span class="name-counter">%{count}</span> znaków
         header: PNG, GIF lub JPG. Maksymalnie 2MB. Zostanie zmniejszony do 700x335px
-        locked: Musisz akceptować obserwacje; Twoje wpisy są domyślnie widoczne tylko dla Twoich obserwujących
+        locked: Musisz akceptować prośby o śledzenie
         note:
           few: Pozostały <span class="name-counter">%{count}</span> znaki.
           many: Pozostało <span class="name-counter">%{count}</span> znaków

From d4b097a88cb43105be86ea06fe4a4dd7830b8416 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 17 Jul 2017 10:57:04 +0200
Subject: [PATCH 259/382] Add missing ActivityPub representations (#4230)

- Follow, undo follow
- Accept follow, reject follow
- Like, undo like
- Block, undo block
- Delete (note)
- Update (actor)
---
 .../activitypub/accept_follow_serializer.rb    | 15 +++++++++++++++
 .../activitypub/block_serializer.rb            | 18 ++++++++++++++++++
 .../activitypub/delete_serializer.rb           | 18 ++++++++++++++++++
 .../activitypub/follow_serializer.rb           | 18 ++++++++++++++++++
 app/serializers/activitypub/like_serializer.rb | 18 ++++++++++++++++++
 .../activitypub/reject_follow_serializer.rb    | 15 +++++++++++++++
 .../activitypub/undo_block_serializer.rb       | 15 +++++++++++++++
 .../activitypub/undo_follow_serializer.rb      | 15 +++++++++++++++
 .../activitypub/undo_like_serializer.rb        | 15 +++++++++++++++
 .../activitypub/update_serializer.rb           | 15 +++++++++++++++
 10 files changed, 162 insertions(+)
 create mode 100644 app/serializers/activitypub/accept_follow_serializer.rb
 create mode 100644 app/serializers/activitypub/block_serializer.rb
 create mode 100644 app/serializers/activitypub/delete_serializer.rb
 create mode 100644 app/serializers/activitypub/follow_serializer.rb
 create mode 100644 app/serializers/activitypub/like_serializer.rb
 create mode 100644 app/serializers/activitypub/reject_follow_serializer.rb
 create mode 100644 app/serializers/activitypub/undo_block_serializer.rb
 create mode 100644 app/serializers/activitypub/undo_follow_serializer.rb
 create mode 100644 app/serializers/activitypub/undo_like_serializer.rb
 create mode 100644 app/serializers/activitypub/update_serializer.rb

diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb
new file mode 100644
index 000000000..ce900bc78
--- /dev/null
+++ b/app/serializers/activitypub/accept_follow_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::FollowSerializer
+
+  def type
+    'Accept'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.target_account)
+  end
+end
diff --git a/app/serializers/activitypub/block_serializer.rb b/app/serializers/activitypub/block_serializer.rb
new file mode 100644
index 000000000..a001b213b
--- /dev/null
+++ b/app/serializers/activitypub/block_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ActivityPub::BlockSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+  attribute :virtual_object, key: :object
+
+  def type
+    'Block'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def virtual_object
+    ActivityPub::TagManager.instance.uri_for(object.target_account)
+  end
+end
diff --git a/app/serializers/activitypub/delete_serializer.rb b/app/serializers/activitypub/delete_serializer.rb
new file mode 100644
index 000000000..77098b1b0
--- /dev/null
+++ b/app/serializers/activitypub/delete_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ActivityPub::DeleteSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+  attribute :virtual_object, key: :object
+
+  def type
+    'Delete'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def virtual_object
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+end
diff --git a/app/serializers/activitypub/follow_serializer.rb b/app/serializers/activitypub/follow_serializer.rb
new file mode 100644
index 000000000..1953a2d7b
--- /dev/null
+++ b/app/serializers/activitypub/follow_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ActivityPub::FollowSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+  attribute :virtual_object, key: :object
+
+  def type
+    'Follow'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def virtual_object
+    ActivityPub::TagManager.instance.uri_for(object.target_account)
+  end
+end
diff --git a/app/serializers/activitypub/like_serializer.rb b/app/serializers/activitypub/like_serializer.rb
new file mode 100644
index 000000000..4226913f5
--- /dev/null
+++ b/app/serializers/activitypub/like_serializer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class ActivityPub::LikeSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+  attribute :virtual_object, key: :object
+
+  def type
+    'Like'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def virtual_object
+    ActivityPub::TagManager.instance.uri_for(object.status)
+  end
+end
diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb
new file mode 100644
index 000000000..28584d627
--- /dev/null
+++ b/app/serializers/activitypub/reject_follow_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::FollowSerializer
+
+  def type
+    'Reject'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.target_account)
+  end
+end
diff --git a/app/serializers/activitypub/undo_block_serializer.rb b/app/serializers/activitypub/undo_block_serializer.rb
new file mode 100644
index 000000000..f71faa729
--- /dev/null
+++ b/app/serializers/activitypub/undo_block_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::UndoBlockSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::BlockSerializer
+
+  def type
+    'Undo'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+end
diff --git a/app/serializers/activitypub/undo_follow_serializer.rb b/app/serializers/activitypub/undo_follow_serializer.rb
new file mode 100644
index 000000000..fe91f5f1c
--- /dev/null
+++ b/app/serializers/activitypub/undo_follow_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::UndoFollowSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::FollowSerializer
+
+  def type
+    'Undo'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+end
diff --git a/app/serializers/activitypub/undo_like_serializer.rb b/app/serializers/activitypub/undo_like_serializer.rb
new file mode 100644
index 000000000..db9cd1d0d
--- /dev/null
+++ b/app/serializers/activitypub/undo_like_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::UndoLikeSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::LikeSerializer
+
+  def type
+    'Undo'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+end
diff --git a/app/serializers/activitypub/update_serializer.rb b/app/serializers/activitypub/update_serializer.rb
new file mode 100644
index 000000000..322305da8
--- /dev/null
+++ b/app/serializers/activitypub/update_serializer.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class ActivityPub::UpdateSerializer < ActiveModel::Serializer
+  attributes :type, :actor
+
+  has_one :object, serializer: ActivityPub::ActorSerializer
+
+  def type
+    'Update'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+end

From 1d2616b79b6bc5b433092c302967c0ee33bd9845 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Mon, 17 Jul 2017 10:57:45 +0200
Subject: [PATCH 260/382] fix(emojis): Handle multipoint emojis (e.g. country
 flags) (#4221)

---
 .../mastodon/features/compose/components/compose_form.js        | 2 +-
 app/javascript/mastodon/reducers/compose.js                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index f07552947..98e823555 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -136,7 +136,7 @@ export default class ComposeForm extends ImmutablePureComponent {
 
   handleEmojiPick = (data) => {
     const position     = this.autosuggestTextarea.textarea.selectionStart;
-    const emojiChar    = String.fromCodePoint(parseInt(data.unicode, 16));
+    const emojiChar    = data.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join('');
     this._restoreCaret = position + emojiChar.length + 1;
     this.props.onPickEmoji(position, data);
   }
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index ea3b78b67..781e6e11b 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -118,7 +118,7 @@ const insertSuggestion = (state, position, token, completion) => {
 };
 
 const insertEmoji = (state, position, emojiData) => {
-  const emoji = String.fromCodePoint(parseInt(emojiData.unicode, 16));
+  const emoji = emojiData.unicode.split('-').map(code => String.fromCodePoint(parseInt(code, 16))).join('');
 
   return state.withMutations(map => {
     map.update('text', oldText => `${oldText.slice(0, position)}${emoji} ${oldText.slice(position)}`);

From 68941d4dfa91194eb6c5b9633df6d88440808e71 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 17 Jul 2017 18:03:42 +0900
Subject: [PATCH 261/382] Use update method to update session in
 WebPushNotificationWorker (#4235)

---
 app/workers/web_push_notification_worker.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
index 0568a3e02..f14efc99e 100644
--- a/app/workers/web_push_notification_worker.rb
+++ b/app/workers/web_push_notification_worker.rb
@@ -17,8 +17,7 @@ class WebPushNotificationWorker
       rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
         # Subscription expiration is not currently implemented in any browser
         session.web_push_subscription.destroy!
-        session.web_push_subscription = nil
-        session.save!
+        session.update!(web_push_subscription: nil)
       rescue Webpush::PayloadTooLarge => e
         Rails.logger.error(e)
       end

From 7f35947d8ed26690b4505f740ee9fbc73e79009a Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Mon, 17 Jul 2017 18:03:48 +0900
Subject: [PATCH 262/382] Improve a query in WebPushNotificationWorker (#4234)

---
 app/workers/web_push_notification_worker.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
index f14efc99e..e8f1d72bd 100644
--- a/app/workers/web_push_notification_worker.rb
+++ b/app/workers/web_push_notification_worker.rb
@@ -9,7 +9,7 @@ class WebPushNotificationWorker
     recipient = Account.find(recipient_id)
     notification = Notification.find(notification_id)
 
-    sessions_with_subscriptions = recipient.user.session_activations.reject { |session| session.web_push_subscription.nil? }
+    sessions_with_subscriptions = recipient.user.session_activations.where.not(web_push_subscription: nil)
 
     sessions_with_subscriptions.each do |session|
       begin

From 681c33d1f4c395742918eb66f2db979b0d628118 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Tue, 18 Jul 2017 02:05:29 +0900
Subject: [PATCH 263/382] Quit overwriting style of extended-video-player
 (#4237)

Though size of extended-video-player is already fixed to 80vw*80vh in components.scss, player size was also set to original video size in extended_video_player.js. Video size is fixed to 80vw*80vh, so video player's size must also be fixed to 80vw*80vh.
---
 app/javascript/mastodon/components/extended_video_player.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/extended_video_player.js b/app/javascript/mastodon/components/extended_video_player.js
index b38a4b8ff..5ab5e9e58 100644
--- a/app/javascript/mastodon/components/extended_video_player.js
+++ b/app/javascript/mastodon/components/extended_video_player.js
@@ -32,7 +32,7 @@ export default class ExtendedVideoPlayer extends React.PureComponent {
 
   render () {
     return (
-      <div className='extended-video-player' style={{ width: this.props.width, height: this.props.height }}>
+      <div className='extended-video-player'>
         <video
           ref={this.setRef}
           src={this.props.src}

From b11ac88692ad7a8765b0b15e6d7a882d171ffe81 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 18 Jul 2017 07:19:02 +0900
Subject: [PATCH 264/382] Require any modules after loading polyfill in entry
 points (#4231)

app/javascript/mastodon/main.js delayed the execution of modules,
but other entry points didn't. That leads to failure in executing
modules, which requires those polyfills.

Strictly enforce the rule to require any modules after loading
polyfill in entry points.
---
 app/javascript/mastodon/main.js     | 11 ++---
 app/javascript/packs/about.js       |  8 +--
 app/javascript/packs/application.js |  5 +-
 app/javascript/packs/public.js      | 75 ++++++++++++++---------------
 4 files changed, 49 insertions(+), 50 deletions(-)

diff --git a/app/javascript/mastodon/main.js b/app/javascript/mastodon/main.js
index cc422c109..a7fc22a00 100644
--- a/app/javascript/mastodon/main.js
+++ b/app/javascript/mastodon/main.js
@@ -1,12 +1,14 @@
+import * as OfflinePluginRuntime from 'offline-plugin/runtime';
+import * as WebPushSubscription from './web_push_subscription';
+import Mastodon from 'mastodon/containers/mastodon';
+import React from 'react';
+import ReactDOM from 'react-dom';
 import ready from './ready';
 
 const perf = require('./performance');
 
 function main() {
   perf.start('main()');
-  const Mastodon = require('mastodon/containers/mastodon').default;
-  const React = require('react');
-  const ReactDOM = require('react-dom');
 
   if (window.history && history.replaceState) {
     const { pathname, search, hash } = window.location;
@@ -23,9 +25,6 @@ function main() {
     ReactDOM.render(<Mastodon {...props} />, mountNode);
     if (process.env.NODE_ENV === 'production') {
       // avoid offline in dev mode because it's harder to debug
-      const OfflinePluginRuntime = require('offline-plugin/runtime');
-      const WebPushSubscription = require('./web_push_subscription');
-
       OfflinePluginRuntime.install();
       WebPushSubscription.register();
     }
diff --git a/app/javascript/packs/about.js b/app/javascript/packs/about.js
index 7b8ab5e5d..6705377c1 100644
--- a/app/javascript/packs/about.js
+++ b/app/javascript/packs/about.js
@@ -1,12 +1,11 @@
-import TimelineContainer from '../mastodon/containers/timeline_container';
-import React from 'react';
-import ReactDOM from 'react-dom';
 import loadPolyfills from '../mastodon/load_polyfills';
-import ready from '../mastodon/ready';
 
 require.context('../images/', true);
 
 function loaded() {
+  const TimelineContainer = require('../mastodon/containers/timeline_container').default;
+  const React = require('react');
+  const ReactDOM = require('react-dom');
   const mountNode = document.getElementById('mastodon-timeline');
 
   if (mountNode !== null) {
@@ -16,6 +15,7 @@ function loaded() {
 }
 
 function main() {
+  const ready = require('../mastodon/ready').default;
   ready(loaded);
 }
 
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 63c5d6272..116632dea 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -1,6 +1,7 @@
-import main from '../mastodon/main';
 import loadPolyfills from '../mastodon/load_polyfills';
 
-loadPolyfills().then(main).catch(e => {
+loadPolyfills().then(() => {
+  require('../mastodon/main').default();
+}).catch(e => {
   console.error(e);
 });
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 371e0f445..ce79836d6 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -1,44 +1,43 @@
-import { length } from 'stringz';
-import IntlRelativeFormat from 'intl-relativeformat';
-import { delegate } from 'rails-ujs';
-import emojify from '../mastodon/emoji';
-import { getLocale } from '../mastodon/locales';
 import loadPolyfills from '../mastodon/load_polyfills';
-import ready from '../mastodon/ready';
-
-const { localeData } = getLocale();
-localeData.forEach(IntlRelativeFormat.__addLocaleData);
-
-function loaded() {
-  const locale = document.documentElement.lang;
-  const dateTimeFormat = new Intl.DateTimeFormat(locale, {
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
-    hour: 'numeric',
-    minute: 'numeric',
-  });
-  const relativeFormat = new IntlRelativeFormat(locale);
-
-  [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
-    content.innerHTML = emojify(content.innerHTML);
-  });
-
-  [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    const formattedDate = dateTimeFormat.format(datetime);
-    content.title = formattedDate;
-    content.textContent = formattedDate;
-  });
-
-  [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
-    const datetime = new Date(content.getAttribute('datetime'));
-    content.textContent = relativeFormat.format(datetime);;
-  });
-}
 
 function main() {
-  ready(loaded);
+  const { length } = require('stringz');
+  const IntlRelativeFormat = require('intl-relativeformat').default;
+  const { delegate } = require('rails-ujs');
+  const emojify = require('../mastodon/emoji').default;
+  const { getLocale } = require('../mastodon/locales');
+  const ready = require('../mastodon/ready').default;
+
+  const { localeData } = getLocale();
+  localeData.forEach(IntlRelativeFormat.__addLocaleData);
+
+  ready(() => {
+    const locale = document.documentElement.lang;
+    const dateTimeFormat = new Intl.DateTimeFormat(locale, {
+      year: 'numeric',
+      month: 'long',
+      day: 'numeric',
+      hour: 'numeric',
+      minute: 'numeric',
+    });
+    const relativeFormat = new IntlRelativeFormat(locale);
+
+    [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
+      content.innerHTML = emojify(content.innerHTML);
+    });
+
+    [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
+      const datetime = new Date(content.getAttribute('datetime'));
+      const formattedDate = dateTimeFormat.format(datetime);
+      content.title = formattedDate;
+      content.textContent = formattedDate;
+    });
+
+    [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
+      const datetime = new Date(content.getAttribute('datetime'));
+      content.textContent = relativeFormat.format(datetime);;
+    });
+  });
 
   delegate(document, '.video-player video', 'click', ({ target }) => {
     if (target.paused) {

From 719ab720a7286c4968f1b42e1be385f5580de13e Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 18 Jul 2017 00:19:17 +0200
Subject: [PATCH 265/382] feat(push-notifications): Open link in current tab if
 possible (#4228)

* fix(push-notification): Open link in current tab if possible

* feat(sw): Skip waiting and claim clients
---
 .../mastodon/service_worker/entry.js          |  9 +++++++++
 .../service_worker/web_push_notifications.js  | 20 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js
index 364b67066..eea4cfc3c 100644
--- a/app/javascript/mastodon/service_worker/entry.js
+++ b/app/javascript/mastodon/service_worker/entry.js
@@ -1 +1,10 @@
 import './web_push_notifications';
+
+// Cause a new version of a registered Service Worker to replace an existing one
+// that is already installed, and replace the currently active worker on open pages.
+self.addEventListener('install', function(event) {
+  event.waitUntil(self.skipWaiting());
+});
+self.addEventListener('activate', function(event) {
+  event.waitUntil(self.clients.claim());
+});
diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js
index 1708aa9f7..4a8a57767 100644
--- a/app/javascript/mastodon/service_worker/web_push_notifications.js
+++ b/app/javascript/mastodon/service_worker/web_push_notifications.js
@@ -50,6 +50,24 @@ const makeRequest = (notification, action) =>
     credentials: 'include',
   });
 
+const openUrl = url =>
+  self.clients.matchAll({ type: 'window' }).then(clientList => {
+    if (clientList.length !== 0 && 'navigate' in clientList[0]) { // Chrome 42-48 does not support navigate
+      const webClients = clientList
+        .filter(client => /\/web\//.test(client.url))
+        .sort(client => client !== 'visible');
+
+      const visibleClient = clientList.find(client => client.visibilityState === 'visible');
+      const focusedClient = clientList.find(client => client.focused);
+
+      const client = webClients[0] || visibleClient || focusedClient || clientList[0];
+
+      return client.navigate(url).then(client => client.focus());
+    } else {
+      return self.clients.openWindow(url);
+    }
+  });
+
 const removeActionFromNotification = (notification, action) => {
   const actions = notification.actions.filter(act => act.action !== action.action);
 
@@ -75,7 +93,7 @@ const handleNotificationClick = (event) => {
       }
     } else {
       event.notification.close();
-      resolve(self.clients.openWindow(event.notification.data.url));
+      resolve(openUrl(event.notification.data.url));
     }
   });
 

From 7f4375822a869bac55eb9dd9884e7803695aed82 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 18 Jul 2017 07:31:43 +0900
Subject: [PATCH 266/382] Install libidn11-dev in Vagrant (#4238)

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index cbe6623b3..0c21bed68 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -35,9 +35,10 @@ sudo apt-get install \
   postgresql-contrib \
   protobuf-compiler \
   yarn \
+  libicu-dev \
+  libidn11-dev \
   libprotobuf-dev \
   libreadline-dev \
-  libicu-dev \
   -y
 
 # Install rvm

From 407073d7a2557bb0da42472b822c664863bcc7fc Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 18 Jul 2017 22:19:49 +0900
Subject: [PATCH 267/382] Move icu-dev to build-dependencies (#4240)

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8cd374481..760999f8c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
  && apk -U upgrade \
  && apk add -t build-dependencies \
     build-base \
+    icu-dev \
     libidn-dev \
     libxml2-dev \
     libxslt-dev \
@@ -26,7 +27,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
     ffmpeg \
     file \
     git \
-    icu-dev \
+    icu-libs \
     imagemagick@edge \
     libidn \
     libpq \

From f5382ec08504a06c005e8f40738596c5c5c837de Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 18 Jul 2017 22:20:38 +0900
Subject: [PATCH 268/382] Exclude self toots from regular expression filter
 (#4245)

* Exclude self toots from regular expression filter

* refactor
---
 .../ui/containers/status_list_container.js    | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/containers/status_list_container.js b/app/javascript/mastodon/features/ui/containers/status_list_container.js
index 1b2e1056a..ff29bfdd4 100644
--- a/app/javascript/mastodon/features/ui/containers/status_list_container.js
+++ b/app/javascript/mastodon/features/ui/containers/status_list_container.js
@@ -10,31 +10,36 @@ const makeGetStatusIds = () => createSelector([
   (state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()),
   (state)           => state.get('statuses'),
   (state)           => state.getIn(['meta', 'me']),
-], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
-  const statusForId = statuses.get(id);
-  let showStatus    = true;
+], (columnSettings, statusIds, statuses, me) => {
+  const rawRegex = columnSettings.getIn(['regex', 'body'], '').trim();
+  let regex      = null;
 
-  if (columnSettings.getIn(['shows', 'reblog']) === false) {
-    showStatus = showStatus && statusForId.get('reblog') === null;
+  try {
+    regex = rawRegex && new RegExp(rawRegex, 'i');
+  } catch (e) {
+    // Bad regex, don't affect filters
   }
 
-  if (columnSettings.getIn(['shows', 'reply']) === false) {
-    showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
-  }
+  return statusIds.filter(id => {
+    const statusForId = statuses.get(id);
+    let showStatus    = true;
 
-  if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) {
-    try {
-      if (showStatus) {
-        const regex = new RegExp(columnSettings.getIn(['regex', 'body']).trim(), 'i');
-        showStatus = !regex.test(statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index'));
-      }
-    } catch(e) {
-      // Bad regex, don't affect filters
+    if (columnSettings.getIn(['shows', 'reblog']) === false) {
+      showStatus = showStatus && statusForId.get('reblog') === null;
     }
-  }
 
-  return showStatus;
-}));
+    if (columnSettings.getIn(['shows', 'reply']) === false) {
+      showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
+    }
+
+    if (showStatus && regex && statusForId.get('account') !== me) {
+      const searchIndex = statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index');
+      showStatus = !regex.test(searchIndex);
+    }
+
+    return showStatus;
+  });
+});
 
 const makeMapStateToProps = () => {
   const getStatusIds = makeGetStatusIds();

From c0c7af2194cffcddbbcab5879f37afca3eb0bcec Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 18 Jul 2017 22:21:30 +0900
Subject: [PATCH 269/382] Download npm and yarn from Alpine packages repository
 (#4242)

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 760999f8c..ef139dcec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ EXPOSE 3000 4000
 WORKDIR /mastodon
 
 RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
+ && echo "@edge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
  && apk -U upgrade \
  && apk add -t build-dependencies \
     build-base \
@@ -38,7 +39,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
     protobuf \
     su-exec \
     tini \
- && npm install -g npm@3 && npm install -g yarn \
+    yarn@edge \
  && update-ca-certificates \
  && rm -rf /tmp/* /var/cache/apk/*
 

From 8949aad030f47b89397ecb371f0464926286ab8f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 18 Jul 2017 22:22:09 +0900
Subject: [PATCH 270/382] Add empty alt attribute to img elements in landing
 page (#4243)

---
 app/views/about/show.html.haml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index fd468bba0..0af47bde3 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -18,13 +18,13 @@
 .landing-page
   .header-wrapper
     .mascot-container
-      = image_tag asset_pack_path('elephant-fren.png'), class: 'mascot'
+      = image_tag asset_pack_path('elephant-fren.png'), alt: '', role: 'presentation', class: 'mascot'
 
     .header
       .container.links
         .brand
           = link_to root_url do
-            = image_tag asset_pack_path('logo.svg')
+            = image_tag asset_pack_path('logo.svg'), alt: '', role: 'presentation'
             Mastodon
 
         %ul.nav
@@ -38,9 +38,9 @@
 
       .container.hero
         .floats
-          = image_tag asset_pack_path('cloud2.png'), class: 'float-1'
-          = image_tag asset_pack_path('cloud3.png'), class: 'float-2'
-          = image_tag asset_pack_path('cloud4.png'), class: 'float-3'
+          = image_tag asset_pack_path('cloud2.png'), alt: '', role: 'presentation', class: 'float-1'
+          = image_tag asset_pack_path('cloud3.png'), alt: '', role: 'presentation', class: 'float-2'
+          = image_tag asset_pack_path('cloud4.png'), alt: '', role: 'presentation', class: 'float-3'
         .heading
           %h1
             = @instance_presenter.site_title
@@ -54,7 +54,7 @@
                 %p= t('about.closed_registrations')
               - else
                 = @instance_presenter.closed_registrations_message.html_safe
-            = link_to t('about.find_another_instance'), 'https://joinmastodon.org', class: 'button button-alternative button--block'
+            = link_to t('about.find_another_instance'), 'https://joinmastodon.org/', class: 'button button-alternative button--block'
 
   .learn-more-cta
     .container
@@ -69,7 +69,7 @@
       .about-mastodon
         %h3= t 'about.what_is_mastodon'
         %p= t 'about.about_mastodon_html'
-        %a.button.button-secondary{ href: 'https://joinmastodon.org' }= t 'about.learn_more'
+        %a.button.button-secondary{ href: 'https://joinmastodon.org/' }= t 'about.learn_more'
         = render 'features'
   .footer-links
     .container

From afa52e4d636f8fdc4b21b90e4f006d8ea434b4e9 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Tue, 18 Jul 2017 22:24:57 +0900
Subject: [PATCH 271/382] Fixed issue that the NSFW image is not hidden on
 detail page (#4244)

---
 app/javascript/mastodon/components/media_gallery.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/javascript/mastodon/components/media_gallery.js b/app/javascript/mastodon/components/media_gallery.js
index 89a358e38..92d7d494e 100644
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -183,6 +183,12 @@ export default class MediaGallery extends React.PureComponent {
     visible: !this.props.sensitive,
   };
 
+  componentWillReceiveProps (nextProps) {
+    if (nextProps.sensitive !== this.props.sensitive) {
+      this.setState({ visible: !nextProps.sensitive });
+    }
+  }
+
   handleOpen = () => {
     this.setState({ visible: !this.state.visible });
   }

From 8387b3928ec7658192907da79df65e65aaa8a7fc Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 18 Jul 2017 16:25:40 +0200
Subject: [PATCH 272/382] fix(push-subscriptions): Refactor how Sidekiq jobs
 are handled (#4226)

---
 app/models/web/push_subscription.rb         |  8 +++++---
 app/services/notify_service.rb              |  6 +++++-
 app/workers/web_push_notification_worker.rb | 22 +++++++++------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index 4440706a6..baf6a1ece 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -12,6 +12,9 @@
 #  updated_at :datetime         not null
 #
 
+require 'webpush'
+require_relative '../../models/setting'
+
 class Web::PushSubscription < ApplicationRecord
   include RoutingHelper
   include StreamEntriesHelper
@@ -37,7 +40,6 @@ class Web::PushSubscription < ApplicationRecord
     nsfw = notification.target_status.nil? || notification.target_status.spoiler_text.empty? ? nil : notification.target_status.spoiler_text
 
     # TODO: Make sure that the payload does not exceed 4KB - Webpush::PayloadTooLarge
-    # TODO: Queue the requests - Webpush::TooManyRequests
     Webpush.payload_send(
       message: JSON.generate(
         title: title,
@@ -59,7 +61,7 @@ class Web::PushSubscription < ApplicationRecord
       p256dh: key_p256dh,
       auth: key_auth,
       vapid: {
-        # subject: "mailto:#{Setting.site_contact_email}",
+        subject: "mailto:#{Setting.site_contact_email}",
         private_key: Rails.configuration.x.vapid_private_key,
         public_key: Rails.configuration.x.vapid_public_key,
       },
@@ -166,7 +168,7 @@ class Web::PushSubscription < ApplicationRecord
       p256dh: key_p256dh,
       auth: key_auth,
       vapid: {
-        # subject: "mailto:#{Setting.site_contact_email}",
+        subject: "mailto:#{Setting.site_contact_email}",
         private_key: Rails.configuration.x.vapid_private_key,
         public_key: Rails.configuration.x.vapid_public_key,
       },
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 0ab61b634..c7d8ad50a 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -65,7 +65,11 @@ class NotifyService < BaseService
   end
 
   def send_push_notifications
-    WebPushNotificationWorker.perform_async(@recipient.id, @notification.id)
+    sessions_with_subscriptions_ids = @recipient.user.session_activations.where.not(web_push_subscription: nil).pluck(:id)
+
+    WebPushNotificationWorker.push_bulk(sessions_with_subscriptions_ids) do |session_activation_id|
+      [session_activation_id, @notification.id]
+    end
   end
 
   def send_email
diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
index e8f1d72bd..da4043ddb 100644
--- a/app/workers/web_push_notification_worker.rb
+++ b/app/workers/web_push_notification_worker.rb
@@ -5,22 +5,18 @@ class WebPushNotificationWorker
 
   sidekiq_options backtrace: true
 
-  def perform(recipient_id, notification_id)
-    recipient = Account.find(recipient_id)
+  def perform(session_activation_id, notification_id)
+    session_activation = SessionActivation.find(session_activation_id)
     notification = Notification.find(notification_id)
 
-    sessions_with_subscriptions = recipient.user.session_activations.where.not(web_push_subscription: nil)
+    begin
+      session_activation.web_push_subscription.push(notification)
+    rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e
+      # Subscription expiration is not currently implemented in any browser
+      session_activation.web_push_subscription.destroy!
+      session_activation.update!(web_push_subscription: nil)
 
-    sessions_with_subscriptions.each do |session|
-      begin
-        session.web_push_subscription.push(notification)
-      rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
-        # Subscription expiration is not currently implemented in any browser
-        session.web_push_subscription.destroy!
-        session.update!(web_push_subscription: nil)
-      rescue Webpush::PayloadTooLarge => e
-        Rails.logger.error(e)
-      end
+      raise e
     end
   end
 end

From 4d42a389540690b32886f2a38af1f86aee617d27 Mon Sep 17 00:00:00 2001
From: abcang <abcang1015@gmail.com>
Date: Tue, 18 Jul 2017 23:38:22 +0900
Subject: [PATCH 273/382] Improve admin page (#4121)

* Improve admin page

* Fix test

* Add spec

* Improve select style
---
 .../admin/reported_statuses_controller.rb     |  15 ++-
 app/controllers/admin/reports_controller.rb   |   4 +-
 app/controllers/admin/statuses_controller.rb  |  69 +++++++++++
 app/javascript/packs/admin.js                 |  40 +++++++
 app/javascript/styles/admin.scss              |  45 +++++++-
 app/models/form/status_batch.rb               |  39 +++++++
 app/views/admin/accounts/show.html.haml       |   4 +-
 app/views/admin/reports/show.html.haml        |  34 ++++--
 app/views/admin/statuses/index.html.haml      |  47 ++++++++
 config/locales/en.yml                         |  15 +++
 config/locales/ja.yml                         |  15 +++
 config/routes.rb                              |   3 +-
 .../reported_statuses_controller_spec.rb      |  38 ++++++-
 .../admin/statuses_controller_spec.rb         | 107 ++++++++++++++++++
 spec/models/form/status_batch_spec.rb         |  52 +++++++++
 15 files changed, 508 insertions(+), 19 deletions(-)
 create mode 100644 app/controllers/admin/statuses_controller.rb
 create mode 100644 app/javascript/packs/admin.js
 create mode 100644 app/models/form/status_batch.rb
 create mode 100644 app/views/admin/statuses/index.html.haml
 create mode 100644 spec/controllers/admin/statuses_controller_spec.rb
 create mode 100644 spec/models/form/status_batch_spec.rb

diff --git a/app/controllers/admin/reported_statuses_controller.rb b/app/controllers/admin/reported_statuses_controller.rb
index 32434d30f..5a31adecf 100644
--- a/app/controllers/admin/reported_statuses_controller.rb
+++ b/app/controllers/admin/reported_statuses_controller.rb
@@ -5,7 +5,14 @@ module Admin
     include Authorization
 
     before_action :set_report
-    before_action :set_status
+    before_action :set_status, only: [:update, :destroy]
+
+    def create
+      @form = Form::StatusBatch.new(form_status_batch_params)
+      flash[:alert] = t('admin.statuses.failed_to_execute') unless @form.save
+
+      redirect_to admin_report_path(@report)
+    end
 
     def update
       @status.update(status_params)
@@ -15,7 +22,7 @@ module Admin
     def destroy
       authorize @status, :destroy?
       RemovalWorker.perform_async(@status.id)
-      redirect_to admin_report_path(@report)
+      render json: @status
     end
 
     private
@@ -24,6 +31,10 @@ module Admin
       params.require(:status).permit(:sensitive)
     end
 
+    def form_status_batch_params
+      params.require(:form_status_batch).permit(:action, status_ids: [])
+    end
+
     def set_report
       @report = Report.find(params[:report_id])
     end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 2d8c3c820..226467739 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -8,7 +8,9 @@ module Admin
       @reports = filtered_reports.page(params[:page])
     end
 
-    def show; end
+    def show
+      @form = Form::StatusBatch.new
+    end
 
     def update
       process_report
diff --git a/app/controllers/admin/statuses_controller.rb b/app/controllers/admin/statuses_controller.rb
new file mode 100644
index 000000000..50712f0dd
--- /dev/null
+++ b/app/controllers/admin/statuses_controller.rb
@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Admin
+  class StatusesController < BaseController
+    include Authorization
+
+    helper_method :current_params
+
+    before_action :set_account
+    before_action :set_status, only: [:update, :destroy]
+
+    PAR_PAGE = 20
+
+    def index
+      @statuses = @account.statuses
+      if params[:media]
+        account_media_status_ids = @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
+        @statuses.merge!(Status.where(id: account_media_status_ids))
+      end
+      @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PAR_PAGE)
+
+      @form = Form::StatusBatch.new
+    end
+
+    def create
+      @form = Form::StatusBatch.new(form_status_batch_params)
+      flash[:alert] = t('admin.statuses.failed_to_execute') unless @form.save
+
+      redirect_to admin_account_statuses_path(@account.id, current_params)
+    end
+
+    def update
+      @status.update(status_params)
+      redirect_to admin_account_statuses_path(@account.id, current_params)
+    end
+
+    def destroy
+      authorize @status, :destroy?
+      RemovalWorker.perform_async(@status.id)
+      render json: @status
+    end
+
+    private
+
+    def status_params
+      params.require(:status).permit(:sensitive)
+    end
+
+    def form_status_batch_params
+      params.require(:form_status_batch).permit(:action, status_ids: [])
+    end
+
+    def set_status
+      @status = @account.statuses.find(params[:id])
+    end
+
+    def set_account
+      @account = Account.find(params[:account_id])
+    end
+
+    def current_params
+      page = (params[:page] || 1).to_i
+      {
+        media: params[:media],
+        page: page > 1 && page,
+      }.select { |_, value| value.present? }
+    end
+  end
+end
diff --git a/app/javascript/packs/admin.js b/app/javascript/packs/admin.js
new file mode 100644
index 000000000..993827db5
--- /dev/null
+++ b/app/javascript/packs/admin.js
@@ -0,0 +1,40 @@
+import { delegate } from 'rails-ujs';
+
+function handleDeleteStatus(event) {
+  const [data] = event.detail;
+  const element = document.querySelector(`[data-id="${data.id}"]`);
+  if (element) {
+    element.parentNode.removeChild(element);
+  }
+}
+
+[].forEach.call(document.querySelectorAll('.trash-button'), (content) => {
+  content.addEventListener('ajax:success', handleDeleteStatus);
+});
+
+const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
+
+delegate(document, '#batch_checkbox_all', 'change', ({ target }) => {
+  [].forEach.call(document.querySelectorAll(batchCheckboxClassName), (content) => {
+    content.checked = target.checked;
+  });
+});
+
+delegate(document, batchCheckboxClassName, 'change', () => {
+  const checkAllElement = document.querySelector('#batch_checkbox_all');
+  if (checkAllElement) {
+    checkAllElement.checked = [].every.call(document.querySelectorAll(batchCheckboxClassName), (content) => content.checked);
+  }
+});
+
+delegate(document, '.media-spoiler-show-button', 'click', () => {
+  [].forEach.call(document.querySelectorAll('.activity-stream .media-spoiler-wrapper'), (content) => {
+    content.classList.add('media-spoiler-wrapper__visible');
+  });
+});
+
+delegate(document, '.media-spoiler-hide-button', 'click', () => {
+  [].forEach.call(document.querySelectorAll('.activity-stream .media-spoiler-wrapper'), (content) => {
+    content.classList.remove('media-spoiler-wrapper__visible');
+  });
+});
diff --git a/app/javascript/styles/admin.scss b/app/javascript/styles/admin.scss
index 3bc713566..4c3bbdfc5 100644
--- a/app/javascript/styles/admin.scss
+++ b/app/javascript/styles/admin.scss
@@ -253,7 +253,8 @@
   }
 }
 
-.report-status {
+.report-status,
+.account-status {
   display: flex;
   margin-bottom: 10px;
 
@@ -263,7 +264,8 @@
   }
 }
 
-.report-status__actions {
+.report-status__actions,
+.account-status__actions {
   flex: 0 0 auto;
   display: flex;
   flex-direction: column;
@@ -275,3 +277,42 @@
     margin-bottom: 10px;
   }
 }
+
+.batch-form-box {
+  display: flex;
+  margin-bottom: 10px;
+
+  #form_status_batch_action {
+    margin-right: 5px;
+    font-size: 14px;
+  }
+
+  .media-spoiler-toggle-buttons {
+    margin-left: auto;
+
+    .button {
+      overflow: visible;
+    }
+  }
+}
+
+.batch-checkbox,
+.batch-checkbox-all {
+  display: flex;
+  align-items: center;
+  margin-right: 5px;
+}
+
+.back-link {
+  margin-bottom: 10px;
+  font-size: 14px;
+
+  a {
+    color: $classic-highlight-color;
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb
new file mode 100644
index 000000000..a97b4aa28
--- /dev/null
+++ b/app/models/form/status_batch.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class Form::StatusBatch
+  include ActiveModel::Model
+
+  attr_accessor :status_ids, :action
+
+  ACTION_TYPE = %w(nsfw_on nsfw_off delete).freeze
+
+  def save
+    case action
+    when 'nsfw_on', 'nsfw_off'
+      change_sensitive(action == 'nsfw_on')
+    when 'delete'
+      delete_statuses
+    end
+  end
+
+  private
+
+  def change_sensitive(sensitive)
+    media_attached_status_ids = MediaAttachment.where(status_id: status_ids).pluck(:status_id)
+    ApplicationRecord.transaction do
+      Status.where(id: media_attached_status_ids).find_each do |status|
+        status.update!(sensitive: sensitive)
+      end
+    end
+    true
+  rescue ActiveRecord::RecordInvalid
+    false
+  end
+
+  def delete_statuses
+    Status.where(id: status_ids).find_each do |status|
+      RemovalWorker.perform_async(status.id)
+    end
+    true
+  end
+end
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index d91ba9c78..5ad1fd6ee 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -53,11 +53,11 @@
       %td= @account.followers_count
     %tr
       %th= t('admin.accounts.statuses')
-      %td= @account.statuses_count
+      %td= link_to @account.statuses_count, admin_account_statuses_path(@account.id)
     %tr
       %th= t('admin.accounts.media_attachments')
       %td
-        = @account.media_attachments.count
+        = link_to @account.media_attachments.count, admin_account_statuses_path(@account.id, { media: true })
         = surround '(', ')' do
           = number_to_human_size @account.media_attachments.sum('file_file_size')
     %tr
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 44486cb42..5747cc274 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -1,3 +1,6 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
 - content_for :page_title do
   = t('admin.reports.report', id: @report.id)
 
@@ -19,16 +22,27 @@
 - unless @report.statuses.empty?
   %hr/
 
-  - @report.statuses.each do |status|
-    .report-status
-      .activity-stream.activity-stream-headless
-        .entry= render 'stream_entries/simple_status', status: status
-      .report-status__actions
-        - unless status.media_attachments.empty?
-          = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
-            = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
-        = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') } do
-          = fa_icon 'trash'
+  = form_for(@form, url: admin_report_reported_statuses_path(@report.id)) do |f|
+    .batch-form-box
+      .batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
+      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
+      .media-spoiler-toggle-buttons
+        .media-spoiler-show-button.button= t('admin.statuses.media.show')
+        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
+    - @report.statuses.each do |status|
+      .report-status{ data: { id: status.id } }
+        .batch-checkbox
+          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+        .activity-stream.activity-stream-headless
+          .entry= render 'stream_entries/simple_status', status: status
+        .report-status__actions
+          - unless status.media_attachments.empty?
+            = link_to admin_report_reported_status_path(@report, status, status: { sensitive: !status.sensitive }), method: :put, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
+              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
+          = link_to admin_report_reported_status_path(@report, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
+            = fa_icon 'trash'
 
 %hr/
 
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
new file mode 100644
index 000000000..fe2581527
--- /dev/null
+++ b/app/views/admin/statuses/index.html.haml
@@ -0,0 +1,47 @@
+- content_for :header_tags do
+  = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous'
+
+- content_for :page_title do
+  = t('admin.statuses.title')
+
+.back-link
+  = link_to admin_account_path(@account.id) do
+    %i.fa.fa-chevron-left.fa-fw
+    = t('admin.statuses.back_to_account')
+
+.filters
+  .filter-subset
+    %strong= t('admin.statuses.media.title')
+    %ul
+      %li= link_to t('admin.statuses.no_media'), admin_account_statuses_path(@account.id, current_params.merge(media: nil)), class: !params[:media] && 'selected'
+      %li= link_to t('admin.statuses.with_media'), admin_account_statuses_path(@account.id, current_params.merge(media: true)), class: params[:media] && 'selected'
+
+- if @statuses.empty?
+  .accounts-grid
+    = render 'accounts/nothing_here'
+- else
+  = form_for(@form, url: admin_account_statuses_path(@account.id)) do |f|
+    = hidden_field_tag :page, params[:page]
+    = hidden_field_tag :media, params[:media]
+    .batch-form-box
+      .batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      = f.select :action, Form::StatusBatch::ACTION_TYPE.map{|action| [t("admin.statuses.batch.#{action}"), action]}
+      = f.submit t('admin.statuses.execute'), data: { confirm: t('admin.reports.are_you_sure') }, class: 'button'
+      .media-spoiler-toggle-buttons
+        .media-spoiler-show-button.button= t('admin.statuses.media.show')
+        .media-spoiler-hide-button.button= t('admin.statuses.media.hide')
+    - @statuses.each do |status|
+      .account-status{ data: { id: status.id } }
+        .batch-checkbox
+          = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+        .activity-stream.activity-stream-headless
+          .entry= render 'stream_entries/simple_status', status: status
+        .account-status__actions
+          - unless status.media_attachments.empty?
+            = link_to admin_account_status_path(@account.id, status, current_params.merge(status: { sensitive: !status.sensitive })), method: :patch, class: 'icon-button nsfw-button', title: t("admin.reports.nsfw.#{!status.sensitive}") do
+              = fa_icon status.sensitive? ? 'eye' : 'eye-slash'
+          = link_to admin_account_status_path(@account.id, status), method: :delete, class: 'icon-button trash-button', title: t('admin.reports.delete'), data: { confirm: t('admin.reports.are_you_sure') }, remote: true do
+            = fa_icon 'trash'
+
+= paginate @statuses
diff --git a/config/locales/en.yml b/config/locales/en.yml
index be1f15e25..4cb536223 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -185,6 +185,21 @@ en:
         desc_html: Display public timeline on landing page
         title: Timeline preview
       title: Site Settings
+    statuses:
+      back_to_account: Back to account page
+      batch:
+        delete: Delete
+        nsfw_off: NSFW OFF
+        nsfw_on: NSFW ON
+      execute: Execute
+      failed_to_execute: Failed to execute
+      media:
+        hide: Hide media
+        show: Show media
+        title: Media
+      no_media: No media
+      with_media: With media
+      title: Account statuses
     subscriptions:
       callback_url: Callback URL
       confirmed: Confirmed
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fda87526d..2897e864f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -171,6 +171,21 @@ ja:
         desc_html: ランディングページに公開タイムラインを表示します
         title: タイムラインプレビュー
       title: サイト設定
+    statuses:
+      back_to_account: アカウントページに戻る
+      batch:
+        delete: 削除
+        nsfw_off: NSFW オフ
+        nsfw_on: NSFW オン
+      execute: 実行
+      failed_to_execute: 実行に失敗しました
+      media:
+        hide: メディアを隠す
+        show: メディアを表示
+        title: メディア
+      no_media: メディアなし
+      with_media: メディアあり
+      title: トゥート一覧
     subscriptions:
       callback_url: コールバックURL
       confirmed: 確認済み
diff --git a/config/routes.rb b/config/routes.rb
index dda3534eb..60234a9e6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,7 +89,7 @@ Rails.application.routes.draw do
     resources :instances, only: [:index]
 
     resources :reports, only: [:index, :show, :update] do
-      resources :reported_statuses, only: [:update, :destroy]
+      resources :reported_statuses, only: [:create, :update, :destroy]
     end
 
     resources :accounts, only: [:index, :show] do
@@ -103,6 +103,7 @@ Rails.application.routes.draw do
       resource :silence, only: [:create, :destroy]
       resource :suspension, only: [:create, :destroy]
       resource :confirmation, only: [:create]
+      resources :statuses, only: [:index, :create, :update, :destroy]
     end
 
     resources :users, only: [] do
diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb
index 80c69e8d1..297807d41 100644
--- a/spec/controllers/admin/reported_statuses_controller_spec.rb
+++ b/spec/controllers/admin/reported_statuses_controller_spec.rb
@@ -11,6 +11,42 @@ describe Admin::ReportedStatusesController do
     sign_in user, scope: :user
   end
 
+  describe 'POST #create' do
+    subject do
+      -> { post :create, params: { report_id: report, form_status_batch: { action: action, status_ids: status_ids } } }
+    end
+
+    let(:action) { 'nsfw_on' }
+    let(:status_ids) { [status.id] }
+    let(:status) { Fabricate(:status, sensitive: !sensitive) }
+    let(:sensitive) { true }
+    let!(:media_attachment) { Fabricate(:media_attachment, status: status) }
+
+    context 'updates sensitive column to true' do
+      it 'updates sensitive column' do
+        is_expected.to change {
+          status.reload.sensitive
+        }.from(false).to(true)
+      end
+    end
+
+    context 'updates sensitive column to false' do
+      let(:action) { 'nsfw_off' }
+      let(:sensitive) { false }
+
+      it 'updates sensitive column' do
+        is_expected.to change {
+          status.reload.sensitive
+        }.from(true).to(false)
+      end
+    end
+
+    it 'redirects to report page' do
+      subject.call
+      expect(response).to redirect_to(admin_report_path(report))
+    end
+  end
+
   describe 'PATCH #update' do
     subject do
       -> { patch :update, params: { report_id: report, id: status, status: { sensitive: sensitive } } }
@@ -48,7 +84,7 @@ describe Admin::ReportedStatusesController do
       allow(RemovalWorker).to receive(:perform_async)
 
       delete :destroy, params: { report_id: report, id: status }
-      expect(response).to redirect_to(admin_report_path(report))
+      expect(response).to have_http_status(:success)
       expect(RemovalWorker).
         to have_received(:perform_async).with(status.id)
     end
diff --git a/spec/controllers/admin/statuses_controller_spec.rb b/spec/controllers/admin/statuses_controller_spec.rb
new file mode 100644
index 000000000..1515e299b
--- /dev/null
+++ b/spec/controllers/admin/statuses_controller_spec.rb
@@ -0,0 +1,107 @@
+require 'rails_helper'
+
+describe Admin::StatusesController do
+  render_views
+
+  let(:user) { Fabricate(:user, admin: true) }
+  let(:account) { Fabricate(:account) }
+  let!(:status) { Fabricate(:status, account: account) }
+  let(:media_attached_status) { Fabricate(:status, account: account, sensitive: !sensitive) }
+  let!(:media_attachment) { Fabricate(:media_attachment, account: account, status: media_attached_status) }
+  let(:sensitive) { true }
+
+  before do
+    sign_in user, scope: :user
+  end
+
+  describe 'GET #index' do
+    it 'returns http success with no media' do
+      get :index, params: { account_id: account.id }
+
+      statuses = assigns(:statuses).to_a
+      expect(statuses.size).to eq 2
+      expect(response).to have_http_status(:success)
+    end
+
+    it 'returns http success with media' do
+      get :index, params: { account_id: account.id , media: true }
+
+      statuses = assigns(:statuses).to_a
+      expect(statuses.size).to eq 1
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+  describe 'POST #create' do
+    subject do
+      -> { post :create, params: { account_id: account.id, form_status_batch: { action: action, status_ids: status_ids } } }
+    end
+
+    let(:action) { 'nsfw_on' }
+    let(:status_ids) { [media_attached_status.id] }
+
+    context 'updates sensitive column to true' do
+      it 'updates sensitive column' do
+        is_expected.to change {
+          media_attached_status.reload.sensitive
+        }.from(false).to(true)
+      end
+    end
+
+    context 'updates sensitive column to false' do
+      let(:action) { 'nsfw_off' }
+      let(:sensitive) { false }
+
+      it 'updates sensitive column' do
+        is_expected.to change {
+          media_attached_status.reload.sensitive
+        }.from(true).to(false)
+      end
+    end
+
+    it 'redirects to account statuses page' do
+      subject.call
+      expect(response).to redirect_to(admin_account_statuses_path(account.id))
+    end
+  end
+
+  describe 'PATCH #update' do
+    subject do
+      -> { patch :update, params: { account_id: account.id, id: media_attached_status, status: { sensitive: sensitive } } }
+    end
+
+    context 'updates sensitive column to true' do
+      it 'updates sensitive column' do
+        is_expected.to change {
+          media_attached_status.reload.sensitive
+        }.from(false).to(true)
+      end
+    end
+
+    context 'updates sensitive column to false' do
+      let(:sensitive) { false }
+
+      it 'updates sensitive column' do
+        is_expected.to change {
+          media_attached_status.reload.sensitive
+        }.from(true).to(false)
+      end
+    end
+
+    it 'redirects to account statuses page' do
+      subject.call
+      expect(response).to redirect_to(admin_account_statuses_path(account.id))
+    end
+  end
+
+  describe 'DELETE #destroy' do
+    it 'removes a status' do
+      allow(RemovalWorker).to receive(:perform_async)
+
+      delete :destroy, params: { account_id: account.id, id: status }
+      expect(response).to have_http_status(:success)
+      expect(RemovalWorker).
+        to have_received(:perform_async).with(status.id)
+    end
+  end
+end
diff --git a/spec/models/form/status_batch_spec.rb b/spec/models/form/status_batch_spec.rb
new file mode 100644
index 000000000..00c790a11
--- /dev/null
+++ b/spec/models/form/status_batch_spec.rb
@@ -0,0 +1,52 @@
+require 'rails_helper'
+
+describe Form::StatusBatch do
+  let(:form) { Form::StatusBatch.new(action: action, status_ids: status_ids) }
+  let(:status) { Fabricate(:status) }
+
+  describe 'with nsfw action' do
+    let(:status_ids) { [status.id, nonsensitive_status.id, sensitive_status.id] }
+    let(:nonsensitive_status) { Fabricate(:status, sensitive: false) }
+    let(:sensitive_status) { Fabricate(:status, sensitive: true) }
+    let!(:shown_media_attachment) { Fabricate(:media_attachment, status: nonsensitive_status) }
+    let!(:hidden_media_attachment) { Fabricate(:media_attachment, status: sensitive_status) }
+
+    context 'nsfw_on' do
+      let(:action) { 'nsfw_on' }
+
+      it { expect(form.save).to be true }
+      it { expect { form.save }.to change { nonsensitive_status.reload.sensitive }.from(false).to(true) }
+      it { expect { form.save }.not_to change { sensitive_status.reload.sensitive } }
+      it { expect { form.save }.not_to change { status.reload.sensitive } }
+    end
+
+    context 'nsfw_off' do
+      let(:action) { 'nsfw_off' }
+
+      it { expect(form.save).to be true }
+      it { expect { form.save }.to change { sensitive_status.reload.sensitive }.from(true).to(false) }
+      it { expect { form.save }.not_to change { nonsensitive_status.reload.sensitive } }
+      it { expect { form.save }.not_to change { status.reload.sensitive } }
+    end
+  end
+
+  describe 'with delete action' do
+    let(:status_ids) { [status.id] }
+    let(:action) { 'delete' }
+    let!(:another_status) { Fabricate(:status) }
+
+    before do
+      allow(RemovalWorker).to receive(:perform_async)
+    end
+
+    it 'call RemovalWorker' do
+      form.save
+      expect(RemovalWorker).to have_received(:perform_async).with(status.id)
+    end
+
+    it 'do not call RemovalWorker' do
+      form.save
+      expect(RemovalWorker).not_to have_received(:perform_async).with(another_status.id)
+    end
+  end
+end

From 89b988cab5e4729bd80400a2b25ec2b790ebd18d Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 18 Jul 2017 23:39:47 +0900
Subject: [PATCH 274/382] Introduce Ostatus name space (#4164)

* Wrap methods of ProcessFeedService::ProcessEntry in classes

This is a change same with 425acecfdb15093a265b191120fb2d4e4c4135c4, except
that it has the following changes:

* Revert irrelevant change in find_or_create_conversation
* Fix error handling for RemoteActivity

* Introduce Ostatus name space
---
 app/controllers/accounts_controller.rb        |   2 +-
 app/controllers/stream_entries_controller.rb  |   2 +-
 app/lib/ostatus/activity/base.rb              |  50 +++
 app/lib/ostatus/activity/creation.rb          | 149 ++++++++
 app/lib/ostatus/activity/deletion.rb          |  14 +
 app/lib/ostatus/activity/general.rb           |  20 ++
 app/lib/ostatus/activity/post.rb              |  23 ++
 app/lib/ostatus/activity/remote.rb            |   7 +
 app/lib/ostatus/activity/share.rb             |  26 ++
 app/lib/{ => ostatus}/atom_serializer.rb      |   2 +-
 app/services/authorize_follow_service.rb      |   2 +-
 app/services/block_service.rb                 |   2 +-
 .../concerns/stream_entry_renderer.rb         |   2 +-
 app/services/favourite_service.rb             |   2 +-
 app/services/follow_service.rb                |   4 +-
 app/services/process_feed_service.rb          | 274 +--------------
 app/services/reject_follow_service.rb         |   2 +-
 app/services/unblock_service.rb               |   2 +-
 app/services/unfavourite_service.rb           |   2 +-
 app/services/unfollow_service.rb              |   2 +-
 .../pubsubhubbub/distribution_worker.rb       |   4 +-
 .../lib/{ => ostatus}/atom_serializer_spec.rb | 330 +++++++++---------
 spec/services/process_feed_service_spec.rb    |  40 +++
 23 files changed, 516 insertions(+), 447 deletions(-)
 create mode 100644 app/lib/ostatus/activity/base.rb
 create mode 100644 app/lib/ostatus/activity/creation.rb
 create mode 100644 app/lib/ostatus/activity/deletion.rb
 create mode 100644 app/lib/ostatus/activity/general.rb
 create mode 100644 app/lib/ostatus/activity/post.rb
 create mode 100644 app/lib/ostatus/activity/remote.rb
 create mode 100644 app/lib/ostatus/activity/share.rb
 rename app/lib/{ => ostatus}/atom_serializer.rb (99%)
 rename spec/lib/{ => ostatus}/atom_serializer_spec.rb (80%)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index a95aabf1d..37a1e540f 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -13,7 +13,7 @@ class AccountsController < ApplicationController
 
       format.atom do
         @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
-        render xml: AtomSerializer.render(AtomSerializer.new.feed(@account, @entries.to_a))
+        render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, @entries.to_a))
       end
 
       format.json do
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index 54a435238..e3db77caa 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -19,7 +19,7 @@ class StreamEntriesController < ApplicationController
       end
 
       format.atom do
-        render xml: AtomSerializer.render(AtomSerializer.new.entry(@stream_entry, true))
+        render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(@stream_entry, true))
       end
     end
   end
diff --git a/app/lib/ostatus/activity/base.rb b/app/lib/ostatus/activity/base.rb
new file mode 100644
index 000000000..f528815b3
--- /dev/null
+++ b/app/lib/ostatus/activity/base.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Base
+  def initialize(xml, account = nil)
+    @xml = xml
+    @account = account
+  end
+
+  def status?
+    [:activity, :note, :comment].include?(type)
+  end
+
+  def verb
+    raw = @xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
+    TagManager::VERBS.key(raw)
+  rescue
+    :post
+  end
+
+  def type
+    raw = @xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
+    TagManager::TYPES.key(raw)
+  rescue
+    :activity
+  end
+
+  def id
+    @xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
+  end
+
+  def url
+    link = @xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
+    link.nil? ? nil : link['href']
+  end
+
+  private
+
+  def find_status(uri)
+    if TagManager.instance.local_id?(uri)
+      local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
+      return Status.find_by(id: local_id)
+    end
+
+    Status.find_by(uri: uri)
+  end
+
+  def redis
+    Redis.current
+  end
+end
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
new file mode 100644
index 000000000..c54d64fd7
--- /dev/null
+++ b/app/lib/ostatus/activity/creation.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Creation < Ostatus::Activity::Base
+  def perform
+    if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
+      Rails.logger.debug "Delete for status #{id} was queued, ignoring"
+      return [nil, false]
+    end
+
+    return [nil, false] if @account.suspended?
+
+    Rails.logger.debug "Creating remote status #{id}"
+
+    # Return early if status already exists in db
+    status = find_status(id)
+
+    return [status, false] unless status.nil?
+
+    status = Status.create!(
+      uri: id,
+      url: url,
+      account: @account,
+      reblog: reblog,
+      text: content,
+      spoiler_text: content_warning,
+      created_at: published,
+      reply: thread?,
+      language: content_language,
+      visibility: visibility_scope,
+      conversation: find_or_create_conversation,
+      thread: thread? ? find_status(thread.first) : nil
+    )
+
+    save_mentions(status)
+    save_hashtags(status)
+    save_media(status)
+
+    if thread? && status.thread.nil?
+      Rails.logger.debug "Trying to attach #{status.id} (#{id}) to #{thread.first}"
+      ThreadResolveWorker.perform_async(status.id, thread.second)
+    end
+
+    Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
+
+    LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
+    DistributionWorker.perform_async(status.id)
+
+    [status, true]
+  end
+
+  def content
+    @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
+  end
+
+  def content_language
+    @xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
+  end
+
+  def content_warning
+    @xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
+  end
+
+  def visibility_scope
+    @xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
+  end
+
+  def published
+    @xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
+  end
+
+  def thread?
+    !@xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
+  end
+
+  def thread
+    thr = @xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
+    [thr['ref'], thr['href']]
+  end
+
+  private
+
+  def find_or_create_conversation
+    uri = @xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
+    return if uri.nil?
+
+    if TagManager.instance.local_id?(uri)
+      local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
+      return Conversation.find_by(id: local_id)
+    end
+
+    Conversation.find_by(uri: uri) || Conversation.create!(uri: uri)
+  end
+
+  def save_mentions(parent)
+    processed_account_ids = []
+
+    @xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
+      next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
+
+      mentioned_account = account_from_href(link['href'])
+
+      next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
+
+      mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
+
+      # So we can skip duplicate mentions
+      processed_account_ids << mentioned_account.id
+    end
+  end
+
+  def save_hashtags(parent)
+    tags = @xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
+    ProcessHashtagsService.new.call(parent, tags)
+  end
+
+  def save_media(parent)
+    do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
+
+    @xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
+      next unless link['href']
+
+      media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
+      parsed_url = Addressable::URI.parse(link['href']).normalize
+
+      next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
+
+      media.save
+
+      next if do_not_download
+
+      begin
+        media.file_remote_url = link['href']
+        media.save!
+      rescue ActiveRecord::RecordInvalid
+        next
+      end
+    end
+  end
+
+  def account_from_href(href)
+    url = Addressable::URI.parse(href).normalize
+
+    if TagManager.instance.web_domain?(url.host)
+      Account.find_local(url.path.gsub('/users/', ''))
+    else
+      Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
+    end
+  end
+end
diff --git a/app/lib/ostatus/activity/deletion.rb b/app/lib/ostatus/activity/deletion.rb
new file mode 100644
index 000000000..c4d05a467
--- /dev/null
+++ b/app/lib/ostatus/activity/deletion.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Deletion < Ostatus::Activity::Base
+  def perform
+    Rails.logger.debug "Deleting remote status #{id}"
+    status = Status.find_by(uri: id, account: @account)
+
+    if status.nil?
+      redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
+    else
+      RemoveStatusService.new.call(status)
+    end
+  end
+end
diff --git a/app/lib/ostatus/activity/general.rb b/app/lib/ostatus/activity/general.rb
new file mode 100644
index 000000000..3ff7a039a
--- /dev/null
+++ b/app/lib/ostatus/activity/general.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::General < Ostatus::Activity::Base
+  def specialize
+    special_class&.new(@xml, @account)
+  end
+
+  private
+
+  def special_class
+    case verb
+    when :post
+      Ostatus::Activity::Post
+    when :share
+      Ostatus::Activity::Share
+    when :delete
+      Ostatus::Activity::Deletion
+    end
+  end
+end
diff --git a/app/lib/ostatus/activity/post.rb b/app/lib/ostatus/activity/post.rb
new file mode 100644
index 000000000..8028db2f8
--- /dev/null
+++ b/app/lib/ostatus/activity/post.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Post < Ostatus::Activity::Creation
+  def perform
+    status, just_created = super
+
+    if just_created
+      status.mentions.includes(:account).each do |mention|
+        mentioned_account = mention.account
+        next unless mentioned_account.local?
+        NotifyService.new.call(mentioned_account, mention)
+      end
+    end
+
+    status
+  end
+
+  private
+
+  def reblog
+    nil
+  end
+end
diff --git a/app/lib/ostatus/activity/remote.rb b/app/lib/ostatus/activity/remote.rb
new file mode 100644
index 000000000..755f885e6
--- /dev/null
+++ b/app/lib/ostatus/activity/remote.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Remote < Ostatus::Activity::Base
+  def perform
+    find_status(id) || FetchRemoteStatusService.new.call(url)
+  end
+end
diff --git a/app/lib/ostatus/activity/share.rb b/app/lib/ostatus/activity/share.rb
new file mode 100644
index 000000000..73aac58ed
--- /dev/null
+++ b/app/lib/ostatus/activity/share.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class Ostatus::Activity::Share < Ostatus::Activity::Creation
+  def perform
+    return if reblog.nil?
+
+    status, just_created = super
+    NotifyService.new.call(reblog.account, status) if reblog.account.local? && just_created
+    status
+  end
+
+  def object
+    @xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS)
+  end
+
+  private
+
+  def reblog
+    return @reblog if defined? @reblog
+
+    original_status = Ostatus::Activity::Remote.new(object).perform
+    return if original_status.nil?
+
+    @reblog = original_status.reblog? ? original_status.reblog : original_status
+  end
+end
diff --git a/app/lib/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
similarity index 99%
rename from app/lib/atom_serializer.rb
rename to app/lib/ostatus/atom_serializer.rb
index b14d596dd..909d84df3 100644
--- a/app/lib/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AtomSerializer
+class Ostatus::AtomSerializer
   include RoutingHelper
   include ActionView::Helpers::SanitizeHelper
 
diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb
index 97c76bee1..a25d11dbd 100644
--- a/app/services/authorize_follow_service.rb
+++ b/app/services/authorize_follow_service.rb
@@ -10,6 +10,6 @@ class AuthorizeFollowService < BaseService
   private
 
   def build_xml(follow_request)
-    AtomSerializer.render(AtomSerializer.new.authorize_follow_request_salmon(follow_request))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request))
   end
 end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index d59b47afb..15420e192 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -18,6 +18,6 @@ class BlockService < BaseService
   private
 
   def build_xml(block)
-    AtomSerializer.render(AtomSerializer.new.block_salmon(block))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.block_salmon(block))
   end
 end
diff --git a/app/services/concerns/stream_entry_renderer.rb b/app/services/concerns/stream_entry_renderer.rb
index ef176d8a6..d9c30c53c 100644
--- a/app/services/concerns/stream_entry_renderer.rb
+++ b/app/services/concerns/stream_entry_renderer.rb
@@ -2,6 +2,6 @@
 
 module StreamEntryRenderer
   def stream_entry_to_xml(stream_entry)
-    AtomSerializer.render(AtomSerializer.new.entry(stream_entry, true))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(stream_entry, true))
   end
 end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 90267af33..a08aba638 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -28,6 +28,6 @@ class FavouriteService < BaseService
   private
 
   def build_xml(favourite)
-    AtomSerializer.render(AtomSerializer.new.favourite_salmon(favourite))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.favourite_salmon(favourite))
   end
 end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index e54ff7d0f..7a7275b6e 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -57,10 +57,10 @@ class FollowService < BaseService
   end
 
   def build_follow_request_xml(follow_request)
-    AtomSerializer.render(AtomSerializer.new.follow_request_salmon(follow_request))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_request_salmon(follow_request))
   end
 
   def build_follow_xml(follow)
-    AtomSerializer.render(AtomSerializer.new.follow_salmon(follow))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_salmon(follow))
   end
 end
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index c335d2159..b99048a06 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -16,274 +16,14 @@ class ProcessFeedService < BaseService
   end
 
   def process_entries(xml, account)
-    xml.xpath('//xmlns:entry', xmlns: TagManager::XMLNS).reverse_each.map { |entry| ProcessEntry.new.call(entry, account) }.compact
+    xml.xpath('//xmlns:entry', xmlns: TagManager::XMLNS).reverse_each.map { |entry| process_entry(entry, account) }.compact
   end
 
-  class ProcessEntry
-    def call(xml, account)
-      @account = account
-      @xml     = xml
-
-      return if skip_unsupported_type?
-
-      case verb
-      when :post, :share
-        return create_status
-      when :delete
-        return delete_status
-      end
-    rescue ActiveRecord::RecordInvalid => e
-      Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
-      nil
-    end
-
-    private
-
-    def create_status
-      if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
-        Rails.logger.debug "Delete for status #{id} was queued, ignoring"
-        return
-      end
-
-      status, just_created = nil
-
-      Rails.logger.debug "Creating remote status #{id}"
-
-      if verb == :share
-        original_status = shared_status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
-        return nil if original_status.nil?
-      end
-
-      ApplicationRecord.transaction do
-        status, just_created = status_from_xml(@xml)
-
-        return if status.nil?
-        return status unless just_created
-
-        if verb == :share
-          status.reblog = original_status.reblog? ? original_status.reblog : original_status
-        end
-
-        status.save!
-      end
-
-      if thread?(@xml) && status.thread.nil?
-        Rails.logger.debug "Trying to attach #{status.id} (#{id(@xml)}) to #{thread(@xml).first}"
-        ThreadResolveWorker.perform_async(status.id, thread(@xml).second)
-      end
-
-      notify_about_mentions!(status) unless status.reblog?
-      notify_about_reblog!(status) if status.reblog? && status.reblog.account.local?
-
-      Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
-
-      LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
-      DistributionWorker.perform_async(status.id)
-
-      status
-    end
-
-    def notify_about_mentions!(status)
-      status.mentions.includes(:account).each do |mention|
-        mentioned_account = mention.account
-        next unless mentioned_account.local?
-        NotifyService.new.call(mentioned_account, mention)
-      end
-    end
-
-    def notify_about_reblog!(status)
-      NotifyService.new.call(status.reblog.account, status)
-    end
-
-    def delete_status
-      Rails.logger.debug "Deleting remote status #{id}"
-      status = Status.find_by(uri: id, account: @account)
-
-      if status.nil?
-        redis.setex("delete_upon_arrival:#{@account.id}:#{id}", 6 * 3_600, id)
-      else
-        RemoveStatusService.new.call(status)
-      end
-    end
-
-    def skip_unsupported_type?
-      !([:post, :share, :delete].include?(verb) && [:activity, :note, :comment].include?(type))
-    end
-
-    def shared_status_from_xml(entry)
-      status = find_status(id(entry))
-
-      return status unless status.nil?
-
-      FetchRemoteStatusService.new.call(url(entry))
-    end
-
-    def status_from_xml(entry)
-      # Return early if status already exists in db
-      status = find_status(id(entry))
-
-      return [status, false] unless status.nil?
-
-      account = @account
-
-      return [nil, false] if account.suspended?
-
-      status = Status.create!(
-        uri: id(entry),
-        url: url(entry),
-        account: account,
-        text: content(entry),
-        spoiler_text: content_warning(entry),
-        created_at: published(entry),
-        reply: thread?(entry),
-        language: content_language(entry),
-        visibility: visibility_scope(entry),
-        conversation: find_or_create_conversation(entry),
-        thread: thread?(entry) ? find_status(thread(entry).first) : nil
-      )
-
-      mentions_from_xml(status, entry)
-      hashtags_from_xml(status, entry)
-      media_from_xml(status, entry)
-
-      [status, true]
-    end
-
-    def find_or_create_conversation(xml)
-      uri = xml.at_xpath('./ostatus:conversation', ostatus: TagManager::OS_XMLNS)&.attribute('ref')&.content
-      return if uri.nil?
-
-      if TagManager.instance.local_id?(uri)
-        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')
-        return Conversation.find_by(id: local_id)
-      end
-
-      Conversation.find_by(uri: uri) || Conversation.create!(uri: uri)
-    end
-
-    def find_status(uri)
-      if TagManager.instance.local_id?(uri)
-        local_id = TagManager.instance.unique_tag_to_local_id(uri, 'Status')
-        return Status.find_by(id: local_id)
-      end
-
-      Status.find_by(uri: uri)
-    end
-
-    def mentions_from_xml(parent, xml)
-      processed_account_ids = []
-
-      xml.xpath('./xmlns:link[@rel="mentioned"]', xmlns: TagManager::XMLNS).each do |link|
-        next if [TagManager::TYPES[:group], TagManager::TYPES[:collection]].include? link['ostatus:object-type']
-
-        mentioned_account = account_from_href(link['href'])
-
-        next if mentioned_account.nil? || processed_account_ids.include?(mentioned_account.id)
-
-        mentioned_account.mentions.where(status: parent).first_or_create(status: parent)
-
-        # So we can skip duplicate mentions
-        processed_account_ids << mentioned_account.id
-      end
-    end
-
-    def account_from_href(href)
-      url = Addressable::URI.parse(href).normalize
-
-      if TagManager.instance.web_domain?(url.host)
-        Account.find_local(url.path.gsub('/users/', ''))
-      else
-        Account.where(uri: href).or(Account.where(url: href)).first || FetchRemoteAccountService.new.call(href)
-      end
-    end
-
-    def hashtags_from_xml(parent, xml)
-      tags = xml.xpath('./xmlns:category', xmlns: TagManager::XMLNS).map { |category| category['term'] }.select(&:present?)
-      ProcessHashtagsService.new.call(parent, tags)
-    end
-
-    def media_from_xml(parent, xml)
-      do_not_download = DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
-
-      xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
-        next unless link['href']
-
-        media = MediaAttachment.where(status: parent, remote_url: link['href']).first_or_initialize(account: parent.account, status: parent, remote_url: link['href'])
-        parsed_url = Addressable::URI.parse(link['href']).normalize
-
-        next if !%w(http https).include?(parsed_url.scheme) || parsed_url.host.empty?
-
-        media.save
-
-        next if do_not_download
-
-        begin
-          media.file_remote_url = link['href']
-          media.save!
-        rescue ActiveRecord::RecordInvalid
-          next
-        end
-      end
-    end
-
-    def id(xml = @xml)
-      xml.at_xpath('./xmlns:id', xmlns: TagManager::XMLNS).content
-    end
-
-    def verb(xml = @xml)
-      raw = xml.at_xpath('./activity:verb', activity: TagManager::AS_XMLNS).content
-      TagManager::VERBS.key(raw)
-    rescue
-      :post
-    end
-
-    def type(xml = @xml)
-      raw = xml.at_xpath('./activity:object-type', activity: TagManager::AS_XMLNS).content
-      TagManager::TYPES.key(raw)
-    rescue
-      :activity
-    end
-
-    def url(xml = @xml)
-      link = xml.at_xpath('./xmlns:link[@rel="alternate"]', xmlns: TagManager::XMLNS)
-      link.nil? ? nil : link['href']
-    end
-
-    def content(xml = @xml)
-      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
-    end
-
-    def content_language(xml = @xml)
-      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['xml:lang']&.presence || 'en'
-    end
-
-    def content_warning(xml = @xml)
-      xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
-    end
-
-    def visibility_scope(xml = @xml)
-      xml.at_xpath('./mastodon:scope', mastodon: TagManager::MTDN_XMLNS)&.content&.to_sym || :public
-    end
-
-    def published(xml = @xml)
-      xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
-    end
-
-    def thread?(xml = @xml)
-      !xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS).nil?
-    end
-
-    def thread(xml = @xml)
-      thr = xml.at_xpath('./thr:in-reply-to', thr: TagManager::THR_XMLNS)
-      [thr['ref'], thr['href']]
-    end
-
-    def account?(xml = @xml)
-      !xml.at_xpath('./xmlns:author', xmlns: TagManager::XMLNS).nil?
-    end
-
-    def redis
-      Redis.current
-    end
+  def process_entry(xml, account)
+    activity = Ostatus::Activity::General.new(xml, account)
+    activity.specialize&.perform if activity.status?
+  rescue ActiveRecord::RecordInvalid => e
+    Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
+    nil
   end
 end
diff --git a/app/services/reject_follow_service.rb b/app/services/reject_follow_service.rb
index 675007938..87fc49b34 100644
--- a/app/services/reject_follow_service.rb
+++ b/app/services/reject_follow_service.rb
@@ -10,6 +10,6 @@ class RejectFollowService < BaseService
   private
 
   def build_xml(follow_request)
-    AtomSerializer.render(AtomSerializer.new.reject_follow_request_salmon(follow_request))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request))
   end
 end
diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb
index 3a3fd2d8c..50c2dc2f0 100644
--- a/app/services/unblock_service.rb
+++ b/app/services/unblock_service.rb
@@ -11,6 +11,6 @@ class UnblockService < BaseService
   private
 
   def build_xml(block)
-    AtomSerializer.render(AtomSerializer.new.unblock_salmon(block))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unblock_salmon(block))
   end
 end
diff --git a/app/services/unfavourite_service.rb b/app/services/unfavourite_service.rb
index a32e87bff..ede3caad1 100644
--- a/app/services/unfavourite_service.rb
+++ b/app/services/unfavourite_service.rb
@@ -13,6 +13,6 @@ class UnfavouriteService < BaseService
   private
 
   def build_xml(favourite)
-    AtomSerializer.render(AtomSerializer.new.unfavourite_salmon(favourite))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfavourite_salmon(favourite))
   end
 end
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 9b39f4945..0c9a5f657 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -14,6 +14,6 @@ class UnfollowService < BaseService
   private
 
   def build_xml(follow)
-    AtomSerializer.render(AtomSerializer.new.unfollow_salmon(follow))
+    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfollow_salmon(follow))
   end
 end
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index 7592354cc..9c1fa76cb 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -22,7 +22,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_public!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
+    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription|
       [subscription.id, @payload]
@@ -32,7 +32,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_hidden!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, stream_entries))
+    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
     @domains = @account.followers.domains
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription|
diff --git a/spec/lib/atom_serializer_spec.rb b/spec/lib/ostatus/atom_serializer_spec.rb
similarity index 80%
rename from spec/lib/atom_serializer_spec.rb
rename to spec/lib/ostatus/atom_serializer_spec.rb
index d14fc5b40..8caef9355 100644
--- a/spec/lib/atom_serializer_spec.rb
+++ b/spec/lib/ostatus/atom_serializer_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe AtomSerializer do
+RSpec.describe Ostatus::AtomSerializer do
   shared_examples 'follow request salmon' do
     it 'appends author element with account' do
       account = Fabricate(:account, domain: nil, username: 'username')
@@ -108,7 +108,7 @@ RSpec.describe AtomSerializer do
     it 'returns XML with emojis' do
       element = Ox::Element.new('tag')
       element << '💩'
-      xml = AtomSerializer.render(element)
+      xml = Ostatus::AtomSerializer.render(element)
 
       expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>💩</tag>\n"
     end
@@ -116,7 +116,7 @@ RSpec.describe AtomSerializer do
     it 'returns XML, stripping invalid characters like \b and \v' do
       element = Ox::Element.new('tag')
       element << "im l33t\b haxo\b\vr"
-      xml = AtomSerializer.render(element)
+      xml = Ostatus::AtomSerializer.render(element)
 
       expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>im l33t haxor</tag>\n"
     end
@@ -127,7 +127,7 @@ RSpec.describe AtomSerializer do
       it 'appends poco:note element with note for local account' do
         account = Fabricate(:account, domain: nil, note: '<p>note</p>')
 
-        author = AtomSerializer.new.author(account)
+        author = Ostatus::AtomSerializer.new.author(account)
 
         note = author.nodes.find { |node| node.name == 'poco:note' }
         expect(note.text).to eq '<p>note</p>'
@@ -136,7 +136,7 @@ RSpec.describe AtomSerializer do
       it 'appends poco:note element with tags-stripped note for remote account' do
         account = Fabricate(:account, domain: 'remote', note: '<p>note</p>')
 
-        author = AtomSerializer.new.author(account)
+        author = Ostatus::AtomSerializer.new.author(account)
 
         note = author.nodes.find { |node| node.name == 'poco:note' }
         expect(note.text).to eq 'note'
@@ -144,7 +144,7 @@ RSpec.describe AtomSerializer do
 
       it 'appends summary element with type attribute and simplified note if present' do
         account = Fabricate(:account, note: 'note')
-        author = AtomSerializer.new.author(account)
+        author = Ostatus::AtomSerializer.new.author(account)
         expect(author.summary.text).to eq '<p>note</p>'
         expect(author.summary[:type]).to eq 'html'
       end
@@ -153,27 +153,27 @@ RSpec.describe AtomSerializer do
     context 'when note is not present' do
       it 'does not append poco:note element' do
         account = Fabricate(:account, note: '')
-        author = AtomSerializer.new.author(account)
+        author = Ostatus::AtomSerializer.new.author(account)
         author.nodes.each { |node| expect(node.name).not_to eq 'poco:note' }
       end
 
       it 'does not append summary element' do
         account = Fabricate(:account, note: '')
-        author = AtomSerializer.new.author(account)
+        author = Ostatus::AtomSerializer.new.author(account)
         author.nodes.each { |node| expect(node.name).not_to eq 'summary' }
       end
     end
 
     it 'returns author element' do
       account = Fabricate(:account)
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
       expect(author.name).to eq 'author'
     end
 
     it 'appends activity:object-type element with person type' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       object_type = author.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:person]
@@ -181,20 +181,20 @@ RSpec.describe AtomSerializer do
 
     it 'appends email element with username and domain for local account' do
       account = Fabricate(:account, username: 'username')
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
       expect(author.email.text).to eq 'username@cb6e6126.ngrok.io'
     end
 
     it 'appends email element with username and domain for remote user' do
       account = Fabricate(:account, domain: 'domain', username: 'username')
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
       expect(author.email.text).to eq 'username@domain'
     end
 
     it 'appends link element for an alternative' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -205,7 +205,7 @@ RSpec.describe AtomSerializer do
     it 'has link element for avatar if present' do
       account = Fabricate(:account, avatar: attachment_fixture('avatar.gif'))
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'avatar' }
       expect(link[:type]).to eq 'image/gif'
@@ -217,7 +217,7 @@ RSpec.describe AtomSerializer do
     it 'does not have link element for avatar if not present' do
       account = Fabricate(:account, avatar: nil)
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       author.nodes.each do |node|
         expect(node[:rel]).not_to eq 'avatar' if node.name == 'link'
@@ -227,7 +227,7 @@ RSpec.describe AtomSerializer do
     it 'appends link element for header if present' do
       account = Fabricate(:account, header: attachment_fixture('avatar.gif'))
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'header' }
       expect(link[:type]).to eq 'image/gif'
@@ -239,7 +239,7 @@ RSpec.describe AtomSerializer do
     it 'does not append link element for header if not present' do
       account = Fabricate(:account, header: nil)
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       author.nodes.each do |node|
         expect(node[:rel]).not_to eq 'header' if node.name == 'link'
@@ -249,7 +249,7 @@ RSpec.describe AtomSerializer do
     it 'appends poco:displayName element with display name if present' do
       account = Fabricate(:account, display_name: 'display name')
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       display_name = author.nodes.find { |node| node.name == 'poco:displayName' }
       expect(display_name.text).to eq 'display name'
@@ -257,14 +257,14 @@ RSpec.describe AtomSerializer do
 
     it 'does not append poco:displayName element with display name if not present' do
       account = Fabricate(:account, display_name: '')
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
       author.nodes.each { |node| expect(node.name).not_to eq 'poco:displayName' }
     end
 
     it "appends mastodon:scope element with 'private' if locked" do
       account = Fabricate(:account, locked: true)
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       scope = author.nodes.find { |node| node.name == 'mastodon:scope' }
       expect(scope.text).to eq 'private'
@@ -273,7 +273,7 @@ RSpec.describe AtomSerializer do
     it "appends mastodon:scope element with 'public' if unlocked" do
       account = Fabricate(:account, locked: false)
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       scope = author.nodes.find { |node| node.name == 'mastodon:scope' }
       expect(scope.text).to eq 'public'
@@ -282,7 +282,7 @@ RSpec.describe AtomSerializer do
     it 'includes URI' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       expect(author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
       expect(author.uri.text).to eq 'https://cb6e6126.ngrok.io/users/username'
@@ -291,7 +291,7 @@ RSpec.describe AtomSerializer do
     it 'includes username' do
       account = Fabricate(:account, username: 'username')
 
-      author = AtomSerializer.new.author(account)
+      author = Ostatus::AtomSerializer.new.author(account)
 
       name = author.nodes.find { |node| node.name == 'name' }
       username = author.nodes.find { |node| node.name == 'poco:preferredUsername' }
@@ -317,7 +317,7 @@ RSpec.describe AtomSerializer do
       include_examples 'namespaces' do
         def serialize
           stream_entry = Fabricate(:stream_entry)
-          AtomSerializer.new.entry(stream_entry, true)
+          Ostatus::AtomSerializer.new.entry(stream_entry, true)
         end
       end
 
@@ -325,7 +325,7 @@ RSpec.describe AtomSerializer do
         account = Fabricate(:account, username: 'username')
         status = Fabricate(:status, account: account)
 
-        entry = AtomSerializer.new.entry(status.stream_entry, true)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry, true)
 
         expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
       end
@@ -334,14 +334,14 @@ RSpec.describe AtomSerializer do
     context 'if status is present' do
       include_examples 'status attributes' do
         def serialize(status)
-          AtomSerializer.new.entry(status.stream_entry, true)
+          Ostatus::AtomSerializer.new.entry(status.stream_entry, true)
         end
       end
 
       it 'appends link element for the public collection if status is publicly visible' do
         status = Fabricate(:status, visibility: :public)
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         mentioned_person = entry.nodes.find do |node|
           node.name == 'link' &&
@@ -354,7 +354,7 @@ RSpec.describe AtomSerializer do
       it 'does not append link element for the public collection if status is not publicly visible' do
         status = Fabricate(:status, visibility: :private)
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         entry.nodes.each do |node|
           if node.name == 'link' &&
@@ -369,14 +369,14 @@ RSpec.describe AtomSerializer do
         tag = Fabricate(:tag, name: 'tag')
         status = Fabricate(:status, tags: [ tag ])
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.category[:term]).to eq 'tag'
       end
 
       it 'appends category element for NSFW if status is sensitive' do
         status = Fabricate(:status, sensitive: true)
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
         expect(entry.category[:term]).to eq 'nsfw'
       end
 
@@ -385,7 +385,7 @@ RSpec.describe AtomSerializer do
         media_attachment = Fabricate(:media_attachment, file: file)
         status = Fabricate(:status, media_attachments: [ media_attachment ])
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         enclosure = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'enclosure' }
         expect(enclosure[:type]).to eq 'image/jpeg'
@@ -395,7 +395,7 @@ RSpec.describe AtomSerializer do
       it 'appends mastodon:scope element with visibility' do
         status = Fabricate(:status, visibility: :public)
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         scope = entry.nodes.find { |node| node.name == 'mastodon:scope' }
         expect(scope.text).to eq 'public'
@@ -406,8 +406,8 @@ RSpec.describe AtomSerializer do
         remote_status = Fabricate(:status, account: remote_account)
         remote_status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z')
 
-        entry = AtomSerializer.new.entry(remote_status.stream_entry, true)
-        xml = AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote')
+        entry = Ostatus::AtomSerializer.new.entry(remote_status.stream_entry, true)
+        xml = Ostatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote')
 
         remote_status.destroy!
         remote_account.destroy!
@@ -429,7 +429,7 @@ RSpec.describe AtomSerializer do
         status = Fabricate(:status)
         status.destroy!
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.content.text).to eq 'Deleted status'
       end
@@ -439,7 +439,7 @@ RSpec.describe AtomSerializer do
         status = Fabricate(:status, account: account)
         status.destroy!
 
-        entry = AtomSerializer.new.entry(status.stream_entry)
+        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.title.text).to eq 'username deleted status'
       end
@@ -447,19 +447,19 @@ RSpec.describe AtomSerializer do
 
     context 'it is not root' do
       let(:stream_entry) { Fabricate(:stream_entry) }
-      subject { AtomSerializer.new.entry(stream_entry, false) }
+      subject { Ostatus::AtomSerializer.new.entry(stream_entry, false) }
       include_examples 'not root'
     end
 
     context 'without root parameter' do
       let(:stream_entry) { Fabricate(:stream_entry) }
-      subject { AtomSerializer.new.entry(stream_entry) }
+      subject { Ostatus::AtomSerializer.new.entry(stream_entry) }
       include_examples 'not root'
     end
 
     it 'returns entry element' do
       stream_entry = Fabricate(:stream_entry)
-      entry = AtomSerializer.new.entry(stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.name).to eq 'entry'
     end
 
@@ -467,33 +467,33 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, reblog_of_id: nil)
       status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       expect(entry.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
     end
 
     it 'appends published element with created date' do
       stream_entry = Fabricate(:stream_entry, created_at: '2000-01-01T00:00:00Z')
-      entry = AtomSerializer.new.entry(stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.published.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends updated element with updated date' do
       stream_entry = Fabricate(:stream_entry, updated_at: '2000-01-01T00:00:00Z')
-      entry = AtomSerializer.new.entry(stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends title element with status title' do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account, reblog_of_id: nil)
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
       expect(entry.title.text).to eq 'New status by username'
     end
 
     it 'appends activity:object-type element with object type' do
       status = Fabricate(:status)
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
       object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:note]
     end
@@ -501,7 +501,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with object type' do
       status = Fabricate(:status)
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
       expect(object_type.text).to eq TagManager::VERBS[:post]
@@ -511,7 +511,7 @@ RSpec.describe AtomSerializer do
       reblogged = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       reblog = Fabricate(:status, reblog: reblogged)
 
-      entry = AtomSerializer.new.entry(reblog.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(reblog.stream_entry)
 
       object = entry.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{reblogged.id}:objectType=Status"
@@ -519,7 +519,7 @@ RSpec.describe AtomSerializer do
 
     it 'does not append activity:object element if target is not present' do
       status = Fabricate(:status, reblog_of_id: nil)
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
       entry.nodes.each { |node| expect(node.name).not_to eq 'activity:object' }
     end
 
@@ -527,7 +527,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -538,7 +538,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -549,7 +549,7 @@ RSpec.describe AtomSerializer do
       in_reply_to_status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reblog_of_id: nil)
       reply_status = Fabricate(:status, in_reply_to_id: in_reply_to_status.id)
 
-      entry = AtomSerializer.new.entry(reply_status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(reply_status.stream_entry)
 
       in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{in_reply_to_status.id}:objectType=Status"
@@ -557,7 +557,7 @@ RSpec.describe AtomSerializer do
 
     it 'does not append thr:in-reply-to element if not threaded' do
       status = Fabricate(:status)
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
       entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' }
     end
 
@@ -565,7 +565,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status)
       status.conversation.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' }
       expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation_id}:objectType=Conversation"
@@ -575,7 +575,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate.build(:status, conversation_id: nil)
       status.save!(validate: false)
 
-      entry = AtomSerializer.new.entry(status.stream_entry)
+      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
 
       entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' }
     end
@@ -585,62 +585,62 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         account = Fabricate(:account)
-        AtomSerializer.new.feed(account, [])
+        Ostatus::AtomSerializer.new.feed(account, [])
       end
     end
 
     it 'returns feed element' do
       account = Fabricate(:account)
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.name).to eq 'feed'
     end
 
     it 'appends id element with account Atom URL' do
       account = Fabricate(:account, username: 'username')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.id.text).to eq 'https://cb6e6126.ngrok.io/users/username.atom'
     end
 
     it 'appends title element with account display name if present' do
       account = Fabricate(:account, display_name: 'display name')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.title.text).to eq 'display name'
     end
 
     it 'does not append title element with account username if account display name is not present' do
       account = Fabricate(:account, display_name: '', username: 'username')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.title.text).to eq 'username'
     end
 
     it 'appends subtitle element with account note' do
       account = Fabricate(:account, note: 'note')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.subtitle.text).to eq 'note'
     end
 
     it 'appends updated element with date account got updated' do
       account = Fabricate(:account, updated_at: '2000-01-01T00:00:00Z')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends logo element with full asset URL for original account avatar' do
       account = Fabricate(:account, avatar: attachment_fixture('avatar.gif'))
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.logo.text).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/avatars\/.+\/original\/avatar.gif/
     end
 
     it 'appends author element' do
       account = Fabricate(:account, username: 'username')
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
       expect(feed.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
 
     it 'appends link element for an alternative' do
       account = Fabricate(:account, username: 'username')
 
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -650,7 +650,7 @@ RSpec.describe AtomSerializer do
     it 'appends link element for itself' do
       account = Fabricate(:account, username: 'username')
 
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -661,7 +661,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       stream_entry = Fabricate(:stream_entry)
 
-      feed = AtomSerializer.new.feed(account, Array.new(20, stream_entry))
+      feed = Ostatus::AtomSerializer.new.feed(account, Array.new(20, stream_entry))
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'next' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -671,7 +671,7 @@ RSpec.describe AtomSerializer do
     it 'does not append link element for the next if it does not have 20 stream entries' do
       account = Fabricate(:account, username: 'username')
 
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
 
       feed.nodes.each do |node|
         expect(node[:rel]).not_to eq 'next' if node.name == 'link'
@@ -681,7 +681,7 @@ RSpec.describe AtomSerializer do
     it 'appends link element for hub' do
       account = Fabricate(:account, username: 'username')
 
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'hub' }
       expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/api/push'
@@ -690,7 +690,7 @@ RSpec.describe AtomSerializer do
     it 'appends link element for Salmon' do
       account = Fabricate(:account, username: 'username')
 
-      feed = AtomSerializer.new.feed(account, [])
+      feed = Ostatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'salmon' }
       expect(link[:href]).to start_with 'https://cb6e6126.ngrok.io/api/salmon/'
@@ -700,7 +700,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      feed = AtomSerializer.new.feed(account, [status.stream_entry])
+      feed = Ostatus::AtomSerializer.new.feed(account, [status.stream_entry])
 
       expect(feed.entry.title.text).to eq 'New status by username'
     end
@@ -710,13 +710,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         block = Fabricate(:block)
-        AtomSerializer.new.block_salmon(block)
+        Ostatus::AtomSerializer.new.block_salmon(block)
       end
     end
 
     it 'returns entry element' do
       block = Fabricate(:block)
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
       expect(block_salmon.name).to eq 'entry'
     end
 
@@ -724,7 +724,7 @@ RSpec.describe AtomSerializer do
       block = Fabricate(:block)
 
       time_before = Time.now
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
       time_after = Time.now
 
       expect(block_salmon.id.text).to(
@@ -738,7 +738,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       block = Fabricate(:block, account: account, target_account: target_account)
 
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
 
       expect(block_salmon.title.text).to eq 'account no longer wishes to interact with target_account@remote'
     end
@@ -747,7 +747,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'account')
       block = Fabricate(:block, account: account)
 
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
 
       expect(block_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account'
     end
@@ -755,7 +755,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       block = Fabricate(:block)
 
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
 
       object_type = block_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -764,7 +764,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with block' do
       block = Fabricate(:block)
 
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
 
       verb = block_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:block]
@@ -774,7 +774,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       block = Fabricate(:block, target_account: target_account)
 
-      block_salmon = AtomSerializer.new.block_salmon(block)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
 
       object = block_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -782,8 +782,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view triggers block when processed' do
       block = Fabricate(:block)
-      block_salmon = AtomSerializer.new.block_salmon(block)
-      xml = AtomSerializer.render(block_salmon)
+      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      xml = Ostatus::AtomSerializer.render(block_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair)
       block.destroy!
 
@@ -797,13 +797,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         block = Fabricate(:block)
-        AtomSerializer.new.unblock_salmon(block)
+        Ostatus::AtomSerializer.new.unblock_salmon(block)
       end
     end
 
     it 'returns entry element' do
       block = Fabricate(:block)
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
       expect(unblock_salmon.name).to eq 'entry'
     end
 
@@ -811,7 +811,7 @@ RSpec.describe AtomSerializer do
       block = Fabricate(:block)
 
       time_before = Time.now
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
       time_after = Time.now
 
       expect(unblock_salmon.id.text).to(
@@ -825,7 +825,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       block = Fabricate(:block, account: account, target_account: target_account)
 
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
 
       expect(unblock_salmon.title.text).to eq 'account no longer blocks target_account@remote'
     end
@@ -834,7 +834,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'account')
       block = Fabricate(:block, account: account)
 
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
 
       expect(unblock_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account'
     end
@@ -842,7 +842,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       block = Fabricate(:block)
 
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
 
       object_type = unblock_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -851,7 +851,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with block' do
       block = Fabricate(:block)
 
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
 
       verb = unblock_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unblock]
@@ -861,7 +861,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       block = Fabricate(:block, target_account: target_account)
 
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
 
       object = unblock_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -869,8 +869,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view triggers block when processed' do
       block = Fabricate(:block)
-      unblock_salmon = AtomSerializer.new.unblock_salmon(block)
-      xml = AtomSerializer.render(unblock_salmon)
+      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      xml = Ostatus::AtomSerializer.render(unblock_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair)
 
       ProcessInteractionService.new.call(envelope, block.target_account)
@@ -883,19 +883,19 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         favourite = Fabricate(:favourite)
-        AtomSerializer.new.favourite_salmon(favourite)
+        Ostatus::AtomSerializer.new.favourite_salmon(favourite)
       end
     end
 
     it 'returns entry element' do
       favourite = Fabricate(:favourite)
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
       expect(favourite_salmon.name).to eq 'entry'
     end
 
     it 'appends id element with unique tag' do
       favourite = Fabricate(:favourite, created_at: '2000-01-01T00:00:00Z')
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
       expect(favourite_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{favourite.id}:objectType=Favourite"
     end
 
@@ -903,7 +903,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       favourite = Fabricate(:favourite, account: account)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       expect(favourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -911,7 +911,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       favourite = Fabricate(:favourite)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       object_type = favourite_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity'
@@ -920,7 +920,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with favorite' do
       favourite = Fabricate(:favourite)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       verb = favourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:favorite]
@@ -930,7 +930,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       object = favourite_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -941,7 +941,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       in_reply_to = favourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -954,7 +954,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, account: status_account)
       favourite = Fabricate(:favourite, account: account, status: status)
 
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
 
       expect(favourite_salmon.title.text).to eq 'account favourited a status by status_account@remote'
       expect(favourite_salmon.content.text).to eq 'account favourited a status by status_account@remote'
@@ -962,8 +962,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view triggers favourite when processed' do
       favourite = Fabricate(:favourite)
-      favourite_salmon = AtomSerializer.new.favourite_salmon(favourite)
-      xml = AtomSerializer.render(favourite_salmon)
+      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      xml = Ostatus::AtomSerializer.render(favourite_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair)
       favourite.destroy!
 
@@ -976,13 +976,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         favourite = Fabricate(:favourite)
-        AtomSerializer.new.favourite_salmon(favourite)
+        Ostatus::AtomSerializer.new.favourite_salmon(favourite)
       end
     end
 
     it 'returns entry element' do
       favourite = Fabricate(:favourite)
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
       expect(unfavourite_salmon.name).to eq 'entry'
     end
 
@@ -990,7 +990,7 @@ RSpec.describe AtomSerializer do
       favourite = Fabricate(:favourite)
 
       time_before = Time.now
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
       time_after = Time.now
 
       expect(unfavourite_salmon.id.text).to(
@@ -1003,7 +1003,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       favourite = Fabricate(:favourite, account: account)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       expect(unfavourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1011,7 +1011,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       favourite = Fabricate(:favourite)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       object_type = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity'
@@ -1020,7 +1020,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with favorite' do
       favourite = Fabricate(:favourite)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       verb = unfavourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unfavorite]
@@ -1030,7 +1030,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       object = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -1041,7 +1041,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       in_reply_to = unfavourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -1054,7 +1054,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status, account: status_account)
       favourite = Fabricate(:favourite, account: account, status: status)
 
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       expect(unfavourite_salmon.title.text).to eq 'account no longer favourites a status by status_account@remote'
       expect(unfavourite_salmon.content.text).to eq 'account no longer favourites a status by status_account@remote'
@@ -1062,8 +1062,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view triggers unfavourite when processed' do
       favourite = Fabricate(:favourite)
-      unfavourite_salmon = AtomSerializer.new.unfavourite_salmon(favourite)
-      xml = AtomSerializer.render(unfavourite_salmon)
+      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      xml = Ostatus::AtomSerializer.render(unfavourite_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair)
 
       ProcessInteractionService.new.call(envelope, favourite.status.account)
@@ -1075,19 +1075,19 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow = Fabricate(:follow)
-        AtomSerializer.new.follow_salmon(follow)
+        Ostatus::AtomSerializer.new.follow_salmon(follow)
       end
     end
 
     it 'returns entry element' do
       follow = Fabricate(:follow)
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
       expect(follow_salmon.name).to eq 'entry'
     end
 
     it 'appends id element with unique tag' do
       follow = Fabricate(:follow, created_at: '2000-01-01T00:00:00Z')
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
       expect(follow_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{follow.id}:objectType=Follow"
     end
 
@@ -1095,7 +1095,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       follow = Fabricate(:follow, account: account)
 
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
 
       expect(follow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1103,7 +1103,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       follow = Fabricate(:follow)
 
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
 
       object_type = follow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1112,7 +1112,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with follow' do
       follow = Fabricate(:follow)
 
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
 
       verb = follow_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:follow]
@@ -1122,7 +1122,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       follow = Fabricate(:follow, target_account: target_account)
 
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
 
       object = follow_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -1133,7 +1133,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       follow = Fabricate(:follow, account: account, target_account: target_account)
 
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
 
       expect(follow_salmon.title.text).to eq 'account started following target_account@remote'
       expect(follow_salmon.content.text).to eq 'account started following target_account@remote'
@@ -1141,8 +1141,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view triggers follow when processed' do
       follow = Fabricate(:follow)
-      follow_salmon = AtomSerializer.new.follow_salmon(follow)
-      xml = AtomSerializer.render(follow_salmon)
+      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      xml = Ostatus::AtomSerializer.render(follow_salmon)
       follow.destroy!
       envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair)
 
@@ -1157,7 +1157,7 @@ RSpec.describe AtomSerializer do
       def serialize
         follow = Fabricate(:follow)
         follow.destroy!
-        AtomSerializer.new.unfollow_salmon(follow)
+        Ostatus::AtomSerializer.new.unfollow_salmon(follow)
       end
     end
 
@@ -1165,7 +1165,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.name).to eq 'entry'
     end
@@ -1175,7 +1175,7 @@ RSpec.describe AtomSerializer do
       follow.destroy!
 
       time_before = Time.now
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
       time_after = Time.now
 
       expect(unfollow_salmon.id.text).to(
@@ -1190,7 +1190,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow, account: account, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.title.text).to eq 'account is no longer following target_account@remote'
     end
@@ -1201,7 +1201,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow, account: account, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.content.text).to eq 'account is no longer following target_account@remote'
     end
@@ -1211,7 +1211,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow, account: account)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1220,7 +1220,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       object_type = unfollow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1230,7 +1230,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       verb = unfollow_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unfollow]
@@ -1241,7 +1241,7 @@ RSpec.describe AtomSerializer do
       follow = Fabricate(:follow, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
 
       object = unfollow_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -1250,8 +1250,8 @@ RSpec.describe AtomSerializer do
     it 'returns element whose rendered view triggers unfollow when processed' do
       follow = Fabricate(:follow)
       follow.destroy!
-      unfollow_salmon = AtomSerializer.new.unfollow_salmon(follow)
-      xml = AtomSerializer.render(unfollow_salmon)
+      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      xml = Ostatus::AtomSerializer.render(unfollow_salmon)
       follow.account.follow!(follow.target_account)
       envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair)
 
@@ -1265,13 +1265,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        AtomSerializer.new.follow_request_salmon(follow_request)
+        Ostatus::AtomSerializer.new.follow_request_salmon(follow_request)
       end
     end
 
     context do
       def serialize(follow_request)
-        AtomSerializer.new.follow_request_salmon(follow_request)
+        Ostatus::AtomSerializer.new.follow_request_salmon(follow_request)
       end
 
       it_behaves_like 'follow request salmon'
@@ -1293,7 +1293,7 @@ RSpec.describe AtomSerializer do
       it 'returns element whose rendered view triggers follow request when processed' do
         follow_request = Fabricate(:follow_request)
         follow_request_salmon = serialize(follow_request)
-        xml = AtomSerializer.render(follow_request_salmon)
+        xml = Ostatus::AtomSerializer.render(follow_request_salmon)
         envelope = OStatus2::Salmon.new.pack(xml, follow_request.account.keypair)
         follow_request.destroy!
 
@@ -1308,13 +1308,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+        Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
       end
     end
 
     it_behaves_like 'follow request salmon' do
       def serialize(follow_request)
-        authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+        authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
         authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' }
       end
     end
@@ -1323,7 +1323,7 @@ RSpec.describe AtomSerializer do
       follow_request = Fabricate(:follow_request)
 
       time_before = Time.now
-      authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
       time_after = Time.now
 
       expect(authorize_follow_request_salmon.id.text).to(
@@ -1337,7 +1337,7 @@ RSpec.describe AtomSerializer do
       target_account = Fabricate(:account, domain: nil, username: 'target_account')
       follow_request = Fabricate(:follow_request, account: account, target_account: target_account)
 
-      authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       expect(authorize_follow_request_salmon.title.text).to eq 'target_account authorizes follow request by account@remote'
     end
@@ -1345,7 +1345,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       follow_request = Fabricate(:follow_request)
 
-      authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       object_type = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1354,7 +1354,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with authorize' do
       follow_request = Fabricate(:follow_request)
 
-      authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       verb = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:authorize]
@@ -1362,8 +1362,8 @@ RSpec.describe AtomSerializer do
 
     it 'returns element whose rendered view creates follow from follow request when processed' do
       follow_request = Fabricate(:follow_request)
-      authorize_follow_request_salmon = AtomSerializer.new.authorize_follow_request_salmon(follow_request)
-      xml = AtomSerializer.render(authorize_follow_request_salmon)
+      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      xml = Ostatus::AtomSerializer.render(authorize_follow_request_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair)
 
       ProcessInteractionService.new.call(envelope, follow_request.account)
@@ -1377,13 +1377,13 @@ RSpec.describe AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        AtomSerializer.new.reject_follow_request_salmon(follow_request)
+        Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       end
     end
 
     it_behaves_like 'follow request salmon' do
       def serialize(follow_request)
-        reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
+        reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
         reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' }
       end
     end
@@ -1392,7 +1392,7 @@ RSpec.describe AtomSerializer do
       follow_request = Fabricate(:follow_request)
 
       time_before = Time.now
-      reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       time_after = Time.now
 
       expect(reject_follow_request_salmon.id.text).to(
@@ -1405,28 +1405,28 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, domain: 'remote', username: 'account')
       target_account = Fabricate(:account, domain: nil, username: 'target_account')
       follow_request = Fabricate(:follow_request, account: account, target_account: target_account)
-      reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       expect(reject_follow_request_salmon.title.text).to eq 'target_account rejects follow request by account@remote'
     end
 
     it 'appends activity:object-type element with activity type' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       object_type = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
     end
 
     it 'appends activity:verb element with authorize' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       verb = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:reject]
     end
 
     it 'returns element whose rendered view deletes follow request when processed' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = AtomSerializer.new.reject_follow_request_salmon(follow_request)
-      xml = AtomSerializer.render(reject_follow_request_salmon)
+      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      xml = Ostatus::AtomSerializer.render(reject_follow_request_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair)
 
       ProcessInteractionService.new.call(envelope, follow_request.account)
@@ -1439,31 +1439,31 @@ RSpec.describe AtomSerializer do
   describe '#object' do
     include_examples 'status attributes' do
       def serialize(status)
-        AtomSerializer.new.object(status)
+        Ostatus::AtomSerializer.new.object(status)
       end
     end
 
     it 'returns activity:object element' do
       status = Fabricate(:status)
-      object = AtomSerializer.new.object(status)
+      object = Ostatus::AtomSerializer.new.object(status)
       expect(object.name).to eq 'activity:object'
     end
 
     it 'appends id element with URL for status' do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
-      object = AtomSerializer.new.object(status)
+      object = Ostatus::AtomSerializer.new.object(status)
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
     end
 
     it 'appends published element with created date' do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
-      object = AtomSerializer.new.object(status)
+      object = Ostatus::AtomSerializer.new.object(status)
       expect(object.published.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends updated element with updated date' do
       status = Fabricate(:status, updated_at: '2000-01-01T00:00:00Z')
-      object = AtomSerializer.new.object(status)
+      object = Ostatus::AtomSerializer.new.object(status)
       expect(object.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
@@ -1471,7 +1471,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      object = AtomSerializer.new.object(status)
+      object = Ostatus::AtomSerializer.new.object(status)
 
       expect(object.title.text).to eq 'New status by username'
     end
@@ -1480,7 +1480,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1488,7 +1488,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:object-type element with object type' do
       status = Fabricate(:status)
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:note]
@@ -1497,7 +1497,7 @@ RSpec.describe AtomSerializer do
     it 'appends activity:verb element with verb' do
       status = Fabricate(:status)
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
       expect(object_type.text).to eq TagManager::VERBS[:post]
@@ -1507,7 +1507,7 @@ RSpec.describe AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -1519,7 +1519,7 @@ RSpec.describe AtomSerializer do
       thread = Fabricate(:status, account: account, created_at: '2000-01-01T00:00:00Z')
       reply = Fabricate(:status, thread: thread)
 
-      entry = AtomSerializer.new.object(reply)
+      entry = Ostatus::AtomSerializer.new.object(reply)
 
       in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{thread.id}:objectType=Status"
@@ -1528,7 +1528,7 @@ RSpec.describe AtomSerializer do
 
     it 'does not append thr:in-reply-to element if thread is nil' do
       status = Fabricate(:status, thread: nil)
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
       entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' }
     end
 
@@ -1536,7 +1536,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate.build(:status, conversation_id: nil)
       status.save!(validate: false)
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' }
     end
@@ -1545,7 +1545,7 @@ RSpec.describe AtomSerializer do
       status = Fabricate(:status)
       status.conversation.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = AtomSerializer.new.object(status)
+      entry = Ostatus::AtomSerializer.new.object(status)
 
       conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' }
       expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation.id}:objectType=Conversation"
diff --git a/spec/services/process_feed_service_spec.rb b/spec/services/process_feed_service_spec.rb
index d85ee3b56..5e34370ee 100644
--- a/spec/services/process_feed_service_spec.rb
+++ b/spec/services/process_feed_service_spec.rb
@@ -167,6 +167,46 @@ XML
     expect(created_statuses.first.reblog.text).to eq 'Overwatch rocks'
   end
 
+  it 'ignores reblogs if it failed to retreive reblogged statuses' do
+    stub_request(:head, 'https://overwatch.com/users/tracer/updates/1').to_return(status: 404)
+
+    actor = Fabricate(:account, username: 'tracer', domain: 'overwatch.com')
+
+    body = <<XML
+<?xml version="1.0"?>
+<entry xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:media="http://purl.org/syndication/atommedia" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:mastodon="http://mastodon.social/schema/1.0">
+  <id>tag:overwatch.com,2017-04-27:objectId=4467137:objectType=Status</id>
+  <published>2017-04-27T13:49:25Z</published>
+  <updated>2017-04-27T13:49:25Z</updated>
+  <author>
+    <id>https://overwatch.com/users/tracer</id>
+    <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+    <uri>https://overwatch.com/users/tracer</uri>
+    <name>tracer</name>
+  </author>
+  <activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
+  <activity:verb>http://activitystrea.ms/schema/1.0/share</activity:verb>
+  <content type="html">Overwatch rocks</content>
+  <activity:object>
+    <id>tag:overwatch.com,2017-04-27:objectId=4467137:objectType=Status</id>
+    <activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
+    <activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
+    <author>
+      <id>https://overwatch.com/users/tracer</id>
+      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+      <uri>https://overwatch.com/users/tracer</uri>
+      <name>tracer</name>
+    </author>
+    <content type="html">Overwatch rocks</content>
+    <link rel="alternate" type="text/html" href="https://overwatch.com/users/tracer/updates/1" />
+  </activity:object>
+XML
+
+    created_statuses = subject.call(body, actor)
+
+    expect(created_statuses).to eq []
+  end
+
   it 'ignores statuses with an out-of-order delete' do
     sender = Fabricate(:account, username: 'tracer', domain: 'overwatch.com')
 

From 3267e4a7851b57bef7d16da4b7c66764f63d4416 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 19 Jul 2017 00:14:43 +0900
Subject: [PATCH 275/382] Add unfollow modal (optional) (#4246)

* Add unfollow modal

* unfollowing someone

* remove unnecessary prop
---
 .../settings/preferences_controller.rb        |  1 +
 .../mastodon/containers/account_container.js  | 24 ++++++++++++++++---
 .../containers/header_container.js            | 14 ++++++++++-
 .../features/ui/components/modal_root.js      |  2 +-
 app/javascript/mastodon/locales/ar.json       |  2 ++
 app/javascript/mastodon/locales/bg.json       |  2 ++
 app/javascript/mastodon/locales/ca.json       |  2 ++
 app/javascript/mastodon/locales/de.json       |  2 ++
 .../mastodon/locales/defaultMessages.json     | 21 ++++++++++++++++
 app/javascript/mastodon/locales/en.json       |  2 ++
 app/javascript/mastodon/locales/eo.json       |  2 ++
 app/javascript/mastodon/locales/es.json       |  2 ++
 app/javascript/mastodon/locales/fa.json       |  2 ++
 app/javascript/mastodon/locales/fi.json       |  2 ++
 app/javascript/mastodon/locales/fr.json       |  2 ++
 app/javascript/mastodon/locales/he.json       |  2 ++
 app/javascript/mastodon/locales/hr.json       |  2 ++
 app/javascript/mastodon/locales/hu.json       |  2 ++
 app/javascript/mastodon/locales/id.json       |  2 ++
 app/javascript/mastodon/locales/io.json       |  2 ++
 app/javascript/mastodon/locales/it.json       |  2 ++
 app/javascript/mastodon/locales/ja.json       |  2 ++
 app/javascript/mastodon/locales/ko.json       |  2 ++
 app/javascript/mastodon/locales/nl.json       |  2 ++
 app/javascript/mastodon/locales/no.json       |  2 ++
 app/javascript/mastodon/locales/oc.json       |  2 ++
 app/javascript/mastodon/locales/pl.json       |  2 ++
 app/javascript/mastodon/locales/pt-BR.json    |  2 ++
 app/javascript/mastodon/locales/pt.json       |  2 ++
 app/javascript/mastodon/locales/ru.json       |  2 ++
 app/javascript/mastodon/locales/th.json       |  2 ++
 app/javascript/mastodon/locales/tr.json       |  2 ++
 app/javascript/mastodon/locales/uk.json       |  2 ++
 app/javascript/mastodon/locales/zh-CN.json    |  2 ++
 app/javascript/mastodon/locales/zh-HK.json    |  2 ++
 app/javascript/mastodon/locales/zh-TW.json    |  2 ++
 app/lib/user_settings_decorator.rb            |  5 ++++
 app/models/user.rb                            |  4 ++++
 app/serializers/initial_state_serializer.rb   |  1 +
 app/views/settings/preferences/show.html.haml |  1 +
 config/locales/simple_form.en.yml             |  1 +
 spec/lib/user_settings_decorator_spec.rb      |  7 ++++++
 spec/models/user_spec.rb                      |  8 +++++++
 43 files changed, 146 insertions(+), 5 deletions(-)

diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index a3f5a008b..f107f2b16 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -35,6 +35,7 @@ class Settings::PreferencesController < ApplicationController
     params.require(:user).permit(
       :setting_default_privacy,
       :setting_default_sensitive,
+      :setting_unfollow_modal,
       :setting_boost_modal,
       :setting_delete_modal,
       :setting_auto_play_gif,
diff --git a/app/javascript/mastodon/containers/account_container.js b/app/javascript/mastodon/containers/account_container.js
index 1426bcaa4..ca1efd0e5 100644
--- a/app/javascript/mastodon/containers/account_container.js
+++ b/app/javascript/mastodon/containers/account_container.js
@@ -1,4 +1,6 @@
+import React from 'react';
 import { connect } from 'react-redux';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { makeGetAccount } from '../selectors';
 import Account from '../components/account';
 import {
@@ -9,6 +11,11 @@ import {
   muteAccount,
   unmuteAccount,
 } from '../actions/accounts';
+import { openModal } from '../actions/modal';
+
+const messages = defineMessages({
+  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
+});
 
 const makeMapStateToProps = () => {
   const getAccount = makeGetAccount();
@@ -16,15 +23,25 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, props) => ({
     account: getAccount(state, props.id),
     me: state.getIn(['meta', 'me']),
+    unfollowModal: state.getIn(['meta', 'unfollow_modal']),
   });
 
   return mapStateToProps;
 };
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch, { intl }) => ({
+
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      dispatch(unfollowAccount(account.get('id')));
+      if (this.unfollowModal) {
+        dispatch(openModal('CONFIRM', {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        }));
+      } else {
+        dispatch(unfollowAccount(account.get('id')));
+      }
     } else {
       dispatch(followAccount(account.get('id')));
     }
@@ -45,6 +62,7 @@ const mapDispatchToProps = (dispatch) => ({
       dispatch(muteAccount(account.get('id')));
     }
   },
+
 });
 
-export default connect(makeMapStateToProps, mapDispatchToProps)(Account);
+export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account));
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
index 19dd64699..baa81bbc2 100644
--- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js
+++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js
@@ -17,6 +17,7 @@ import { blockDomain, unblockDomain } from '../../../actions/domain_blocks';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 
 const messages = defineMessages({
+  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
   blockConfirm: { id: 'confirmations.block.confirm', defaultMessage: 'Block' },
   muteConfirm: { id: 'confirmations.mute.confirm', defaultMessage: 'Mute' },
   blockDomainConfirm: { id: 'confirmations.domain_block.confirm', defaultMessage: 'Hide entire domain' },
@@ -28,15 +29,25 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, { accountId }) => ({
     account: getAccount(state, Number(accountId)),
     me: state.getIn(['meta', 'me']),
+    unfollowModal: state.getIn(['meta', 'unfollow_modal']),
   });
 
   return mapStateToProps;
 };
 
 const mapDispatchToProps = (dispatch, { intl }) => ({
+
   onFollow (account) {
     if (account.getIn(['relationship', 'following'])) {
-      dispatch(unfollowAccount(account.get('id')));
+      if (this.unfollowModal) {
+        dispatch(openModal('CONFIRM', {
+          message: <FormattedMessage id='confirmations.unfollow.message' defaultMessage='Are you sure you want to unfollow {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+          confirm: intl.formatMessage(messages.unfollowConfirm),
+          onConfirm: () => dispatch(unfollowAccount(account.get('id'))),
+        }));
+      } else {
+        dispatch(unfollowAccount(account.get('id')));
+      }
     } else {
       dispatch(followAccount(account.get('id')));
     }
@@ -85,6 +96,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
   onUnblockDomain (domain, accountId) {
     dispatch(unblockDomain(domain, accountId));
   },
+
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Header));
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.js b/app/javascript/mastodon/features/ui/components/modal_root.js
index 4240871a7..f303088d7 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.js
+++ b/app/javascript/mastodon/features/ui/components/modal_root.js
@@ -85,7 +85,7 @@ export default class ModalRoot extends React.PureComponent {
       >
         {interpolatedStyles =>
           <div className='modal-root'>
-            {interpolatedStyles.map(({ key, data: { type }, style }) => (
+            {interpolatedStyles.map(({ key, data: { type, props }, style }) => (
               <div key={key} style={{ pointerEvents: visible ? 'auto' : 'none' }}>
                 <div role='presentation' className='modal-root__overlay' style={{ opacity: style.opacity }} onClick={onClose} />
                 <div className='modal-root__container' style={{ opacity: style.opacity, transform: `translateZ(0px) scale(${style.scale})` }}>
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 7b890ce64..89ddb2d15 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "أكتم",
   "confirmations.mute.message": "هل أنت متأكد أنك تريد كتم {name} ؟",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "الأنشطة",
   "emoji_button.flags": "الأعلام",
   "emoji_button.food": "الطعام والشراب",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 0cf6bf3ac..3dba91b82 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 1e44d6fa5..54f2e5e22 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Estàs realment, realment segur que vols bloquejar totalment {domain}? En la majoria dels casos bloquejar o silenciar és suficient i preferible.",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.mute.message": "Estàs segur que vols silenciar {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activitat",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Menjar i Beure",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index f73011e73..a041e6655 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index aaa558c0e..bf462a537 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -228,6 +228,19 @@
     ],
     "path": "app/javascript/mastodon/components/video_player.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "Unfollow",
+        "id": "confirmations.unfollow.confirm"
+      },
+      {
+        "defaultMessage": "Are you sure you want to unfollow {name}?",
+        "id": "confirmations.unfollow.message"
+      }
+    ],
+    "path": "app/javascript/mastodon/containers/account_container.json"
+  },
   {
     "descriptors": [
       {
@@ -268,6 +281,10 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Unfollow",
+        "id": "confirmations.unfollow.confirm"
+      },
       {
         "defaultMessage": "Block",
         "id": "confirmations.block.confirm"
@@ -280,6 +297,10 @@
         "defaultMessage": "Hide entire domain",
         "id": "confirmations.domain_block.confirm"
       },
+      {
+        "defaultMessage": "Are you sure you want to unfollow {name}?",
+        "id": "confirmations.unfollow.message"
+      },
       {
         "defaultMessage": "Are you sure you want to block {name}?",
         "id": "confirmations.block.message"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 15afe2309..fe2bd4cb4 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 4f9e26c25..029cef883 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 64ba78716..36ad66ace 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 306937cc2..113daef77 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "آیا جدی جدی می‌خواهید کل دامین {domain} را مسدود کنید؟ بیشتر وقت‌ها مسدودکردن یا بی‌صداکردن چند حساب کاربری خاص کافی است و توصیه می‌شود.",
   "confirmations.mute.confirm": "بی‌صدا کن",
   "confirmations.mute.message": "آیا واقعاً می‌خواهید {name} را بی‌صدا کنید؟",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "فعالیت",
   "emoji_button.flags": "پرچم‌ها",
   "emoji_button.food": "غذا و نوشیدنی",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 1b17fb155..da9e5d0f2 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index b6605295b..c3e743259 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables.",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.message": "Confirmez vous le masquage de {name} ?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activités",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Boire et manger",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 8b63bd26b..c8dc4fe8d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "באמת באמת לחסום את כל קהילת {domain}? ברב המקרים השתקות נבחרות של מספר משתמשים מסויימים צריכה להספיק.",
   "confirmations.mute.confirm": "להשתיק",
   "confirmations.mute.message": "להשתיק את {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "פעילות",
   "emoji_button.flags": "דגלים",
   "emoji_button.food": "אוכל ושתיה",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 165e3088f..fd669b2b2 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Jesi li zaista, zaista siguran da želiš blokirati sve sa {domain}? U većini slučajeva nekoliko ciljanih blokiranja ili utišavanja je dostatno i poželjnije.",
   "confirmations.mute.confirm": "Utišaj",
   "confirmations.mute.message": "Jesi li siguran da želiš utišati {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Aktivnost",
   "emoji_button.flags": "Zastave",
   "emoji_button.food": "Hrana & Piće",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 71dcce505..b3672cb7a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 0c21877d8..8a17262fe 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Bisukan",
   "confirmations.mute.message": "Apa anda yakin ingin membisukan {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Aktivitas",
   "emoji_button.flags": "Bendera",
   "emoji_button.food": "Makanan & Minuman",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 788d09f34..154ca66ce 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 9176bfaaf..6cb274bae 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index a686cdc03..c62e36482 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？　多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。",
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.message": "本当に{name}をミュートしますか？",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "活動",
   "emoji_button.flags": "国旗",
   "emoji_button.food": "食べ物",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 0b47cc990..fbd0098d7 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "정말로 {domain} 전체를 숨기시겠습니까? 대부분의 경우 개별 차단이나 뮤트로 충분합니다.",
   "confirmations.mute.confirm": "뮤트",
   "confirmations.mute.message": "정말로 {name}를 뮤트하시겠습니까?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "활동",
   "emoji_button.flags": "국기",
   "emoji_button.food": "음식",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index cf6a8bd31..f7b0bbf68 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Weet je het echt, echt zeker dat je alles van {domain} wil negeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en gewenst.",
   "confirmations.mute.confirm": "Negeren",
   "confirmations.mute.message": "Weet je zeker dat je {name} wilt negeren?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activiteiten",
   "emoji_button.flags": "Vlaggen",
   "emoji_button.food": "Eten en drinken",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 1f4082d7b..98f59f774 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Er du sikker på at du vil skjule hele domenet {domain}? I de fleste tilfeller er det bedre med målrettet blokkering eller demping.",
   "confirmations.mute.confirm": "Demp",
   "confirmations.mute.message": "Er du sikker på at du vil dempe {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Aktivitet",
   "emoji_button.flags": "Flagg",
   "emoji_button.food": "Mat og drikke",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index dc6dd5e32..ca094c18a 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Sètz segur segur de voler blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.",
   "confirmations.mute.confirm": "Metre en silenci",
   "confirmations.mute.message": "Sètz segur de voler metre en silenci {name} ?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activitat",
   "emoji_button.flags": "Drapèus",
   "emoji_button.food": "Beure e manjar",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 233d61995..683f589b1 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.mute.confirm": "Wycisz",
   "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Aktywność",
   "emoji_button.flags": "Flagi",
   "emoji_button.food": "Żywność i napoje",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index cf2b911f2..3944e33e9 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index cf2b911f2..3944e33e9 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 942a13ede..cffc285f4 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Вы на самом деле уверены, что хотите блокировать весь {domain}? В большинстве случаев нескольких отдельных блокировок или глушений достаточно.",
   "confirmations.mute.confirm": "Заглушить",
   "confirmations.mute.message": "Вы уверены, что хотите заглушить {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Занятия",
   "emoji_button.flags": "Флаги",
   "emoji_button.food": "Еда и напитки",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index e9e96c14f..63bed6d8c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Mute",
   "confirmations.mute.message": "Are you sure you want to mute {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Activity",
   "emoji_button.flags": "Flags",
   "emoji_button.food": "Food & Drink",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index adfa79cd9..5bd308e95 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "Sessize al",
   "confirmations.mute.message": "{name} kullanıcısını sessize almak istiyor musunuz?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Aktivite",
   "emoji_button.flags": "Bayraklar",
   "emoji_button.food": "Yiyecek ve İçecek",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 435067281..e1611505d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Ви точно, точно впевнені, що хочете заблокувати весь домен {domain}? У більшості випадків для нормальної роботи краще заблокувати/заглушити лише деяких користувачів.",
   "confirmations.mute.confirm": "Заглушити",
   "confirmations.mute.message": "Ви впевнені, що хочете заглушити {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "Заняття",
   "emoji_button.flags": "Прапори",
   "emoji_button.food": "Їжа та напої",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 0f2c1fcec..18bf872e5 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "静音",
   "confirmations.mute.message": "想好了，真的要静音 {name}?",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "活动",
   "emoji_button.flags": "旗帜",
   "emoji_button.food": "食物和饮料",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index c0b4cfce9..a461085c7 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "Are you really, really sure you want to block the entire {domain}? In most cases a few targeted blocks or mutes are sufficient and preferable.",
   "confirmations.mute.confirm": "靜音",
   "confirmations.mute.message": "你確定要將{name}靜音嗎？",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "活動",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "飲飲食食",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 772cc691c..d766fb394 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -55,6 +55,8 @@
   "confirmations.domain_block.message": "你真的真的確定要封鎖整個 {domain} ？多數情況下，比較推薦封鎖或消音幾個特定目標就好。",
   "confirmations.mute.confirm": "消音",
   "confirmations.mute.message": "你確定要消音 {name} ？",
+  "confirmations.unfollow.confirm": "Unfollow",
+  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "emoji_button.activity": "活動",
   "emoji_button.flags": "旗幟",
   "emoji_button.food": "食物與飲料",
diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb
index c5da18029..62046ed72 100644
--- a/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@ -19,6 +19,7 @@ class UserSettingsDecorator
     user.settings['interactions'] = merged_interactions
     user.settings['default_privacy'] = default_privacy_preference
     user.settings['default_sensitive'] = default_sensitive_preference
+    user.settings['unfollow_modal'] = unfollow_modal_preference
     user.settings['boost_modal'] = boost_modal_preference
     user.settings['delete_modal'] = delete_modal_preference
     user.settings['auto_play_gif'] = auto_play_gif_preference
@@ -42,6 +43,10 @@ class UserSettingsDecorator
     boolean_cast_setting 'setting_default_sensitive'
   end
 
+  def unfollow_modal_preference
+    boolean_cast_setting 'setting_unfollow_modal'
+  end
+
   def boost_modal_preference
     boolean_cast_setting 'setting_boost_modal'
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index becf0018f..25dc25864 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,6 +83,10 @@ class User < ApplicationRecord
     settings.default_sensitive
   end
 
+  def setting_unfollow_modal
+    settings.unfollow_modal
+  end
+
   def setting_boost_modal
     settings.boost_modal
   end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 704d29a57..0191948b1 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -15,6 +15,7 @@ class InitialStateSerializer < ActiveModel::Serializer
 
     if object.current_account
       store[:me]             = object.current_account.id
+      store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
       store[:boost_modal]    = object.current_account.user.setting_boost_modal
       store[:delete_modal]   = object.current_account.user.setting_delete_modal
       store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 3b5d90942..fae6090c8 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -44,6 +44,7 @@
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
 
   .fields-group
+    = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label
 
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 476ccc773..536bb06e1 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -42,6 +42,7 @@ en:
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_system_font_ui: Use system's default font
+        setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         setting_noindex: Opt-out of search engine indexing
         severity: Severity
         type: Import type
diff --git a/spec/lib/user_settings_decorator_spec.rb b/spec/lib/user_settings_decorator_spec.rb
index a67487779..6fbf6536b 100644
--- a/spec/lib/user_settings_decorator_spec.rb
+++ b/spec/lib/user_settings_decorator_spec.rb
@@ -35,6 +35,13 @@ describe UserSettingsDecorator do
       expect(user.settings['default_sensitive']).to eq true
     end
 
+    it 'updates the user settings value for unfollow modal' do
+      values = { 'setting_unfollow_modal' => '0' }
+
+      settings.update(values)
+      expect(user.settings['unfollow_modal']).to eq false
+    end
+
     it 'updates the user settings value for boost modal' do
       values = { 'setting_boost_modal' => '1' }
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2019ec0f6..ef45818b9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -219,6 +219,14 @@ RSpec.describe User, type: :model do
     end
   end
 
+  describe '#setting_unfollow_modal' do
+    it 'returns unfollow modal setting' do
+      user = Fabricate(:user)
+      user.settings[:unfollow_modal] = true
+      expect(user.setting_unfollow_modal).to eq true
+    end
+  end
+
   describe '#setting_delete_modal' do
     it 'returns delete modal setting' do
       user = Fabricate(:user)

From bb4c3831b2466438d04f5b7064ac688c2a30cb98 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Wed, 19 Jul 2017 00:23:35 +0900
Subject: [PATCH 276/382] Add Japanese translation for #4199 (#4247)

---
 config/locales/simple_form.ja.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 74cf91de4..58975e426 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -8,6 +8,8 @@ ja:
         header: 2MBまでのPNGやGIF、JPGが利用可能です。 700x335pxまで縮小されます。
         locked: フォロワーを手動で承認する必要があります。
         note: あと<span class="note-counter">%{count}</span>文字入力できます。
+        setting_noindex: 公開プロフィールおよび各投稿ページに影響します
+
       imports:
         data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい
       sessions:
@@ -37,6 +39,7 @@ ja:
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
         setting_system_font_ui: システムのデフォルトフォントを使う
+        setting_noindex: 検索エンジンによるインデックスを拒否する
         severity: 重大性
         type: インポートする項目
         username: ユーザー名

From 02f896c12efce87e33af15d0c88b77ad050a7fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Tue, 18 Jul 2017 18:42:45 +0200
Subject: [PATCH 277/382] Fix broken CSS reload due to webpack upgrade (#4250)

---
 package.json |  4 ++--
 yarn.lock    | 51 +++++++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index aede6df2e..c90e49db5 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "es6-symbol": "^3.1.1",
     "escape-html": "^1.0.3",
     "express": "^4.15.2",
-    "extract-text-webpack-plugin": "^3.0.0",
+    "extract-text-webpack-plugin": "^2.1.2",
     "file-loader": "^0.11.2",
     "font-awesome": "^4.7.0",
     "glob": "^7.1.1",
@@ -112,7 +112,7 @@
     "tiny-queue": "^0.2.1",
     "uuid": "^3.1.0",
     "uws": "^8.14.0",
-    "webpack": "^3.2.0",
+    "webpack": "^3.0.0",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-manifest-plugin": "^1.1.2",
     "webpack-merge": "^4.1.0",
diff --git a/yarn.lock b/yarn.lock
index defd8599f..dcf09643e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -415,7 +415,7 @@ async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4, async@^2.1.5, async@^2.4.1:
+async@^2.1.2, async@^2.1.4, async@^2.1.5:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -1657,7 +1657,7 @@ cheerio@^0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-chokidar@^1.4.3, chokidar@^1.6.0:
+chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -2868,12 +2868,12 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extract-text-webpack-plugin@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz#90caa7907bc449f335005e3ac7532b41b00de612"
+extract-text-webpack-plugin@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.2.tgz#756ef4efa8155c3681833fbc34da53b941746d6c"
   dependencies:
-    async "^2.4.1"
-    loader-utils "^1.1.0"
+    async "^2.1.2"
+    loader-utils "^1.0.2"
     schema-utils "^0.3.0"
     webpack-sources "^1.0.1"
 
@@ -7328,6 +7328,14 @@ watchpack@^1.3.1:
     chokidar "^1.4.3"
     graceful-fs "^4.1.2"
 
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
+  dependencies:
+    async "^2.1.2"
+    chokidar "^1.7.0"
+    graceful-fs "^4.1.2"
+
 wbuf@^1.1.0, wbuf@^1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.2.tgz#d697b99f1f59512df2751be42769c1580b5801fe"
@@ -7425,7 +7433,7 @@ webpack-sources@^1.0.1:
     source-list-map "^2.0.0"
     source-map "~0.5.3"
 
-"webpack@^2.5.1 || ^3.0.0", webpack@^3.2.0:
+"webpack@^2.5.1 || ^3.0.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.2.0.tgz#8b0cae0e1a9fd76bfbf0eab61a8c2ada848c312f"
   dependencies:
@@ -7452,6 +7460,33 @@ webpack-sources@^1.0.1:
     webpack-sources "^1.0.1"
     yargs "^6.0.0"
 
+webpack@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-3.3.0.tgz#ce2f9e076566aba91f74887133a883fd7da187bc"
+  dependencies:
+    acorn "^5.0.0"
+    acorn-dynamic-import "^2.0.0"
+    ajv "^5.1.5"
+    ajv-keywords "^2.0.0"
+    async "^2.1.2"
+    enhanced-resolve "^3.3.0"
+    escope "^3.6.0"
+    interpret "^1.0.0"
+    json-loader "^0.5.4"
+    json5 "^0.5.1"
+    loader-runner "^2.3.0"
+    loader-utils "^1.1.0"
+    memory-fs "~0.4.1"
+    mkdirp "~0.5.0"
+    node-libs-browser "^2.0.0"
+    source-map "^0.5.3"
+    supports-color "^3.1.0"
+    tapable "~0.2.5"
+    uglifyjs-webpack-plugin "^0.4.6"
+    watchpack "^1.4.0"
+    webpack-sources "^1.0.1"
+    yargs "^6.0.0"
+
 websocket-driver@>=0.5.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36"

From 0ccd47f413fe249c2c848596789b83bdd228a58b Mon Sep 17 00:00:00 2001
From: lindwurm <lindwurm.q@gmail.com>
Date: Wed, 19 Jul 2017 01:42:59 +0900
Subject: [PATCH 278/382] Update Japanese translations for new landing page
 (#4159)

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
---
 app/javascript/mastodon/locales/ja.json |  2 +-
 config/locales/ja.yml                   | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c62e36482..f58395d10 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -151,7 +151,7 @@
   "report.target": "問題のユーザー",
   "search.placeholder": "検索",
   "search_results.total": "{count, number}件の結果",
-  "standalone.public_title": "A look inside...",
+  "standalone.public_title": "連合タイムライン",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.delete": "削除",
   "status.favourite": "お気に入り",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2897e864f..fc5a98d09 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,15 +1,28 @@
 ---
 ja:
   about:
-    about_mastodon: Mastodon は<em>自由でオープンソース</em>なソーシャルネットワークです。商用プラットフォームの代替となる<em>分散型</em>を採用し、あなたのやりとりが一つの会社によって独占されるのを防ぎます。信頼できるインスタンスを選択してください &mdash; どのインスタンスを選んでも、誰とでもやりとりすることができます。 だれでも自分の Mastodon インスタンスを作ることができ、シームレスに<em>ソーシャルネットワーク</em>に参加できます。
+    about_mastodon_html: Mastodon は、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。
     about_this: このインスタンスについて
     business_email: 'ビジネスメールアドレス:'
-    closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。
+    closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。しかし、他のインスタンスにアカウントを作成しても全く同じネットワークに参加することができます。
     contact: 連絡先
     description_headline: "%{domain} とは？"
     domain_count_after: 個のインスタンス
     domain_count_before: 接続中
+    features:
+      humane_approach_body: 他の SNS の失敗から学び、Mastodon はソーシャルメディアが誤った使い方をされることの無いように倫理的な設計を目指しています。
+      humane_approach_title: より思いやりのある設計
+      not_a_product_body: Mastodon は営利的な SNS ではありません。広告や、データの収集・解析は無く、またユーザーの囲い込みもありません。
+      not_a_product_title: あなたは人間であり、商品ではありません
+      real_conversation_body: 好きなように書ける500文字までの投稿や、文章やメディアの内容に警告をつけられる機能で、思い通りに自分自身を表現することができます。
+      real_conversation_title: 本当のコミュニケーションのために
+      within_reach_body: デベロッパーフレンドリーな API により実現された、iOS や Android、その他様々なプラットフォームのためのアプリでどこでも友人とやりとりできます。
+      within_reach_title: いつでも身近に
+    find_another_instance: 他のインスタンスを探す
+    generic_description: "%{domain} は、Mastodon インスタンスの一つです。"
     get_started: 参加する
+    hosted_on: Mastodon hosted on %{domain}
+    learn_more: もっと詳しく
     links: リンク
     other_instances: 他のインスタンス
     source_code: ソースコード
@@ -19,6 +32,7 @@ ja:
     user_count_after: 人
     user_count_before: ユーザー数
     version: バージョン
+    what_is_mastodon: Mastodon とは？
   accounts:
     follow: フォロー
     followers: フォロワー
@@ -205,9 +219,10 @@ ja:
   applications:
     invalid_url: URLが無効です
   auth:
+    agreement_html: 登録すると <a href="%{rules_path}">利用規約</a> と <a href="%{terms_path}">プライバシーポリシー</a> に同意したことになります。
     change_password: セキュリティ
     delete_account: アカウントの削除
-    delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a>から手続きが行えます。削除前には確認画面があります。
+    delete_account_html: アカウントを削除したい場合、<a href="%{path}">こちら</a> から手続きが行えます。削除する前に、確認画面があります。
     didnt_get_confirmation: 確認メールを受信できませんか？
     forgot_password: パスワードをお忘れですか？
     login: ログイン

From 0b4006fc47dcd3d57ffdd0b95c95ad4c40a4918f Mon Sep 17 00:00:00 2001
From: lindwurm <lindwurm.q@gmail.com>
Date: Wed, 19 Jul 2017 01:43:19 +0900
Subject: [PATCH 279/382] Add Japanese translation for #4246 (#4249)

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
---
 app/javascript/mastodon/locales/ja.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index f58395d10..b3943f646 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -55,8 +55,8 @@
   "confirmations.domain_block.message": "本当に{domain}全体を非表示にしますか？　多くの場合は個別にブロックやミュートするだけで充分であり、また好ましいです。",
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.message": "本当に{name}をミュートしますか？",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.confirm": "フォロー解除",
+  "confirmations.unfollow.message": "本当に{name}のフォローを解除しますか？",
   "emoji_button.activity": "活動",
   "emoji_button.flags": "国旗",
   "emoji_button.food": "食べ物",

From fb7f06a752be89378ca7b76895a90038f9d5b11c Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 18 Jul 2017 20:03:06 +0200
Subject: [PATCH 280/382] i18n: Update Polish translation (#4252)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 app/javascript/mastodon/locales/pl.json |  4 ++--
 config/locales/pl.yml                   | 17 ++++++++++++++++-
 config/locales/simple_form.pl.yml       |  3 +++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 683f589b1..f04ef4e8c 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -55,8 +55,8 @@
   "confirmations.domain_block.message": "Czy na pewno chcesz zablokować całą domenę {domain}? Zwykle lepszym rozwiązaniem jest blokada lub wyciszenie kilku użytkowników.",
   "confirmations.mute.confirm": "Wycisz",
   "confirmations.mute.message": "Czy na pewno chcesz wyciszyć {name}?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.confirm": "Przestań śledzić",
+  "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać śledzić {name}?",
   "emoji_button.activity": "Aktywność",
   "emoji_button.flags": "Flagi",
   "emoji_button.food": "Żywność i napoje",
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 98cfe1b77..23912662e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -176,7 +176,7 @@ pl:
         title: Opis instancji
       site_description_extended:
         desc_html: Dobre miejsce na zasady użytkowania, wprowadzenie i inne rzeczy, które wyróżniają tą instancję. Możesz korzystać z tagów HTML
-        title: Niestandrdowy opis stronyv
+        title: Niestandrdowy opis strony
       site_terms:
         desc_html: Miejsce na własną politykę prywatności, zasady użytkowania i inne unormowania prawne. Możesz używać tagów HTML
         title: Niestandardowe zasady użytkowania
@@ -185,6 +185,21 @@ pl:
         desc_html: Wyświetlaj publiczną oś czasu na stronie widocznej dla niezalogowanych
         title: Podgląd osi czasu
       title: Ustawienia strony
+    statuses:
+      back_to_account: Wróć na konto
+      batch:
+        delete: Usuń
+        nsfw_off: Cofnij NSFW
+        nsfw_on: Oznacz jako NSFW
+      execute: Wykonaj
+      failed_to_execute: Nie udało się wykonać
+      media:
+        hide: Ukryj zawartość multimedialną
+        show: Pokaż zawartość multimedialną
+        title: Media
+      no_media: Bez zawartości multimedialnej
+      with_media: Z zawartością multimedialną
+      title: Statusy konta
     subscriptions:
       callback_url: URL zwrotny
       confirmed: Potwierdzono
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index 5553c75e3..dc5492ea5 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -40,11 +40,14 @@ pl:
         otp_attempt: Kod uwierzytelnienia dwustopniowego
         password: Hasło
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
+
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_privacy: Widoczność posta
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem postu
         setting_system_font_ui: Używaj domyślnej czcionki systemu
+        setting_unfollow_modal: Pytaj o potwierdzenie przed usunięciem śledzenia
+        setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
         severity: Priorytet
         type: Typ importu
         username: Nazwa użytkownika

From 767117f9b06972c74895c8127c3603055821a9d7 Mon Sep 17 00:00:00 2001
From: lindwurm <lindwurm.q@gmail.com>
Date: Wed, 19 Jul 2017 03:03:18 +0900
Subject: [PATCH 281/382] Update Japanese translation (chase #4249) (#4251)

Signed-off-by: lindwurm <lindwurm.q@gmail.com>
---
 app/javascript/mastodon/locales/ja.json | 2 +-
 config/locales/simple_form.ja.yml       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index b3943f646..7fe27a092 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -56,7 +56,7 @@
   "confirmations.mute.confirm": "ミュート",
   "confirmations.mute.message": "本当に{name}をミュートしますか？",
   "confirmations.unfollow.confirm": "フォロー解除",
-  "confirmations.unfollow.message": "本当に{name}のフォローを解除しますか？",
+  "confirmations.unfollow.message": "本当に{name}をフォロー解除しますか？",
   "emoji_button.activity": "活動",
   "emoji_button.flags": "国旗",
   "emoji_button.food": "食べ物",
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 58975e426..65845e1aa 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -39,6 +39,7 @@ ja:
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
         setting_system_font_ui: システムのデフォルトフォントを使う
+        setting_unfollow_modal: フォロー解除する前に確認ダイアログを表示する
         setting_noindex: 検索エンジンによるインデックスを拒否する
         severity: 重大性
         type: インポートする項目

From 72108b20e215a866ae4ce54bd2113e36551ba2ef Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 18 Jul 2017 22:49:24 +0200
Subject: [PATCH 282/382] feat(emoji): Add back title attribute (#4253)

---
 app/javascript/mastodon/emoji.js           | 10 +++++-----
 app/javascript/mastodon/emojione_light.js  |  4 ++--
 spec/javascript/components/emojify.test.js | 16 ++++++++--------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/emoji.js b/app/javascript/mastodon/emoji.js
index 1de41f572..9b58cacf5 100644
--- a/app/javascript/mastodon/emoji.js
+++ b/app/javascript/mastodon/emoji.js
@@ -1,7 +1,7 @@
-import { unicodeToFilename } from './emojione_light';
+import { unicodeMapping } from './emojione_light';
 import Trie from 'substring-trie';
 
-const trie = new Trie(Object.keys(unicodeToFilename));
+const trie = new Trie(Object.keys(unicodeMapping));
 
 function emojify(str) {
   // This walks through the string from start to end, ignoring any tags (<p>, <br>, etc.)
@@ -19,10 +19,10 @@ function emojify(str) {
       insideTag = true;
     } else if (!insideTag && (match = trie.search(str.substring(i)))) {
       const unicodeStr = match;
-      if (unicodeStr in unicodeToFilename) {
-        const filename = unicodeToFilename[unicodeStr];
+      if (unicodeStr in unicodeMapping) {
+        const [filename, shortCode] = unicodeMapping[unicodeStr];
         const alt      = unicodeStr;
-        const replacement =  `<img draggable="false" class="emojione" alt="${alt}" src="/emoji/${filename}.svg" />`;
+        const replacement =  `<img draggable="false" class="emojione" alt="${alt}" title=":${shortCode}:" src="/emoji/${filename}.svg" />`;
         str = str.substring(0, i) + replacement + str.substring(i + unicodeStr.length);
         i += (replacement.length - unicodeStr.length); // jump ahead the length we've added to the string
       }
diff --git a/app/javascript/mastodon/emojione_light.js b/app/javascript/mastodon/emojione_light.js
index c75e10a98..985e9dbcb 100644
--- a/app/javascript/mastodon/emojione_light.js
+++ b/app/javascript/mastodon/emojione_light.js
@@ -5,7 +5,7 @@ const emojione = require('emojione');
 
 const mappedUnicode = emojione.mapUnicodeToShort();
 
-module.exports.unicodeToFilename = Object.keys(emojione.jsEscapeMap)
+module.exports.unicodeMapping = Object.keys(emojione.jsEscapeMap)
   .map(unicodeStr => [unicodeStr, mappedUnicode[emojione.jsEscapeMap[unicodeStr]]])
-  .map(([unicodeStr, shortCode]) => ({ [unicodeStr]: emojione.emojioneList[shortCode].fname }))
+  .map(([unicodeStr, shortCode]) => ({ [unicodeStr]: [emojione.emojioneList[shortCode].fname, shortCode.slice(1, shortCode.length - 1)] }))
   .reduce((x, y) => Object.assign(x, y), { });
diff --git a/spec/javascript/components/emojify.test.js b/spec/javascript/components/emojify.test.js
index 2874bb56d..e165b4519 100644
--- a/spec/javascript/components/emojify.test.js
+++ b/spec/javascript/components/emojify.test.js
@@ -22,23 +22,23 @@ describe('emojify', () => {
 
   it('does unicode', () => {
     expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).to.equal(
-      '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
+      '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":family_wwbb:" src="/emoji/1f469-1f469-1f466-1f466.svg" />');
     expect(emojify('\uD83D\uDC68\uD83D\uDC69\uD83D\uDC67\uD83D\uDC67')).to.equal(
-      '<img draggable="false" class="emojione" alt="👨👩👧👧" src="/emoji/1f468-1f469-1f467-1f467.svg" />');
-    expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('<img draggable="false" class="emojione" alt="👩👩👦" src="/emoji/1f469-1f469-1f466.svg" />');
+      '<img draggable="false" class="emojione" alt="👨👩👧👧" title=":family_mwgg:" src="/emoji/1f468-1f469-1f467-1f467.svg" />');
+    expect(emojify('\uD83D\uDC69\uD83D\uDC69\uD83D\uDC66')).to.equal('<img draggable="false" class="emojione" alt="👩👩👦" title=":family_wwb:" src="/emoji/1f469-1f469-1f466.svg" />');
     expect(emojify('\u2757')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
   });
 
   it('does multiple unicode', () => {
     expect(emojify('\u2757 #\uFE0F\u20E3')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
     expect(emojify('\u2757#\uFE0F\u20E3')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" />');
     expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).to.equal(
-      '<img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" />');
+      '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" />');
     expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).to.equal(
-      'foo <img draggable="false" class="emojione" alt="❗" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" src="/emoji/0023-20e3.svg" /> bar');
+      'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg" /> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/0023-20e3.svg" /> bar');
   });
 
   it('ignores unicode inside of tags', () => {

From a5a07da8926589647160ac642a8e082bbeca4451 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 19 Jul 2017 01:37:26 +0200
Subject: [PATCH 283/382] Correct OStatus inflection (Ostatus -> OStatus)
 (#4255)

---
 app/controllers/accounts_controller.rb        |   2 +-
 app/controllers/stream_entries_controller.rb  |   2 +-
 app/lib/ostatus/activity/base.rb              |   2 +-
 app/lib/ostatus/activity/creation.rb          |   2 +-
 app/lib/ostatus/activity/deletion.rb          |   2 +-
 app/lib/ostatus/activity/general.rb           |   8 +-
 app/lib/ostatus/activity/post.rb              |   2 +-
 app/lib/ostatus/activity/remote.rb            |   2 +-
 app/lib/ostatus/activity/share.rb             |   4 +-
 app/lib/ostatus/atom_serializer.rb            |   2 +-
 app/services/authorize_follow_service.rb      |   2 +-
 app/services/block_service.rb                 |   2 +-
 .../concerns/stream_entry_renderer.rb         |   2 +-
 app/services/favourite_service.rb             |   2 +-
 app/services/follow_service.rb                |   4 +-
 app/services/process_feed_service.rb          |   2 +-
 app/services/reject_follow_service.rb         |   2 +-
 app/services/unblock_service.rb               |   2 +-
 app/services/unfavourite_service.rb           |   2 +-
 app/services/unfollow_service.rb              |   2 +-
 .../pubsubhubbub/distribution_worker.rb       |   4 +-
 config/initializers/inflections.rb            |   1 +
 spec/lib/ostatus/atom_serializer_spec.rb      | 330 +++++++++---------
 23 files changed, 193 insertions(+), 192 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 37a1e540f..c270eb000 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -13,7 +13,7 @@ class AccountsController < ApplicationController
 
       format.atom do
         @entries = @account.stream_entries.where(hidden: false).with_includes.paginate_by_max_id(20, params[:max_id], params[:since_id])
-        render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, @entries.to_a))
+        render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.to_a))
       end
 
       format.json do
diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index e3db77caa..3eb91d830 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -19,7 +19,7 @@ class StreamEntriesController < ApplicationController
       end
 
       format.atom do
-        render xml: Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(@stream_entry, true))
+        render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(@stream_entry, true))
       end
     end
   end
diff --git a/app/lib/ostatus/activity/base.rb b/app/lib/ostatus/activity/base.rb
index f528815b3..e1477f0eb 100644
--- a/app/lib/ostatus/activity/base.rb
+++ b/app/lib/ostatus/activity/base.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Base
+class OStatus::Activity::Base
   def initialize(xml, account = nil)
     @xml = xml
     @account = account
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb
index c54d64fd7..e22f746f2 100644
--- a/app/lib/ostatus/activity/creation.rb
+++ b/app/lib/ostatus/activity/creation.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Creation < Ostatus::Activity::Base
+class OStatus::Activity::Creation < OStatus::Activity::Base
   def perform
     if redis.exists("delete_upon_arrival:#{@account.id}:#{id}")
       Rails.logger.debug "Delete for status #{id} was queued, ignoring"
diff --git a/app/lib/ostatus/activity/deletion.rb b/app/lib/ostatus/activity/deletion.rb
index c4d05a467..860faf501 100644
--- a/app/lib/ostatus/activity/deletion.rb
+++ b/app/lib/ostatus/activity/deletion.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Deletion < Ostatus::Activity::Base
+class OStatus::Activity::Deletion < OStatus::Activity::Base
   def perform
     Rails.logger.debug "Deleting remote status #{id}"
     status = Status.find_by(uri: id, account: @account)
diff --git a/app/lib/ostatus/activity/general.rb b/app/lib/ostatus/activity/general.rb
index 3ff7a039a..b3bef9861 100644
--- a/app/lib/ostatus/activity/general.rb
+++ b/app/lib/ostatus/activity/general.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::General < Ostatus::Activity::Base
+class OStatus::Activity::General < OStatus::Activity::Base
   def specialize
     special_class&.new(@xml, @account)
   end
@@ -10,11 +10,11 @@ class Ostatus::Activity::General < Ostatus::Activity::Base
   def special_class
     case verb
     when :post
-      Ostatus::Activity::Post
+      OStatus::Activity::Post
     when :share
-      Ostatus::Activity::Share
+      OStatus::Activity::Share
     when :delete
-      Ostatus::Activity::Deletion
+      OStatus::Activity::Deletion
     end
   end
 end
diff --git a/app/lib/ostatus/activity/post.rb b/app/lib/ostatus/activity/post.rb
index 8028db2f8..755ed8656 100644
--- a/app/lib/ostatus/activity/post.rb
+++ b/app/lib/ostatus/activity/post.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Post < Ostatus::Activity::Creation
+class OStatus::Activity::Post < OStatus::Activity::Creation
   def perform
     status, just_created = super
 
diff --git a/app/lib/ostatus/activity/remote.rb b/app/lib/ostatus/activity/remote.rb
index 755f885e6..ecec6886c 100644
--- a/app/lib/ostatus/activity/remote.rb
+++ b/app/lib/ostatus/activity/remote.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Remote < Ostatus::Activity::Base
+class OStatus::Activity::Remote < OStatus::Activity::Base
   def perform
     find_status(id) || FetchRemoteStatusService.new.call(url)
   end
diff --git a/app/lib/ostatus/activity/share.rb b/app/lib/ostatus/activity/share.rb
index 73aac58ed..290008021 100644
--- a/app/lib/ostatus/activity/share.rb
+++ b/app/lib/ostatus/activity/share.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::Activity::Share < Ostatus::Activity::Creation
+class OStatus::Activity::Share < OStatus::Activity::Creation
   def perform
     return if reblog.nil?
 
@@ -18,7 +18,7 @@ class Ostatus::Activity::Share < Ostatus::Activity::Creation
   def reblog
     return @reblog if defined? @reblog
 
-    original_status = Ostatus::Activity::Remote.new(object).perform
+    original_status = OStatus::Activity::Remote.new(object).perform
     return if original_status.nil?
 
     @reblog = original_status.reblog? ? original_status.reblog : original_status
diff --git a/app/lib/ostatus/atom_serializer.rb b/app/lib/ostatus/atom_serializer.rb
index 909d84df3..0d62361be 100644
--- a/app/lib/ostatus/atom_serializer.rb
+++ b/app/lib/ostatus/atom_serializer.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Ostatus::AtomSerializer
+class OStatus::AtomSerializer
   include RoutingHelper
   include ActionView::Helpers::SanitizeHelper
 
diff --git a/app/services/authorize_follow_service.rb b/app/services/authorize_follow_service.rb
index a25d11dbd..41815a393 100644
--- a/app/services/authorize_follow_service.rb
+++ b/app/services/authorize_follow_service.rb
@@ -10,6 +10,6 @@ class AuthorizeFollowService < BaseService
   private
 
   def build_xml(follow_request)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request))
   end
 end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index 15420e192..5d7bf6a3b 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -18,6 +18,6 @@ class BlockService < BaseService
   private
 
   def build_xml(block)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.block_salmon(block))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.block_salmon(block))
   end
 end
diff --git a/app/services/concerns/stream_entry_renderer.rb b/app/services/concerns/stream_entry_renderer.rb
index d9c30c53c..9f6c8a082 100644
--- a/app/services/concerns/stream_entry_renderer.rb
+++ b/app/services/concerns/stream_entry_renderer.rb
@@ -2,6 +2,6 @@
 
 module StreamEntryRenderer
   def stream_entry_to_xml(stream_entry)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.entry(stream_entry, true))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.entry(stream_entry, true))
   end
 end
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index a08aba638..291f9e56e 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -28,6 +28,6 @@ class FavouriteService < BaseService
   private
 
   def build_xml(favourite)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.favourite_salmon(favourite))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.favourite_salmon(favourite))
   end
 end
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 7a7275b6e..3155feaa4 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -57,10 +57,10 @@ class FollowService < BaseService
   end
 
   def build_follow_request_xml(follow_request)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_request_salmon(follow_request))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.follow_request_salmon(follow_request))
   end
 
   def build_follow_xml(follow)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.follow_salmon(follow))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.follow_salmon(follow))
   end
 end
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index b99048a06..9fa8eda51 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -20,7 +20,7 @@ class ProcessFeedService < BaseService
   end
 
   def process_entry(xml, account)
-    activity = Ostatus::Activity::General.new(xml, account)
+    activity = OStatus::Activity::General.new(xml, account)
     activity.specialize&.perform if activity.status?
   rescue ActiveRecord::RecordInvalid => e
     Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
diff --git a/app/services/reject_follow_service.rb b/app/services/reject_follow_service.rb
index 87fc49b34..fd7e66c23 100644
--- a/app/services/reject_follow_service.rb
+++ b/app/services/reject_follow_service.rb
@@ -10,6 +10,6 @@ class RejectFollowService < BaseService
   private
 
   def build_xml(follow_request)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request))
   end
 end
diff --git a/app/services/unblock_service.rb b/app/services/unblock_service.rb
index 50c2dc2f0..ff15c7275 100644
--- a/app/services/unblock_service.rb
+++ b/app/services/unblock_service.rb
@@ -11,6 +11,6 @@ class UnblockService < BaseService
   private
 
   def build_xml(block)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unblock_salmon(block))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unblock_salmon(block))
   end
 end
diff --git a/app/services/unfavourite_service.rb b/app/services/unfavourite_service.rb
index ede3caad1..564aaee46 100644
--- a/app/services/unfavourite_service.rb
+++ b/app/services/unfavourite_service.rb
@@ -13,6 +13,6 @@ class UnfavouriteService < BaseService
   private
 
   def build_xml(favourite)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfavourite_salmon(favourite))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unfavourite_salmon(favourite))
   end
 end
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 0c9a5f657..388909586 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -14,6 +14,6 @@ class UnfollowService < BaseService
   private
 
   def build_xml(follow)
-    Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.unfollow_salmon(follow))
+    OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unfollow_salmon(follow))
   end
 end
diff --git a/app/workers/pubsubhubbub/distribution_worker.rb b/app/workers/pubsubhubbub/distribution_worker.rb
index 9c1fa76cb..ce467d18b 100644
--- a/app/workers/pubsubhubbub/distribution_worker.rb
+++ b/app/workers/pubsubhubbub/distribution_worker.rb
@@ -22,7 +22,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_public!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
+    @payload = OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, stream_entries))
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions) do |subscription|
       [subscription.id, @payload]
@@ -32,7 +32,7 @@ class Pubsubhubbub::DistributionWorker
   def distribute_hidden!(stream_entries)
     return if stream_entries.empty?
 
-    @payload = Ostatus::AtomSerializer.render(Ostatus::AtomSerializer.new.feed(@account, stream_entries))
+    @payload = OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, stream_entries))
     @domains = @account.followers.domains
 
     Pubsubhubbub::DeliveryWorker.push_bulk(@subscriptions.reject { |s| !allowed_to_receive?(s.callback_url, s.domain) }) do |subscription|
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 26275d092..44e54c9f3 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -13,6 +13,7 @@
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'StatsD'
   inflect.acronym 'OEmbed'
+  inflect.acronym 'OStatus'
   inflect.acronym 'ActivityPub'
   inflect.acronym 'PubSubHubbub'
   inflect.acronym 'ActivityStreams'
diff --git a/spec/lib/ostatus/atom_serializer_spec.rb b/spec/lib/ostatus/atom_serializer_spec.rb
index 8caef9355..b0cb8f019 100644
--- a/spec/lib/ostatus/atom_serializer_spec.rb
+++ b/spec/lib/ostatus/atom_serializer_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Ostatus::AtomSerializer do
+RSpec.describe OStatus::AtomSerializer do
   shared_examples 'follow request salmon' do
     it 'appends author element with account' do
       account = Fabricate(:account, domain: nil, username: 'username')
@@ -108,7 +108,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'returns XML with emojis' do
       element = Ox::Element.new('tag')
       element << '💩'
-      xml = Ostatus::AtomSerializer.render(element)
+      xml = OStatus::AtomSerializer.render(element)
 
       expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>💩</tag>\n"
     end
@@ -116,7 +116,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'returns XML, stripping invalid characters like \b and \v' do
       element = Ox::Element.new('tag')
       element << "im l33t\b haxo\b\vr"
-      xml = Ostatus::AtomSerializer.render(element)
+      xml = OStatus::AtomSerializer.render(element)
 
       expect(xml).to eq "<?xml version=\"1.0\"?>\n<tag>im l33t haxor</tag>\n"
     end
@@ -127,7 +127,7 @@ RSpec.describe Ostatus::AtomSerializer do
       it 'appends poco:note element with note for local account' do
         account = Fabricate(:account, domain: nil, note: '<p>note</p>')
 
-        author = Ostatus::AtomSerializer.new.author(account)
+        author = OStatus::AtomSerializer.new.author(account)
 
         note = author.nodes.find { |node| node.name == 'poco:note' }
         expect(note.text).to eq '<p>note</p>'
@@ -136,7 +136,7 @@ RSpec.describe Ostatus::AtomSerializer do
       it 'appends poco:note element with tags-stripped note for remote account' do
         account = Fabricate(:account, domain: 'remote', note: '<p>note</p>')
 
-        author = Ostatus::AtomSerializer.new.author(account)
+        author = OStatus::AtomSerializer.new.author(account)
 
         note = author.nodes.find { |node| node.name == 'poco:note' }
         expect(note.text).to eq 'note'
@@ -144,7 +144,7 @@ RSpec.describe Ostatus::AtomSerializer do
 
       it 'appends summary element with type attribute and simplified note if present' do
         account = Fabricate(:account, note: 'note')
-        author = Ostatus::AtomSerializer.new.author(account)
+        author = OStatus::AtomSerializer.new.author(account)
         expect(author.summary.text).to eq '<p>note</p>'
         expect(author.summary[:type]).to eq 'html'
       end
@@ -153,27 +153,27 @@ RSpec.describe Ostatus::AtomSerializer do
     context 'when note is not present' do
       it 'does not append poco:note element' do
         account = Fabricate(:account, note: '')
-        author = Ostatus::AtomSerializer.new.author(account)
+        author = OStatus::AtomSerializer.new.author(account)
         author.nodes.each { |node| expect(node.name).not_to eq 'poco:note' }
       end
 
       it 'does not append summary element' do
         account = Fabricate(:account, note: '')
-        author = Ostatus::AtomSerializer.new.author(account)
+        author = OStatus::AtomSerializer.new.author(account)
         author.nodes.each { |node| expect(node.name).not_to eq 'summary' }
       end
     end
 
     it 'returns author element' do
       account = Fabricate(:account)
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
       expect(author.name).to eq 'author'
     end
 
     it 'appends activity:object-type element with person type' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       object_type = author.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:person]
@@ -181,20 +181,20 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'appends email element with username and domain for local account' do
       account = Fabricate(:account, username: 'username')
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
       expect(author.email.text).to eq 'username@cb6e6126.ngrok.io'
     end
 
     it 'appends email element with username and domain for remote user' do
       account = Fabricate(:account, domain: 'domain', username: 'username')
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
       expect(author.email.text).to eq 'username@domain'
     end
 
     it 'appends link element for an alternative' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -205,7 +205,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'has link element for avatar if present' do
       account = Fabricate(:account, avatar: attachment_fixture('avatar.gif'))
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'avatar' }
       expect(link[:type]).to eq 'image/gif'
@@ -217,7 +217,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'does not have link element for avatar if not present' do
       account = Fabricate(:account, avatar: nil)
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       author.nodes.each do |node|
         expect(node[:rel]).not_to eq 'avatar' if node.name == 'link'
@@ -227,7 +227,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends link element for header if present' do
       account = Fabricate(:account, header: attachment_fixture('avatar.gif'))
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       link = author.nodes.find { |node| node.name == 'link' && node[:rel] == 'header' }
       expect(link[:type]).to eq 'image/gif'
@@ -239,7 +239,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'does not append link element for header if not present' do
       account = Fabricate(:account, header: nil)
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       author.nodes.each do |node|
         expect(node[:rel]).not_to eq 'header' if node.name == 'link'
@@ -249,7 +249,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends poco:displayName element with display name if present' do
       account = Fabricate(:account, display_name: 'display name')
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       display_name = author.nodes.find { |node| node.name == 'poco:displayName' }
       expect(display_name.text).to eq 'display name'
@@ -257,14 +257,14 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'does not append poco:displayName element with display name if not present' do
       account = Fabricate(:account, display_name: '')
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
       author.nodes.each { |node| expect(node.name).not_to eq 'poco:displayName' }
     end
 
     it "appends mastodon:scope element with 'private' if locked" do
       account = Fabricate(:account, locked: true)
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       scope = author.nodes.find { |node| node.name == 'mastodon:scope' }
       expect(scope.text).to eq 'private'
@@ -273,7 +273,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it "appends mastodon:scope element with 'public' if unlocked" do
       account = Fabricate(:account, locked: false)
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       scope = author.nodes.find { |node| node.name == 'mastodon:scope' }
       expect(scope.text).to eq 'public'
@@ -282,7 +282,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'includes URI' do
       account = Fabricate(:account, domain: nil, username: 'username')
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       expect(author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
       expect(author.uri.text).to eq 'https://cb6e6126.ngrok.io/users/username'
@@ -291,7 +291,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'includes username' do
       account = Fabricate(:account, username: 'username')
 
-      author = Ostatus::AtomSerializer.new.author(account)
+      author = OStatus::AtomSerializer.new.author(account)
 
       name = author.nodes.find { |node| node.name == 'name' }
       username = author.nodes.find { |node| node.name == 'poco:preferredUsername' }
@@ -317,7 +317,7 @@ RSpec.describe Ostatus::AtomSerializer do
       include_examples 'namespaces' do
         def serialize
           stream_entry = Fabricate(:stream_entry)
-          Ostatus::AtomSerializer.new.entry(stream_entry, true)
+          OStatus::AtomSerializer.new.entry(stream_entry, true)
         end
       end
 
@@ -325,7 +325,7 @@ RSpec.describe Ostatus::AtomSerializer do
         account = Fabricate(:account, username: 'username')
         status = Fabricate(:status, account: account)
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry, true)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry, true)
 
         expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
       end
@@ -334,14 +334,14 @@ RSpec.describe Ostatus::AtomSerializer do
     context 'if status is present' do
       include_examples 'status attributes' do
         def serialize(status)
-          Ostatus::AtomSerializer.new.entry(status.stream_entry, true)
+          OStatus::AtomSerializer.new.entry(status.stream_entry, true)
         end
       end
 
       it 'appends link element for the public collection if status is publicly visible' do
         status = Fabricate(:status, visibility: :public)
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         mentioned_person = entry.nodes.find do |node|
           node.name == 'link' &&
@@ -354,7 +354,7 @@ RSpec.describe Ostatus::AtomSerializer do
       it 'does not append link element for the public collection if status is not publicly visible' do
         status = Fabricate(:status, visibility: :private)
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         entry.nodes.each do |node|
           if node.name == 'link' &&
@@ -369,14 +369,14 @@ RSpec.describe Ostatus::AtomSerializer do
         tag = Fabricate(:tag, name: 'tag')
         status = Fabricate(:status, tags: [ tag ])
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.category[:term]).to eq 'tag'
       end
 
       it 'appends category element for NSFW if status is sensitive' do
         status = Fabricate(:status, sensitive: true)
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
         expect(entry.category[:term]).to eq 'nsfw'
       end
 
@@ -385,7 +385,7 @@ RSpec.describe Ostatus::AtomSerializer do
         media_attachment = Fabricate(:media_attachment, file: file)
         status = Fabricate(:status, media_attachments: [ media_attachment ])
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         enclosure = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'enclosure' }
         expect(enclosure[:type]).to eq 'image/jpeg'
@@ -395,7 +395,7 @@ RSpec.describe Ostatus::AtomSerializer do
       it 'appends mastodon:scope element with visibility' do
         status = Fabricate(:status, visibility: :public)
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         scope = entry.nodes.find { |node| node.name == 'mastodon:scope' }
         expect(scope.text).to eq 'public'
@@ -406,8 +406,8 @@ RSpec.describe Ostatus::AtomSerializer do
         remote_status = Fabricate(:status, account: remote_account)
         remote_status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z')
 
-        entry = Ostatus::AtomSerializer.new.entry(remote_status.stream_entry, true)
-        xml = Ostatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote')
+        entry = OStatus::AtomSerializer.new.entry(remote_status.stream_entry, true)
+        xml = OStatus::AtomSerializer.render(entry).gsub('cb6e6126.ngrok.io', 'remote')
 
         remote_status.destroy!
         remote_account.destroy!
@@ -429,7 +429,7 @@ RSpec.describe Ostatus::AtomSerializer do
         status = Fabricate(:status)
         status.destroy!
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.content.text).to eq 'Deleted status'
       end
@@ -439,7 +439,7 @@ RSpec.describe Ostatus::AtomSerializer do
         status = Fabricate(:status, account: account)
         status.destroy!
 
-        entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+        entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
         expect(entry.title.text).to eq 'username deleted status'
       end
@@ -447,19 +447,19 @@ RSpec.describe Ostatus::AtomSerializer do
 
     context 'it is not root' do
       let(:stream_entry) { Fabricate(:stream_entry) }
-      subject { Ostatus::AtomSerializer.new.entry(stream_entry, false) }
+      subject { OStatus::AtomSerializer.new.entry(stream_entry, false) }
       include_examples 'not root'
     end
 
     context 'without root parameter' do
       let(:stream_entry) { Fabricate(:stream_entry) }
-      subject { Ostatus::AtomSerializer.new.entry(stream_entry) }
+      subject { OStatus::AtomSerializer.new.entry(stream_entry) }
       include_examples 'not root'
     end
 
     it 'returns entry element' do
       stream_entry = Fabricate(:stream_entry)
-      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.name).to eq 'entry'
     end
 
@@ -467,33 +467,33 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, reblog_of_id: nil)
       status.stream_entry.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       expect(entry.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
     end
 
     it 'appends published element with created date' do
       stream_entry = Fabricate(:stream_entry, created_at: '2000-01-01T00:00:00Z')
-      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.published.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends updated element with updated date' do
       stream_entry = Fabricate(:stream_entry, updated_at: '2000-01-01T00:00:00Z')
-      entry = Ostatus::AtomSerializer.new.entry(stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(stream_entry)
       expect(entry.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends title element with status title' do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account, reblog_of_id: nil)
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
       expect(entry.title.text).to eq 'New status by username'
     end
 
     it 'appends activity:object-type element with object type' do
       status = Fabricate(:status)
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
       object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:note]
     end
@@ -501,7 +501,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with object type' do
       status = Fabricate(:status)
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
       expect(object_type.text).to eq TagManager::VERBS[:post]
@@ -511,7 +511,7 @@ RSpec.describe Ostatus::AtomSerializer do
       reblogged = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       reblog = Fabricate(:status, reblog: reblogged)
 
-      entry = Ostatus::AtomSerializer.new.entry(reblog.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(reblog.stream_entry)
 
       object = entry.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{reblogged.id}:objectType=Status"
@@ -519,7 +519,7 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'does not append activity:object element if target is not present' do
       status = Fabricate(:status, reblog_of_id: nil)
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
       entry.nodes.each { |node| expect(node.name).not_to eq 'activity:object' }
     end
 
@@ -527,7 +527,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -538,7 +538,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -549,7 +549,7 @@ RSpec.describe Ostatus::AtomSerializer do
       in_reply_to_status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z', reblog_of_id: nil)
       reply_status = Fabricate(:status, in_reply_to_id: in_reply_to_status.id)
 
-      entry = Ostatus::AtomSerializer.new.entry(reply_status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(reply_status.stream_entry)
 
       in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{in_reply_to_status.id}:objectType=Status"
@@ -557,7 +557,7 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'does not append thr:in-reply-to element if not threaded' do
       status = Fabricate(:status)
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
       entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' }
     end
 
@@ -565,7 +565,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status)
       status.conversation.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' }
       expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation_id}:objectType=Conversation"
@@ -575,7 +575,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate.build(:status, conversation_id: nil)
       status.save!(validate: false)
 
-      entry = Ostatus::AtomSerializer.new.entry(status.stream_entry)
+      entry = OStatus::AtomSerializer.new.entry(status.stream_entry)
 
       entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' }
     end
@@ -585,62 +585,62 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         account = Fabricate(:account)
-        Ostatus::AtomSerializer.new.feed(account, [])
+        OStatus::AtomSerializer.new.feed(account, [])
       end
     end
 
     it 'returns feed element' do
       account = Fabricate(:account)
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.name).to eq 'feed'
     end
 
     it 'appends id element with account Atom URL' do
       account = Fabricate(:account, username: 'username')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.id.text).to eq 'https://cb6e6126.ngrok.io/users/username.atom'
     end
 
     it 'appends title element with account display name if present' do
       account = Fabricate(:account, display_name: 'display name')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.title.text).to eq 'display name'
     end
 
     it 'does not append title element with account username if account display name is not present' do
       account = Fabricate(:account, display_name: '', username: 'username')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.title.text).to eq 'username'
     end
 
     it 'appends subtitle element with account note' do
       account = Fabricate(:account, note: 'note')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.subtitle.text).to eq 'note'
     end
 
     it 'appends updated element with date account got updated' do
       account = Fabricate(:account, updated_at: '2000-01-01T00:00:00Z')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends logo element with full asset URL for original account avatar' do
       account = Fabricate(:account, avatar: attachment_fixture('avatar.gif'))
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.logo.text).to match /^https:\/\/cb6e6126.ngrok.io\/system\/accounts\/avatars\/.+\/original\/avatar.gif/
     end
 
     it 'appends author element' do
       account = Fabricate(:account, username: 'username')
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
       expect(feed.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
 
     it 'appends link element for an alternative' do
       account = Fabricate(:account, username: 'username')
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -650,7 +650,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends link element for itself' do
       account = Fabricate(:account, username: 'username')
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'self' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -661,7 +661,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       stream_entry = Fabricate(:stream_entry)
 
-      feed = Ostatus::AtomSerializer.new.feed(account, Array.new(20, stream_entry))
+      feed = OStatus::AtomSerializer.new.feed(account, Array.new(20, stream_entry))
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'next' }
       expect(link[:type]).to eq 'application/atom+xml'
@@ -671,7 +671,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'does not append link element for the next if it does not have 20 stream entries' do
       account = Fabricate(:account, username: 'username')
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
 
       feed.nodes.each do |node|
         expect(node[:rel]).not_to eq 'next' if node.name == 'link'
@@ -681,7 +681,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends link element for hub' do
       account = Fabricate(:account, username: 'username')
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'hub' }
       expect(link[:href]).to eq 'https://cb6e6126.ngrok.io/api/push'
@@ -690,7 +690,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends link element for Salmon' do
       account = Fabricate(:account, username: 'username')
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [])
+      feed = OStatus::AtomSerializer.new.feed(account, [])
 
       link = feed.nodes.find { |node| node.name == 'link' && node[:rel] == 'salmon' }
       expect(link[:href]).to start_with 'https://cb6e6126.ngrok.io/api/salmon/'
@@ -700,7 +700,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      feed = Ostatus::AtomSerializer.new.feed(account, [status.stream_entry])
+      feed = OStatus::AtomSerializer.new.feed(account, [status.stream_entry])
 
       expect(feed.entry.title.text).to eq 'New status by username'
     end
@@ -710,13 +710,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         block = Fabricate(:block)
-        Ostatus::AtomSerializer.new.block_salmon(block)
+        OStatus::AtomSerializer.new.block_salmon(block)
       end
     end
 
     it 'returns entry element' do
       block = Fabricate(:block)
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
       expect(block_salmon.name).to eq 'entry'
     end
 
@@ -724,7 +724,7 @@ RSpec.describe Ostatus::AtomSerializer do
       block = Fabricate(:block)
 
       time_before = Time.now
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
       time_after = Time.now
 
       expect(block_salmon.id.text).to(
@@ -738,7 +738,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       block = Fabricate(:block, account: account, target_account: target_account)
 
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
 
       expect(block_salmon.title.text).to eq 'account no longer wishes to interact with target_account@remote'
     end
@@ -747,7 +747,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'account')
       block = Fabricate(:block, account: account)
 
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
 
       expect(block_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account'
     end
@@ -755,7 +755,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       block = Fabricate(:block)
 
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
 
       object_type = block_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -764,7 +764,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with block' do
       block = Fabricate(:block)
 
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
 
       verb = block_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:block]
@@ -774,7 +774,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       block = Fabricate(:block, target_account: target_account)
 
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
 
       object = block_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -782,8 +782,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view triggers block when processed' do
       block = Fabricate(:block)
-      block_salmon = Ostatus::AtomSerializer.new.block_salmon(block)
-      xml = Ostatus::AtomSerializer.render(block_salmon)
+      block_salmon = OStatus::AtomSerializer.new.block_salmon(block)
+      xml = OStatus::AtomSerializer.render(block_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair)
       block.destroy!
 
@@ -797,13 +797,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         block = Fabricate(:block)
-        Ostatus::AtomSerializer.new.unblock_salmon(block)
+        OStatus::AtomSerializer.new.unblock_salmon(block)
       end
     end
 
     it 'returns entry element' do
       block = Fabricate(:block)
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
       expect(unblock_salmon.name).to eq 'entry'
     end
 
@@ -811,7 +811,7 @@ RSpec.describe Ostatus::AtomSerializer do
       block = Fabricate(:block)
 
       time_before = Time.now
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
       time_after = Time.now
 
       expect(unblock_salmon.id.text).to(
@@ -825,7 +825,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       block = Fabricate(:block, account: account, target_account: target_account)
 
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
 
       expect(unblock_salmon.title.text).to eq 'account no longer blocks target_account@remote'
     end
@@ -834,7 +834,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'account')
       block = Fabricate(:block, account: account)
 
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
 
       expect(unblock_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/account'
     end
@@ -842,7 +842,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       block = Fabricate(:block)
 
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
 
       object_type = unblock_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -851,7 +851,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with block' do
       block = Fabricate(:block)
 
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
 
       verb = unblock_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unblock]
@@ -861,7 +861,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       block = Fabricate(:block, target_account: target_account)
 
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
 
       object = unblock_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -869,8 +869,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view triggers block when processed' do
       block = Fabricate(:block)
-      unblock_salmon = Ostatus::AtomSerializer.new.unblock_salmon(block)
-      xml = Ostatus::AtomSerializer.render(unblock_salmon)
+      unblock_salmon = OStatus::AtomSerializer.new.unblock_salmon(block)
+      xml = OStatus::AtomSerializer.render(unblock_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, block.account.keypair)
 
       ProcessInteractionService.new.call(envelope, block.target_account)
@@ -883,19 +883,19 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         favourite = Fabricate(:favourite)
-        Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+        OStatus::AtomSerializer.new.favourite_salmon(favourite)
       end
     end
 
     it 'returns entry element' do
       favourite = Fabricate(:favourite)
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
       expect(favourite_salmon.name).to eq 'entry'
     end
 
     it 'appends id element with unique tag' do
       favourite = Fabricate(:favourite, created_at: '2000-01-01T00:00:00Z')
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
       expect(favourite_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{favourite.id}:objectType=Favourite"
     end
 
@@ -903,7 +903,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       favourite = Fabricate(:favourite, account: account)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       expect(favourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -911,7 +911,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       favourite = Fabricate(:favourite)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       object_type = favourite_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity'
@@ -920,7 +920,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with favorite' do
       favourite = Fabricate(:favourite)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       verb = favourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:favorite]
@@ -930,7 +930,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       object = favourite_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -941,7 +941,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       in_reply_to = favourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -954,7 +954,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, account: status_account)
       favourite = Fabricate(:favourite, account: account, status: status)
 
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
 
       expect(favourite_salmon.title.text).to eq 'account favourited a status by status_account@remote'
       expect(favourite_salmon.content.text).to eq 'account favourited a status by status_account@remote'
@@ -962,8 +962,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view triggers favourite when processed' do
       favourite = Fabricate(:favourite)
-      favourite_salmon = Ostatus::AtomSerializer.new.favourite_salmon(favourite)
-      xml = Ostatus::AtomSerializer.render(favourite_salmon)
+      favourite_salmon = OStatus::AtomSerializer.new.favourite_salmon(favourite)
+      xml = OStatus::AtomSerializer.render(favourite_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair)
       favourite.destroy!
 
@@ -976,13 +976,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         favourite = Fabricate(:favourite)
-        Ostatus::AtomSerializer.new.favourite_salmon(favourite)
+        OStatus::AtomSerializer.new.favourite_salmon(favourite)
       end
     end
 
     it 'returns entry element' do
       favourite = Fabricate(:favourite)
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
       expect(unfavourite_salmon.name).to eq 'entry'
     end
 
@@ -990,7 +990,7 @@ RSpec.describe Ostatus::AtomSerializer do
       favourite = Fabricate(:favourite)
 
       time_before = Time.now
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
       time_after = Time.now
 
       expect(unfavourite_salmon.id.text).to(
@@ -1003,7 +1003,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       favourite = Fabricate(:favourite, account: account)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       expect(unfavourite_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1011,7 +1011,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       favourite = Fabricate(:favourite)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       object_type = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq 'http://activitystrea.ms/schema/1.0/activity'
@@ -1020,7 +1020,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with favorite' do
       favourite = Fabricate(:favourite)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       verb = unfavourite_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unfavorite]
@@ -1030,7 +1030,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       object = unfavourite_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -1041,7 +1041,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, account: status_account, created_at: '2000-01-01T00:00:00Z')
       favourite = Fabricate(:favourite, status: status)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       in_reply_to = unfavourite_salmon.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
@@ -1054,7 +1054,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status, account: status_account)
       favourite = Fabricate(:favourite, account: account, status: status)
 
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
 
       expect(unfavourite_salmon.title.text).to eq 'account no longer favourites a status by status_account@remote'
       expect(unfavourite_salmon.content.text).to eq 'account no longer favourites a status by status_account@remote'
@@ -1062,8 +1062,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view triggers unfavourite when processed' do
       favourite = Fabricate(:favourite)
-      unfavourite_salmon = Ostatus::AtomSerializer.new.unfavourite_salmon(favourite)
-      xml = Ostatus::AtomSerializer.render(unfavourite_salmon)
+      unfavourite_salmon = OStatus::AtomSerializer.new.unfavourite_salmon(favourite)
+      xml = OStatus::AtomSerializer.render(unfavourite_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, favourite.account.keypair)
 
       ProcessInteractionService.new.call(envelope, favourite.status.account)
@@ -1075,19 +1075,19 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow = Fabricate(:follow)
-        Ostatus::AtomSerializer.new.follow_salmon(follow)
+        OStatus::AtomSerializer.new.follow_salmon(follow)
       end
     end
 
     it 'returns entry element' do
       follow = Fabricate(:follow)
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
       expect(follow_salmon.name).to eq 'entry'
     end
 
     it 'appends id element with unique tag' do
       follow = Fabricate(:follow, created_at: '2000-01-01T00:00:00Z')
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
       expect(follow_salmon.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{follow.id}:objectType=Follow"
     end
 
@@ -1095,7 +1095,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: nil, username: 'username')
       follow = Fabricate(:follow, account: account)
 
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
 
       expect(follow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1103,7 +1103,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       follow = Fabricate(:follow)
 
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
 
       object_type = follow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1112,7 +1112,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with follow' do
       follow = Fabricate(:follow)
 
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
 
       verb = follow_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:follow]
@@ -1122,7 +1122,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'domain', uri: 'https://domain/id')
       follow = Fabricate(:follow, target_account: target_account)
 
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
 
       object = follow_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -1133,7 +1133,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: 'remote', username: 'target_account')
       follow = Fabricate(:follow, account: account, target_account: target_account)
 
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
 
       expect(follow_salmon.title.text).to eq 'account started following target_account@remote'
       expect(follow_salmon.content.text).to eq 'account started following target_account@remote'
@@ -1141,8 +1141,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view triggers follow when processed' do
       follow = Fabricate(:follow)
-      follow_salmon = Ostatus::AtomSerializer.new.follow_salmon(follow)
-      xml = Ostatus::AtomSerializer.render(follow_salmon)
+      follow_salmon = OStatus::AtomSerializer.new.follow_salmon(follow)
+      xml = OStatus::AtomSerializer.render(follow_salmon)
       follow.destroy!
       envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair)
 
@@ -1157,7 +1157,7 @@ RSpec.describe Ostatus::AtomSerializer do
       def serialize
         follow = Fabricate(:follow)
         follow.destroy!
-        Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+        OStatus::AtomSerializer.new.unfollow_salmon(follow)
       end
     end
 
@@ -1165,7 +1165,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.name).to eq 'entry'
     end
@@ -1175,7 +1175,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow.destroy!
 
       time_before = Time.now
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
       time_after = Time.now
 
       expect(unfollow_salmon.id.text).to(
@@ -1190,7 +1190,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow, account: account, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.title.text).to eq 'account is no longer following target_account@remote'
     end
@@ -1201,7 +1201,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow, account: account, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.content.text).to eq 'account is no longer following target_account@remote'
     end
@@ -1211,7 +1211,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow, account: account)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       expect(unfollow_salmon.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1220,7 +1220,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       object_type = unfollow_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1230,7 +1230,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       verb = unfollow_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:unfollow]
@@ -1241,7 +1241,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow = Fabricate(:follow, target_account: target_account)
       follow.destroy!
 
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
 
       object = unfollow_salmon.nodes.find { |node| node.name == 'activity:object' }
       expect(object.id.text).to eq 'https://domain/id'
@@ -1250,8 +1250,8 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'returns element whose rendered view triggers unfollow when processed' do
       follow = Fabricate(:follow)
       follow.destroy!
-      unfollow_salmon = Ostatus::AtomSerializer.new.unfollow_salmon(follow)
-      xml = Ostatus::AtomSerializer.render(unfollow_salmon)
+      unfollow_salmon = OStatus::AtomSerializer.new.unfollow_salmon(follow)
+      xml = OStatus::AtomSerializer.render(unfollow_salmon)
       follow.account.follow!(follow.target_account)
       envelope = OStatus2::Salmon.new.pack(xml, follow.account.keypair)
 
@@ -1265,13 +1265,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        Ostatus::AtomSerializer.new.follow_request_salmon(follow_request)
+        OStatus::AtomSerializer.new.follow_request_salmon(follow_request)
       end
     end
 
     context do
       def serialize(follow_request)
-        Ostatus::AtomSerializer.new.follow_request_salmon(follow_request)
+        OStatus::AtomSerializer.new.follow_request_salmon(follow_request)
       end
 
       it_behaves_like 'follow request salmon'
@@ -1293,7 +1293,7 @@ RSpec.describe Ostatus::AtomSerializer do
       it 'returns element whose rendered view triggers follow request when processed' do
         follow_request = Fabricate(:follow_request)
         follow_request_salmon = serialize(follow_request)
-        xml = Ostatus::AtomSerializer.render(follow_request_salmon)
+        xml = OStatus::AtomSerializer.render(follow_request_salmon)
         envelope = OStatus2::Salmon.new.pack(xml, follow_request.account.keypair)
         follow_request.destroy!
 
@@ -1308,13 +1308,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+        OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
       end
     end
 
     it_behaves_like 'follow request salmon' do
       def serialize(follow_request)
-        authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+        authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
         authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' }
       end
     end
@@ -1323,7 +1323,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow_request = Fabricate(:follow_request)
 
       time_before = Time.now
-      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
       time_after = Time.now
 
       expect(authorize_follow_request_salmon.id.text).to(
@@ -1337,7 +1337,7 @@ RSpec.describe Ostatus::AtomSerializer do
       target_account = Fabricate(:account, domain: nil, username: 'target_account')
       follow_request = Fabricate(:follow_request, account: account, target_account: target_account)
 
-      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       expect(authorize_follow_request_salmon.title.text).to eq 'target_account authorizes follow request by account@remote'
     end
@@ -1345,7 +1345,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with activity type' do
       follow_request = Fabricate(:follow_request)
 
-      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       object_type = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
@@ -1354,7 +1354,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with authorize' do
       follow_request = Fabricate(:follow_request)
 
-      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
 
       verb = authorize_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:authorize]
@@ -1362,8 +1362,8 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'returns element whose rendered view creates follow from follow request when processed' do
       follow_request = Fabricate(:follow_request)
-      authorize_follow_request_salmon = Ostatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
-      xml = Ostatus::AtomSerializer.render(authorize_follow_request_salmon)
+      authorize_follow_request_salmon = OStatus::AtomSerializer.new.authorize_follow_request_salmon(follow_request)
+      xml = OStatus::AtomSerializer.render(authorize_follow_request_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair)
 
       ProcessInteractionService.new.call(envelope, follow_request.account)
@@ -1377,13 +1377,13 @@ RSpec.describe Ostatus::AtomSerializer do
     include_examples 'namespaces' do
       def serialize
         follow_request = Fabricate(:follow_request)
-        Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+        OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       end
     end
 
     it_behaves_like 'follow request salmon' do
       def serialize(follow_request)
-        reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+        reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
         reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object' }
       end
     end
@@ -1392,7 +1392,7 @@ RSpec.describe Ostatus::AtomSerializer do
       follow_request = Fabricate(:follow_request)
 
       time_before = Time.now
-      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       time_after = Time.now
 
       expect(reject_follow_request_salmon.id.text).to(
@@ -1405,28 +1405,28 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, domain: 'remote', username: 'account')
       target_account = Fabricate(:account, domain: nil, username: 'target_account')
       follow_request = Fabricate(:follow_request, account: account, target_account: target_account)
-      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       expect(reject_follow_request_salmon.title.text).to eq 'target_account rejects follow request by account@remote'
     end
 
     it 'appends activity:object-type element with activity type' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       object_type = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:activity]
     end
 
     it 'appends activity:verb element with authorize' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
       verb = reject_follow_request_salmon.nodes.find { |node| node.name == 'activity:verb' }
       expect(verb.text).to eq TagManager::VERBS[:reject]
     end
 
     it 'returns element whose rendered view deletes follow request when processed' do
       follow_request = Fabricate(:follow_request)
-      reject_follow_request_salmon = Ostatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
-      xml = Ostatus::AtomSerializer.render(reject_follow_request_salmon)
+      reject_follow_request_salmon = OStatus::AtomSerializer.new.reject_follow_request_salmon(follow_request)
+      xml = OStatus::AtomSerializer.render(reject_follow_request_salmon)
       envelope = OStatus2::Salmon.new.pack(xml, follow_request.target_account.keypair)
 
       ProcessInteractionService.new.call(envelope, follow_request.account)
@@ -1439,31 +1439,31 @@ RSpec.describe Ostatus::AtomSerializer do
   describe '#object' do
     include_examples 'status attributes' do
       def serialize(status)
-        Ostatus::AtomSerializer.new.object(status)
+        OStatus::AtomSerializer.new.object(status)
       end
     end
 
     it 'returns activity:object element' do
       status = Fabricate(:status)
-      object = Ostatus::AtomSerializer.new.object(status)
+      object = OStatus::AtomSerializer.new.object(status)
       expect(object.name).to eq 'activity:object'
     end
 
     it 'appends id element with URL for status' do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
-      object = Ostatus::AtomSerializer.new.object(status)
+      object = OStatus::AtomSerializer.new.object(status)
       expect(object.id.text).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.id}:objectType=Status"
     end
 
     it 'appends published element with created date' do
       status = Fabricate(:status, created_at: '2000-01-01T00:00:00Z')
-      object = Ostatus::AtomSerializer.new.object(status)
+      object = OStatus::AtomSerializer.new.object(status)
       expect(object.published.text).to eq '2000-01-01T00:00:00Z'
     end
 
     it 'appends updated element with updated date' do
       status = Fabricate(:status, updated_at: '2000-01-01T00:00:00Z')
-      object = Ostatus::AtomSerializer.new.object(status)
+      object = OStatus::AtomSerializer.new.object(status)
       expect(object.updated.text).to eq '2000-01-01T00:00:00Z'
     end
 
@@ -1471,7 +1471,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      object = Ostatus::AtomSerializer.new.object(status)
+      object = OStatus::AtomSerializer.new.object(status)
 
       expect(object.title.text).to eq 'New status by username'
     end
@@ -1480,7 +1480,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       expect(entry.author.id.text).to eq 'https://cb6e6126.ngrok.io/users/username'
     end
@@ -1488,7 +1488,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:object-type element with object type' do
       status = Fabricate(:status)
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:object-type' }
       expect(object_type.text).to eq TagManager::TYPES[:note]
@@ -1497,7 +1497,7 @@ RSpec.describe Ostatus::AtomSerializer do
     it 'appends activity:verb element with verb' do
       status = Fabricate(:status)
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       object_type = entry.nodes.find { |node| node.name == 'activity:verb' }
       expect(object_type.text).to eq TagManager::VERBS[:post]
@@ -1507,7 +1507,7 @@ RSpec.describe Ostatus::AtomSerializer do
       account = Fabricate(:account, username: 'username')
       status = Fabricate(:status, account: account)
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       link = entry.nodes.find { |node| node.name == 'link' && node[:rel] == 'alternate' }
       expect(link[:type]).to eq 'text/html'
@@ -1519,7 +1519,7 @@ RSpec.describe Ostatus::AtomSerializer do
       thread = Fabricate(:status, account: account, created_at: '2000-01-01T00:00:00Z')
       reply = Fabricate(:status, thread: thread)
 
-      entry = Ostatus::AtomSerializer.new.object(reply)
+      entry = OStatus::AtomSerializer.new.object(reply)
 
       in_reply_to = entry.nodes.find { |node| node.name == 'thr:in-reply-to' }
       expect(in_reply_to.ref).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{thread.id}:objectType=Status"
@@ -1528,7 +1528,7 @@ RSpec.describe Ostatus::AtomSerializer do
 
     it 'does not append thr:in-reply-to element if thread is nil' do
       status = Fabricate(:status, thread: nil)
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
       entry.nodes.each { |node| expect(node.name).not_to eq 'thr:in-reply-to' }
     end
 
@@ -1536,7 +1536,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate.build(:status, conversation_id: nil)
       status.save!(validate: false)
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       entry.nodes.each { |node| expect(node.name).not_to eq 'ostatus:conversation' }
     end
@@ -1545,7 +1545,7 @@ RSpec.describe Ostatus::AtomSerializer do
       status = Fabricate(:status)
       status.conversation.update!(created_at: '2000-01-01T00:00:00Z')
 
-      entry = Ostatus::AtomSerializer.new.object(status)
+      entry = OStatus::AtomSerializer.new.object(status)
 
       conversation = entry.nodes.find { |node| node.name == 'ostatus:conversation' }
       expect(conversation[:ref]).to eq "tag:cb6e6126.ngrok.io,2000-01-01:objectId=#{status.conversation.id}:objectType=Conversation"

From 716f4cb11c0a1cafd4def7beeba5c938abe56fc5 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Wed, 19 Jul 2017 11:59:04 +0900
Subject: [PATCH 284/382] Add feature to revoke sessions (#4259)

---
 app/controllers/settings/sessions_controller.rb | 17 +++++++++++++++++
 .../auth/registrations/_sessions.html.haml      |  4 ++++
 config/locales/en.yml                           |  2 ++
 config/routes.rb                                |  2 ++
 4 files changed, 25 insertions(+)
 create mode 100644 app/controllers/settings/sessions_controller.rb

diff --git a/app/controllers/settings/sessions_controller.rb b/app/controllers/settings/sessions_controller.rb
new file mode 100644
index 000000000..0da1b027b
--- /dev/null
+++ b/app/controllers/settings/sessions_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Settings::SessionsController < ApplicationController
+  before_action :set_session, only: :destroy
+
+  def destroy
+    @session.destroy!
+    flash[:notice] = I18n.t('sessions.revoke_success')
+    redirect_to edit_user_registration_path
+  end
+
+  private
+
+  def set_session
+    @session = current_user.session_activations.find(params[:id])
+  end
+end
diff --git a/app/views/auth/registrations/_sessions.html.haml b/app/views/auth/registrations/_sessions.html.haml
index 4521aad0a..84207862a 100644
--- a/app/views/auth/registrations/_sessions.html.haml
+++ b/app/views/auth/registrations/_sessions.html.haml
@@ -7,6 +7,7 @@
       %th= t 'sessions.browser'
       %th= t 'sessions.ip'
       %th= t 'sessions.activity'
+      %td
   %tbody
     - @sessions.each do |session|
       %tr
@@ -22,3 +23,6 @@
             = t 'sessions.current_session'
           - else
             %time.time-ago{ datetime: session.updated_at.iso8601, title: l(session.updated_at) }= l(session.updated_at)
+        %td
+          - if request.session['auth_id'] != session.session_id
+            = table_link_to 'times', t('sessions.revoke'), settings_session_path(session), method: :delete
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4cb536223..ff02226ac 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -397,6 +397,8 @@ en:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Revoke
+    revoke_success: Session successfully revoked
     title: Sessions
   settings:
     authorized_apps: Authorized apps
diff --git a/config/routes.rb b/config/routes.rb
index 60234a9e6..2aa89f16d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -74,6 +74,8 @@ Rails.application.routes.draw do
 
     resource :follower_domains, only: [:show, :update]
     resource :delete, only: [:show, :destroy]
+
+    resources :sessions, only: [:destroy]
   end
 
   resources :media, only: [:show]

From 030e5cec58f0c6b3369cea49e7ce7b21e0092b75 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 19 Jul 2017 09:43:10 +0200
Subject: [PATCH 285/382] Fix missing closing <p> tag in ToS in .yml files
 (#4264)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 config/locales/ja.yml | 2 +-
 config/locales/pl.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index fc5a98d09..632f93ea3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -492,7 +492,7 @@ ja:
 
       <p>この文章のライセンスはCC-BY-SAです。このページは2017年5月6日が最終更新です。</p>
 
-      <p>オリジナルの出典 <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.
+      <p>オリジナルの出典 <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} 利用規約・プライバシーポリシー"
   time:
     formats:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 23912662e..4e903936e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -496,7 +496,7 @@ pl:
 
       <p>Dokument jest dostępny na licencji CC-BY-SA. Ostatnio modyfikowany 31 maja 2013, przetłumaczony 4 lipca 2017. Tłumaczenie (mimo dołożenia wszelkich starań) może nie być w pełni poprawne.</p>
 
-      <p>Tekst bazuje na <a href="https://github.com/discourse/discourse">polityce prywatności Discourse</a>.
+      <p>Tekst bazuje na <a href="https://github.com/discourse/discourse">polityce prywatności Discourse</a>.</p>
     title: Zasady korzystania i polityka prywatności %{instance}
   time:
     formats:

From 4c7a9adb987ec56a3f84294fe83c6d55bd199ab7 Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien.erambert@me.com>
Date: Wed, 19 Jul 2017 00:43:46 -0700
Subject: [PATCH 286/382] fix missing closing <p> tag in ToS in en.yml (#4262)

---
 config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ff02226ac..47f276ca1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -494,7 +494,7 @@ en:
 
       <p>This document is CC-BY-SA. It was last updated May 31, 2013.</p>
 
-      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
     title: "%{instance} Terms of Service and Privacy Policy"
   time:
     formats:

From 9fc082ea81932b2ee5c7d887f9c31d26d913df7c Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 19 Jul 2017 10:49:36 +0200
Subject: [PATCH 287/382] i18n: @716f4cb (pl) (#4266)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 config/locales/pl.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 4e903936e..325d52b45 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -401,6 +401,8 @@ pl:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Unieważnij
+    revoke_success: Pomyślnie unieważniono sesję
     title: Sesje
   settings:
     authorized_apps: Uwierzytelnione aplikacje

From c2c93f8cd64704c715f5fb843e2b532779a1ca0f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 19 Jul 2017 12:00:05 +0200
Subject: [PATCH 288/382] Fix deprecation warning for non-pipeline assets
 (#4267)

---
 app/helpers/routing_helper.rb       | 4 ++--
 app/models/web/push_subscription.rb | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 9650ee286..8126176ba 100644
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -11,7 +11,7 @@ module RoutingHelper
     end
   end
 
-  def full_asset_url(source)
-    Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source)).to_s
+  def full_asset_url(source, options = {})
+    Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source, options)).to_s
   end
 end
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index baf6a1ece..dffdbbd05 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -45,7 +45,7 @@ class Web::PushSubscription < ApplicationRecord
         title: title,
         dir: dir,
         image: image,
-        badge: full_asset_url('badge.png'),
+        badge: full_asset_url('badge.png', skip_pipeline: true),
         tag: notification.id,
         timestamp: notification.created_at,
         icon: notification.from_account.avatar_static_url,
@@ -115,7 +115,7 @@ class Web::PushSubscription < ApplicationRecord
       when :mention then [
         {
           title: translate('push_notifications.mention.action_favourite'),
-          icon: full_asset_url('emoji/2764.png'),
+          icon: full_asset_url('emoji/2764.png', skip_pipeline: true),
           todo: 'request',
           method: 'POST',
           action: "/api/v1/statuses/#{notification.target_status.id}/favourite",
@@ -156,8 +156,8 @@ class Web::PushSubscription < ApplicationRecord
     Webpush.payload_send(
       message: JSON.generate(
         title: translate('push_notifications.subscribed.title'),
-        icon: full_asset_url('android-chrome-192x192.png'),
-        badge: full_asset_url('badge.png'),
+        icon: full_asset_url('android-chrome-192x192.png', skip_pipeline: true),
+        badge: full_asset_url('badge.png', skip_pipeline: true),
         data: {
           content: translate('push_notifications.subscribed.body'),
           actions: [],

From cdc349a2d17da3c8bd1c738937690baf3936848e Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 19 Jul 2017 12:25:06 +0200
Subject: [PATCH 289/382] i18n: Update Polish translation (#4268)

---
 app/javascript/mastodon/locales/pl.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index f04ef4e8c..348984648 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -111,8 +111,8 @@
   "notifications.column_settings.favourite": "Ulubione:",
   "notifications.column_settings.follow": "Nowi śledzący:",
   "notifications.column_settings.mention": "Wspomniali:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.push": "Powiadomienia push",
+  "notifications.column_settings.push_meta": "To urządzenie",
   "notifications.column_settings.reblog": "Podbili:",
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
@@ -125,7 +125,7 @@
   "onboarding.page_one.handle": "Jesteś na domenie {domain}, więc Twój pełny adres to {handle}",
   "onboarding.page_one.welcome": "Witamy w Mastodon!",
   "onboarding.page_six.admin": "Administratorem tej instancji jest {admin}.",
-  "onboarding.page_six.almost_done": "Prawie gotowe...",
+  "onboarding.page_six.almost_done": "Prawie gotowe…",
   "onboarding.page_six.appetoot": "Bon Appetoot!",
   "onboarding.page_six.apps_available": "Są dostępne {apps} dla Androida, iOS i innych platform.",
   "onboarding.page_six.github": "Mastodon jest oprogramowaniem otwartoźródłwym. Możesz zgłaszać błędy, proponować funkcje i pomóc w rozwoju na {github}.",
@@ -151,7 +151,7 @@
   "report.target": "Zgłaszanie {target}",
   "search.placeholder": "Szukaj",
   "search_results.total": "{count, number} {count, plural, one {wynik} more {wyniki}}",
-  "standalone.public_title": "A look inside...",
+  "standalone.public_title": "Spojrzenie wgłąb…",
   "status.cannot_reblog": "Ten post nie może zostać podbity",
   "status.delete": "Usuń",
   "status.favourite": "Ulubione",
@@ -178,7 +178,7 @@
   "upload_area.title": "Przeciągnij i upuść aby wysłać",
   "upload_button.label": "Dodaj zawartość multimedialną",
   "upload_form.undo": "Cofnij",
-  "upload_progress.label": "Wysyłanie...",
+  "upload_progress.label": "Wysyłanie",
   "video_player.expand": "Przełącz wideo",
   "video_player.toggle_sound": "Przełącz dźwięk",
   "video_player.toggle_visible": "Przełącz widoczność",

From bc1f9dc24bc5d524d1b4adebadcd71984d9f11f0 Mon Sep 17 00:00:00 2001
From: Cygnan <mail@cygnan.com>
Date: Wed, 19 Jul 2017 20:35:22 +0900
Subject: [PATCH 290/382] Fix a typo in public.js (double semicolons) (#4269)

Signed-off-by: Cygnan <mail@cygnan.com>
---
 app/javascript/packs/public.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index ce79836d6..a2ed086f1 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -35,7 +35,7 @@ function main() {
 
     [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
       const datetime = new Date(content.getAttribute('datetime'));
-      content.textContent = relativeFormat.format(datetime);;
+      content.textContent = relativeFormat.format(datetime);
     });
   });
 

From 8400bee3b1960a56746196508b5e54ad9b2e0492 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 19 Jul 2017 14:44:04 +0200
Subject: [PATCH 291/382] Refactor ResolveRemoteAccountService (#4258)

* Refactor ResolveRemoteAccountService

* Remove trailing whitespace

* Use redis locks around critical ResolveRemoteAccountService code

* Add test for race condition of lock
---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   3 +
 .../resolve_remote_account_service.rb         | 172 ++++++++++++------
 .../resolve_remote_account_service_spec.rb    |  23 +++
 4 files changed, 141 insertions(+), 58 deletions(-)

diff --git a/Gemfile b/Gemfile
index a6c2b2d65..f4d889165 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,6 +52,7 @@ gem 'rack-timeout', '~> 0.4'
 gem 'rails-i18n', '~> 5.0'
 gem 'rails-settings-cached', '~> 0.6'
 gem 'redis', '~> 3.3', require: ['redis', 'redis/connection/hiredis']
+gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'rqrcode', '~> 0.10'
 gem 'ruby-oembed', '~> 0.12', require: 'oembed'
 gem 'sanitize', '~> 4.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index f637c9bbe..6f0621f5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -242,6 +242,8 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.6)
       mime-types (>= 1.16, < 4)
+    mario-redis-lock (1.2.0)
+      redis (~> 3, >= 3.0.5)
     method_source (0.8.2)
     microformats (4.0.7)
       json
@@ -535,6 +537,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3)
   link_header (~> 0.0)
   lograge (~> 0.5)
+  mario-redis-lock (~> 1.2)
   microformats (~> 4.0)
   mime-types (~> 3.1)
   nokogiri (~> 1.7)
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
index d2dfda824..c948243ec 100644
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@@ -11,97 +11,153 @@ class ResolveRemoteAccountService < BaseService
   # @param [String] uri User URI in the form of username@domain
   # @return [Account]
   def call(uri, update_profile = true, redirected = nil)
-    username, domain = uri.split('@')
+    @username, @domain = uri.split('@')
 
-    return Account.find_local(username) if TagManager.instance.local_domain?(domain)
+    return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
 
-    account = Account.find_remote(username, domain)
-    return account unless account_needs_webfinger_update?(account)
+    @account = Account.find_remote(@username, @domain)
+
+    return @account unless webfinger_update_due?
 
     Rails.logger.debug "Looking up webfinger for #{uri}"
 
-    data = Goldfinger.finger("acct:#{uri}")
+    @webfinger = Goldfinger.finger("acct:#{uri}")
 
-    raise Goldfinger::Error, 'Missing resource links' if data.link('http://schemas.google.com/g/2010#updates-from').nil? || data.link('salmon').nil? || data.link('http://webfinger.net/rel/profile-page').nil? || data.link('magic-public-key').nil?
+    raise Goldfinger::Error, 'Missing resource links' if links_missing?
 
-    # Disallow account hijacking
-    confirmed_username, confirmed_domain = data.subject.gsub(/\Aacct:/, '').split('@')
+    confirmed_username, confirmed_domain = @webfinger.subject.gsub(/\Aacct:/, '').split('@')
 
-    unless confirmed_username.casecmp(username).zero? && confirmed_domain.casecmp(domain).zero?
-      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true) if redirected.nil?
-      raise Goldfinger::Error, 'Requested and returned acct URI do not match'
-    end
-
-    return Account.find_local(confirmed_username) if TagManager.instance.local_domain?(confirmed_domain)
-
-    confirmed_account = Account.find_remote(confirmed_username, confirmed_domain)
-    if confirmed_account.nil?
-      Rails.logger.debug "Creating new remote account for #{uri}"
-
-      domain_block = DomainBlock.find_by(domain: domain)
-      account = Account.new(username: confirmed_username, domain: confirmed_domain)
-      account.suspended   = true if domain_block && domain_block.suspend?
-      account.silenced    = true if domain_block && domain_block.silence?
-      account.private_key = nil
+    if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
+      @username = confirmed_username
+      @domain   = confirmed_domain
     else
-      account = confirmed_account
+      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true) if redirected.nil?
+      raise Goldfinger::Error, 'Requested and returned acct URIs do not match'
     end
 
-    account.last_webfingered_at = Time.now.utc
+    return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
 
-    account.remote_url  = data.link('http://schemas.google.com/g/2010#updates-from').href
-    account.salmon_url  = data.link('salmon').href
-    account.url         = data.link('http://webfinger.net/rel/profile-page').href
-    account.public_key  = magic_key_to_pem(data.link('magic-public-key').href)
+    RedisLock.acquire(lock_options) do |lock|
+      if lock.acquired?
+        @account = Account.find_remote(@username, @domain)
 
-    body, xml = get_feed(account.remote_url)
-    hubs      = get_hubs(xml)
+        create_account if @account.nil?
+        update_account
 
-    account.uri     = get_account_uri(xml)
-    account.hub_url = hubs.first.attribute('href').value
-
-    begin
-      account.save!
-      get_profile(body, account) if update_profile
-    rescue ActiveRecord::RecordNotUnique
-      # The account has been added by another worker!
-      return Account.find_remote(confirmed_username, confirmed_domain)
+        update_account_profile if update_profile
+      end
     end
 
-    account
+    @account
   end
 
   private
 
-  def account_needs_webfinger_update?(account)
-    account&.last_webfingered_at.nil? || account.last_webfingered_at <= 1.day.ago
+  def links_missing?
+    @webfinger.link('http://schemas.google.com/g/2010#updates-from').nil? ||
+      @webfinger.link('salmon').nil? ||
+      @webfinger.link('http://webfinger.net/rel/profile-page').nil? ||
+      @webfinger.link('magic-public-key').nil?
   end
 
-  def get_feed(url)
-    response = Request.new(:get, url).perform
-    raise Goldfinger::Error, "Feed attempt failed for #{url}: HTTP #{response.code}" unless response.code == 200
-    [response.to_s, Nokogiri::XML(response)]
+  def webfinger_update_due?
+    @account.nil? || @account.last_webfingered_at.nil? || @account.last_webfingered_at <= 1.day.ago
   end
 
-  def get_hubs(xml)
-    hubs = xml.xpath('//xmlns:link[@rel="hub"]')
-    raise Goldfinger::Error, 'No PubSubHubbub hubs found' if hubs.empty? || hubs.first.attribute('href').nil?
-    hubs
+  def create_account
+    Rails.logger.debug "Creating new remote account for #{@username}@#{@domain}"
+
+    @account = Account.new(username: @username, domain: @domain)
+    @account.suspended   = true if auto_suspend?
+    @account.silenced    = true if auto_silence?
+    @account.private_key = nil
   end
 
-  def get_account_uri(xml)
-    author_uri = xml.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri')
+  def update_account
+    @account.last_webfingered_at = Time.now.utc
+    @account.remote_url          = atom_url
+    @account.salmon_url          = salmon_url
+    @account.url                 = url
+    @account.public_key          = public_key
+    @account.uri                 = canonical_uri
+    @account.hub_url             = hub_url
+    @account.save!
+  end
+
+  def auto_suspend?
+    domain_block && domain_block.suspend?
+  end
+
+  def auto_silence?
+    domain_block && domain_block.silence?
+  end
+
+  def domain_block
+    return @domain_block if defined?(@domain_block)
+    @domain_block = DomainBlock.find_by(domain: @domain)
+  end
+
+  def atom_url
+    @atom_url ||= @webfinger.link('http://schemas.google.com/g/2010#updates-from').href
+  end
+
+  def salmon_url
+    @salmon_url ||= @webfinger.link('salmon').href
+  end
+
+  def url
+    @url ||= @webfinger.link('http://webfinger.net/rel/profile-page').href
+  end
+
+  def public_key
+    @public_key ||= magic_key_to_pem(@webfinger.link('magic-public-key').href)
+  end
+
+  def canonical_uri
+    return @canonical_uri if defined?(@canonical_uri)
+
+    author_uri = atom.at_xpath('/xmlns:feed/xmlns:author/xmlns:uri')
 
     if author_uri.nil?
-      owner = xml.at_xpath('/xmlns:feed').at_xpath('./dfrn:owner', dfrn: DFRN_NS)
+      owner      = atom.at_xpath('/xmlns:feed').at_xpath('./dfrn:owner', dfrn: DFRN_NS)
       author_uri = owner.at_xpath('./xmlns:uri') unless owner.nil?
     end
 
     raise Goldfinger::Error, 'Author URI could not be found' if author_uri.nil?
-    author_uri.content
+
+    @canonical_uri = author_uri.content
   end
 
-  def get_profile(body, account)
-    RemoteProfileUpdateWorker.perform_async(account.id, body.force_encoding('UTF-8'), false)
+  def hub_url
+    return @hub_url if defined?(@hub_url)
+
+    hubs = atom.xpath('//xmlns:link[@rel="hub"]')
+
+    raise Goldfinger::Error, 'No PubSubHubbub hubs found' if hubs.empty? || hubs.first['href'].nil?
+
+    @hub_url = hubs.first['href']
+  end
+
+  def atom_body
+    return @atom_body if defined?(@atom_body)
+
+    response = Request.new(:get, atom_url).perform
+
+    raise Goldfinger::Error, "Feed attempt failed for #{atom_url}: HTTP #{response.code}" unless response.code == 200
+
+    @atom_body = response.to_s
+  end
+
+  def atom
+    return @atom if defined?(@atom)
+    @atom = Nokogiri::XML(atom_body)
+  end
+
+  def update_account_profile
+    RemoteProfileUpdateWorker.perform_async(@account.id, atom_body.force_encoding('UTF-8'), false)
+  end
+
+  def lock_options
+    { redis: Redis.current, key: "resolve:#{@username}@#{@domain}" }
   end
 end
diff --git a/spec/services/resolve_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb
index ad4d436ba..c51588210 100644
--- a/spec/services/resolve_remote_account_service_spec.rb
+++ b/spec/services/resolve_remote_account_service_spec.rb
@@ -68,4 +68,27 @@ RSpec.describe ResolveRemoteAccountService do
     expect(account.domain).to eq 'localdomain.com'
     expect(account.remote_url).to eq 'https://webdomain.com/users/foo.atom'
   end
+
+  it 'processes one remote account at a time using locks' do
+    wait_for_start = true
+    fail_occurred  = false
+    return_values  = []
+
+    threads = Array.new(5) do
+      Thread.new do
+        true while wait_for_start
+        begin
+          return_values << subject.call('foo@localdomain.com')
+        rescue ActiveRecord::RecordNotUnique
+          fail_occurred = true
+        end
+      end
+    end
+
+    wait_for_start = false
+    threads.each(&:join)
+
+    expect(fail_occurred).to be false
+    expect(return_values).to_not include(nil)
+  end
 end

From f0d6550f1628b828268369b3ffcc352bab127012 Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 19 Jul 2017 23:02:03 +0900
Subject: [PATCH 292/382] Fix logging in ProcessFeedService (#4270)

---
 app/services/process_feed_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 9fa8eda51..31191a818 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -23,7 +23,7 @@ class ProcessFeedService < BaseService
     activity = OStatus::Activity::General.new(xml, account)
     activity.specialize&.perform if activity.status?
   rescue ActiveRecord::RecordInvalid => e
-    Rails.logger.debug "Nothing was saved for #{id} because: #{e}"
+    Rails.logger.debug "Nothing was saved for #{activity.id} because: #{e}"
     nil
   end
 end

From bbdcfd6baf8da01098eb377c3d3579b23ae54d80 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 19 Jul 2017 17:06:46 +0200
Subject: [PATCH 293/382] Add ActivityPub attributes to accounts (#4273)

---
 app/models/account.rb                                    | 7 +++++++
 app/services/send_interaction_service.rb                 | 2 +-
 app/services/subscribe_service.rb                        | 2 ++
 app/services/unsubscribe_service.rb                      | 2 ++
 db/migrate/20170718211102_add_activitypub_to_accounts.rb | 9 +++++++++
 db/schema.rb                                             | 7 ++++++-
 6 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20170718211102_add_activitypub_to_accounts.rb

diff --git a/app/models/account.rb b/app/models/account.rb
index 58b0a1086..82c9b58d5 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -36,6 +36,11 @@
 #  followers_count         :integer          default(0), not null
 #  following_count         :integer          default(0), not null
 #  last_webfingered_at     :datetime
+#  inbox_url               :string           default(""), not null
+#  outbox_url              :string           default(""), not null
+#  shared_inbox_url        :string           default(""), not null
+#  followers_url           :string           default(""), not null
+#  protocol                :integer          default("ostatus"), not null
 #
 
 class Account < ApplicationRecord
@@ -49,6 +54,8 @@ class Account < ApplicationRecord
   include Remotable
   include EmojiHelper
 
+  enum protocol: [:ostatus, :activitypub]
+
   # Local users
   has_one :user, inverse_of: :account
 
diff --git a/app/services/send_interaction_service.rb b/app/services/send_interaction_service.rb
index ef38a748b..ab0d3aeed 100644
--- a/app/services/send_interaction_service.rb
+++ b/app/services/send_interaction_service.rb
@@ -10,7 +10,7 @@ class SendInteractionService < BaseService
     @source_account = source_account
     @target_account = target_account
 
-    return if block_notification?
+    return if !target_account.ostatus? || block_notification?
 
     delivery = build_request.perform
 
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb
index f58067038..c1c0a4c8b 100644
--- a/app/services/subscribe_service.rb
+++ b/app/services/subscribe_service.rb
@@ -2,6 +2,8 @@
 
 class SubscribeService < BaseService
   def call(account)
+    return unless account.ostatus?
+
     @account        = account
     @account.secret = SecureRandom.hex
     @response       = build_request.perform
diff --git a/app/services/unsubscribe_service.rb b/app/services/unsubscribe_service.rb
index c2f022d7d..c5e0e73fe 100644
--- a/app/services/unsubscribe_service.rb
+++ b/app/services/unsubscribe_service.rb
@@ -2,6 +2,8 @@
 
 class UnsubscribeService < BaseService
   def call(account)
+    return unless account.ostatus?
+
     @account  = account
     @response = build_request.perform
 
diff --git a/db/migrate/20170718211102_add_activitypub_to_accounts.rb b/db/migrate/20170718211102_add_activitypub_to_accounts.rb
new file mode 100644
index 000000000..c08e38bb9
--- /dev/null
+++ b/db/migrate/20170718211102_add_activitypub_to_accounts.rb
@@ -0,0 +1,9 @@
+class AddActivityPubToAccounts < ActiveRecord::Migration[5.1]
+  def change
+    add_column :accounts, :inbox_url, :string, null: false, default: ''
+    add_column :accounts, :outbox_url, :string, null: false, default: ''
+    add_column :accounts, :shared_inbox_url, :string, null: false, default: ''
+    add_column :accounts, :followers_url, :string, null: false, default: ''
+    add_column :accounts, :protocol, :integer, null: false, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ec78a7c9..cf7b0722f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170714184731) do
+ActiveRecord::Schema.define(version: 20170718211102) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -56,6 +56,11 @@ ActiveRecord::Schema.define(version: 20170714184731) do
     t.integer "followers_count", default: 0, null: false
     t.integer "following_count", default: 0, null: false
     t.datetime "last_webfingered_at"
+    t.string "inbox_url", default: "", null: false
+    t.string "outbox_url", default: "", null: false
+    t.string "shared_inbox_url", default: "", null: false
+    t.string "followers_url", default: "", null: false
+    t.integer "protocol", default: 0, null: false
     t.index "(((setweight(to_tsvector('simple'::regconfig, (display_name)::text), 'A'::\"char\") || setweight(to_tsvector('simple'::regconfig, (username)::text), 'B'::\"char\")) || setweight(to_tsvector('simple'::regconfig, (COALESCE(domain, ''::character varying))::text), 'C'::\"char\")))", name: "search_index", using: :gin
     t.index "lower((username)::text), lower((domain)::text)", name: "index_accounts_on_username_and_domain_lower"
     t.index ["uri"], name: "index_accounts_on_uri"

From 015269914e0908799a4a958fe8af39cb81984986 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 19 Jul 2017 19:38:50 +0200
Subject: [PATCH 294/382] fix: Handle errors without response (#4274)

---
 app/javascript/mastodon/actions/statuses.js  | 2 +-
 app/javascript/mastodon/actions/timelines.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 8d385715c..2204e0b14 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -113,7 +113,7 @@ export function fetchContext(id) {
       dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
 
     }).catch(error => {
-      if (error.response.status === 404) {
+      if (error.response && error.response.status === 404) {
         dispatch(deleteFromTimelines(id));
       }
 
diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js
index dd14cb1cd..5c0cd93c7 100644
--- a/app/javascript/mastodon/actions/timelines.js
+++ b/app/javascript/mastodon/actions/timelines.js
@@ -105,7 +105,7 @@ export function refreshTimelineFail(timeline, error, skipLoading) {
     timeline,
     error,
     skipLoading,
-    skipAlert: error.response.status === 404,
+    skipAlert: error.response && error.response.status === 404,
   };
 };
 

From 4f2513337f77a9f05883b82e5b6a6e3a0dc10b14 Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Thu, 20 Jul 2017 03:26:51 +0900
Subject: [PATCH 295/382] Update scroll top state on column mounting (#4276)

---
 app/javascript/mastodon/components/status_list.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 86e8386bd..a8ea1ec5b 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -30,8 +30,8 @@ export default class StatusList extends ImmutablePureComponent {
 
   intersectionObserverWrapper = new IntersectionObserverWrapper();
 
-  handleScroll = debounce((e) => {
-    const { scrollTop, scrollHeight, clientHeight } = e.target;
+  handleScroll = debounce(() => {
+    const { scrollTop, scrollHeight, clientHeight } = this.node;
     const offset = scrollHeight - scrollTop - clientHeight;
     this._oldScrollPosition = scrollHeight - scrollTop;
 
@@ -49,6 +49,9 @@ export default class StatusList extends ImmutablePureComponent {
   componentDidMount () {
     this.attachScrollListener();
     this.attachIntersectionObserver();
+
+    // Handle initial scroll posiiton
+    this.handleScroll();
   }
 
   componentDidUpdate (prevProps) {

From dcb94971484c46e470b89032f174267ace86be5c Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 19 Jul 2017 22:37:52 +0200
Subject: [PATCH 296/382] fix(push_subscription): Guard against malformed
 favourite notification (#4271)

---
 app/models/web/push_subscription.rb | 10 ++++------
 app/services/notify_service.rb      |  7 ++++++-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
index dffdbbd05..86df9b591 100644
--- a/app/models/web/push_subscription.rb
+++ b/app/models/web/push_subscription.rb
@@ -26,8 +26,6 @@ class Web::PushSubscription < ApplicationRecord
   before_create :send_welcome_notification
 
   def push(notification)
-    return unless pushable? notification
-
     name = display_name notification.from_account
     title = title_str(name, notification)
     body = body_str notification
@@ -69,6 +67,10 @@ class Web::PushSubscription < ApplicationRecord
     )
   end
 
+  def pushable?(notification)
+    data && data.key?('alerts') && data['alerts'][notification.type.to_s]
+  end
+
   def as_payload
     payload = {
       id: id,
@@ -148,10 +150,6 @@ class Web::PushSubscription < ApplicationRecord
     rtl?(body) ? 'rtl' : 'ltr'
   end
 
-  def pushable?(notification)
-    data && data.key?('alerts') && data['alerts'][notification.type.to_s]
-  end
-
   def send_welcome_notification
     Webpush.payload_send(
       message: JSON.generate(
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index c7d8ad50a..a44df5180 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -65,7 +65,12 @@ class NotifyService < BaseService
   end
 
   def send_push_notifications
-    sessions_with_subscriptions_ids = @recipient.user.session_activations.where.not(web_push_subscription: nil).pluck(:id)
+    # HACK: Can be caused by quickly unfavouriting a status, since creating
+    # a favourite and creating a notification are not wrapped in a transaction.
+    return if @notification.activity.nil?
+
+    sessions_with_subscriptions = @recipient.user.session_activations.where.not(web_push_subscription: nil)
+    sessions_with_subscriptions_ids = sessions_with_subscriptions.select { |session| session.web_push_subscription.pushable? @notification }.map(&:id)
 
     WebPushNotificationWorker.push_bulk(sessions_with_subscriptions_ids) do |session_activation_id|
       [session_activation_id, @notification.id]

From e01966f7b8201b04314cb0e8de34c2c1259b5ca3 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 19 Jul 2017 22:38:26 +0200
Subject: [PATCH 297/382] fix(status_list): Update scroll position after toots
 are appended (#4277)

---
 app/javascript/mastodon/components/status_list.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index a8ea1ec5b..98f0de0a8 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -57,13 +57,14 @@ export default class StatusList extends ImmutablePureComponent {
   componentDidUpdate (prevProps) {
     // Reset the scroll position when a new toot comes in in order not to
     // jerk the scrollbar around if you're already scrolled down the page.
-    if (prevProps.statusIds.size < this.props.statusIds.size &&
-        prevProps.statusIds.first() !== this.props.statusIds.first() &&
-        this._oldScrollPosition &&
-        this.node.scrollTop > 0) {
-      let newScrollTop = this.node.scrollHeight - this._oldScrollPosition;
-      if (this.node.scrollTop !== newScrollTop) {
-        this.node.scrollTop = newScrollTop;
+    if (prevProps.statusIds.size < this.props.statusIds.size && this._oldScrollPosition && this.node.scrollTop > 0) {
+      if (prevProps.statusIds.first() !== this.props.statusIds.first()) {
+        let newScrollTop = this.node.scrollHeight - this._oldScrollPosition;
+        if (this.node.scrollTop !== newScrollTop) {
+          this.node.scrollTop = newScrollTop;
+        }
+      } else {
+        this._oldScrollPosition = this.node.scrollHeight - this.node.scrollTop;
       }
     }
   }

From f24b81e27f1c6290cc6f43a71a32200a08c47d1c Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 20 Jul 2017 00:20:54 +0200
Subject: [PATCH 298/382] feat(css): Remove border radius from WebKit's
 scrollbars (#4278)

---
 app/javascript/styles/components.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 1c4c97f18..8c930ad11 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3711,6 +3711,10 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+::-webkit-scrollbar-thumb {
+  border-radius: 0;
+}
+
 noscript {
   text-align: center;
 

From 1fcdaafa6fbe6d746a096c33263d76e6819da46d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 20 Jul 2017 01:59:07 +0200
Subject: [PATCH 299/382] Fix webfinger retries (#4275)

* Do not raise unretryable exceptions in ResolveRemoteAccountService

* Removed fatal exceptions from ResolveRemoteAccountService

Exceptions that cannot be retried should not be raised. New exception
class for those that can be retried (Mastodon::UnexpectedResponseError)
---
 app/controllers/api/base_controller.rb        |  6 +---
 app/lib/exceptions.rb                         | 10 +++++++
 app/services/fetch_remote_account_service.rb  |  3 --
 app/services/fetch_remote_status_service.rb   |  3 --
 app/services/process_interaction_service.rb   |  2 +-
 .../resolve_remote_account_service.rb         | 29 ++++++++++---------
 app/services/send_interaction_service.rb      |  2 +-
 app/services/subscribe_service.rb             |  2 +-
 app/workers/import_worker.rb                  |  6 ++--
 app/workers/pubsubhubbub/delivery_worker.rb   |  2 +-
 spec/controllers/api/base_controller_spec.rb  |  2 +-
 .../resolve_remote_account_service_spec.rb    |  6 ++--
 spec/services/subscribe_service_spec.rb       |  4 +--
 .../pubsubhubbub/delivery_worker_spec.rb      |  2 +-
 14 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index c1b2ec3cf..105a2859d 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -17,11 +17,7 @@ class Api::BaseController < ApplicationController
     render json: { error: 'Record not found' }, status: 404
   end
 
-  rescue_from Goldfinger::Error do
-    render json: { error: 'Remote account could not be resolved' }, status: 422
-  end
-
-  rescue_from HTTP::Error do
+  rescue_from HTTP::Error, Mastodon::UnexpectedResponseError do
     render json: { error: 'Remote data could not be fetched' }, status: 503
   end
 
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 9bc802c12..34d84a34f 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -5,4 +5,14 @@ module Mastodon
   class NotPermittedError < Error; end
   class ValidationError < Error; end
   class RaceConditionError < Error; end
+
+  class UnexpectedResponseError < Error
+    def initialize(response = nil)
+      @response = response
+    end
+
+    def to_s
+      "#{@response.uri} returned code #{@response.code}"
+    end
+  end
 end
diff --git a/app/services/fetch_remote_account_service.rb b/app/services/fetch_remote_account_service.rb
index 1efac365b..8eed0d454 100644
--- a/app/services/fetch_remote_account_service.rb
+++ b/app/services/fetch_remote_account_service.rb
@@ -32,8 +32,5 @@ class FetchRemoteAccountService < BaseService
   rescue Nokogiri::XML::XPath::SyntaxError
     Rails.logger.debug 'Invalid XML or missing namespace'
     nil
-  rescue Goldfinger::NotFoundError, Goldfinger::Error
-    Rails.logger.debug 'Exceptions related to Goldfinger occurs'
-    nil
   end
 end
diff --git a/app/services/fetch_remote_status_service.rb b/app/services/fetch_remote_status_service.rb
index 6ac31e4d8..b9f5f97b1 100644
--- a/app/services/fetch_remote_status_service.rb
+++ b/app/services/fetch_remote_status_service.rb
@@ -33,9 +33,6 @@ class FetchRemoteStatusService < BaseService
   rescue Nokogiri::XML::XPath::SyntaxError
     Rails.logger.debug 'Invalid XML or missing namespace'
     nil
-  rescue Goldfinger::NotFoundError, Goldfinger::Error
-    Rails.logger.debug 'Exceptions related to Goldfinger occurs'
-    nil
   end
 
   def confirmed_domain?(domain, account)
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 584a109ad..cc99cde03 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -47,7 +47,7 @@ class ProcessInteractionService < BaseService
         reflect_unblock!(account, target_account)
       end
     end
-  rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError, Mastodon::NotPermittedError
+  rescue HTTP::Error, OStatus2::BadSalmonError, Mastodon::NotPermittedError
     nil
   end
 
diff --git a/app/services/resolve_remote_account_service.rb b/app/services/resolve_remote_account_service.rb
index c948243ec..e0e2ebc83 100644
--- a/app/services/resolve_remote_account_service.rb
+++ b/app/services/resolve_remote_account_service.rb
@@ -23,18 +23,19 @@ class ResolveRemoteAccountService < BaseService
 
     @webfinger = Goldfinger.finger("acct:#{uri}")
 
-    raise Goldfinger::Error, 'Missing resource links' if links_missing?
-
     confirmed_username, confirmed_domain = @webfinger.subject.gsub(/\Aacct:/, '').split('@')
 
     if confirmed_username.casecmp(@username).zero? && confirmed_domain.casecmp(@domain).zero?
       @username = confirmed_username
       @domain   = confirmed_domain
+    elsif redirected.nil?
+      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true)
     else
-      return call("#{confirmed_username}@#{confirmed_domain}", update_profile, true) if redirected.nil?
-      raise Goldfinger::Error, 'Requested and returned acct URIs do not match'
+      Rails.logger.debug 'Requested and returned acct URIs do not match'
+      return
     end
 
+    return if links_missing?
     return Account.find_local(@username) if TagManager.instance.local_domain?(@domain)
 
     RedisLock.acquire(lock_options) do |lock|
@@ -49,6 +50,9 @@ class ResolveRemoteAccountService < BaseService
     end
 
     @account
+  rescue Goldfinger::Error => e
+    Rails.logger.debug "Webfinger query for #{uri} unsuccessful: #{e}"
+    nil
   end
 
   private
@@ -57,7 +61,9 @@ class ResolveRemoteAccountService < BaseService
     @webfinger.link('http://schemas.google.com/g/2010#updates-from').nil? ||
       @webfinger.link('salmon').nil? ||
       @webfinger.link('http://webfinger.net/rel/profile-page').nil? ||
-      @webfinger.link('magic-public-key').nil?
+      @webfinger.link('magic-public-key').nil? ||
+      canonical_uri.nil? ||
+      hub_url.nil?
   end
 
   def webfinger_update_due?
@@ -123,19 +129,14 @@ class ResolveRemoteAccountService < BaseService
       author_uri = owner.at_xpath('./xmlns:uri') unless owner.nil?
     end
 
-    raise Goldfinger::Error, 'Author URI could not be found' if author_uri.nil?
-
-    @canonical_uri = author_uri.content
+    @canonical_uri = author_uri.nil? ? nil : author_uri.content
   end
 
   def hub_url
     return @hub_url if defined?(@hub_url)
 
-    hubs = atom.xpath('//xmlns:link[@rel="hub"]')
-
-    raise Goldfinger::Error, 'No PubSubHubbub hubs found' if hubs.empty? || hubs.first['href'].nil?
-
-    @hub_url = hubs.first['href']
+    hubs     = atom.xpath('//xmlns:link[@rel="hub"]')
+    @hub_url = hubs.empty? || hubs.first['href'].nil? ? nil : hubs.first['href']
   end
 
   def atom_body
@@ -143,7 +144,7 @@ class ResolveRemoteAccountService < BaseService
 
     response = Request.new(:get, atom_url).perform
 
-    raise Goldfinger::Error, "Feed attempt failed for #{atom_url}: HTTP #{response.code}" unless response.code == 200
+    raise Mastodon::UnexpectedResponseError, response unless response.code == 200
 
     @atom_body = response.to_s
   end
diff --git a/app/services/send_interaction_service.rb b/app/services/send_interaction_service.rb
index ab0d3aeed..c11813abc 100644
--- a/app/services/send_interaction_service.rb
+++ b/app/services/send_interaction_service.rb
@@ -14,7 +14,7 @@ class SendInteractionService < BaseService
 
     delivery = build_request.perform
 
-    raise "Delivery failed for #{target_account.salmon_url}: HTTP #{delivery.code}" unless delivery.code > 199 && delivery.code < 300
+    raise Mastodon::UnexpectedResponseError, delivery unless delivery.code > 199 && delivery.code < 300
   end
 
   private
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb
index c1c0a4c8b..d3e41e691 100644
--- a/app/services/subscribe_service.rb
+++ b/app/services/subscribe_service.rb
@@ -18,7 +18,7 @@ class SubscribeService < BaseService
     else
       # The response was either a 429 rate limit, or a 5xx error.
       # We need to retry at a later time. Fail loudly!
-      raise "Subscription attempt failed for #{@account.acct} (#{@account.hub_url}): HTTP #{@response.code}"
+      raise Mastodon::UnexpectedResponseError, @response
     end
   end
 
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb
index 90a226206..27cc6b365 100644
--- a/app/workers/import_worker.rb
+++ b/app/workers/import_worker.rb
@@ -44,7 +44,7 @@ class ImportWorker
         target_account = ResolveRemoteAccountService.new.call(row.first)
         next if target_account.nil?
         MuteService.new.call(from_account, target_account)
-      rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
+      rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
     end
@@ -56,7 +56,7 @@ class ImportWorker
         target_account = ResolveRemoteAccountService.new.call(row.first)
         next if target_account.nil?
         BlockService.new.call(from_account, target_account)
-      rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
+      rescue Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
     end
@@ -66,7 +66,7 @@ class ImportWorker
     import_rows.each do |row|
       begin
         FollowService.new.call(from_account, row.first)
-      rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError
+      rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Mastodon::UnexpectedResponseError, HTTP::Error, OpenSSL::SSL::SSLError
         next
       end
     end
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
index 2e1101b93..035a59048 100644
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ b/app/workers/pubsubhubbub/delivery_worker.rb
@@ -23,7 +23,7 @@ class Pubsubhubbub::DeliveryWorker
   def process_delivery
     payload_delivery
 
-    raise "Delivery failed for #{subscription.callback_url}: HTTP #{payload_delivery.code}" unless response_successful?
+    raise Mastodon::UnexpectedResponseError, payload_delivery unless response_successful?
 
     subscription.touch(:last_successful_delivery_at)
   end
diff --git a/spec/controllers/api/base_controller_spec.rb b/spec/controllers/api/base_controller_spec.rb
index 7d5e0116c..0c7ca8990 100644
--- a/spec/controllers/api/base_controller_spec.rb
+++ b/spec/controllers/api/base_controller_spec.rb
@@ -32,7 +32,7 @@ describe Api::BaseController do
       ActiveRecord::RecordInvalid => 422,
       Mastodon::ValidationError => 422,
       ActiveRecord::RecordNotFound => 404,
-      Goldfinger::Error => 422,
+      Mastodon::UnexpectedResponseError => 503,
       HTTP::Error => 503,
       OpenSSL::SSL::SSLError => 503,
       Mastodon::NotPermittedError => 403,
diff --git a/spec/services/resolve_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb
index c51588210..ab5d3c6e5 100644
--- a/spec/services/resolve_remote_account_service_spec.rb
+++ b/spec/services/resolve_remote_account_service_spec.rb
@@ -22,11 +22,11 @@ RSpec.describe ResolveRemoteAccountService do
   end
 
   it 'raises error if no such user can be resolved via webfinger' do
-    expect { subject.call('catsrgr8@quitter.no') }.to raise_error Goldfinger::Error
+    expect(subject.call('catsrgr8@quitter.no')).to be_nil
   end
 
   it 'raises error if the domain does not have webfinger' do
-    expect { subject.call('catsrgr8@example.com') }.to raise_error Goldfinger::Error
+    expect(subject.call('catsrgr8@example.com')).to be_nil
   end
 
   it 'returns an already existing remote account' do
@@ -58,7 +58,7 @@ RSpec.describe ResolveRemoteAccountService do
   end
 
   it 'prevents hijacking inexisting accounts' do
-    expect { subject.call('hacker2@redirected.com') }.to raise_error Goldfinger::Error
+    expect(subject.call('hacker2@redirected.com')).to be_nil
   end
 
   it 'returns a new remote account' do
diff --git a/spec/services/subscribe_service_spec.rb b/spec/services/subscribe_service_spec.rb
index 5db91ad99..835be5ec5 100644
--- a/spec/services/subscribe_service_spec.rb
+++ b/spec/services/subscribe_service_spec.rb
@@ -33,11 +33,11 @@ RSpec.describe SubscribeService do
 
   it 'fails loudly if PuSH hub is unavailable' do
     stub_request(:post, 'http://hub.example.com/').to_return(status: 503)
-    expect { subject.call(account) }.to raise_error(/Subscription attempt failed/)
+    expect { subject.call(account) }.to raise_error Mastodon::UnexpectedResponseError
   end
 
   it 'fails loudly if rate limited' do
     stub_request(:post, 'http://hub.example.com/').to_return(status: 429)
-    expect { subject.call(account) }.to raise_error(/Subscription attempt failed/)
+    expect { subject.call(account) }.to raise_error Mastodon::UnexpectedResponseError
   end
 end
diff --git a/spec/workers/pubsubhubbub/delivery_worker_spec.rb b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
index a83245786..b72001568 100644
--- a/spec/workers/pubsubhubbub/delivery_worker_spec.rb
+++ b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
@@ -26,7 +26,7 @@ describe Pubsubhubbub::DeliveryWorker do
       subscription = Fabricate(:subscription)
 
       stub_request_to_respond_with(subscription, 500)
-      expect { subject.perform(subscription.id, payload) }.to raise_error(/Delivery failed/)
+      expect { subject.perform(subscription.id, payload) }.to raise_error Mastodon::UnexpectedResponseError
     end
 
     it 'updates subscriptions when delivery succeeds' do

From 4b911fea03a204a1a1cc0e5f63ede1679e0494c3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 20 Jul 2017 23:07:13 +0200
Subject: [PATCH 300/382] Add button to re-subscribe to all accounts from a
 domain (#4285)

---
 app/controllers/admin/instances_controller.rb | 11 +++++++++++
 app/views/admin/instances/_instance.html.haml |  2 ++
 config/routes.rb                              |  7 ++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/instances_controller.rb b/app/controllers/admin/instances_controller.rb
index ac93248a8..3296e08db 100644
--- a/app/controllers/admin/instances_controller.rb
+++ b/app/controllers/admin/instances_controller.rb
@@ -6,15 +6,26 @@ module Admin
       @instances = ordered_instances
     end
 
+    def resubscribe
+      params.require(:by_domain)
+      Pubsubhubbub::SubscribeWorker.push_bulk(subscribeable_accounts.pluck(:id))
+      redirect_to admin_instances_path
+    end
+
     private
 
     def paginated_instances
       Account.remote.by_domain_accounts.page(params[:page])
     end
+
     helper_method :paginated_instances
 
     def ordered_instances
       paginated_instances.map { |account| Instance.new(account) }
     end
+
+    def subscribeable_accounts
+      Account.with_followers.remote.where(domain: params[:by_domain])
+    end
   end
 end
diff --git a/app/views/admin/instances/_instance.html.haml b/app/views/admin/instances/_instance.html.haml
index 5c6783d06..435cd8f64 100644
--- a/app/views/admin/instances/_instance.html.haml
+++ b/app/views/admin/instances/_instance.html.haml
@@ -3,3 +3,5 @@
     = instance.domain
   %td.count
     = instance.accounts_count
+  %td
+    = table_link_to 'paper-plane-o', t('admin.accounts.resubscribe'), resubscribe_admin_instances_url(by_domain: instance.domain), method: :post, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/config/routes.rb b/config/routes.rb
index 2aa89f16d..072ef7984 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -88,7 +88,12 @@ Rails.application.routes.draw do
     resources :subscriptions, only: [:index]
     resources :domain_blocks, only: [:index, :new, :create, :show, :destroy]
     resource :settings, only: [:edit, :update]
-    resources :instances, only: [:index]
+    
+    resources :instances, only: [:index] do
+      collection do
+        post :resubscribe
+      end
+    end
 
     resources :reports, only: [:index, :show, :update] do
       resources :reported_statuses, only: [:create, :update, :destroy]

From c1bc5e14ebbecd8ffc6b4188fbf608e11f64422e Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 21 Jul 2017 01:38:24 +0200
Subject: [PATCH 301/382] feat(compose): More space on mobile devices (#4282)

* feat(compose): More space on mobile devices

* feat(compose): Hide navigation when typing on mobile devices

* fix(compose): Make animation faster

* fix(navigation_bar): Remove hardcoded title

* fix(compose): Prevent accidental bluring

* fix(compose): Increase max-height to 600px
---
 app/javascript/mastodon/actions/compose.js    |  8 +++
 .../compose/components/navigation_bar.js      |  5 ++
 .../mastodon/features/compose/index.js        | 13 +++-
 app/javascript/mastodon/features/ui/index.js  | 15 ++++
 app/javascript/mastodon/reducers/compose.js   |  8 ++-
 app/javascript/styles/components.scss         | 68 +++++++++++++++++++
 6 files changed, 114 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index 9f05a53e9..ebb75f36e 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -27,6 +27,7 @@ export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
 export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
 export const COMPOSE_VISIBILITY_CHANGE  = 'COMPOSE_VISIBILITY_CHANGE';
 export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE';
+export const COMPOSE_COMPOSING_CHANGE = 'COMPOSE_COMPOSING_CHANGE';
 
 export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
 
@@ -278,3 +279,10 @@ export function insertEmojiCompose(position, emoji) {
     emoji,
   };
 };
+
+export function changeComposing(value) {
+  return {
+    type: COMPOSE_COMPOSING_CHANGE,
+    value,
+  };
+}
diff --git a/app/javascript/mastodon/features/compose/components/navigation_bar.js b/app/javascript/mastodon/features/compose/components/navigation_bar.js
index fa4f560f3..c76210c85 100644
--- a/app/javascript/mastodon/features/compose/components/navigation_bar.js
+++ b/app/javascript/mastodon/features/compose/components/navigation_bar.js
@@ -1,6 +1,8 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import Avatar from '../../../components/avatar';
+import IconButton from '../../../components/icon_button';
 import Permalink from '../../../components/permalink';
 import { FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -9,6 +11,7 @@ export default class NavigationBar extends ImmutablePureComponent {
 
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
+    onClose: PropTypes.func.isRequired,
   };
 
   render () {
@@ -25,6 +28,8 @@ export default class NavigationBar extends ImmutablePureComponent {
 
           <a href='/settings/profile' className='navigation-bar__profile-edit'><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
         </div>
+
+        <IconButton title='' icon='close' onClick={this.props.onClose} />
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index 6aa5de96c..e3cf2d33b 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -11,6 +11,7 @@ import SearchContainer from './containers/search_container';
 import Motion from 'react-motion/lib/Motion';
 import spring from 'react-motion/lib/spring';
 import SearchResultsContainer from './containers/search_results_container';
+import { changeComposing } from '../../actions/compose';
 
 const messages = defineMessages({
   start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@@ -47,6 +48,14 @@ export default class Compose extends React.PureComponent {
     this.props.dispatch(unmountCompose());
   }
 
+  onFocus = () => {
+    this.props.dispatch(changeComposing(true));
+  }
+
+  onBlur = () => {
+    this.props.dispatch(changeComposing(false));
+  }
+
   render () {
     const { multiColumn, showSearch, intl } = this.props;
 
@@ -82,8 +91,8 @@ export default class Compose extends React.PureComponent {
         <SearchContainer />
 
         <div className='drawer__pager'>
-          <div className='drawer__inner'>
-            <NavigationContainer />
+          <div className='drawer__inner' onFocus={this.onFocus}>
+            <NavigationContainer onClose={this.onBlur} />
             <ComposeFormContainer />
           </div>
 
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
index 3baf09b93..e667b390b 100644
--- a/app/javascript/mastodon/features/ui/index.js
+++ b/app/javascript/mastodon/features/ui/index.js
@@ -43,6 +43,7 @@ import '../../components/status';
 
 const mapStateToProps = state => ({
   systemFontUi: state.getIn(['meta', 'system_font_ui']),
+  isComposing: state.getIn(['compose', 'is_composing']),
 });
 
 @connect(mapStateToProps)
@@ -52,6 +53,7 @@ export default class UI extends React.PureComponent {
     dispatch: PropTypes.func.isRequired,
     children: PropTypes.node,
     systemFontUi: PropTypes.bool,
+    isComposing: PropTypes.bool,
   };
 
   state = {
@@ -133,6 +135,19 @@ export default class UI extends React.PureComponent {
     this.props.dispatch(refreshNotifications());
   }
 
+  shouldComponentUpdate (nextProps) {
+    if (nextProps.isComposing !== this.props.isComposing) {
+      // Avoid expensive update just to toggle a class
+      this.node.classList.toggle('is-composing', nextProps.isComposing);
+
+      return false;
+    }
+
+    // Why isn't this working?!?
+    // return super.shouldComponentUpdate(nextProps, nextState);
+    return true;
+  }
+
   componentWillUnmount () {
     window.removeEventListener('resize', this.handleResize);
     document.removeEventListener('dragenter', this.handleDragEnter);
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 781e6e11b..534022000 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -20,6 +20,7 @@ import {
   COMPOSE_SPOILERNESS_CHANGE,
   COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
+  COMPOSE_COMPOSING_CHANGE,
   COMPOSE_EMOJI_INSERT,
 } from '../actions/compose';
 import { TIMELINE_DELETE } from '../actions/timelines';
@@ -37,6 +38,7 @@ const initialState = ImmutableMap({
   focusDate: null,
   preselectDate: null,
   in_reply_to: null,
+  is_composing: false,
   is_submitting: false,
   is_uploading: false,
   progress: 0,
@@ -146,7 +148,9 @@ export default function compose(state = initialState, action) {
   case COMPOSE_MOUNT:
     return state.set('mounted', true);
   case COMPOSE_UNMOUNT:
-    return state.set('mounted', false);
+    return state
+      .set('mounted', false)
+      .set('is_composing', false);
   case COMPOSE_SENSITIVITY_CHANGE:
     return state
       .set('sensitive', !state.get('sensitive'))
@@ -169,6 +173,8 @@ export default function compose(state = initialState, action) {
     return state
       .set('text', action.text)
       .set('idempotencyKey', uuid());
+  case COMPOSE_COMPOSING_CHANGE:
+    return state.set('is_composing', action.value);
   case COMPOSE_REPLY:
     return state.withMutations(map => {
       map.set('in_reply_to', action.status.get('id'));
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 8c930ad11..b376f3a30 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1177,6 +1177,11 @@
   .permalink {
     text-decoration: none;
   }
+
+  .icon-button {
+    pointer-events: none;
+    opacity: 0;
+  }
 }
 
 .navigation-bar__profile {
@@ -3723,3 +3728,66 @@ noscript {
     margin: 20px 0;
   }
 }
+
+@media screen and (max-width: 1024px) and (max-height: 600px) {
+  $duration: 400ms;
+  $delay: 100ms;
+
+  .tabs-bar,
+  .search {
+    will-change: margin-top;
+    transition: margin-top $duration $delay;
+  }
+
+  .navigation-bar {
+    will-change: padding-bottom;
+    transition: padding-bottom $duration $delay;
+  }
+
+  .navigation-bar {
+    & > a:first-child {
+      will-change: margin-top, margin-left, width;
+      transition: margin-top $duration $delay, margin-left $duration ($duration + $delay);
+    }
+
+    & > .navigation-bar__profile-edit {
+      will-change: margin-top;
+      transition: margin-top $duration $delay;
+    }
+
+    & > .icon-button {
+      will-change: opacity;
+      transition: opacity $duration $delay;
+    }
+  }
+
+  .is-composing {
+    .tabs-bar,
+    .search {
+      margin-top: -50px;
+    }
+
+    .navigation-bar {
+      padding-bottom: 0;
+
+      & > a:first-child {
+        margin-top: -50px;
+        margin-left: -40px;
+      }
+
+      .navigation-bar__profile {
+        padding-top: 2px;
+      }
+
+      .navigation-bar__profile-edit {
+        position: absolute;
+        margin-top: -50px;
+      }
+
+      .icon-button {
+        pointer-events: auto;
+        opacity: 1;
+      }
+    }
+  }
+}

From a390abdefb5d741ba4375858a79fbf3eaf30f06d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 21 Jul 2017 04:27:40 +0200
Subject: [PATCH 302/382] Use the same emoji data on the frontend and backend
 (#4284)

* Use the same emoji data on the frontend and backend

* Move emoji.json to repository, add tests

This way you don't need to install node dependencies if you only
want to run Ruby code
---
 Gemfile                     |  1 -
 app/helpers/emoji_helper.rb | 15 +++++++++-----
 app/lib/emoji.rb            | 40 +++++++++++++++++++++++++++++++++++++
 lib/assets/emoji.json       |  1 +
 spec/lib/emoji_spec.rb      | 15 ++++++++++++++
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 app/lib/emoji.rb
 create mode 100644 lib/assets/emoji.json
 create mode 100644 spec/lib/emoji_spec.rb

diff --git a/Gemfile b/Gemfile
index f4d889165..86f092080 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,6 @@ gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
 gem 'doorkeeper', '~> 4.2'
 gem 'fast_blank', '~> 1.0'
-gem 'gemoji', '~> 3.0'
 gem 'goldfinger', '~> 1.2'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
diff --git a/app/helpers/emoji_helper.rb b/app/helpers/emoji_helper.rb
index c1595851f..848c03fce 100644
--- a/app/helpers/emoji_helper.rb
+++ b/app/helpers/emoji_helper.rb
@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 module EmojiHelper
-  EMOJI_PATTERN = /(?<=[^[:alnum:]:]|\n|^):([\w+-]+):(?=[^[:alnum:]:]|$)/x
-
   def emojify(text)
     return text if text.blank?
 
-    text.gsub(EMOJI_PATTERN) do |match|
-      emoji = Emoji.find_by_alias($1) # rubocop:disable Rails/DynamicFindBy,Style/PerlBackrefs
+    text.gsub(emoji_pattern) do |match|
+      emoji = Emoji.instance.unicode($1) # rubocop:disable Style/PerlBackrefs
 
       if emoji
-        emoji.raw
+        emoji
       else
         match
       end
     end
   end
+
+  def emoji_pattern
+    @emoji_pattern ||=
+      /(?<=[^[:alnum:]:]|\n|^)
+      (#{Emoji.instance.names.map { |name| Regexp.escape(name) }.join('|')})
+      (?=[^[:alnum:]:]|$)/x
+  end
 end
diff --git a/app/lib/emoji.rb b/app/lib/emoji.rb
new file mode 100644
index 000000000..e444b6893
--- /dev/null
+++ b/app/lib/emoji.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+class Emoji
+  include Singleton
+
+  def initialize
+    data = Oj.load(File.open(File.join(Rails.root, 'lib', 'assets', 'emoji.json')))
+
+    @map = {}
+
+    data.each do |_, emoji|
+      keys    = [emoji['shortname']] + emoji['aliases']
+      unicode = codepoint_to_unicode(emoji['unicode'])
+
+      keys.each do |key|
+        @map[key] = unicode
+      end
+    end
+  end
+
+  def unicode(shortcode)
+    @map[shortcode]
+  end
+
+  def names
+    @map.keys
+  end
+
+  private
+
+  def codepoint_to_unicode(codepoint)
+    if codepoint.include?('-')
+      codepoint.split('-').map(&:hex).pack('U')
+    else
+      [codepoint.hex].pack('U')
+    end
+  end
+end
diff --git a/lib/assets/emoji.json b/lib/assets/emoji.json
new file mode 100644
index 000000000..b12b76024
--- /dev/null
+++ b/lib/assets/emoji.json
@@ -0,0 +1 @@
+{"grinning":{"unicode":"1f600","unicode_alt":"","code_decimal":"&#128512;","name":"grinning face","shortname":":grinning:","category":"people","emoji_order":"1","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley","emotion"]},"grin":{"unicode":"1f601","unicode_alt":"","code_decimal":"&#128513;","name":"grinning face with smiling eyes","shortname":":grin:","category":"people","emoji_order":"2","aliases":[],"aliases_ascii":[],"keywords":["happy","silly","smiley","emotion","good","selfie"]},"joy":{"unicode":"1f602","unicode_alt":"","code_decimal":"&#128514;","name":"face with tears of joy","shortname":":joy:","category":"people","emoji_order":"3","aliases":[],"aliases_ascii":[":')",":'-)"],"keywords":["happy","silly","smiley","cry","laugh","emotion","sarcastic"]},"rofl":{"unicode":"1f923","unicode_alt":"","code_decimal":"&#129315;","name":"rolling on the floor laughing","shortname":":rofl:","category":"people","emoji_order":"4","aliases":[":rolling_on_the_floor_laughing:"],"aliases_ascii":[],"keywords":[]},"smiley":{"unicode":"1f603","unicode_alt":"","code_decimal":"&#128515;","name":"smiling face with open mouth","shortname":":smiley:","category":"people","emoji_order":"5","aliases":[],"aliases_ascii":[":D",":-D","=D"],"keywords":["happy","smiley","emotion","good"]},"smile":{"unicode":"1f604","unicode_alt":"","code_decimal":"&#128516;","name":"smiling face with open mouth and smiling eyes","shortname":":smile:","category":"people","emoji_order":"6","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley","emotion"]},"sweat_smile":{"unicode":"1f605","unicode_alt":"","code_decimal":"&#128517;","name":"smiling face with open mouth and cold sweat","shortname":":sweat_smile:","category":"people","emoji_order":"7","aliases":[],"aliases_ascii":["':)","':-)","'=)","':D","':-D","'=D"],"keywords":["smiley","workout","sweat","emotion"]},"laughing":{"unicode":"1f606","unicode_alt":"","code_decimal":"&#128518;","name":"smiling face with open mouth and tightly-closed eyes","shortname":":laughing:","category":"people","emoji_order":"8","aliases":[":satisfied:"],"aliases_ascii":[">:)",">;)",">:-)",">=)"],"keywords":["happy","smiley","laugh","emotion"]},"wink":{"unicode":"1f609","unicode_alt":"","code_decimal":"&#128521;","name":"winking face","shortname":":wink:","category":"people","emoji_order":"9","aliases":[],"aliases_ascii":[";)",";-)","*-)","*)",";-]",";]",";D",";^)"],"keywords":["silly","smiley","emotion"]},"blush":{"unicode":"1f60a","unicode_alt":"","code_decimal":"&#128522;","name":"smiling face with smiling eyes","shortname":":blush:","category":"people","emoji_order":"10","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley","emotion","good","beautiful"]},"yum":{"unicode":"1f60b","unicode_alt":"","code_decimal":"&#128523;","name":"face savouring delicious food","shortname":":yum:","category":"people","emoji_order":"11","aliases":[],"aliases_ascii":[],"keywords":["happy","silly","smiley","emotion","sarcastic","good"]},"sunglasses":{"unicode":"1f60e","unicode_alt":"","code_decimal":"&#128526;","name":"smiling face with sunglasses","shortname":":sunglasses:","category":"people","emoji_order":"12","aliases":[],"aliases_ascii":["B-)","B)","8)","8-)","B-D","8-D"],"keywords":["silly","smiley","emojione","glasses","boys night"]},"heart_eyes":{"unicode":"1f60d","unicode_alt":"","code_decimal":"&#128525;","name":"smiling face with heart-shaped eyes","shortname":":heart_eyes:","category":"people","emoji_order":"13","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley","love","sex","heart eyes","emotion","beautiful"]},"kissing_heart":{"unicode":"1f618","unicode_alt":"","code_decimal":"&#128536;","name":"face throwing a kiss","shortname":":kissing_heart:","category":"people","emoji_order":"14","aliases":[],"aliases_ascii":[":*",":-*","=*",":^*"],"keywords":["smiley","love","sexy"]},"kissing":{"unicode":"1f617","unicode_alt":"","code_decimal":"&#128535;","name":"kissing face","shortname":":kissing:","category":"people","emoji_order":"15","aliases":[],"aliases_ascii":[],"keywords":["smiley","sexy"]},"kissing_smiling_eyes":{"unicode":"1f619","unicode_alt":"","code_decimal":"&#128537;","name":"kissing face with smiling eyes","shortname":":kissing_smiling_eyes:","category":"people","emoji_order":"16","aliases":[],"aliases_ascii":[],"keywords":["smiley","sexy"]},"kissing_closed_eyes":{"unicode":"1f61a","unicode_alt":"","code_decimal":"&#128538;","name":"kissing face with closed eyes","shortname":":kissing_closed_eyes:","category":"people","emoji_order":"17","aliases":[],"aliases_ascii":[],"keywords":["smiley","sexy"]},"relaxed":{"unicode":"263a","unicode_alt":"263a-fe0f","code_decimal":"&#9786;","name":"white smiling face","shortname":":relaxed:","category":"people","emoji_order":"18","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley"]},"slight_smile":{"unicode":"1f642","unicode_alt":"","code_decimal":"&#128578;","name":"slightly smiling face","shortname":":slight_smile:","category":"people","emoji_order":"19","aliases":[":slightly_smiling_face:"],"aliases_ascii":[":)",":-)","=]","=)",":]"],"keywords":["happy","smiley"]},"hugging":{"unicode":"1f917","unicode_alt":"","code_decimal":"&#129303;","name":"hugging face","shortname":":hugging:","category":"people","emoji_order":"20","aliases":[":hugging_face:"],"aliases_ascii":[],"keywords":["smiley","hug","thank you"]},"thinking":{"unicode":"1f914","unicode_alt":"","code_decimal":"&#129300;","name":"thinking face","shortname":":thinking:","category":"people","emoji_order":"21","aliases":[":thinking_face:"],"aliases_ascii":[],"keywords":["smiley","thinking","boys night"]},"neutral_face":{"unicode":"1f610","unicode_alt":"","code_decimal":"&#128528;","name":"neutral face","shortname":":neutral_face:","category":"people","emoji_order":"22","aliases":[],"aliases_ascii":[],"keywords":["mad","smiley","shrug","neutral","emotion"]},"expressionless":{"unicode":"1f611","unicode_alt":"","code_decimal":"&#128529;","name":"expressionless face","shortname":":expressionless:","category":"people","emoji_order":"23","aliases":[],"aliases_ascii":["-_-","-__-","-___-"],"keywords":["mad","smiley","neutral","emotion"]},"no_mouth":{"unicode":"1f636","unicode_alt":"","code_decimal":"&#128566;","name":"face without mouth","shortname":":no_mouth:","category":"people","emoji_order":"24","aliases":[],"aliases_ascii":[":-X",":X",":-#",":#","=X","=x",":x",":-x","=#"],"keywords":["mad","smiley","neutral","emotion"]},"rolling_eyes":{"unicode":"1f644","unicode_alt":"","code_decimal":"&#128580;","name":"face with rolling eyes","shortname":":rolling_eyes:","category":"people","emoji_order":"25","aliases":[":face_with_rolling_eyes:"],"aliases_ascii":[],"keywords":["mad","smiley","rolling eyes","emotion","sarcastic"]},"smirk":{"unicode":"1f60f","unicode_alt":"","code_decimal":"&#128527;","name":"smirking face","shortname":":smirk:","category":"people","emoji_order":"26","aliases":[],"aliases_ascii":[],"keywords":["silly","smiley","sexy","sarcastic"]},"persevere":{"unicode":"1f623","unicode_alt":"","code_decimal":"&#128547;","name":"persevering face","shortname":":persevere:","category":"people","emoji_order":"27","aliases":[],"aliases_ascii":[">.<"],"keywords":["sad","smiley","angry","emotion"]},"disappointed_relieved":{"unicode":"1f625","unicode_alt":"","code_decimal":"&#128549;","name":"disappointed but relieved face","shortname":":disappointed_relieved:","category":"people","emoji_order":"28","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","stressed","sweat","cry","emotion"]},"open_mouth":{"unicode":"1f62e","unicode_alt":"","code_decimal":"&#128558;","name":"face with open mouth","shortname":":open_mouth:","category":"people","emoji_order":"29","aliases":[],"aliases_ascii":[":-O",":O",":-o",":o","O_O",">:O"],"keywords":["smiley","surprised","wow","emotion"]},"zipper_mouth":{"unicode":"1f910","unicode_alt":"","code_decimal":"&#129296;","name":"zipper-mouth face","shortname":":zipper_mouth:","category":"people","emoji_order":"30","aliases":[":zipper_mouth_face:"],"aliases_ascii":[],"keywords":["mad","smiley"]},"hushed":{"unicode":"1f62f","unicode_alt":"","code_decimal":"&#128559;","name":"hushed face","shortname":":hushed:","category":"people","emoji_order":"31","aliases":[],"aliases_ascii":[],"keywords":["smiley","surprised","wow"]},"sleepy":{"unicode":"1f62a","unicode_alt":"","code_decimal":"&#128554;","name":"sleepy face","shortname":":sleepy:","category":"people","emoji_order":"32","aliases":[],"aliases_ascii":[],"keywords":["smiley","sick","emotion"]},"tired_face":{"unicode":"1f62b","unicode_alt":"","code_decimal":"&#128555;","name":"tired face","shortname":":tired_face:","category":"people","emoji_order":"33","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","tired","emotion"]},"sleeping":{"unicode":"1f634","unicode_alt":"","code_decimal":"&#128564;","name":"sleeping face","shortname":":sleeping:","category":"people","emoji_order":"34","aliases":[],"aliases_ascii":[],"keywords":["smiley","tired","emotion","goodnight"]},"relieved":{"unicode":"1f60c","unicode_alt":"","code_decimal":"&#128524;","name":"relieved face","shortname":":relieved:","category":"people","emoji_order":"35","aliases":[],"aliases_ascii":[],"keywords":["smiley","emotion"]},"nerd":{"unicode":"1f913","unicode_alt":"","code_decimal":"&#129299;","name":"nerd face","shortname":":nerd:","category":"people","emoji_order":"36","aliases":[":nerd_face:"],"aliases_ascii":[],"keywords":["smiley","glasses"]},"stuck_out_tongue":{"unicode":"1f61b","unicode_alt":"","code_decimal":"&#128539;","name":"face with stuck-out tongue","shortname":":stuck_out_tongue:","category":"people","emoji_order":"37","aliases":[],"aliases_ascii":[":P",":-P","=P",":-p",":p","=p",":-\u00de",":\u00de",":\u00fe",":-\u00fe",":-b",":b","d:"],"keywords":["smiley","sex","emotion"]},"stuck_out_tongue_winking_eye":{"unicode":"1f61c","unicode_alt":"","code_decimal":"&#128540;","name":"face with stuck-out tongue and winking eye","shortname":":stuck_out_tongue_winking_eye:","category":"people","emoji_order":"38","aliases":[],"aliases_ascii":[">:P","X-P","x-p"],"keywords":["happy","smiley","emotion","parties"]},"stuck_out_tongue_closed_eyes":{"unicode":"1f61d","unicode_alt":"","code_decimal":"&#128541;","name":"face with stuck-out tongue and tightly-closed eyes","shortname":":stuck_out_tongue_closed_eyes:","category":"people","emoji_order":"39","aliases":[],"aliases_ascii":[],"keywords":["happy","smiley","emotion"]},"drooling_face":{"unicode":"1f924","unicode_alt":"","code_decimal":"&#129316;","name":"drooling face","shortname":":drooling_face:","category":"people","emoji_order":"40","aliases":[":drool:"],"aliases_ascii":[],"keywords":[]},"unamused":{"unicode":"1f612","unicode_alt":"","code_decimal":"&#128530;","name":"unamused face","shortname":":unamused:","category":"people","emoji_order":"41","aliases":[],"aliases_ascii":[],"keywords":["sad","mad","smiley","tired","emotion"]},"sweat":{"unicode":"1f613","unicode_alt":"","code_decimal":"&#128531;","name":"face with cold sweat","shortname":":sweat:","category":"people","emoji_order":"42","aliases":[],"aliases_ascii":["':(","':-(","'=("],"keywords":["sad","smiley","stressed","sweat","emotion"]},"pensive":{"unicode":"1f614","unicode_alt":"","code_decimal":"&#128532;","name":"pensive face","shortname":":pensive:","category":"people","emoji_order":"43","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","emotion","rip"]},"confused":{"unicode":"1f615","unicode_alt":"","code_decimal":"&#128533;","name":"confused face","shortname":":confused:","category":"people","emoji_order":"44","aliases":[],"aliases_ascii":[">:\\",">:\/",":-\/",":-.",":\/",":\\","=\/","=\\",":L","=L"],"keywords":["smiley","surprised","emotion"]},"upside_down":{"unicode":"1f643","unicode_alt":"","code_decimal":"&#128579;","name":"upside-down face","shortname":":upside_down:","category":"people","emoji_order":"45","aliases":[":upside_down_face:"],"aliases_ascii":[],"keywords":["silly","smiley","sarcastic"]},"money_mouth":{"unicode":"1f911","unicode_alt":"","code_decimal":"&#129297;","name":"money-mouth face","shortname":":money_mouth:","category":"people","emoji_order":"46","aliases":[":money_mouth_face:"],"aliases_ascii":[],"keywords":["smiley","win","money","emotion","boys night"]},"astonished":{"unicode":"1f632","unicode_alt":"","code_decimal":"&#128562;","name":"astonished face","shortname":":astonished:","category":"people","emoji_order":"47","aliases":[],"aliases_ascii":[],"keywords":["smiley","surprised","wow","emotion","omg"]},"frowning2":{"unicode":"2639","unicode_alt":"2639-fe0f","code_decimal":"&#9785;","name":"white frowning face","shortname":":frowning2:","category":"people","emoji_order":"48","aliases":[":white_frowning_face:"],"aliases_ascii":[],"keywords":["sad","smiley","emotion"]},"slight_frown":{"unicode":"1f641","unicode_alt":"","code_decimal":"&#128577;","name":"slightly frowning face","shortname":":slight_frown:","category":"people","emoji_order":"49","aliases":[":slightly_frowning_face:"],"aliases_ascii":[],"keywords":["sad","smiley","emotion"]},"confounded":{"unicode":"1f616","unicode_alt":"","code_decimal":"&#128534;","name":"confounded face","shortname":":confounded:","category":"people","emoji_order":"50","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","angry","emotion"]},"disappointed":{"unicode":"1f61e","unicode_alt":"","code_decimal":"&#128542;","name":"disappointed face","shortname":":disappointed:","category":"people","emoji_order":"51","aliases":[],"aliases_ascii":[">:[",":-(",":(",":-[",":[","=("],"keywords":["sad","smiley","tired","emotion"]},"worried":{"unicode":"1f61f","unicode_alt":"","code_decimal":"&#128543;","name":"worried face","shortname":":worried:","category":"people","emoji_order":"52","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","emotion"]},"triumph":{"unicode":"1f624","unicode_alt":"","code_decimal":"&#128548;","name":"face with look of triumph","shortname":":triumph:","category":"people","emoji_order":"53","aliases":[],"aliases_ascii":[],"keywords":["mad","smiley","angry","emotion","steam"]},"cry":{"unicode":"1f622","unicode_alt":"","code_decimal":"&#128546;","name":"crying face","shortname":":cry:","category":"people","emoji_order":"54","aliases":[],"aliases_ascii":[":'(",":'-(",";(",";-("],"keywords":["sad","smiley","cry","emotion","rip","heartbreak"]},"sob":{"unicode":"1f62d","unicode_alt":"","code_decimal":"&#128557;","name":"loudly crying face","shortname":":sob:","category":"people","emoji_order":"55","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","cry","emotion","heartbreak"]},"frowning":{"unicode":"1f626","unicode_alt":"","code_decimal":"&#128550;","name":"frowning face with open mouth","shortname":":frowning:","category":"people","emoji_order":"56","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","surprised","emotion"]},"anguished":{"unicode":"1f627","unicode_alt":"","code_decimal":"&#128551;","name":"anguished face","shortname":":anguished:","category":"people","emoji_order":"57","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","surprised","emotion"]},"fearful":{"unicode":"1f628","unicode_alt":"","code_decimal":"&#128552;","name":"fearful face","shortname":":fearful:","category":"people","emoji_order":"58","aliases":[],"aliases_ascii":["D:"],"keywords":["smiley","surprised","emotion"]},"weary":{"unicode":"1f629","unicode_alt":"","code_decimal":"&#128553;","name":"weary face","shortname":":weary:","category":"people","emoji_order":"59","aliases":[],"aliases_ascii":[],"keywords":["sad","smiley","tired","stressed","emotion"]},"grimacing":{"unicode":"1f62c","unicode_alt":"","code_decimal":"&#128556;","name":"grimacing face","shortname":":grimacing:","category":"people","emoji_order":"60","aliases":[],"aliases_ascii":[],"keywords":["silly","smiley","emotion","selfie"]},"cold_sweat":{"unicode":"1f630","unicode_alt":"","code_decimal":"&#128560;","name":"face with open mouth and cold sweat","shortname":":cold_sweat:","category":"people","emoji_order":"61","aliases":[],"aliases_ascii":[],"keywords":["smiley","sweat","emotion"]},"scream":{"unicode":"1f631","unicode_alt":"","code_decimal":"&#128561;","name":"face screaming in fear","shortname":":scream:","category":"people","emoji_order":"62","aliases":[],"aliases_ascii":[],"keywords":["smiley","surprised","wow","emotion","omg"]},"flushed":{"unicode":"1f633","unicode_alt":"","code_decimal":"&#128563;","name":"flushed face","shortname":":flushed:","category":"people","emoji_order":"63","aliases":[],"aliases_ascii":[":$","=$"],"keywords":["smiley","emotion","omg"]},"dizzy_face":{"unicode":"1f635","unicode_alt":"","code_decimal":"&#128565;","name":"dizzy face","shortname":":dizzy_face:","category":"people","emoji_order":"64","aliases":[],"aliases_ascii":["#-)","#)","%-)","%)","X)","X-)"],"keywords":["smiley","surprised","dead","wow","emotion","omg"]},"rage":{"unicode":"1f621","unicode_alt":"","code_decimal":"&#128545;","name":"pouting face","shortname":":rage:","category":"people","emoji_order":"65","aliases":[],"aliases_ascii":[],"keywords":["mad","smiley","angry","emotion"]},"angry":{"unicode":"1f620","unicode_alt":"","code_decimal":"&#128544;","name":"angry face","shortname":":angry:","category":"people","emoji_order":"66","aliases":[],"aliases_ascii":[">:(",">:-(",":@"],"keywords":["mad","smiley","emotion"]},"innocent":{"unicode":"1f607","unicode_alt":"","code_decimal":"&#128519;","name":"smiling face with halo","shortname":":innocent:","category":"people","emoji_order":"67","aliases":[],"aliases_ascii":["O:-)","0:-3","0:3","0:-)","0:)","0;^)","O:)","O;-)","O=)","0;-)","O:-3","O:3"],"keywords":["smiley","emotion"]},"cowboy":{"unicode":"1f920","unicode_alt":"","code_decimal":"&#129312;","name":"face with cowboy hat","shortname":":cowboy:","category":"people","emoji_order":"68","aliases":[":face_with_cowboy_hat:"],"aliases_ascii":[],"keywords":[]},"clown":{"unicode":"1f921","unicode_alt":"","code_decimal":"&#129313;","name":"clown face","shortname":":clown:","category":"people","emoji_order":"69","aliases":[":clown_face:"],"aliases_ascii":[],"keywords":[]},"lying_face":{"unicode":"1f925","unicode_alt":"","code_decimal":"&#129317;","name":"lying face","shortname":":lying_face:","category":"people","emoji_order":"70","aliases":[":liar:"],"aliases_ascii":[],"keywords":[]},"mask":{"unicode":"1f637","unicode_alt":"","code_decimal":"&#128567;","name":"face with medical mask","shortname":":mask:","category":"people","emoji_order":"71","aliases":[],"aliases_ascii":[],"keywords":["smiley","dead","health","sick"]},"thermometer_face":{"unicode":"1f912","unicode_alt":"","code_decimal":"&#129298;","name":"face with thermometer","shortname":":thermometer_face:","category":"people","emoji_order":"72","aliases":[":face_with_thermometer:"],"aliases_ascii":[],"keywords":["smiley","health","sick","emotion"]},"head_bandage":{"unicode":"1f915","unicode_alt":"","code_decimal":"&#129301;","name":"face with head-bandage","shortname":":head_bandage:","category":"people","emoji_order":"73","aliases":[":face_with_head_bandage:"],"aliases_ascii":[],"keywords":["smiley","health","sick","emotion"]},"nauseated_face":{"unicode":"1f922","unicode_alt":"","code_decimal":"&#129314;","name":"nauseated face","shortname":":nauseated_face:","category":"people","emoji_order":"74","aliases":[":sick:"],"aliases_ascii":[],"keywords":[]},"sneezing_face":{"unicode":"1f927","unicode_alt":"","code_decimal":"&#129319;","name":"sneezing face","shortname":":sneezing_face:","category":"people","emoji_order":"75","aliases":[":sneeze:"],"aliases_ascii":[],"keywords":[]},"smiling_imp":{"unicode":"1f608","unicode_alt":"","code_decimal":"&#128520;","name":"smiling face with horns","shortname":":smiling_imp:","category":"people","emoji_order":"76","aliases":[],"aliases_ascii":[],"keywords":["silly","smiley","angry","monster","devil","boys night"]},"imp":{"unicode":"1f47f","unicode_alt":"","code_decimal":"&#128127;","name":"imp","shortname":":imp:","category":"people","emoji_order":"77","aliases":[],"aliases_ascii":[],"keywords":["smiley","monster","devil","wth"]},"japanese_ogre":{"unicode":"1f479","unicode_alt":"","code_decimal":"&#128121;","name":"japanese ogre","shortname":":japanese_ogre:","category":"people","emoji_order":"78","aliases":[],"aliases_ascii":[],"keywords":["monster"]},"japanese_goblin":{"unicode":"1f47a","unicode_alt":"","code_decimal":"&#128122;","name":"japanese goblin","shortname":":japanese_goblin:","category":"people","emoji_order":"79","aliases":[],"aliases_ascii":[],"keywords":["angry","monster"]},"skull":{"unicode":"1f480","unicode_alt":"","code_decimal":"&#128128;","name":"skull","shortname":":skull:","category":"people","emoji_order":"80","aliases":[":skeleton:"],"aliases_ascii":[],"keywords":["dead","halloween","skull"]},"skull_crossbones":{"unicode":"2620","unicode_alt":"2620-fe0f","code_decimal":"&#9760;","name":"skull and crossbones","shortname":":skull_crossbones:","category":"objects","emoji_order":"81","aliases":[":skull_and_crossbones:"],"aliases_ascii":[],"keywords":["symbol","dead","skull"]},"ghost":{"unicode":"1f47b","unicode_alt":"","code_decimal":"&#128123;","name":"ghost","shortname":":ghost:","category":"people","emoji_order":"82","aliases":[],"aliases_ascii":[],"keywords":["holidays","halloween","monster"]},"alien":{"unicode":"1f47d","unicode_alt":"","code_decimal":"&#128125;","name":"extraterrestrial alien","shortname":":alien:","category":"people","emoji_order":"83","aliases":[],"aliases_ascii":[],"keywords":["space","monster","alien","scientology"]},"space_invader":{"unicode":"1f47e","unicode_alt":"","code_decimal":"&#128126;","name":"alien monster","shortname":":space_invader:","category":"activity","emoji_order":"84","aliases":[],"aliases_ascii":[],"keywords":["monster","alien"]},"robot":{"unicode":"1f916","unicode_alt":"","code_decimal":"&#129302;","name":"robot face","shortname":":robot:","category":"people","emoji_order":"85","aliases":[":robot_face:"],"aliases_ascii":[],"keywords":["monster","robot"]},"poop":{"unicode":"1f4a9","unicode_alt":"","code_decimal":"&#128169;","name":"pile of poo","shortname":":poop:","category":"people","emoji_order":"86","aliases":[":shit:",":hankey:",":poo:"],"aliases_ascii":[],"keywords":["bathroom","shit","sol","diarrhea"]},"smiley_cat":{"unicode":"1f63a","unicode_alt":"","code_decimal":"&#128570;","name":"smiling cat face with open mouth","shortname":":smiley_cat:","category":"people","emoji_order":"87","aliases":[],"aliases_ascii":[],"keywords":["happy","cat","animal"]},"smile_cat":{"unicode":"1f638","unicode_alt":"","code_decimal":"&#128568;","name":"grinning cat face with smiling eyes","shortname":":smile_cat:","category":"people","emoji_order":"88","aliases":[],"aliases_ascii":[],"keywords":["happy","cat","animal"]},"joy_cat":{"unicode":"1f639","unicode_alt":"","code_decimal":"&#128569;","name":"cat face with tears of joy","shortname":":joy_cat:","category":"people","emoji_order":"89","aliases":[],"aliases_ascii":[],"keywords":["happy","silly","cry","laugh","cat","animal","sarcastic"]},"heart_eyes_cat":{"unicode":"1f63b","unicode_alt":"","code_decimal":"&#128571;","name":"smiling cat face with heart-shaped eyes","shortname":":heart_eyes_cat:","category":"people","emoji_order":"90","aliases":[],"aliases_ascii":[],"keywords":["heart eyes","cat","animal","beautiful"]},"smirk_cat":{"unicode":"1f63c","unicode_alt":"","code_decimal":"&#128572;","name":"cat face with wry smile","shortname":":smirk_cat:","category":"people","emoji_order":"91","aliases":[],"aliases_ascii":[],"keywords":["cat","animal"]},"kissing_cat":{"unicode":"1f63d","unicode_alt":"","code_decimal":"&#128573;","name":"kissing cat face with closed eyes","shortname":":kissing_cat:","category":"people","emoji_order":"92","aliases":[],"aliases_ascii":[],"keywords":["cat","animal"]},"scream_cat":{"unicode":"1f640","unicode_alt":"","code_decimal":"&#128576;","name":"weary cat face","shortname":":scream_cat:","category":"people","emoji_order":"93","aliases":[],"aliases_ascii":[],"keywords":["cat","animal"]},"crying_cat_face":{"unicode":"1f63f","unicode_alt":"","code_decimal":"&#128575;","name":"crying cat face","shortname":":crying_cat_face:","category":"people","emoji_order":"94","aliases":[],"aliases_ascii":[],"keywords":["cry","cat","animal"]},"pouting_cat":{"unicode":"1f63e","unicode_alt":"","code_decimal":"&#128574;","name":"pouting cat face","shortname":":pouting_cat:","category":"people","emoji_order":"95","aliases":[],"aliases_ascii":[],"keywords":["cat","animal"]},"see_no_evil":{"unicode":"1f648","unicode_alt":"","code_decimal":"&#128584;","name":"see-no-evil monkey","shortname":":see_no_evil:","category":"nature","emoji_order":"96","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"hear_no_evil":{"unicode":"1f649","unicode_alt":"","code_decimal":"&#128585;","name":"hear-no-evil monkey","shortname":":hear_no_evil:","category":"nature","emoji_order":"97","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"speak_no_evil":{"unicode":"1f64a","unicode_alt":"","code_decimal":"&#128586;","name":"speak-no-evil monkey","shortname":":speak_no_evil:","category":"nature","emoji_order":"98","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"boy":{"unicode":"1f466","unicode_alt":"","code_decimal":"&#128102;","name":"boy","shortname":":boy:","category":"people","emoji_order":"99","aliases":[],"aliases_ascii":[],"keywords":["people","baby","diversity"]},"boy_tone1":{"unicode":"1f466-1f3fb","unicode_alt":"","code_decimal":"&#128102;&#127995;","name":"boy tone 1","shortname":":boy_tone1:","category":"people","emoji_order":"100","aliases":[],"aliases_ascii":[],"keywords":[]},"boy_tone2":{"unicode":"1f466-1f3fc","unicode_alt":"","code_decimal":"&#128102;&#127996;","name":"boy tone 2","shortname":":boy_tone2:","category":"people","emoji_order":"101","aliases":[],"aliases_ascii":[],"keywords":[]},"boy_tone3":{"unicode":"1f466-1f3fd","unicode_alt":"","code_decimal":"&#128102;&#127997;","name":"boy tone 3","shortname":":boy_tone3:","category":"people","emoji_order":"102","aliases":[],"aliases_ascii":[],"keywords":[]},"boy_tone4":{"unicode":"1f466-1f3fe","unicode_alt":"","code_decimal":"&#128102;&#127998;","name":"boy tone 4","shortname":":boy_tone4:","category":"people","emoji_order":"103","aliases":[],"aliases_ascii":[],"keywords":[]},"boy_tone5":{"unicode":"1f466-1f3ff","unicode_alt":"","code_decimal":"&#128102;&#127999;","name":"boy tone 5","shortname":":boy_tone5:","category":"people","emoji_order":"104","aliases":[],"aliases_ascii":[],"keywords":[]},"girl":{"unicode":"1f467","unicode_alt":"","code_decimal":"&#128103;","name":"girl","shortname":":girl:","category":"people","emoji_order":"105","aliases":[],"aliases_ascii":[],"keywords":["people","women","baby","diversity"]},"girl_tone1":{"unicode":"1f467-1f3fb","unicode_alt":"","code_decimal":"&#128103;&#127995;","name":"girl tone 1","shortname":":girl_tone1:","category":"people","emoji_order":"106","aliases":[],"aliases_ascii":[],"keywords":[]},"girl_tone2":{"unicode":"1f467-1f3fc","unicode_alt":"","code_decimal":"&#128103;&#127996;","name":"girl tone 2","shortname":":girl_tone2:","category":"people","emoji_order":"107","aliases":[],"aliases_ascii":[],"keywords":[]},"girl_tone3":{"unicode":"1f467-1f3fd","unicode_alt":"","code_decimal":"&#128103;&#127997;","name":"girl tone 3","shortname":":girl_tone3:","category":"people","emoji_order":"108","aliases":[],"aliases_ascii":[],"keywords":[]},"girl_tone4":{"unicode":"1f467-1f3fe","unicode_alt":"","code_decimal":"&#128103;&#127998;","name":"girl tone 4","shortname":":girl_tone4:","category":"people","emoji_order":"109","aliases":[],"aliases_ascii":[],"keywords":[]},"girl_tone5":{"unicode":"1f467-1f3ff","unicode_alt":"","code_decimal":"&#128103;&#127999;","name":"girl tone 5","shortname":":girl_tone5:","category":"people","emoji_order":"110","aliases":[],"aliases_ascii":[],"keywords":[]},"man":{"unicode":"1f468","unicode_alt":"","code_decimal":"&#128104;","name":"man","shortname":":man:","category":"people","emoji_order":"111","aliases":[],"aliases_ascii":[],"keywords":["people","men","sex","diversity","selfie","boys night"]},"man_tone1":{"unicode":"1f468-1f3fb","unicode_alt":"","code_decimal":"&#128104;&#127995;","name":"man tone 1","shortname":":man_tone1:","category":"people","emoji_order":"112","aliases":[],"aliases_ascii":[],"keywords":[]},"man_tone2":{"unicode":"1f468-1f3fc","unicode_alt":"","code_decimal":"&#128104;&#127996;","name":"man tone 2","shortname":":man_tone2:","category":"people","emoji_order":"113","aliases":[],"aliases_ascii":[],"keywords":[]},"man_tone3":{"unicode":"1f468-1f3fd","unicode_alt":"","code_decimal":"&#128104;&#127997;","name":"man tone 3","shortname":":man_tone3:","category":"people","emoji_order":"114","aliases":[],"aliases_ascii":[],"keywords":[]},"man_tone4":{"unicode":"1f468-1f3fe","unicode_alt":"","code_decimal":"&#128104;&#127998;","name":"man tone 4","shortname":":man_tone4:","category":"people","emoji_order":"115","aliases":[],"aliases_ascii":[],"keywords":[]},"man_tone5":{"unicode":"1f468-1f3ff","unicode_alt":"","code_decimal":"&#128104;&#127999;","name":"man tone 5","shortname":":man_tone5:","category":"people","emoji_order":"116","aliases":[],"aliases_ascii":[],"keywords":[]},"woman":{"unicode":"1f469","unicode_alt":"","code_decimal":"&#128105;","name":"woman","shortname":":woman:","category":"people","emoji_order":"117","aliases":[],"aliases_ascii":[],"keywords":["people","women","sex","diversity","feminist","selfie","girls night"]},"woman_tone1":{"unicode":"1f469-1f3fb","unicode_alt":"","code_decimal":"&#128105;&#127995;","name":"woman tone 1","shortname":":woman_tone1:","category":"people","emoji_order":"118","aliases":[],"aliases_ascii":[],"keywords":[]},"woman_tone2":{"unicode":"1f469-1f3fc","unicode_alt":"","code_decimal":"&#128105;&#127996;","name":"woman tone 2","shortname":":woman_tone2:","category":"people","emoji_order":"119","aliases":[],"aliases_ascii":[],"keywords":[]},"woman_tone3":{"unicode":"1f469-1f3fd","unicode_alt":"","code_decimal":"&#128105;&#127997;","name":"woman tone 3","shortname":":woman_tone3:","category":"people","emoji_order":"120","aliases":[],"aliases_ascii":[],"keywords":[]},"woman_tone4":{"unicode":"1f469-1f3fe","unicode_alt":"","code_decimal":"&#128105;&#127998;","name":"woman tone 4","shortname":":woman_tone4:","category":"people","emoji_order":"121","aliases":[],"aliases_ascii":[],"keywords":[]},"woman_tone5":{"unicode":"1f469-1f3ff","unicode_alt":"","code_decimal":"&#128105;&#127999;","name":"woman tone 5","shortname":":woman_tone5:","category":"people","emoji_order":"122","aliases":[],"aliases_ascii":[],"keywords":[]},"older_man":{"unicode":"1f474","unicode_alt":"","code_decimal":"&#128116;","name":"older man","shortname":":older_man:","category":"people","emoji_order":"123","aliases":[],"aliases_ascii":[],"keywords":["people","men","old people","diversity"]},"older_man_tone1":{"unicode":"1f474-1f3fb","unicode_alt":"","code_decimal":"&#128116;&#127995;","name":"older man tone 1","shortname":":older_man_tone1:","category":"people","emoji_order":"124","aliases":[],"aliases_ascii":[],"keywords":[]},"older_man_tone2":{"unicode":"1f474-1f3fc","unicode_alt":"","code_decimal":"&#128116;&#127996;","name":"older man tone 2","shortname":":older_man_tone2:","category":"people","emoji_order":"125","aliases":[],"aliases_ascii":[],"keywords":[]},"older_man_tone3":{"unicode":"1f474-1f3fd","unicode_alt":"","code_decimal":"&#128116;&#127997;","name":"older man tone 3","shortname":":older_man_tone3:","category":"people","emoji_order":"126","aliases":[],"aliases_ascii":[],"keywords":[]},"older_man_tone4":{"unicode":"1f474-1f3fe","unicode_alt":"","code_decimal":"&#128116;&#127998;","name":"older man tone 4","shortname":":older_man_tone4:","category":"people","emoji_order":"127","aliases":[],"aliases_ascii":[],"keywords":[]},"older_man_tone5":{"unicode":"1f474-1f3ff","unicode_alt":"","code_decimal":"&#128116;&#127999;","name":"older man tone 5","shortname":":older_man_tone5:","category":"people","emoji_order":"128","aliases":[],"aliases_ascii":[],"keywords":[]},"older_woman":{"unicode":"1f475","unicode_alt":"","code_decimal":"&#128117;","name":"older woman","shortname":":older_woman:","category":"people","emoji_order":"129","aliases":[":grandma:"],"aliases_ascii":[],"keywords":["people","old people","diversity"]},"older_woman_tone1":{"unicode":"1f475-1f3fb","unicode_alt":"","code_decimal":"&#128117;&#127995;","name":"older woman tone 1","shortname":":older_woman_tone1:","category":"people","emoji_order":"130","aliases":[":grandma_tone1:"],"aliases_ascii":[],"keywords":[]},"older_woman_tone2":{"unicode":"1f475-1f3fc","unicode_alt":"","code_decimal":"&#128117;&#127996;","name":"older woman tone 2","shortname":":older_woman_tone2:","category":"people","emoji_order":"131","aliases":[":grandma_tone2:"],"aliases_ascii":[],"keywords":[]},"older_woman_tone3":{"unicode":"1f475-1f3fd","unicode_alt":"","code_decimal":"&#128117;&#127997;","name":"older woman tone 3","shortname":":older_woman_tone3:","category":"people","emoji_order":"132","aliases":[":grandma_tone3:"],"aliases_ascii":[],"keywords":[]},"older_woman_tone4":{"unicode":"1f475-1f3fe","unicode_alt":"","code_decimal":"&#128117;&#127998;","name":"older woman tone 4","shortname":":older_woman_tone4:","category":"people","emoji_order":"133","aliases":[":grandma_tone4:"],"aliases_ascii":[],"keywords":[]},"older_woman_tone5":{"unicode":"1f475-1f3ff","unicode_alt":"","code_decimal":"&#128117;&#127999;","name":"older woman tone 5","shortname":":older_woman_tone5:","category":"people","emoji_order":"134","aliases":[":grandma_tone5:"],"aliases_ascii":[],"keywords":[]},"baby":{"unicode":"1f476","unicode_alt":"","code_decimal":"&#128118;","name":"baby","shortname":":baby:","category":"people","emoji_order":"135","aliases":[],"aliases_ascii":[],"keywords":["people","baby","diversity"]},"baby_tone1":{"unicode":"1f476-1f3fb","unicode_alt":"","code_decimal":"&#128118;&#127995;","name":"baby tone 1","shortname":":baby_tone1:","category":"people","emoji_order":"136","aliases":[],"aliases_ascii":[],"keywords":[]},"baby_tone2":{"unicode":"1f476-1f3fc","unicode_alt":"","code_decimal":"&#128118;&#127996;","name":"baby tone 2","shortname":":baby_tone2:","category":"people","emoji_order":"137","aliases":[],"aliases_ascii":[],"keywords":[]},"baby_tone3":{"unicode":"1f476-1f3fd","unicode_alt":"","code_decimal":"&#128118;&#127997;","name":"baby tone 3","shortname":":baby_tone3:","category":"people","emoji_order":"138","aliases":[],"aliases_ascii":[],"keywords":[]},"baby_tone4":{"unicode":"1f476-1f3fe","unicode_alt":"","code_decimal":"&#128118;&#127998;","name":"baby tone 4","shortname":":baby_tone4:","category":"people","emoji_order":"139","aliases":[],"aliases_ascii":[],"keywords":[]},"baby_tone5":{"unicode":"1f476-1f3ff","unicode_alt":"","code_decimal":"&#128118;&#127999;","name":"baby tone 5","shortname":":baby_tone5:","category":"people","emoji_order":"140","aliases":[],"aliases_ascii":[],"keywords":[]},"angel":{"unicode":"1f47c","unicode_alt":"","code_decimal":"&#128124;","name":"baby angel","shortname":":angel:","category":"people","emoji_order":"141","aliases":[],"aliases_ascii":[],"keywords":["people","diversity","omg"]},"angel_tone1":{"unicode":"1f47c-1f3fb","unicode_alt":"","code_decimal":"&#128124;&#127995;","name":"baby angel tone 1","shortname":":angel_tone1:","category":"people","emoji_order":"142","aliases":[],"aliases_ascii":[],"keywords":[]},"angel_tone2":{"unicode":"1f47c-1f3fc","unicode_alt":"","code_decimal":"&#128124;&#127996;","name":"baby angel tone 2","shortname":":angel_tone2:","category":"people","emoji_order":"143","aliases":[],"aliases_ascii":[],"keywords":[]},"angel_tone3":{"unicode":"1f47c-1f3fd","unicode_alt":"","code_decimal":"&#128124;&#127997;","name":"baby angel tone 3","shortname":":angel_tone3:","category":"people","emoji_order":"144","aliases":[],"aliases_ascii":[],"keywords":[]},"angel_tone4":{"unicode":"1f47c-1f3fe","unicode_alt":"","code_decimal":"&#128124;&#127998;","name":"baby angel tone 4","shortname":":angel_tone4:","category":"people","emoji_order":"145","aliases":[],"aliases_ascii":[],"keywords":[]},"angel_tone5":{"unicode":"1f47c-1f3ff","unicode_alt":"","code_decimal":"&#128124;&#127999;","name":"baby angel tone 5","shortname":":angel_tone5:","category":"people","emoji_order":"146","aliases":[],"aliases_ascii":[],"keywords":[]},"cop":{"unicode":"1f46e","unicode_alt":"","code_decimal":"&#128110;","name":"police officer","shortname":":cop:","category":"people","emoji_order":"339","aliases":[],"aliases_ascii":[],"keywords":["people","hat","men","diversity","job","police","911"]},"cop_tone1":{"unicode":"1f46e-1f3fb","unicode_alt":"","code_decimal":"&#128110;&#127995;","name":"police officer tone 1","shortname":":cop_tone1:","category":"people","emoji_order":"340","aliases":[],"aliases_ascii":[],"keywords":[]},"cop_tone2":{"unicode":"1f46e-1f3fc","unicode_alt":"","code_decimal":"&#128110;&#127996;","name":"police officer tone 2","shortname":":cop_tone2:","category":"people","emoji_order":"341","aliases":[],"aliases_ascii":[],"keywords":[]},"cop_tone3":{"unicode":"1f46e-1f3fd","unicode_alt":"","code_decimal":"&#128110;&#127997;","name":"police officer tone 3","shortname":":cop_tone3:","category":"people","emoji_order":"342","aliases":[],"aliases_ascii":[],"keywords":[]},"cop_tone4":{"unicode":"1f46e-1f3fe","unicode_alt":"","code_decimal":"&#128110;&#127998;","name":"police officer tone 4","shortname":":cop_tone4:","category":"people","emoji_order":"343","aliases":[],"aliases_ascii":[],"keywords":[]},"cop_tone5":{"unicode":"1f46e-1f3ff","unicode_alt":"","code_decimal":"&#128110;&#127999;","name":"police officer tone 5","shortname":":cop_tone5:","category":"people","emoji_order":"344","aliases":[],"aliases_ascii":[],"keywords":[]},"spy":{"unicode":"1f575","unicode_alt":"1f575-fe0f","code_decimal":"&#128373;","name":"sleuth or spy","shortname":":spy:","category":"people","emoji_order":"357","aliases":[":sleuth_or_spy:"],"aliases_ascii":[],"keywords":["people","hat","men","glasses","diversity","job"]},"spy_tone1":{"unicode":"1f575-1f3fb","unicode_alt":"","code_decimal":"&#128373;&#127995;","name":"sleuth or spy tone 1","shortname":":spy_tone1:","category":"people","emoji_order":"358","aliases":[":sleuth_or_spy_tone1:"],"aliases_ascii":[],"keywords":[]},"spy_tone2":{"unicode":"1f575-1f3fc","unicode_alt":"","code_decimal":"&#128373;&#127996;","name":"sleuth or spy tone 2","shortname":":spy_tone2:","category":"people","emoji_order":"359","aliases":[":sleuth_or_spy_tone2:"],"aliases_ascii":[],"keywords":[]},"spy_tone3":{"unicode":"1f575-1f3fd","unicode_alt":"","code_decimal":"&#128373;&#127997;","name":"sleuth or spy tone 3","shortname":":spy_tone3:","category":"people","emoji_order":"360","aliases":[":sleuth_or_spy_tone3:"],"aliases_ascii":[],"keywords":[]},"spy_tone4":{"unicode":"1f575-1f3fe","unicode_alt":"","code_decimal":"&#128373;&#127998;","name":"sleuth or spy tone 4","shortname":":spy_tone4:","category":"people","emoji_order":"361","aliases":[":sleuth_or_spy_tone4:"],"aliases_ascii":[],"keywords":[]},"spy_tone5":{"unicode":"1f575-1f3ff","unicode_alt":"","code_decimal":"&#128373;&#127999;","name":"sleuth or spy tone 5","shortname":":spy_tone5:","category":"people","emoji_order":"362","aliases":[":sleuth_or_spy_tone5:"],"aliases_ascii":[],"keywords":[]},"guardsman":{"unicode":"1f482","unicode_alt":"","code_decimal":"&#128130;","name":"guardsman","shortname":":guardsman:","category":"people","emoji_order":"375","aliases":[],"aliases_ascii":[],"keywords":["people","hat","men","diversity","job"]},"guardsman_tone1":{"unicode":"1f482-1f3fb","unicode_alt":"","code_decimal":"&#128130;&#127995;","name":"guardsman tone 1","shortname":":guardsman_tone1:","category":"people","emoji_order":"376","aliases":[],"aliases_ascii":[],"keywords":[]},"guardsman_tone2":{"unicode":"1f482-1f3fc","unicode_alt":"","code_decimal":"&#128130;&#127996;","name":"guardsman tone 2","shortname":":guardsman_tone2:","category":"people","emoji_order":"377","aliases":[],"aliases_ascii":[],"keywords":[]},"guardsman_tone3":{"unicode":"1f482-1f3fd","unicode_alt":"","code_decimal":"&#128130;&#127997;","name":"guardsman tone 3","shortname":":guardsman_tone3:","category":"people","emoji_order":"378","aliases":[],"aliases_ascii":[],"keywords":[]},"guardsman_tone4":{"unicode":"1f482-1f3fe","unicode_alt":"","code_decimal":"&#128130;&#127998;","name":"guardsman tone 4","shortname":":guardsman_tone4:","category":"people","emoji_order":"379","aliases":[],"aliases_ascii":[],"keywords":[]},"guardsman_tone5":{"unicode":"1f482-1f3ff","unicode_alt":"","code_decimal":"&#128130;&#127999;","name":"guardsman tone 5","shortname":":guardsman_tone5:","category":"people","emoji_order":"380","aliases":[],"aliases_ascii":[],"keywords":[]},"construction_worker":{"unicode":"1f477","unicode_alt":"","code_decimal":"&#128119;","name":"construction worker","shortname":":construction_worker:","category":"people","emoji_order":"393","aliases":[],"aliases_ascii":[],"keywords":["people","hat","men","diversity","job"]},"construction_worker_tone1":{"unicode":"1f477-1f3fb","unicode_alt":"","code_decimal":"&#128119;&#127995;","name":"construction worker tone 1","shortname":":construction_worker_tone1:","category":"people","emoji_order":"394","aliases":[],"aliases_ascii":[],"keywords":[]},"construction_worker_tone2":{"unicode":"1f477-1f3fc","unicode_alt":"","code_decimal":"&#128119;&#127996;","name":"construction worker tone 2","shortname":":construction_worker_tone2:","category":"people","emoji_order":"395","aliases":[],"aliases_ascii":[],"keywords":[]},"construction_worker_tone3":{"unicode":"1f477-1f3fd","unicode_alt":"","code_decimal":"&#128119;&#127997;","name":"construction worker tone 3","shortname":":construction_worker_tone3:","category":"people","emoji_order":"396","aliases":[],"aliases_ascii":[],"keywords":[]},"construction_worker_tone4":{"unicode":"1f477-1f3fe","unicode_alt":"","code_decimal":"&#128119;&#127998;","name":"construction worker tone 4","shortname":":construction_worker_tone4:","category":"people","emoji_order":"397","aliases":[],"aliases_ascii":[],"keywords":[]},"construction_worker_tone5":{"unicode":"1f477-1f3ff","unicode_alt":"","code_decimal":"&#128119;&#127999;","name":"construction worker tone 5","shortname":":construction_worker_tone5:","category":"people","emoji_order":"398","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_turban":{"unicode":"1f473","unicode_alt":"","code_decimal":"&#128115;","name":"man with turban","shortname":":man_with_turban:","category":"people","emoji_order":"411","aliases":[],"aliases_ascii":[],"keywords":["people","hat","diversity"]},"man_with_turban_tone1":{"unicode":"1f473-1f3fb","unicode_alt":"","code_decimal":"&#128115;&#127995;","name":"man with turban tone 1","shortname":":man_with_turban_tone1:","category":"people","emoji_order":"412","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_turban_tone2":{"unicode":"1f473-1f3fc","unicode_alt":"","code_decimal":"&#128115;&#127996;","name":"man with turban tone 2","shortname":":man_with_turban_tone2:","category":"people","emoji_order":"413","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_turban_tone3":{"unicode":"1f473-1f3fd","unicode_alt":"","code_decimal":"&#128115;&#127997;","name":"man with turban tone 3","shortname":":man_with_turban_tone3:","category":"people","emoji_order":"414","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_turban_tone4":{"unicode":"1f473-1f3fe","unicode_alt":"","code_decimal":"&#128115;&#127998;","name":"man with turban tone 4","shortname":":man_with_turban_tone4:","category":"people","emoji_order":"415","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_turban_tone5":{"unicode":"1f473-1f3ff","unicode_alt":"","code_decimal":"&#128115;&#127999;","name":"man with turban tone 5","shortname":":man_with_turban_tone5:","category":"people","emoji_order":"416","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_blond_hair":{"unicode":"1f471","unicode_alt":"","code_decimal":"&#128113;","name":"person with blond hair","shortname":":person_with_blond_hair:","category":"people","emoji_order":"429","aliases":[],"aliases_ascii":[],"keywords":["people","men","diversity"]},"person_with_blond_hair_tone1":{"unicode":"1f471-1f3fb","unicode_alt":"","code_decimal":"&#128113;&#127995;","name":"person with blond hair tone 1","shortname":":person_with_blond_hair_tone1:","category":"people","emoji_order":"430","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_blond_hair_tone2":{"unicode":"1f471-1f3fc","unicode_alt":"","code_decimal":"&#128113;&#127996;","name":"person with blond hair tone 2","shortname":":person_with_blond_hair_tone2:","category":"people","emoji_order":"431","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_blond_hair_tone3":{"unicode":"1f471-1f3fd","unicode_alt":"","code_decimal":"&#128113;&#127997;","name":"person with blond hair tone 3","shortname":":person_with_blond_hair_tone3:","category":"people","emoji_order":"432","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_blond_hair_tone4":{"unicode":"1f471-1f3fe","unicode_alt":"","code_decimal":"&#128113;&#127998;","name":"person with blond hair tone 4","shortname":":person_with_blond_hair_tone4:","category":"people","emoji_order":"433","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_blond_hair_tone5":{"unicode":"1f471-1f3ff","unicode_alt":"","code_decimal":"&#128113;&#127999;","name":"person with blond hair tone 5","shortname":":person_with_blond_hair_tone5:","category":"people","emoji_order":"434","aliases":[],"aliases_ascii":[],"keywords":[]},"santa":{"unicode":"1f385","unicode_alt":"","code_decimal":"&#127877;","name":"father christmas","shortname":":santa:","category":"people","emoji_order":"447","aliases":[],"aliases_ascii":[],"keywords":["people","hat","winter","holidays","christmas","diversity","santa"]},"santa_tone1":{"unicode":"1f385-1f3fb","unicode_alt":"","code_decimal":"&#127877;&#127995;","name":"father christmas tone 1","shortname":":santa_tone1:","category":"people","emoji_order":"448","aliases":[],"aliases_ascii":[],"keywords":[]},"santa_tone2":{"unicode":"1f385-1f3fc","unicode_alt":"","code_decimal":"&#127877;&#127996;","name":"father christmas tone 2","shortname":":santa_tone2:","category":"people","emoji_order":"449","aliases":[],"aliases_ascii":[],"keywords":[]},"santa_tone3":{"unicode":"1f385-1f3fd","unicode_alt":"","code_decimal":"&#127877;&#127997;","name":"father christmas tone 3","shortname":":santa_tone3:","category":"people","emoji_order":"450","aliases":[],"aliases_ascii":[],"keywords":[]},"santa_tone4":{"unicode":"1f385-1f3fe","unicode_alt":"","code_decimal":"&#127877;&#127998;","name":"father christmas tone 4","shortname":":santa_tone4:","category":"people","emoji_order":"451","aliases":[],"aliases_ascii":[],"keywords":[]},"santa_tone5":{"unicode":"1f385-1f3ff","unicode_alt":"","code_decimal":"&#127877;&#127999;","name":"father christmas tone 5","shortname":":santa_tone5:","category":"people","emoji_order":"452","aliases":[],"aliases_ascii":[],"keywords":[]},"mrs_claus":{"unicode":"1f936","unicode_alt":"","code_decimal":"&#129334;","name":"mother christmas","shortname":":mrs_claus:","category":"people","emoji_order":"453","aliases":[":mother_christmas:"],"aliases_ascii":[],"keywords":[]},"mrs_claus_tone1":{"unicode":"1f936-1f3fb","unicode_alt":"","code_decimal":"&#129334;&#127995;","name":"mother christmas tone 1","shortname":":mrs_claus_tone1:","category":"people","emoji_order":"454","aliases":[":mother_christmas_tone1:"],"aliases_ascii":[],"keywords":[]},"mrs_claus_tone2":{"unicode":"1f936-1f3fc","unicode_alt":"","code_decimal":"&#129334;&#127996;","name":"mother christmas tone 2","shortname":":mrs_claus_tone2:","category":"people","emoji_order":"455","aliases":[":mother_christmas_tone2:"],"aliases_ascii":[],"keywords":[]},"mrs_claus_tone3":{"unicode":"1f936-1f3fd","unicode_alt":"","code_decimal":"&#129334;&#127997;","name":"mother christmas tone 3","shortname":":mrs_claus_tone3:","category":"people","emoji_order":"456","aliases":[":mother_christmas_tone3:"],"aliases_ascii":[],"keywords":[]},"mrs_claus_tone4":{"unicode":"1f936-1f3fe","unicode_alt":"","code_decimal":"&#129334;&#127998;","name":"mother christmas tone 4","shortname":":mrs_claus_tone4:","category":"people","emoji_order":"457","aliases":[":mother_christmas_tone4:"],"aliases_ascii":[],"keywords":[]},"mrs_claus_tone5":{"unicode":"1f936-1f3ff","unicode_alt":"","code_decimal":"&#129334;&#127999;","name":"mother christmas tone 5","shortname":":mrs_claus_tone5:","category":"people","emoji_order":"458","aliases":[":mother_christmas_tone5:"],"aliases_ascii":[],"keywords":[]},"princess":{"unicode":"1f478","unicode_alt":"","code_decimal":"&#128120;","name":"princess","shortname":":princess:","category":"people","emoji_order":"459","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity","beautiful","girls night"]},"princess_tone1":{"unicode":"1f478-1f3fb","unicode_alt":"","code_decimal":"&#128120;&#127995;","name":"princess tone 1","shortname":":princess_tone1:","category":"people","emoji_order":"460","aliases":[],"aliases_ascii":[],"keywords":[]},"princess_tone2":{"unicode":"1f478-1f3fc","unicode_alt":"","code_decimal":"&#128120;&#127996;","name":"princess tone 2","shortname":":princess_tone2:","category":"people","emoji_order":"461","aliases":[],"aliases_ascii":[],"keywords":[]},"princess_tone3":{"unicode":"1f478-1f3fd","unicode_alt":"","code_decimal":"&#128120;&#127997;","name":"princess tone 3","shortname":":princess_tone3:","category":"people","emoji_order":"462","aliases":[],"aliases_ascii":[],"keywords":[]},"princess_tone4":{"unicode":"1f478-1f3fe","unicode_alt":"","code_decimal":"&#128120;&#127998;","name":"princess tone 4","shortname":":princess_tone4:","category":"people","emoji_order":"463","aliases":[],"aliases_ascii":[],"keywords":[]},"princess_tone5":{"unicode":"1f478-1f3ff","unicode_alt":"","code_decimal":"&#128120;&#127999;","name":"princess tone 5","shortname":":princess_tone5:","category":"people","emoji_order":"464","aliases":[],"aliases_ascii":[],"keywords":[]},"prince":{"unicode":"1f934","unicode_alt":"","code_decimal":"&#129332;","name":"prince","shortname":":prince:","category":"people","emoji_order":"465","aliases":[],"aliases_ascii":[],"keywords":[]},"prince_tone1":{"unicode":"1f934-1f3fb","unicode_alt":"","code_decimal":"&#129332;&#127995;","name":"prince tone 1","shortname":":prince_tone1:","category":"people","emoji_order":"466","aliases":[],"aliases_ascii":[],"keywords":[]},"prince_tone2":{"unicode":"1f934-1f3fc","unicode_alt":"","code_decimal":"&#129332;&#127996;","name":"prince tone 2","shortname":":prince_tone2:","category":"people","emoji_order":"467","aliases":[],"aliases_ascii":[],"keywords":[]},"prince_tone3":{"unicode":"1f934-1f3fd","unicode_alt":"","code_decimal":"&#129332;&#127997;","name":"prince tone 3","shortname":":prince_tone3:","category":"people","emoji_order":"468","aliases":[],"aliases_ascii":[],"keywords":[]},"prince_tone4":{"unicode":"1f934-1f3fe","unicode_alt":"","code_decimal":"&#129332;&#127998;","name":"prince tone 4","shortname":":prince_tone4:","category":"people","emoji_order":"469","aliases":[],"aliases_ascii":[],"keywords":[]},"prince_tone5":{"unicode":"1f934-1f3ff","unicode_alt":"","code_decimal":"&#129332;&#127999;","name":"prince tone 5","shortname":":prince_tone5:","category":"people","emoji_order":"470","aliases":[],"aliases_ascii":[],"keywords":[]},"bride_with_veil":{"unicode":"1f470","unicode_alt":"","code_decimal":"&#128112;","name":"bride with veil","shortname":":bride_with_veil:","category":"people","emoji_order":"471","aliases":[],"aliases_ascii":[],"keywords":["people","wedding","women","diversity"]},"bride_with_veil_tone1":{"unicode":"1f470-1f3fb","unicode_alt":"","code_decimal":"&#128112;&#127995;","name":"bride with veil tone 1","shortname":":bride_with_veil_tone1:","category":"people","emoji_order":"472","aliases":[],"aliases_ascii":[],"keywords":[]},"bride_with_veil_tone2":{"unicode":"1f470-1f3fc","unicode_alt":"","code_decimal":"&#128112;&#127996;","name":"bride with veil tone 2","shortname":":bride_with_veil_tone2:","category":"people","emoji_order":"473","aliases":[],"aliases_ascii":[],"keywords":[]},"bride_with_veil_tone3":{"unicode":"1f470-1f3fd","unicode_alt":"","code_decimal":"&#128112;&#127997;","name":"bride with veil tone 3","shortname":":bride_with_veil_tone3:","category":"people","emoji_order":"474","aliases":[],"aliases_ascii":[],"keywords":[]},"bride_with_veil_tone4":{"unicode":"1f470-1f3fe","unicode_alt":"","code_decimal":"&#128112;&#127998;","name":"bride with veil tone 4","shortname":":bride_with_veil_tone4:","category":"people","emoji_order":"475","aliases":[],"aliases_ascii":[],"keywords":[]},"bride_with_veil_tone5":{"unicode":"1f470-1f3ff","unicode_alt":"","code_decimal":"&#128112;&#127999;","name":"bride with veil tone 5","shortname":":bride_with_veil_tone5:","category":"people","emoji_order":"476","aliases":[],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo":{"unicode":"1f935","unicode_alt":"","code_decimal":"&#129333;","name":"man in tuxedo","shortname":":man_in_tuxedo:","category":"people","emoji_order":"477","aliases":[],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo_tone1":{"unicode":"1f935-1f3fb","unicode_alt":"","code_decimal":"&#129333;&#127995;","name":"man in tuxedo tone 1","shortname":":man_in_tuxedo_tone1:","category":"people","emoji_order":"478","aliases":[":tuxedo_tone1:"],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo_tone2":{"unicode":"1f935-1f3fc","unicode_alt":"","code_decimal":"&#129333;&#127996;","name":"man in tuxedo tone 2","shortname":":man_in_tuxedo_tone2:","category":"people","emoji_order":"479","aliases":[":tuxedo_tone2:"],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo_tone3":{"unicode":"1f935-1f3fd","unicode_alt":"","code_decimal":"&#129333;&#127997;","name":"man in tuxedo tone 3","shortname":":man_in_tuxedo_tone3:","category":"people","emoji_order":"480","aliases":[":tuxedo_tone3:"],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo_tone4":{"unicode":"1f935-1f3fe","unicode_alt":"","code_decimal":"&#129333;&#127998;","name":"man in tuxedo tone 4","shortname":":man_in_tuxedo_tone4:","category":"people","emoji_order":"481","aliases":[":tuxedo_tone4:"],"aliases_ascii":[],"keywords":[]},"man_in_tuxedo_tone5":{"unicode":"1f935-1f3ff","unicode_alt":"","code_decimal":"&#129333;&#127999;","name":"man in tuxedo tone 5","shortname":":man_in_tuxedo_tone5:","category":"people","emoji_order":"482","aliases":[":tuxedo_tone5:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman":{"unicode":"1f930","unicode_alt":"","code_decimal":"&#129328;","name":"pregnant woman","shortname":":pregnant_woman:","category":"people","emoji_order":"483","aliases":[":expecting_woman:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman_tone1":{"unicode":"1f930-1f3fb","unicode_alt":"","code_decimal":"&#129328;&#127995;","name":"pregnant woman tone 1","shortname":":pregnant_woman_tone1:","category":"people","emoji_order":"484","aliases":[":expecting_woman_tone1:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman_tone2":{"unicode":"1f930-1f3fc","unicode_alt":"","code_decimal":"&#129328;&#127996;","name":"pregnant woman tone 2","shortname":":pregnant_woman_tone2:","category":"people","emoji_order":"485","aliases":[":expecting_woman_tone2:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman_tone3":{"unicode":"1f930-1f3fd","unicode_alt":"","code_decimal":"&#129328;&#127997;","name":"pregnant woman tone 3","shortname":":pregnant_woman_tone3:","category":"people","emoji_order":"486","aliases":[":expecting_woman_tone3:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman_tone4":{"unicode":"1f930-1f3fe","unicode_alt":"","code_decimal":"&#129328;&#127998;","name":"pregnant woman tone 4","shortname":":pregnant_woman_tone4:","category":"people","emoji_order":"487","aliases":[":expecting_woman_tone4:"],"aliases_ascii":[],"keywords":[]},"pregnant_woman_tone5":{"unicode":"1f930-1f3ff","unicode_alt":"","code_decimal":"&#129328;&#127999;","name":"pregnant woman tone 5","shortname":":pregnant_woman_tone5:","category":"people","emoji_order":"488","aliases":[":expecting_woman_tone5:"],"aliases_ascii":[],"keywords":[]},"man_with_gua_pi_mao":{"unicode":"1f472","unicode_alt":"","code_decimal":"&#128114;","name":"man with gua pi mao","shortname":":man_with_gua_pi_mao:","category":"people","emoji_order":"489","aliases":[],"aliases_ascii":[],"keywords":["people","hat","men","diversity"]},"man_with_gua_pi_mao_tone1":{"unicode":"1f472-1f3fb","unicode_alt":"","code_decimal":"&#128114;&#127995;","name":"man with gua pi mao tone 1","shortname":":man_with_gua_pi_mao_tone1:","category":"people","emoji_order":"490","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_gua_pi_mao_tone2":{"unicode":"1f472-1f3fc","unicode_alt":"","code_decimal":"&#128114;&#127996;","name":"man with gua pi mao tone 2","shortname":":man_with_gua_pi_mao_tone2:","category":"people","emoji_order":"491","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_gua_pi_mao_tone3":{"unicode":"1f472-1f3fd","unicode_alt":"","code_decimal":"&#128114;&#127997;","name":"man with gua pi mao tone 3","shortname":":man_with_gua_pi_mao_tone3:","category":"people","emoji_order":"492","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_gua_pi_mao_tone4":{"unicode":"1f472-1f3fe","unicode_alt":"","code_decimal":"&#128114;&#127998;","name":"man with gua pi mao tone 4","shortname":":man_with_gua_pi_mao_tone4:","category":"people","emoji_order":"493","aliases":[],"aliases_ascii":[],"keywords":[]},"man_with_gua_pi_mao_tone5":{"unicode":"1f472-1f3ff","unicode_alt":"","code_decimal":"&#128114;&#127999;","name":"man with gua pi mao tone 5","shortname":":man_with_gua_pi_mao_tone5:","category":"people","emoji_order":"494","aliases":[],"aliases_ascii":[],"keywords":[]},"person_frowning":{"unicode":"1f64d","unicode_alt":"","code_decimal":"&#128589;","name":"person frowning","shortname":":person_frowning:","category":"people","emoji_order":"495","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"person_frowning_tone1":{"unicode":"1f64d-1f3fb","unicode_alt":"","code_decimal":"&#128589;&#127995;","name":"person frowning tone 1","shortname":":person_frowning_tone1:","category":"people","emoji_order":"496","aliases":[],"aliases_ascii":[],"keywords":[]},"person_frowning_tone2":{"unicode":"1f64d-1f3fc","unicode_alt":"","code_decimal":"&#128589;&#127996;","name":"person frowning tone 2","shortname":":person_frowning_tone2:","category":"people","emoji_order":"497","aliases":[],"aliases_ascii":[],"keywords":[]},"person_frowning_tone3":{"unicode":"1f64d-1f3fd","unicode_alt":"","code_decimal":"&#128589;&#127997;","name":"person frowning tone 3","shortname":":person_frowning_tone3:","category":"people","emoji_order":"498","aliases":[],"aliases_ascii":[],"keywords":[]},"person_frowning_tone4":{"unicode":"1f64d-1f3fe","unicode_alt":"","code_decimal":"&#128589;&#127998;","name":"person frowning tone 4","shortname":":person_frowning_tone4:","category":"people","emoji_order":"499","aliases":[],"aliases_ascii":[],"keywords":[]},"person_frowning_tone5":{"unicode":"1f64d-1f3ff","unicode_alt":"","code_decimal":"&#128589;&#127999;","name":"person frowning tone 5","shortname":":person_frowning_tone5:","category":"people","emoji_order":"500","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_pouting_face":{"unicode":"1f64e","unicode_alt":"","code_decimal":"&#128590;","name":"person with pouting face","shortname":":person_with_pouting_face:","category":"people","emoji_order":"513","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"person_with_pouting_face_tone1":{"unicode":"1f64e-1f3fb","unicode_alt":"","code_decimal":"&#128590;&#127995;","name":"person with pouting face tone1","shortname":":person_with_pouting_face_tone1:","category":"people","emoji_order":"514","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_pouting_face_tone2":{"unicode":"1f64e-1f3fc","unicode_alt":"","code_decimal":"&#128590;&#127996;","name":"person with pouting face tone2","shortname":":person_with_pouting_face_tone2:","category":"people","emoji_order":"515","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_pouting_face_tone3":{"unicode":"1f64e-1f3fd","unicode_alt":"","code_decimal":"&#128590;&#127997;","name":"person with pouting face tone3","shortname":":person_with_pouting_face_tone3:","category":"people","emoji_order":"516","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_pouting_face_tone4":{"unicode":"1f64e-1f3fe","unicode_alt":"","code_decimal":"&#128590;&#127998;","name":"person with pouting face tone4","shortname":":person_with_pouting_face_tone4:","category":"people","emoji_order":"517","aliases":[],"aliases_ascii":[],"keywords":[]},"person_with_pouting_face_tone5":{"unicode":"1f64e-1f3ff","unicode_alt":"","code_decimal":"&#128590;&#127999;","name":"person with pouting face tone5","shortname":":person_with_pouting_face_tone5:","category":"people","emoji_order":"518","aliases":[],"aliases_ascii":[],"keywords":[]},"no_good":{"unicode":"1f645","unicode_alt":"","code_decimal":"&#128581;","name":"face with no good gesture","shortname":":no_good:","category":"people","emoji_order":"531","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity","girls night"]},"no_good_tone1":{"unicode":"1f645-1f3fb","unicode_alt":"","code_decimal":"&#128581;&#127995;","name":"face with no good gesture tone 1","shortname":":no_good_tone1:","category":"people","emoji_order":"532","aliases":[],"aliases_ascii":[],"keywords":[]},"no_good_tone2":{"unicode":"1f645-1f3fc","unicode_alt":"","code_decimal":"&#128581;&#127996;","name":"face with no good gesture tone 2","shortname":":no_good_tone2:","category":"people","emoji_order":"533","aliases":[],"aliases_ascii":[],"keywords":[]},"no_good_tone3":{"unicode":"1f645-1f3fd","unicode_alt":"","code_decimal":"&#128581;&#127997;","name":"face with no good gesture tone 3","shortname":":no_good_tone3:","category":"people","emoji_order":"534","aliases":[],"aliases_ascii":[],"keywords":[]},"no_good_tone4":{"unicode":"1f645-1f3fe","unicode_alt":"","code_decimal":"&#128581;&#127998;","name":"face with no good gesture tone 4","shortname":":no_good_tone4:","category":"people","emoji_order":"535","aliases":[],"aliases_ascii":[],"keywords":[]},"no_good_tone5":{"unicode":"1f645-1f3ff","unicode_alt":"","code_decimal":"&#128581;&#127999;","name":"face with no good gesture tone 5","shortname":":no_good_tone5:","category":"people","emoji_order":"536","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_woman":{"unicode":"1f646","unicode_alt":"","code_decimal":"&#128582;","name":"face with ok gesture","shortname":":ok_woman:","category":"people","emoji_order":"549","aliases":[],"aliases_ascii":["*\\0\/*","\\0\/","*\\O\/*","\\O\/"],"keywords":["people","women","diversity"]},"ok_woman_tone1":{"unicode":"1f646-1f3fb","unicode_alt":"","code_decimal":"&#128582;&#127995;","name":"face with ok gesture tone1","shortname":":ok_woman_tone1:","category":"people","emoji_order":"550","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_woman_tone2":{"unicode":"1f646-1f3fc","unicode_alt":"","code_decimal":"&#128582;&#127996;","name":"face with ok gesture tone2","shortname":":ok_woman_tone2:","category":"people","emoji_order":"551","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_woman_tone3":{"unicode":"1f646-1f3fd","unicode_alt":"","code_decimal":"&#128582;&#127997;","name":"face with ok gesture tone3","shortname":":ok_woman_tone3:","category":"people","emoji_order":"552","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_woman_tone4":{"unicode":"1f646-1f3fe","unicode_alt":"","code_decimal":"&#128582;&#127998;","name":"face with ok gesture tone4","shortname":":ok_woman_tone4:","category":"people","emoji_order":"553","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_woman_tone5":{"unicode":"1f646-1f3ff","unicode_alt":"","code_decimal":"&#128582;&#127999;","name":"face with ok gesture tone5","shortname":":ok_woman_tone5:","category":"people","emoji_order":"554","aliases":[],"aliases_ascii":[],"keywords":[]},"information_desk_person":{"unicode":"1f481","unicode_alt":"","code_decimal":"&#128129;","name":"information desk person","shortname":":information_desk_person:","category":"people","emoji_order":"567","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"information_desk_person_tone1":{"unicode":"1f481-1f3fb","unicode_alt":"","code_decimal":"&#128129;&#127995;","name":"information desk person tone 1","shortname":":information_desk_person_tone1:","category":"people","emoji_order":"568","aliases":[],"aliases_ascii":[],"keywords":[]},"information_desk_person_tone2":{"unicode":"1f481-1f3fc","unicode_alt":"","code_decimal":"&#128129;&#127996;","name":"information desk person tone 2","shortname":":information_desk_person_tone2:","category":"people","emoji_order":"569","aliases":[],"aliases_ascii":[],"keywords":[]},"information_desk_person_tone3":{"unicode":"1f481-1f3fd","unicode_alt":"","code_decimal":"&#128129;&#127997;","name":"information desk person tone 3","shortname":":information_desk_person_tone3:","category":"people","emoji_order":"570","aliases":[],"aliases_ascii":[],"keywords":[]},"information_desk_person_tone4":{"unicode":"1f481-1f3fe","unicode_alt":"","code_decimal":"&#128129;&#127998;","name":"information desk person tone 4","shortname":":information_desk_person_tone4:","category":"people","emoji_order":"571","aliases":[],"aliases_ascii":[],"keywords":[]},"information_desk_person_tone5":{"unicode":"1f481-1f3ff","unicode_alt":"","code_decimal":"&#128129;&#127999;","name":"information desk person tone 5","shortname":":information_desk_person_tone5:","category":"people","emoji_order":"572","aliases":[],"aliases_ascii":[],"keywords":[]},"raising_hand":{"unicode":"1f64b","unicode_alt":"","code_decimal":"&#128587;","name":"happy person raising one hand","shortname":":raising_hand:","category":"people","emoji_order":"585","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"raising_hand_tone1":{"unicode":"1f64b-1f3fb","unicode_alt":"","code_decimal":"&#128587;&#127995;","name":"happy person raising one hand tone1","shortname":":raising_hand_tone1:","category":"people","emoji_order":"586","aliases":[],"aliases_ascii":[],"keywords":[]},"raising_hand_tone2":{"unicode":"1f64b-1f3fc","unicode_alt":"","code_decimal":"&#128587;&#127996;","name":"happy person raising one hand tone2","shortname":":raising_hand_tone2:","category":"people","emoji_order":"587","aliases":[],"aliases_ascii":[],"keywords":[]},"raising_hand_tone3":{"unicode":"1f64b-1f3fd","unicode_alt":"","code_decimal":"&#128587;&#127997;","name":"happy person raising one hand tone3","shortname":":raising_hand_tone3:","category":"people","emoji_order":"588","aliases":[],"aliases_ascii":[],"keywords":[]},"raising_hand_tone4":{"unicode":"1f64b-1f3fe","unicode_alt":"","code_decimal":"&#128587;&#127998;","name":"happy person raising one hand tone4","shortname":":raising_hand_tone4:","category":"people","emoji_order":"589","aliases":[],"aliases_ascii":[],"keywords":[]},"raising_hand_tone5":{"unicode":"1f64b-1f3ff","unicode_alt":"","code_decimal":"&#128587;&#127999;","name":"happy person raising one hand tone5","shortname":":raising_hand_tone5:","category":"people","emoji_order":"590","aliases":[],"aliases_ascii":[],"keywords":[]},"bow":{"unicode":"1f647","unicode_alt":"","code_decimal":"&#128583;","name":"person bowing deeply","shortname":":bow:","category":"people","emoji_order":"603","aliases":[],"aliases_ascii":[],"keywords":["people","pray","diversity"]},"bow_tone1":{"unicode":"1f647-1f3fb","unicode_alt":"","code_decimal":"&#128583;&#127995;","name":"person bowing deeply tone 1","shortname":":bow_tone1:","category":"people","emoji_order":"604","aliases":[],"aliases_ascii":[],"keywords":[]},"bow_tone2":{"unicode":"1f647-1f3fc","unicode_alt":"","code_decimal":"&#128583;&#127996;","name":"person bowing deeply tone 2","shortname":":bow_tone2:","category":"people","emoji_order":"605","aliases":[],"aliases_ascii":[],"keywords":[]},"bow_tone3":{"unicode":"1f647-1f3fd","unicode_alt":"","code_decimal":"&#128583;&#127997;","name":"person bowing deeply tone 3","shortname":":bow_tone3:","category":"people","emoji_order":"606","aliases":[],"aliases_ascii":[],"keywords":[]},"bow_tone4":{"unicode":"1f647-1f3fe","unicode_alt":"","code_decimal":"&#128583;&#127998;","name":"person bowing deeply tone 4","shortname":":bow_tone4:","category":"people","emoji_order":"607","aliases":[],"aliases_ascii":[],"keywords":[]},"bow_tone5":{"unicode":"1f647-1f3ff","unicode_alt":"","code_decimal":"&#128583;&#127999;","name":"person bowing deeply tone 5","shortname":":bow_tone5:","category":"people","emoji_order":"608","aliases":[],"aliases_ascii":[],"keywords":[]},"face_palm":{"unicode":"1f926","unicode_alt":"","code_decimal":"&#129318;","name":"face palm","shortname":":face_palm:","category":"people","emoji_order":"621","aliases":[":facepalm:"],"aliases_ascii":[],"keywords":[]},"face_palm_tone1":{"unicode":"1f926-1f3fb","unicode_alt":"","code_decimal":"&#129318;&#127995;","name":"face palm tone 1","shortname":":face_palm_tone1:","category":"people","emoji_order":"622","aliases":[":facepalm_tone1:"],"aliases_ascii":[],"keywords":[]},"face_palm_tone2":{"unicode":"1f926-1f3fc","unicode_alt":"","code_decimal":"&#129318;&#127996;","name":"face palm tone 2","shortname":":face_palm_tone2:","category":"people","emoji_order":"623","aliases":[":facepalm_tone2:"],"aliases_ascii":[],"keywords":[]},"face_palm_tone3":{"unicode":"1f926-1f3fd","unicode_alt":"","code_decimal":"&#129318;&#127997;","name":"face palm tone 3","shortname":":face_palm_tone3:","category":"people","emoji_order":"624","aliases":[":facepalm_tone3:"],"aliases_ascii":[],"keywords":[]},"face_palm_tone4":{"unicode":"1f926-1f3fe","unicode_alt":"","code_decimal":"&#129318;&#127998;","name":"face palm tone 4","shortname":":face_palm_tone4:","category":"people","emoji_order":"625","aliases":[":facepalm_tone4:"],"aliases_ascii":[],"keywords":[]},"face_palm_tone5":{"unicode":"1f926-1f3ff","unicode_alt":"","code_decimal":"&#129318;&#127999;","name":"face palm tone 5","shortname":":face_palm_tone5:","category":"people","emoji_order":"626","aliases":[":facepalm_tone5:"],"aliases_ascii":[],"keywords":[]},"shrug":{"unicode":"1f937","unicode_alt":"","code_decimal":"&#129335;","name":"shrug","shortname":":shrug:","category":"people","emoji_order":"639","aliases":[],"aliases_ascii":[],"keywords":[]},"shrug_tone1":{"unicode":"1f937-1f3fb","unicode_alt":"","code_decimal":"&#129335;&#127995;","name":"shrug tone 1","shortname":":shrug_tone1:","category":"people","emoji_order":"640","aliases":[],"aliases_ascii":[],"keywords":[]},"shrug_tone2":{"unicode":"1f937-1f3fc","unicode_alt":"","code_decimal":"&#129335;&#127996;","name":"shrug tone 2","shortname":":shrug_tone2:","category":"people","emoji_order":"641","aliases":[],"aliases_ascii":[],"keywords":[]},"shrug_tone3":{"unicode":"1f937-1f3fd","unicode_alt":"","code_decimal":"&#129335;&#127997;","name":"shrug tone 3","shortname":":shrug_tone3:","category":"people","emoji_order":"642","aliases":[],"aliases_ascii":[],"keywords":[]},"shrug_tone4":{"unicode":"1f937-1f3fe","unicode_alt":"","code_decimal":"&#129335;&#127998;","name":"shrug tone 4","shortname":":shrug_tone4:","category":"people","emoji_order":"643","aliases":[],"aliases_ascii":[],"keywords":[]},"shrug_tone5":{"unicode":"1f937-1f3ff","unicode_alt":"","code_decimal":"&#129335;&#127999;","name":"shrug tone 5","shortname":":shrug_tone5:","category":"people","emoji_order":"644","aliases":[],"aliases_ascii":[],"keywords":[]},"massage":{"unicode":"1f486","unicode_alt":"","code_decimal":"&#128134;","name":"face massage","shortname":":massage:","category":"people","emoji_order":"657","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"massage_tone1":{"unicode":"1f486-1f3fb","unicode_alt":"","code_decimal":"&#128134;&#127995;","name":"face massage tone 1","shortname":":massage_tone1:","category":"people","emoji_order":"658","aliases":[],"aliases_ascii":[],"keywords":[]},"massage_tone2":{"unicode":"1f486-1f3fc","unicode_alt":"","code_decimal":"&#128134;&#127996;","name":"face massage tone 2","shortname":":massage_tone2:","category":"people","emoji_order":"659","aliases":[],"aliases_ascii":[],"keywords":[]},"massage_tone3":{"unicode":"1f486-1f3fd","unicode_alt":"","code_decimal":"&#128134;&#127997;","name":"face massage tone 3","shortname":":massage_tone3:","category":"people","emoji_order":"660","aliases":[],"aliases_ascii":[],"keywords":[]},"massage_tone4":{"unicode":"1f486-1f3fe","unicode_alt":"","code_decimal":"&#128134;&#127998;","name":"face massage tone 4","shortname":":massage_tone4:","category":"people","emoji_order":"661","aliases":[],"aliases_ascii":[],"keywords":[]},"massage_tone5":{"unicode":"1f486-1f3ff","unicode_alt":"","code_decimal":"&#128134;&#127999;","name":"face massage tone 5","shortname":":massage_tone5:","category":"people","emoji_order":"662","aliases":[],"aliases_ascii":[],"keywords":[]},"haircut":{"unicode":"1f487","unicode_alt":"","code_decimal":"&#128135;","name":"haircut","shortname":":haircut:","category":"people","emoji_order":"675","aliases":[],"aliases_ascii":[],"keywords":["people","women","diversity"]},"haircut_tone1":{"unicode":"1f487-1f3fb","unicode_alt":"","code_decimal":"&#128135;&#127995;","name":"haircut tone 1","shortname":":haircut_tone1:","category":"people","emoji_order":"676","aliases":[],"aliases_ascii":[],"keywords":[]},"haircut_tone2":{"unicode":"1f487-1f3fc","unicode_alt":"","code_decimal":"&#128135;&#127996;","name":"haircut tone 2","shortname":":haircut_tone2:","category":"people","emoji_order":"677","aliases":[],"aliases_ascii":[],"keywords":[]},"haircut_tone3":{"unicode":"1f487-1f3fd","unicode_alt":"","code_decimal":"&#128135;&#127997;","name":"haircut tone 3","shortname":":haircut_tone3:","category":"people","emoji_order":"678","aliases":[],"aliases_ascii":[],"keywords":[]},"haircut_tone4":{"unicode":"1f487-1f3fe","unicode_alt":"","code_decimal":"&#128135;&#127998;","name":"haircut tone 4","shortname":":haircut_tone4:","category":"people","emoji_order":"679","aliases":[],"aliases_ascii":[],"keywords":[]},"haircut_tone5":{"unicode":"1f487-1f3ff","unicode_alt":"","code_decimal":"&#128135;&#127999;","name":"haircut tone 5","shortname":":haircut_tone5:","category":"people","emoji_order":"680","aliases":[],"aliases_ascii":[],"keywords":[]},"walking":{"unicode":"1f6b6","unicode_alt":"","code_decimal":"&#128694;","name":"pedestrian","shortname":":walking:","category":"people","emoji_order":"693","aliases":[],"aliases_ascii":[],"keywords":["people","men","diversity"]},"walking_tone1":{"unicode":"1f6b6-1f3fb","unicode_alt":"","code_decimal":"&#128694;&#127995;","name":"pedestrian tone 1","shortname":":walking_tone1:","category":"people","emoji_order":"694","aliases":[],"aliases_ascii":[],"keywords":[]},"walking_tone2":{"unicode":"1f6b6-1f3fc","unicode_alt":"","code_decimal":"&#128694;&#127996;","name":"pedestrian tone 2","shortname":":walking_tone2:","category":"people","emoji_order":"695","aliases":[],"aliases_ascii":[],"keywords":[]},"walking_tone3":{"unicode":"1f6b6-1f3fd","unicode_alt":"","code_decimal":"&#128694;&#127997;","name":"pedestrian tone 3","shortname":":walking_tone3:","category":"people","emoji_order":"696","aliases":[],"aliases_ascii":[],"keywords":[]},"walking_tone4":{"unicode":"1f6b6-1f3fe","unicode_alt":"","code_decimal":"&#128694;&#127998;","name":"pedestrian tone 4","shortname":":walking_tone4:","category":"people","emoji_order":"697","aliases":[],"aliases_ascii":[],"keywords":[]},"walking_tone5":{"unicode":"1f6b6-1f3ff","unicode_alt":"","code_decimal":"&#128694;&#127999;","name":"pedestrian tone 5","shortname":":walking_tone5:","category":"people","emoji_order":"698","aliases":[],"aliases_ascii":[],"keywords":[]},"runner":{"unicode":"1f3c3","unicode_alt":"","code_decimal":"&#127939;","name":"runner","shortname":":runner:","category":"people","emoji_order":"711","aliases":[],"aliases_ascii":[],"keywords":["people","men","diversity","boys night","run"]},"runner_tone1":{"unicode":"1f3c3-1f3fb","unicode_alt":"","code_decimal":"&#127939;&#127995;","name":"runner tone 1","shortname":":runner_tone1:","category":"people","emoji_order":"712","aliases":[],"aliases_ascii":[],"keywords":[]},"runner_tone2":{"unicode":"1f3c3-1f3fc","unicode_alt":"","code_decimal":"&#127939;&#127996;","name":"runner tone 2","shortname":":runner_tone2:","category":"people","emoji_order":"713","aliases":[],"aliases_ascii":[],"keywords":[]},"runner_tone3":{"unicode":"1f3c3-1f3fd","unicode_alt":"","code_decimal":"&#127939;&#127997;","name":"runner tone 3","shortname":":runner_tone3:","category":"people","emoji_order":"714","aliases":[],"aliases_ascii":[],"keywords":[]},"runner_tone4":{"unicode":"1f3c3-1f3fe","unicode_alt":"","code_decimal":"&#127939;&#127998;","name":"runner tone 4","shortname":":runner_tone4:","category":"people","emoji_order":"715","aliases":[],"aliases_ascii":[],"keywords":[]},"runner_tone5":{"unicode":"1f3c3-1f3ff","unicode_alt":"","code_decimal":"&#127939;&#127999;","name":"runner tone 5","shortname":":runner_tone5:","category":"people","emoji_order":"716","aliases":[],"aliases_ascii":[],"keywords":[]},"dancer":{"unicode":"1f483","unicode_alt":"","code_decimal":"&#128131;","name":"dancer","shortname":":dancer:","category":"people","emoji_order":"729","aliases":[],"aliases_ascii":[],"keywords":["people","women","sexy","diversity","girls night","dance"]},"dancer_tone1":{"unicode":"1f483-1f3fb","unicode_alt":"","code_decimal":"&#128131;&#127995;","name":"dancer tone 1","shortname":":dancer_tone1:","category":"people","emoji_order":"730","aliases":[],"aliases_ascii":[],"keywords":[]},"dancer_tone2":{"unicode":"1f483-1f3fc","unicode_alt":"","code_decimal":"&#128131;&#127996;","name":"dancer tone 2","shortname":":dancer_tone2:","category":"people","emoji_order":"731","aliases":[],"aliases_ascii":[],"keywords":[]},"dancer_tone3":{"unicode":"1f483-1f3fd","unicode_alt":"","code_decimal":"&#128131;&#127997;","name":"dancer tone 3","shortname":":dancer_tone3:","category":"people","emoji_order":"732","aliases":[],"aliases_ascii":[],"keywords":[]},"dancer_tone4":{"unicode":"1f483-1f3fe","unicode_alt":"","code_decimal":"&#128131;&#127998;","name":"dancer tone 4","shortname":":dancer_tone4:","category":"people","emoji_order":"733","aliases":[],"aliases_ascii":[],"keywords":[]},"dancer_tone5":{"unicode":"1f483-1f3ff","unicode_alt":"","code_decimal":"&#128131;&#127999;","name":"dancer tone 5","shortname":":dancer_tone5:","category":"people","emoji_order":"734","aliases":[],"aliases_ascii":[],"keywords":[]},"man_dancing":{"unicode":"1f57a","unicode_alt":"","code_decimal":"&#128378;","name":"man dancing","shortname":":man_dancing:","category":"people","emoji_order":"735","aliases":[":male_dancer:"],"aliases_ascii":[],"keywords":[]},"man_dancing_tone1":{"unicode":"1f57a-1f3fb","unicode_alt":"","code_decimal":"&#128378;&#127995;","name":"man dancing tone 1","shortname":":man_dancing_tone1:","category":"people","emoji_order":"736","aliases":[":male_dancer_tone1:"],"aliases_ascii":[],"keywords":[]},"man_dancing_tone2":{"unicode":"1f57a-1f3fc","unicode_alt":"","code_decimal":"&#128378;&#127996;","name":"man dancing tone 2","shortname":":man_dancing_tone2:","category":"people","emoji_order":"737","aliases":[":male_dancer_tone2:"],"aliases_ascii":[],"keywords":[]},"man_dancing_tone3":{"unicode":"1f57a-1f3fd","unicode_alt":"","code_decimal":"&#128378;&#127997;","name":"man dancing tone 3","shortname":":man_dancing_tone3:","category":"people","emoji_order":"738","aliases":[":male_dancer_tone3:"],"aliases_ascii":[],"keywords":[]},"man_dancing_tone4":{"unicode":"1f57a-1f3fe","unicode_alt":"","code_decimal":"&#128378;&#127998;","name":"man dancing tone 4","shortname":":man_dancing_tone4:","category":"people","emoji_order":"739","aliases":[":male_dancer_tone4:"],"aliases_ascii":[],"keywords":[]},"man_dancing_tone5":{"unicode":"1f57a-1f3ff","unicode_alt":"","code_decimal":"&#128378;&#127999;","name":"man dancing tone 5","shortname":":man_dancing_tone5:","category":"people","emoji_order":"740","aliases":[":male_dancer_tone5:"],"aliases_ascii":[],"keywords":[]},"dancers":{"unicode":"1f46f","unicode_alt":"","code_decimal":"&#128111;","name":"woman with bunny ears","shortname":":dancers:","category":"people","emoji_order":"741","aliases":[],"aliases_ascii":[],"keywords":["people","women","sexy","girls night","boys night","parties","dance"]},"levitate":{"unicode":"1f574","unicode_alt":"1f574-fe0f","code_decimal":"&#128372;","name":"man in business suit levitating","shortname":":levitate:","category":"activity","emoji_order":"759","aliases":[":man_in_business_suit_levitating:"],"aliases_ascii":[],"keywords":["men","job"]},"speaking_head":{"unicode":"1f5e3","unicode_alt":"1f5e3-fe0f","code_decimal":"&#128483;","name":"speaking head in silhouette","shortname":":speaking_head:","category":"people","emoji_order":"765","aliases":[":speaking_head_in_silhouette:"],"aliases_ascii":[],"keywords":["people","talk"]},"bust_in_silhouette":{"unicode":"1f464","unicode_alt":"","code_decimal":"&#128100;","name":"bust in silhouette","shortname":":bust_in_silhouette:","category":"people","emoji_order":"766","aliases":[],"aliases_ascii":[],"keywords":["people"]},"busts_in_silhouette":{"unicode":"1f465","unicode_alt":"","code_decimal":"&#128101;","name":"busts in silhouette","shortname":":busts_in_silhouette:","category":"people","emoji_order":"767","aliases":[],"aliases_ascii":[],"keywords":["people"]},"fencer":{"unicode":"1f93a","unicode_alt":"","code_decimal":"&#129338;","name":"fencer","shortname":":fencer:","category":"activity","emoji_order":"768","aliases":[":fencing:"],"aliases_ascii":[],"keywords":[]},"horse_racing":{"unicode":"1f3c7","unicode_alt":"","code_decimal":"&#127943;","name":"horse racing","shortname":":horse_racing:","category":"activity","emoji_order":"769","aliases":[],"aliases_ascii":[],"keywords":["men","sport","horse racing"]},"horse_racing_tone1":{"unicode":"1f3c7-1f3fb","unicode_alt":"","code_decimal":"&#127943;&#127995;","name":"horse racing tone 1","shortname":":horse_racing_tone1:","category":"activity","emoji_order":"770","aliases":[],"aliases_ascii":[],"keywords":[]},"horse_racing_tone2":{"unicode":"1f3c7-1f3fc","unicode_alt":"","code_decimal":"&#127943;&#127996;","name":"horse racing tone 2","shortname":":horse_racing_tone2:","category":"activity","emoji_order":"771","aliases":[],"aliases_ascii":[],"keywords":[]},"horse_racing_tone3":{"unicode":"1f3c7-1f3fd","unicode_alt":"","code_decimal":"&#127943;&#127997;","name":"horse racing tone 3","shortname":":horse_racing_tone3:","category":"activity","emoji_order":"772","aliases":[],"aliases_ascii":[],"keywords":[]},"horse_racing_tone4":{"unicode":"1f3c7-1f3fe","unicode_alt":"","code_decimal":"&#127943;&#127998;","name":"horse racing tone 4","shortname":":horse_racing_tone4:","category":"activity","emoji_order":"773","aliases":[],"aliases_ascii":[],"keywords":[]},"horse_racing_tone5":{"unicode":"1f3c7-1f3ff","unicode_alt":"","code_decimal":"&#127943;&#127999;","name":"horse racing tone 5","shortname":":horse_racing_tone5:","category":"activity","emoji_order":"774","aliases":[],"aliases_ascii":[],"keywords":[]},"skier":{"unicode":"26f7","unicode_alt":"26f7-fe0f","code_decimal":"&#9975;","name":"skier","shortname":":skier:","category":"activity","emoji_order":"775","aliases":[],"aliases_ascii":[],"keywords":["hat","vacation","cold","sport","skiing"]},"snowboarder":{"unicode":"1f3c2","unicode_alt":"","code_decimal":"&#127938;","name":"snowboarder","shortname":":snowboarder:","category":"activity","emoji_order":"776","aliases":[],"aliases_ascii":[],"keywords":["hat","vacation","cold","sport","snowboarding"]},"golfer":{"unicode":"1f3cc","unicode_alt":"1f3cc-fe0f","code_decimal":"&#127948;","name":"golfer","shortname":":golfer:","category":"activity","emoji_order":"782","aliases":[],"aliases_ascii":[],"keywords":["men","game","ball","vacation","sport","golf"]},"surfer":{"unicode":"1f3c4","unicode_alt":"","code_decimal":"&#127940;","name":"surfer","shortname":":surfer:","category":"activity","emoji_order":"800","aliases":[],"aliases_ascii":[],"keywords":["men","vacation","tropical","sport","diversity"]},"surfer_tone1":{"unicode":"1f3c4-1f3fb","unicode_alt":"","code_decimal":"&#127940;&#127995;","name":"surfer tone 1","shortname":":surfer_tone1:","category":"activity","emoji_order":"801","aliases":[],"aliases_ascii":[],"keywords":[]},"surfer_tone2":{"unicode":"1f3c4-1f3fc","unicode_alt":"","code_decimal":"&#127940;&#127996;","name":"surfer tone 2","shortname":":surfer_tone2:","category":"activity","emoji_order":"802","aliases":[],"aliases_ascii":[],"keywords":[]},"surfer_tone3":{"unicode":"1f3c4-1f3fd","unicode_alt":"","code_decimal":"&#127940;&#127997;","name":"surfer tone 3","shortname":":surfer_tone3:","category":"activity","emoji_order":"803","aliases":[],"aliases_ascii":[],"keywords":[]},"surfer_tone4":{"unicode":"1f3c4-1f3fe","unicode_alt":"","code_decimal":"&#127940;&#127998;","name":"surfer tone 4","shortname":":surfer_tone4:","category":"activity","emoji_order":"804","aliases":[],"aliases_ascii":[],"keywords":[]},"surfer_tone5":{"unicode":"1f3c4-1f3ff","unicode_alt":"","code_decimal":"&#127940;&#127999;","name":"surfer tone 5","shortname":":surfer_tone5:","category":"activity","emoji_order":"805","aliases":[],"aliases_ascii":[],"keywords":[]},"rowboat":{"unicode":"1f6a3","unicode_alt":"","code_decimal":"&#128675;","name":"rowboat","shortname":":rowboat:","category":"activity","emoji_order":"818","aliases":[],"aliases_ascii":[],"keywords":["men","workout","sport","rowing","diversity"]},"rowboat_tone1":{"unicode":"1f6a3-1f3fb","unicode_alt":"","code_decimal":"&#128675;&#127995;","name":"rowboat tone 1","shortname":":rowboat_tone1:","category":"activity","emoji_order":"819","aliases":[],"aliases_ascii":[],"keywords":[]},"rowboat_tone2":{"unicode":"1f6a3-1f3fc","unicode_alt":"","code_decimal":"&#128675;&#127996;","name":"rowboat tone 2","shortname":":rowboat_tone2:","category":"activity","emoji_order":"820","aliases":[],"aliases_ascii":[],"keywords":[]},"rowboat_tone3":{"unicode":"1f6a3-1f3fd","unicode_alt":"","code_decimal":"&#128675;&#127997;","name":"rowboat tone 3","shortname":":rowboat_tone3:","category":"activity","emoji_order":"821","aliases":[],"aliases_ascii":[],"keywords":[]},"rowboat_tone4":{"unicode":"1f6a3-1f3fe","unicode_alt":"","code_decimal":"&#128675;&#127998;","name":"rowboat tone 4","shortname":":rowboat_tone4:","category":"activity","emoji_order":"822","aliases":[],"aliases_ascii":[],"keywords":[]},"rowboat_tone5":{"unicode":"1f6a3-1f3ff","unicode_alt":"","code_decimal":"&#128675;&#127999;","name":"rowboat tone 5","shortname":":rowboat_tone5:","category":"activity","emoji_order":"823","aliases":[],"aliases_ascii":[],"keywords":[]},"swimmer":{"unicode":"1f3ca","unicode_alt":"","code_decimal":"&#127946;","name":"swimmer","shortname":":swimmer:","category":"activity","emoji_order":"836","aliases":[],"aliases_ascii":[],"keywords":["workout","sport","swim","diversity"]},"swimmer_tone1":{"unicode":"1f3ca-1f3fb","unicode_alt":"","code_decimal":"&#127946;&#127995;","name":"swimmer tone 1","shortname":":swimmer_tone1:","category":"activity","emoji_order":"837","aliases":[],"aliases_ascii":[],"keywords":[]},"swimmer_tone2":{"unicode":"1f3ca-1f3fc","unicode_alt":"","code_decimal":"&#127946;&#127996;","name":"swimmer tone 2","shortname":":swimmer_tone2:","category":"activity","emoji_order":"838","aliases":[],"aliases_ascii":[],"keywords":[]},"swimmer_tone3":{"unicode":"1f3ca-1f3fd","unicode_alt":"","code_decimal":"&#127946;&#127997;","name":"swimmer tone 3","shortname":":swimmer_tone3:","category":"activity","emoji_order":"839","aliases":[],"aliases_ascii":[],"keywords":[]},"swimmer_tone4":{"unicode":"1f3ca-1f3fe","unicode_alt":"","code_decimal":"&#127946;&#127998;","name":"swimmer tone 4","shortname":":swimmer_tone4:","category":"activity","emoji_order":"840","aliases":[],"aliases_ascii":[],"keywords":[]},"swimmer_tone5":{"unicode":"1f3ca-1f3ff","unicode_alt":"","code_decimal":"&#127946;&#127999;","name":"swimmer tone 5","shortname":":swimmer_tone5:","category":"activity","emoji_order":"841","aliases":[],"aliases_ascii":[],"keywords":[]},"basketball_player":{"unicode":"26f9","unicode_alt":"26f9-fe0f","code_decimal":"&#9977;","name":"person with ball","shortname":":basketball_player:","category":"activity","emoji_order":"854","aliases":[":person_with_ball:"],"aliases_ascii":[],"keywords":["men","game","ball","sport","basketball","diversity"]},"basketball_player_tone1":{"unicode":"26f9-1f3fb","unicode_alt":"","code_decimal":"&#9977;&#127995;","name":"person with ball tone 1","shortname":":basketball_player_tone1:","category":"activity","emoji_order":"855","aliases":[":person_with_ball_tone1:"],"aliases_ascii":[],"keywords":[]},"basketball_player_tone2":{"unicode":"26f9-1f3fc","unicode_alt":"","code_decimal":"&#9977;&#127996;","name":"person with ball tone 2","shortname":":basketball_player_tone2:","category":"activity","emoji_order":"856","aliases":[":person_with_ball_tone2:"],"aliases_ascii":[],"keywords":[]},"basketball_player_tone3":{"unicode":"26f9-1f3fd","unicode_alt":"","code_decimal":"&#9977;&#127997;","name":"person with ball tone 3","shortname":":basketball_player_tone3:","category":"activity","emoji_order":"857","aliases":[":person_with_ball_tone3:"],"aliases_ascii":[],"keywords":[]},"basketball_player_tone4":{"unicode":"26f9-1f3fe","unicode_alt":"","code_decimal":"&#9977;&#127998;","name":"person with ball tone 4","shortname":":basketball_player_tone4:","category":"activity","emoji_order":"858","aliases":[":person_with_ball_tone4:"],"aliases_ascii":[],"keywords":[]},"basketball_player_tone5":{"unicode":"26f9-1f3ff","unicode_alt":"","code_decimal":"&#9977;&#127999;","name":"person with ball tone 5","shortname":":basketball_player_tone5:","category":"activity","emoji_order":"859","aliases":[":person_with_ball_tone5:"],"aliases_ascii":[],"keywords":[]},"lifter":{"unicode":"1f3cb","unicode_alt":"1f3cb-fe0f","code_decimal":"&#127947;","name":"weight lifter","shortname":":lifter:","category":"activity","emoji_order":"872","aliases":[":weight_lifter:"],"aliases_ascii":[],"keywords":["men","workout","flex","sport","weight lifting","win","diversity"]},"lifter_tone1":{"unicode":"1f3cb-1f3fb","unicode_alt":"","code_decimal":"&#127947;&#127995;","name":"weight lifter tone 1","shortname":":lifter_tone1:","category":"activity","emoji_order":"873","aliases":[":weight_lifter_tone1:"],"aliases_ascii":[],"keywords":[]},"lifter_tone2":{"unicode":"1f3cb-1f3fc","unicode_alt":"","code_decimal":"&#127947;&#127996;","name":"weight lifter tone 2","shortname":":lifter_tone2:","category":"activity","emoji_order":"874","aliases":[":weight_lifter_tone2:"],"aliases_ascii":[],"keywords":[]},"lifter_tone3":{"unicode":"1f3cb-1f3fd","unicode_alt":"","code_decimal":"&#127947;&#127997;","name":"weight lifter tone 3","shortname":":lifter_tone3:","category":"activity","emoji_order":"875","aliases":[":weight_lifter_tone3:"],"aliases_ascii":[],"keywords":[]},"lifter_tone4":{"unicode":"1f3cb-1f3fe","unicode_alt":"","code_decimal":"&#127947;&#127998;","name":"weight lifter tone 4","shortname":":lifter_tone4:","category":"activity","emoji_order":"876","aliases":[":weight_lifter_tone4:"],"aliases_ascii":[],"keywords":[]},"lifter_tone5":{"unicode":"1f3cb-1f3ff","unicode_alt":"","code_decimal":"&#127947;&#127999;","name":"weight lifter tone 5","shortname":":lifter_tone5:","category":"activity","emoji_order":"877","aliases":[":weight_lifter_tone5:"],"aliases_ascii":[],"keywords":[]},"bicyclist":{"unicode":"1f6b4","unicode_alt":"","code_decimal":"&#128692;","name":"bicyclist","shortname":":bicyclist:","category":"activity","emoji_order":"890","aliases":[],"aliases_ascii":[],"keywords":["men","workout","sport","bike","diversity"]},"bicyclist_tone1":{"unicode":"1f6b4-1f3fb","unicode_alt":"","code_decimal":"&#128692;&#127995;","name":"bicyclist tone 1","shortname":":bicyclist_tone1:","category":"activity","emoji_order":"891","aliases":[],"aliases_ascii":[],"keywords":[]},"bicyclist_tone2":{"unicode":"1f6b4-1f3fc","unicode_alt":"","code_decimal":"&#128692;&#127996;","name":"bicyclist tone 2","shortname":":bicyclist_tone2:","category":"activity","emoji_order":"892","aliases":[],"aliases_ascii":[],"keywords":[]},"bicyclist_tone3":{"unicode":"1f6b4-1f3fd","unicode_alt":"","code_decimal":"&#128692;&#127997;","name":"bicyclist tone 3","shortname":":bicyclist_tone3:","category":"activity","emoji_order":"893","aliases":[],"aliases_ascii":[],"keywords":[]},"bicyclist_tone4":{"unicode":"1f6b4-1f3fe","unicode_alt":"","code_decimal":"&#128692;&#127998;","name":"bicyclist tone 4","shortname":":bicyclist_tone4:","category":"activity","emoji_order":"894","aliases":[],"aliases_ascii":[],"keywords":[]},"bicyclist_tone5":{"unicode":"1f6b4-1f3ff","unicode_alt":"","code_decimal":"&#128692;&#127999;","name":"bicyclist tone 5","shortname":":bicyclist_tone5:","category":"activity","emoji_order":"895","aliases":[],"aliases_ascii":[],"keywords":[]},"mountain_bicyclist":{"unicode":"1f6b5","unicode_alt":"","code_decimal":"&#128693;","name":"mountain bicyclist","shortname":":mountain_bicyclist:","category":"activity","emoji_order":"908","aliases":[],"aliases_ascii":[],"keywords":["men","sport","bike","diversity"]},"mountain_bicyclist_tone1":{"unicode":"1f6b5-1f3fb","unicode_alt":"","code_decimal":"&#128693;&#127995;","name":"mountain bicyclist tone 1","shortname":":mountain_bicyclist_tone1:","category":"activity","emoji_order":"909","aliases":[],"aliases_ascii":[],"keywords":[]},"mountain_bicyclist_tone2":{"unicode":"1f6b5-1f3fc","unicode_alt":"","code_decimal":"&#128693;&#127996;","name":"mountain bicyclist tone 2","shortname":":mountain_bicyclist_tone2:","category":"activity","emoji_order":"910","aliases":[],"aliases_ascii":[],"keywords":[]},"mountain_bicyclist_tone3":{"unicode":"1f6b5-1f3fd","unicode_alt":"","code_decimal":"&#128693;&#127997;","name":"mountain bicyclist tone 3","shortname":":mountain_bicyclist_tone3:","category":"activity","emoji_order":"911","aliases":[],"aliases_ascii":[],"keywords":[]},"mountain_bicyclist_tone4":{"unicode":"1f6b5-1f3fe","unicode_alt":"","code_decimal":"&#128693;&#127998;","name":"mountain bicyclist tone 4","shortname":":mountain_bicyclist_tone4:","category":"activity","emoji_order":"912","aliases":[],"aliases_ascii":[],"keywords":[]},"mountain_bicyclist_tone5":{"unicode":"1f6b5-1f3ff","unicode_alt":"","code_decimal":"&#128693;&#127999;","name":"mountain bicyclist tone 5","shortname":":mountain_bicyclist_tone5:","category":"activity","emoji_order":"913","aliases":[],"aliases_ascii":[],"keywords":[]},"race_car":{"unicode":"1f3ce","unicode_alt":"1f3ce-fe0f","code_decimal":"&#127950;","name":"racing car","shortname":":race_car:","category":"travel","emoji_order":"926","aliases":[":racing_car:"],"aliases_ascii":[],"keywords":["transportation","car"]},"motorcycle":{"unicode":"1f3cd","unicode_alt":"1f3cd-fe0f","code_decimal":"&#127949;","name":"racing motorcycle","shortname":":motorcycle:","category":"travel","emoji_order":"927","aliases":[":racing_motorcycle:"],"aliases_ascii":[],"keywords":["transportation","travel","bike"]},"cartwheel":{"unicode":"1f938","unicode_alt":"","code_decimal":"&#129336;","name":"person doing cartwheel","shortname":":cartwheel:","category":"activity","emoji_order":"928","aliases":[":person_doing_cartwheel:"],"aliases_ascii":[],"keywords":[]},"cartwheel_tone1":{"unicode":"1f938-1f3fb","unicode_alt":"","code_decimal":"&#129336;&#127995;","name":"person doing cartwheel tone 1","shortname":":cartwheel_tone1:","category":"activity","emoji_order":"929","aliases":[":person_doing_cartwheel_tone1:"],"aliases_ascii":[],"keywords":[]},"cartwheel_tone2":{"unicode":"1f938-1f3fc","unicode_alt":"","code_decimal":"&#129336;&#127996;","name":"person doing cartwheel tone 2","shortname":":cartwheel_tone2:","category":"activity","emoji_order":"930","aliases":[":person_doing_cartwheel_tone2:"],"aliases_ascii":[],"keywords":[]},"cartwheel_tone3":{"unicode":"1f938-1f3fd","unicode_alt":"","code_decimal":"&#129336;&#127997;","name":"person doing cartwheel tone 3","shortname":":cartwheel_tone3:","category":"activity","emoji_order":"931","aliases":[":person_doing_cartwheel_tone3:"],"aliases_ascii":[],"keywords":[]},"cartwheel_tone4":{"unicode":"1f938-1f3fe","unicode_alt":"","code_decimal":"&#129336;&#127998;","name":"person doing cartwheel tone 4","shortname":":cartwheel_tone4:","category":"activity","emoji_order":"932","aliases":[":person_doing_cartwheel_tone4:"],"aliases_ascii":[],"keywords":[]},"cartwheel_tone5":{"unicode":"1f938-1f3ff","unicode_alt":"","code_decimal":"&#129336;&#127999;","name":"person doing cartwheel tone 5","shortname":":cartwheel_tone5:","category":"activity","emoji_order":"933","aliases":[":person_doing_cartwheel_tone5:"],"aliases_ascii":[],"keywords":[]},"wrestlers":{"unicode":"1f93c","unicode_alt":"","code_decimal":"&#129340;","name":"wrestlers","shortname":":wrestlers:","category":"activity","emoji_order":"946","aliases":[":wrestling:"],"aliases_ascii":[],"keywords":[]},"wrestlers_tone1":{"unicode":"1f93c-1f3fb","unicode_alt":"","code_decimal":"&#129340;&#127995;","name":"wrestlers tone 1","shortname":":wrestlers_tone1:","category":"activity","emoji_order":"947","aliases":[":wrestling_tone1:"],"aliases_ascii":[],"keywords":[]},"wrestlers_tone2":{"unicode":"1f93c-1f3fc","unicode_alt":"","code_decimal":"&#129340;&#127996;","name":"wrestlers tone 2","shortname":":wrestlers_tone2:","category":"activity","emoji_order":"948","aliases":[":wrestling_tone2:"],"aliases_ascii":[],"keywords":[]},"wrestlers_tone3":{"unicode":"1f93c-1f3fd","unicode_alt":"","code_decimal":"&#129340;&#127997;","name":"wrestlers tone 3","shortname":":wrestlers_tone3:","category":"activity","emoji_order":"949","aliases":[":wrestling_tone3:"],"aliases_ascii":[],"keywords":[]},"wrestlers_tone4":{"unicode":"1f93c-1f3fe","unicode_alt":"","code_decimal":"&#129340;&#127998;","name":"wrestlers tone 4","shortname":":wrestlers_tone4:","category":"activity","emoji_order":"950","aliases":[":wrestling_tone4:"],"aliases_ascii":[],"keywords":[]},"wrestlers_tone5":{"unicode":"1f93c-1f3ff","unicode_alt":"","code_decimal":"&#129340;&#127999;","name":"wrestlers tone 5","shortname":":wrestlers_tone5:","category":"activity","emoji_order":"951","aliases":[":wrestling_tone5:"],"aliases_ascii":[],"keywords":[]},"water_polo":{"unicode":"1f93d","unicode_alt":"","code_decimal":"&#129341;","name":"water polo","shortname":":water_polo:","category":"activity","emoji_order":"964","aliases":[],"aliases_ascii":[],"keywords":[]},"water_polo_tone1":{"unicode":"1f93d-1f3fb","unicode_alt":"","code_decimal":"&#129341;&#127995;","name":"water polo tone 1","shortname":":water_polo_tone1:","category":"activity","emoji_order":"965","aliases":[],"aliases_ascii":[],"keywords":[]},"water_polo_tone2":{"unicode":"1f93d-1f3fc","unicode_alt":"","code_decimal":"&#129341;&#127996;","name":"water polo tone 2","shortname":":water_polo_tone2:","category":"activity","emoji_order":"966","aliases":[],"aliases_ascii":[],"keywords":[]},"water_polo_tone3":{"unicode":"1f93d-1f3fd","unicode_alt":"","code_decimal":"&#129341;&#127997;","name":"water polo tone 3","shortname":":water_polo_tone3:","category":"activity","emoji_order":"967","aliases":[],"aliases_ascii":[],"keywords":[]},"water_polo_tone4":{"unicode":"1f93d-1f3fe","unicode_alt":"","code_decimal":"&#129341;&#127998;","name":"water polo tone 4","shortname":":water_polo_tone4:","category":"activity","emoji_order":"968","aliases":[],"aliases_ascii":[],"keywords":[]},"water_polo_tone5":{"unicode":"1f93d-1f3ff","unicode_alt":"","code_decimal":"&#129341;&#127999;","name":"water polo tone 5","shortname":":water_polo_tone5:","category":"activity","emoji_order":"969","aliases":[],"aliases_ascii":[],"keywords":[]},"handball":{"unicode":"1f93e","unicode_alt":"","code_decimal":"&#129342;","name":"handball","shortname":":handball:","category":"activity","emoji_order":"982","aliases":[],"aliases_ascii":[],"keywords":[]},"handball_tone1":{"unicode":"1f93e-1f3fb","unicode_alt":"","code_decimal":"&#129342;&#127995;","name":"handball tone 1","shortname":":handball_tone1:","category":"activity","emoji_order":"983","aliases":[],"aliases_ascii":[],"keywords":[]},"handball_tone2":{"unicode":"1f93e-1f3fc","unicode_alt":"","code_decimal":"&#129342;&#127996;","name":"handball tone 2","shortname":":handball_tone2:","category":"activity","emoji_order":"984","aliases":[],"aliases_ascii":[],"keywords":[]},"handball_tone3":{"unicode":"1f93e-1f3fd","unicode_alt":"","code_decimal":"&#129342;&#127997;","name":"handball tone 3","shortname":":handball_tone3:","category":"activity","emoji_order":"985","aliases":[],"aliases_ascii":[],"keywords":[]},"handball_tone4":{"unicode":"1f93e-1f3fe","unicode_alt":"","code_decimal":"&#129342;&#127998;","name":"handball tone 4","shortname":":handball_tone4:","category":"activity","emoji_order":"986","aliases":[],"aliases_ascii":[],"keywords":[]},"handball_tone5":{"unicode":"1f93e-1f3ff","unicode_alt":"","code_decimal":"&#129342;&#127999;","name":"handball tone 5","shortname":":handball_tone5:","category":"activity","emoji_order":"987","aliases":[],"aliases_ascii":[],"keywords":[]},"juggling":{"unicode":"1f939","unicode_alt":"","code_decimal":"&#129337;","name":"juggling","shortname":":juggling:","category":"activity","emoji_order":"1000","aliases":[":juggler:"],"aliases_ascii":[],"keywords":[]},"juggling_tone1":{"unicode":"1f939-1f3fb","unicode_alt":"","code_decimal":"&#129337;&#127995;","name":"juggling tone 1","shortname":":juggling_tone1:","category":"activity","emoji_order":"1001","aliases":[":juggler_tone1:"],"aliases_ascii":[],"keywords":[]},"juggling_tone2":{"unicode":"1f939-1f3fc","unicode_alt":"","code_decimal":"&#129337;&#127996;","name":"juggling tone 2","shortname":":juggling_tone2:","category":"activity","emoji_order":"1002","aliases":[":juggler_tone2:"],"aliases_ascii":[],"keywords":[]},"juggling_tone3":{"unicode":"1f939-1f3fd","unicode_alt":"","code_decimal":"&#129337;&#127997;","name":"juggling tone 3","shortname":":juggling_tone3:","category":"activity","emoji_order":"1003","aliases":[":juggler_tone3:"],"aliases_ascii":[],"keywords":[]},"juggling_tone4":{"unicode":"1f939-1f3fe","unicode_alt":"","code_decimal":"&#129337;&#127998;","name":"juggling tone 4","shortname":":juggling_tone4:","category":"activity","emoji_order":"1004","aliases":[":juggler_tone4:"],"aliases_ascii":[],"keywords":[]},"juggling_tone5":{"unicode":"1f939-1f3ff","unicode_alt":"","code_decimal":"&#129337;&#127999;","name":"juggling tone 5","shortname":":juggling_tone5:","category":"activity","emoji_order":"1005","aliases":[":juggler_tone5:"],"aliases_ascii":[],"keywords":[]},"couple":{"unicode":"1f46b","unicode_alt":"","code_decimal":"&#128107;","name":"man and woman holding hands","shortname":":couple:","category":"people","emoji_order":"1018","aliases":[],"aliases_ascii":[],"keywords":["people","sex","creationism"]},"two_men_holding_hands":{"unicode":"1f46c","unicode_alt":"","code_decimal":"&#128108;","name":"two men holding hands","shortname":":two_men_holding_hands:","category":"people","emoji_order":"1024","aliases":[],"aliases_ascii":[],"keywords":["people","gay","men","sex","lgbt"]},"two_women_holding_hands":{"unicode":"1f46d","unicode_alt":"","code_decimal":"&#128109;","name":"two women holding hands","shortname":":two_women_holding_hands:","category":"people","emoji_order":"1030","aliases":[],"aliases_ascii":[],"keywords":["people","women","sex","lgbt","lesbian","girls night"]},"couplekiss":{"unicode":"1f48f","unicode_alt":"","code_decimal":"&#128143;","name":"kiss","shortname":":couplekiss:","category":"people","emoji_order":"1036","aliases":[],"aliases_ascii":[],"keywords":["people","love","sex"]},"kiss_mm":{"unicode":"1f468-2764-1f48b-1f468","unicode_alt":"1f468-200d-2764-fe0f-200d-1f48b-200d-1f468","code_decimal":"&#128104;&#10084;&#128139;&#128104;","name":"kiss (man,man)","shortname":":kiss_mm:","category":"people","emoji_order":"1038","aliases":[":couplekiss_mm:"],"aliases_ascii":[],"keywords":["people","gay","men","love","sex","lgbt"]},"kiss_ww":{"unicode":"1f469-2764-1f48b-1f469","unicode_alt":"1f469-200d-2764-fe0f-200d-1f48b-200d-1f469","code_decimal":"&#128105;&#10084;&#128139;&#128105;","name":"kiss (woman,woman)","shortname":":kiss_ww:","category":"people","emoji_order":"1039","aliases":[":couplekiss_ww:"],"aliases_ascii":[],"keywords":["people","women","love","sex","lgbt","lesbian"]},"couple_with_heart":{"unicode":"1f491","unicode_alt":"","code_decimal":"&#128145;","name":"couple with heart","shortname":":couple_with_heart:","category":"people","emoji_order":"1040","aliases":[],"aliases_ascii":[],"keywords":["people","love","sex"]},"couple_mm":{"unicode":"1f468-2764-1f468","unicode_alt":"1f468-200d-2764-fe0f-200d-1f468","code_decimal":"&#128104;&#10084;&#128104;","name":"couple (man,man)","shortname":":couple_mm:","category":"people","emoji_order":"1042","aliases":[":couple_with_heart_mm:"],"aliases_ascii":[],"keywords":["people","gay","men","love","sex","lgbt"]},"couple_ww":{"unicode":"1f469-2764-1f469","unicode_alt":"1f469-200d-2764-fe0f-200d-1f469","code_decimal":"&#128105;&#10084;&#128105;","name":"couple (woman,woman)","shortname":":couple_ww:","category":"people","emoji_order":"1043","aliases":[":couple_with_heart_ww:"],"aliases_ascii":[],"keywords":["people","women","love","sex","lgbt"]},"family":{"unicode":"1f46a","unicode_alt":"","code_decimal":"&#128106;","name":"family","shortname":":family:","category":"people","emoji_order":"1044","aliases":[],"aliases_ascii":[],"keywords":["people","family","baby"]},"family_mwg":{"unicode":"1f468-1f469-1f467","unicode_alt":"1f468-200d-1f469-200d-1f467","code_decimal":"&#128104;&#128105;&#128103;","name":"family (man,woman,girl)","shortname":":family_mwg:","category":"people","emoji_order":"1051","aliases":[],"aliases_ascii":[],"keywords":["people","family","baby"]},"family_mwgb":{"unicode":"1f468-1f469-1f467-1f466","unicode_alt":"1f468-200d-1f469-200d-1f467-200d-1f466","code_decimal":"&#128104;&#128105;&#128103;&#128102;","name":"family (man,woman,girl,boy)","shortname":":family_mwgb:","category":"people","emoji_order":"1052","aliases":[],"aliases_ascii":[],"keywords":["people","family","baby"]},"family_mwbb":{"unicode":"1f468-1f469-1f466-1f466","unicode_alt":"1f468-200d-1f469-200d-1f466-200d-1f466","code_decimal":"&#128104;&#128105;&#128102;&#128102;","name":"family (man,woman,boy,boy)","shortname":":family_mwbb:","category":"people","emoji_order":"1053","aliases":[],"aliases_ascii":[],"keywords":["people","family","baby"]},"family_mwgg":{"unicode":"1f468-1f469-1f467-1f467","unicode_alt":"1f468-200d-1f469-200d-1f467-200d-1f467","code_decimal":"&#128104;&#128105;&#128103;&#128103;","name":"family (man,woman,girl,girl)","shortname":":family_mwgg:","category":"people","emoji_order":"1054","aliases":[],"aliases_ascii":[],"keywords":["people","family","baby"]},"family_mmb":{"unicode":"1f468-1f468-1f466","unicode_alt":"1f468-200d-1f468-200d-1f466","code_decimal":"&#128104;&#128104;&#128102;","name":"family (man,man,boy)","shortname":":family_mmb:","category":"people","emoji_order":"1055","aliases":[],"aliases_ascii":[],"keywords":["people","gay","family","men","baby","lgbt"]},"family_mmg":{"unicode":"1f468-1f468-1f467","unicode_alt":"1f468-200d-1f468-200d-1f467","code_decimal":"&#128104;&#128104;&#128103;","name":"family (man,man,girl)","shortname":":family_mmg:","category":"people","emoji_order":"1056","aliases":[],"aliases_ascii":[],"keywords":["people","gay","family","men","baby","lgbt"]},"family_mmgb":{"unicode":"1f468-1f468-1f467-1f466","unicode_alt":"1f468-200d-1f468-200d-1f467-200d-1f466","code_decimal":"&#128104;&#128104;&#128103;&#128102;","name":"family (man,man,girl,boy)","shortname":":family_mmgb:","category":"people","emoji_order":"1057","aliases":[],"aliases_ascii":[],"keywords":["people","gay","family","men","baby","lgbt"]},"family_mmbb":{"unicode":"1f468-1f468-1f466-1f466","unicode_alt":"1f468-200d-1f468-200d-1f466-200d-1f466","code_decimal":"&#128104;&#128104;&#128102;&#128102;","name":"family (man,man,boy,boy)","shortname":":family_mmbb:","category":"people","emoji_order":"1058","aliases":[],"aliases_ascii":[],"keywords":["people","gay","family","men","baby","lgbt"]},"family_mmgg":{"unicode":"1f468-1f468-1f467-1f467","unicode_alt":"1f468-200d-1f468-200d-1f467-200d-1f467","code_decimal":"&#128104;&#128104;&#128103;&#128103;","name":"family (man,man,girl,girl)","shortname":":family_mmgg:","category":"people","emoji_order":"1059","aliases":[],"aliases_ascii":[],"keywords":["people","gay","family","men","baby","lgbt"]},"family_wwb":{"unicode":"1f469-1f469-1f466","unicode_alt":"1f469-200d-1f469-200d-1f466","code_decimal":"&#128105;&#128105;&#128102;","name":"family (woman,woman,boy)","shortname":":family_wwb:","category":"people","emoji_order":"1060","aliases":[],"aliases_ascii":[],"keywords":["people","family","women","baby","lgbt","lesbian"]},"family_wwg":{"unicode":"1f469-1f469-1f467","unicode_alt":"1f469-200d-1f469-200d-1f467","code_decimal":"&#128105;&#128105;&#128103;","name":"family (woman,woman,girl)","shortname":":family_wwg:","category":"people","emoji_order":"1061","aliases":[],"aliases_ascii":[],"keywords":["people","family","women","baby","lgbt","lesbian"]},"family_wwgb":{"unicode":"1f469-1f469-1f467-1f466","unicode_alt":"1f469-200d-1f469-200d-1f467-200d-1f466","code_decimal":"&#128105;&#128105;&#128103;&#128102;","name":"family (woman,woman,girl,boy)","shortname":":family_wwgb:","category":"people","emoji_order":"1062","aliases":[],"aliases_ascii":[],"keywords":["people","family","women","baby","lgbt","lesbian"]},"family_wwbb":{"unicode":"1f469-1f469-1f466-1f466","unicode_alt":"1f469-200d-1f469-200d-1f466-200d-1f466","code_decimal":"&#128105;&#128105;&#128102;&#128102;","name":"family (woman,woman,boy,boy)","shortname":":family_wwbb:","category":"people","emoji_order":"1063","aliases":[],"aliases_ascii":[],"keywords":["people","family","women","baby","lgbt","lesbian"]},"family_wwgg":{"unicode":"1f469-1f469-1f467-1f467","unicode_alt":"1f469-200d-1f469-200d-1f467-200d-1f467","code_decimal":"&#128105;&#128105;&#128103;&#128103;","name":"family (woman,woman,girl,girl)","shortname":":family_wwgg:","category":"people","emoji_order":"1064","aliases":[],"aliases_ascii":[],"keywords":["people","family","women","baby","lgbt","lesbian"]},"tone1":{"unicode":"1f3fb","unicode_alt":"","code_decimal":"&#127995;","name":"emoji modifier Fitzpatrick type-1-2","shortname":":tone1:","category":"modifier","emoji_order":"1075","aliases":[],"aliases_ascii":[],"keywords":[]},"tone2":{"unicode":"1f3fc","unicode_alt":"","code_decimal":"&#127996;","name":"emoji modifier Fitzpatrick type-3","shortname":":tone2:","category":"modifier","emoji_order":"1076","aliases":[],"aliases_ascii":[],"keywords":[]},"tone3":{"unicode":"1f3fd","unicode_alt":"","code_decimal":"&#127997;","name":"emoji modifier Fitzpatrick type-4","shortname":":tone3:","category":"modifier","emoji_order":"1077","aliases":[],"aliases_ascii":[],"keywords":[]},"tone4":{"unicode":"1f3fe","unicode_alt":"","code_decimal":"&#127998;","name":"emoji modifier Fitzpatrick type-5","shortname":":tone4:","category":"modifier","emoji_order":"1078","aliases":[],"aliases_ascii":[],"keywords":[]},"tone5":{"unicode":"1f3ff","unicode_alt":"","code_decimal":"&#127999;","name":"emoji modifier Fitzpatrick type-6","shortname":":tone5:","category":"modifier","emoji_order":"1079","aliases":[],"aliases_ascii":[],"keywords":[]},"muscle":{"unicode":"1f4aa","unicode_alt":"","code_decimal":"&#128170;","name":"flexed biceps","shortname":":muscle:","category":"people","emoji_order":"1080","aliases":[],"aliases_ascii":[],"keywords":["body","hands","workout","flex","win","diversity","feminist","boys night"]},"muscle_tone1":{"unicode":"1f4aa-1f3fb","unicode_alt":"","code_decimal":"&#128170;&#127995;","name":"flexed biceps tone 1","shortname":":muscle_tone1:","category":"people","emoji_order":"1081","aliases":[],"aliases_ascii":[],"keywords":[]},"muscle_tone2":{"unicode":"1f4aa-1f3fc","unicode_alt":"","code_decimal":"&#128170;&#127996;","name":"flexed biceps tone 2","shortname":":muscle_tone2:","category":"people","emoji_order":"1082","aliases":[],"aliases_ascii":[],"keywords":[]},"muscle_tone3":{"unicode":"1f4aa-1f3fd","unicode_alt":"","code_decimal":"&#128170;&#127997;","name":"flexed biceps tone 3","shortname":":muscle_tone3:","category":"people","emoji_order":"1083","aliases":[],"aliases_ascii":[],"keywords":[]},"muscle_tone4":{"unicode":"1f4aa-1f3fe","unicode_alt":"","code_decimal":"&#128170;&#127998;","name":"flexed biceps tone 4","shortname":":muscle_tone4:","category":"people","emoji_order":"1084","aliases":[],"aliases_ascii":[],"keywords":[]},"muscle_tone5":{"unicode":"1f4aa-1f3ff","unicode_alt":"","code_decimal":"&#128170;&#127999;","name":"flexed biceps tone 5","shortname":":muscle_tone5:","category":"people","emoji_order":"1085","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie":{"unicode":"1f933","unicode_alt":"","code_decimal":"&#129331;","name":"selfie","shortname":":selfie:","category":"people","emoji_order":"1086","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie_tone1":{"unicode":"1f933-1f3fb","unicode_alt":"","code_decimal":"&#129331;&#127995;","name":"selfie tone 1","shortname":":selfie_tone1:","category":"people","emoji_order":"1087","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie_tone2":{"unicode":"1f933-1f3fc","unicode_alt":"","code_decimal":"&#129331;&#127996;","name":"selfie tone 2","shortname":":selfie_tone2:","category":"people","emoji_order":"1088","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie_tone3":{"unicode":"1f933-1f3fd","unicode_alt":"","code_decimal":"&#129331;&#127997;","name":"selfie tone 3","shortname":":selfie_tone3:","category":"people","emoji_order":"1089","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie_tone4":{"unicode":"1f933-1f3fe","unicode_alt":"","code_decimal":"&#129331;&#127998;","name":"selfie tone 4","shortname":":selfie_tone4:","category":"people","emoji_order":"1090","aliases":[],"aliases_ascii":[],"keywords":[]},"selfie_tone5":{"unicode":"1f933-1f3ff","unicode_alt":"","code_decimal":"&#129331;&#127999;","name":"selfie tone 5","shortname":":selfie_tone5:","category":"people","emoji_order":"1091","aliases":[],"aliases_ascii":[],"keywords":[]},"point_left":{"unicode":"1f448","unicode_alt":"","code_decimal":"&#128072;","name":"white left pointing backhand index","shortname":":point_left:","category":"people","emoji_order":"1092","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","diversity"]},"point_left_tone1":{"unicode":"1f448-1f3fb","unicode_alt":"","code_decimal":"&#128072;&#127995;","name":"white left pointing backhand index tone 1","shortname":":point_left_tone1:","category":"people","emoji_order":"1093","aliases":[],"aliases_ascii":[],"keywords":[]},"point_left_tone2":{"unicode":"1f448-1f3fc","unicode_alt":"","code_decimal":"&#128072;&#127996;","name":"white left pointing backhand index tone 2","shortname":":point_left_tone2:","category":"people","emoji_order":"1094","aliases":[],"aliases_ascii":[],"keywords":[]},"point_left_tone3":{"unicode":"1f448-1f3fd","unicode_alt":"","code_decimal":"&#128072;&#127997;","name":"white left pointing backhand index tone 3","shortname":":point_left_tone3:","category":"people","emoji_order":"1095","aliases":[],"aliases_ascii":[],"keywords":[]},"point_left_tone4":{"unicode":"1f448-1f3fe","unicode_alt":"","code_decimal":"&#128072;&#127998;","name":"white left pointing backhand index tone 4","shortname":":point_left_tone4:","category":"people","emoji_order":"1096","aliases":[],"aliases_ascii":[],"keywords":[]},"point_left_tone5":{"unicode":"1f448-1f3ff","unicode_alt":"","code_decimal":"&#128072;&#127999;","name":"white left pointing backhand index tone 5","shortname":":point_left_tone5:","category":"people","emoji_order":"1097","aliases":[],"aliases_ascii":[],"keywords":[]},"point_right":{"unicode":"1f449","unicode_alt":"","code_decimal":"&#128073;","name":"white right pointing backhand index","shortname":":point_right:","category":"people","emoji_order":"1098","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","diversity"]},"point_right_tone1":{"unicode":"1f449-1f3fb","unicode_alt":"","code_decimal":"&#128073;&#127995;","name":"white right pointing backhand index tone 1","shortname":":point_right_tone1:","category":"people","emoji_order":"1099","aliases":[],"aliases_ascii":[],"keywords":[]},"point_right_tone2":{"unicode":"1f449-1f3fc","unicode_alt":"","code_decimal":"&#128073;&#127996;","name":"white right pointing backhand index tone 2","shortname":":point_right_tone2:","category":"people","emoji_order":"1100","aliases":[],"aliases_ascii":[],"keywords":[]},"point_right_tone3":{"unicode":"1f449-1f3fd","unicode_alt":"","code_decimal":"&#128073;&#127997;","name":"white right pointing backhand index tone 3","shortname":":point_right_tone3:","category":"people","emoji_order":"1101","aliases":[],"aliases_ascii":[],"keywords":[]},"point_right_tone4":{"unicode":"1f449-1f3fe","unicode_alt":"","code_decimal":"&#128073;&#127998;","name":"white right pointing backhand index tone 4","shortname":":point_right_tone4:","category":"people","emoji_order":"1102","aliases":[],"aliases_ascii":[],"keywords":[]},"point_right_tone5":{"unicode":"1f449-1f3ff","unicode_alt":"","code_decimal":"&#128073;&#127999;","name":"white right pointing backhand index tone 5","shortname":":point_right_tone5:","category":"people","emoji_order":"1103","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up":{"unicode":"261d","unicode_alt":"261d-fe0f","code_decimal":"&#9757;","name":"white up pointing index","shortname":":point_up:","category":"people","emoji_order":"1104","aliases":[],"aliases_ascii":[],"keywords":["body","hands","emojione","diversity"]},"point_up_tone1":{"unicode":"261d-1f3fb","unicode_alt":"","code_decimal":"&#9757;&#127995;","name":"white up pointing index tone 1","shortname":":point_up_tone1:","category":"people","emoji_order":"1105","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_tone2":{"unicode":"261d-1f3fc","unicode_alt":"","code_decimal":"&#9757;&#127996;","name":"white up pointing index tone 2","shortname":":point_up_tone2:","category":"people","emoji_order":"1106","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_tone3":{"unicode":"261d-1f3fd","unicode_alt":"","code_decimal":"&#9757;&#127997;","name":"white up pointing index tone 3","shortname":":point_up_tone3:","category":"people","emoji_order":"1107","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_tone4":{"unicode":"261d-1f3fe","unicode_alt":"","code_decimal":"&#9757;&#127998;","name":"white up pointing index tone 4","shortname":":point_up_tone4:","category":"people","emoji_order":"1108","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_tone5":{"unicode":"261d-1f3ff","unicode_alt":"","code_decimal":"&#9757;&#127999;","name":"white up pointing index tone 5","shortname":":point_up_tone5:","category":"people","emoji_order":"1109","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_2":{"unicode":"1f446","unicode_alt":"","code_decimal":"&#128070;","name":"white up pointing backhand index","shortname":":point_up_2:","category":"people","emoji_order":"1110","aliases":[],"aliases_ascii":[],"keywords":["body","hands","diversity"]},"point_up_2_tone1":{"unicode":"1f446-1f3fb","unicode_alt":"","code_decimal":"&#128070;&#127995;","name":"white up pointing backhand index tone 1","shortname":":point_up_2_tone1:","category":"people","emoji_order":"1111","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_2_tone2":{"unicode":"1f446-1f3fc","unicode_alt":"","code_decimal":"&#128070;&#127996;","name":"white up pointing backhand index tone 2","shortname":":point_up_2_tone2:","category":"people","emoji_order":"1112","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_2_tone3":{"unicode":"1f446-1f3fd","unicode_alt":"","code_decimal":"&#128070;&#127997;","name":"white up pointing backhand index tone 3","shortname":":point_up_2_tone3:","category":"people","emoji_order":"1113","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_2_tone4":{"unicode":"1f446-1f3fe","unicode_alt":"","code_decimal":"&#128070;&#127998;","name":"white up pointing backhand index tone 4","shortname":":point_up_2_tone4:","category":"people","emoji_order":"1114","aliases":[],"aliases_ascii":[],"keywords":[]},"point_up_2_tone5":{"unicode":"1f446-1f3ff","unicode_alt":"","code_decimal":"&#128070;&#127999;","name":"white up pointing backhand index tone 5","shortname":":point_up_2_tone5:","category":"people","emoji_order":"1115","aliases":[],"aliases_ascii":[],"keywords":[]},"middle_finger":{"unicode":"1f595","unicode_alt":"","code_decimal":"&#128405;","name":"reversed hand with middle finger extended","shortname":":middle_finger:","category":"people","emoji_order":"1116","aliases":[":reversed_hand_with_middle_finger_extended:"],"aliases_ascii":[],"keywords":["body","hands","middle finger","diversity"]},"middle_finger_tone1":{"unicode":"1f595-1f3fb","unicode_alt":"","code_decimal":"&#128405;&#127995;","name":"reversed hand with middle finger extended tone 1","shortname":":middle_finger_tone1:","category":"people","emoji_order":"1117","aliases":[":reversed_hand_with_middle_finger_extended_tone1:"],"aliases_ascii":[],"keywords":[]},"middle_finger_tone2":{"unicode":"1f595-1f3fc","unicode_alt":"","code_decimal":"&#128405;&#127996;","name":"reversed hand with middle finger extended tone 2","shortname":":middle_finger_tone2:","category":"people","emoji_order":"1118","aliases":[":reversed_hand_with_middle_finger_extended_tone2:"],"aliases_ascii":[],"keywords":[]},"middle_finger_tone3":{"unicode":"1f595-1f3fd","unicode_alt":"","code_decimal":"&#128405;&#127997;","name":"reversed hand with middle finger extended tone 3","shortname":":middle_finger_tone3:","category":"people","emoji_order":"1119","aliases":[":reversed_hand_with_middle_finger_extended_tone3:"],"aliases_ascii":[],"keywords":[]},"middle_finger_tone4":{"unicode":"1f595-1f3fe","unicode_alt":"","code_decimal":"&#128405;&#127998;","name":"reversed hand with middle finger extended tone 4","shortname":":middle_finger_tone4:","category":"people","emoji_order":"1120","aliases":[":reversed_hand_with_middle_finger_extended_tone4:"],"aliases_ascii":[],"keywords":[]},"middle_finger_tone5":{"unicode":"1f595-1f3ff","unicode_alt":"","code_decimal":"&#128405;&#127999;","name":"reversed hand with middle finger extended tone 5","shortname":":middle_finger_tone5:","category":"people","emoji_order":"1121","aliases":[":reversed_hand_with_middle_finger_extended_tone5:"],"aliases_ascii":[],"keywords":[]},"point_down":{"unicode":"1f447","unicode_alt":"","code_decimal":"&#128071;","name":"white down pointing backhand index","shortname":":point_down:","category":"people","emoji_order":"1122","aliases":[],"aliases_ascii":[],"keywords":["body","hands","diversity"]},"point_down_tone1":{"unicode":"1f447-1f3fb","unicode_alt":"","code_decimal":"&#128071;&#127995;","name":"white down pointing backhand index tone 1","shortname":":point_down_tone1:","category":"people","emoji_order":"1123","aliases":[],"aliases_ascii":[],"keywords":[]},"point_down_tone2":{"unicode":"1f447-1f3fc","unicode_alt":"","code_decimal":"&#128071;&#127996;","name":"white down pointing backhand index tone 2","shortname":":point_down_tone2:","category":"people","emoji_order":"1124","aliases":[],"aliases_ascii":[],"keywords":[]},"point_down_tone3":{"unicode":"1f447-1f3fd","unicode_alt":"","code_decimal":"&#128071;&#127997;","name":"white down pointing backhand index tone 3","shortname":":point_down_tone3:","category":"people","emoji_order":"1125","aliases":[],"aliases_ascii":[],"keywords":[]},"point_down_tone4":{"unicode":"1f447-1f3fe","unicode_alt":"","code_decimal":"&#128071;&#127998;","name":"white down pointing backhand index tone 4","shortname":":point_down_tone4:","category":"people","emoji_order":"1126","aliases":[],"aliases_ascii":[],"keywords":[]},"point_down_tone5":{"unicode":"1f447-1f3ff","unicode_alt":"","code_decimal":"&#128071;&#127999;","name":"white down pointing backhand index tone 5","shortname":":point_down_tone5:","category":"people","emoji_order":"1127","aliases":[],"aliases_ascii":[],"keywords":[]},"v":{"unicode":"270c","unicode_alt":"270c-fe0f","code_decimal":"&#9996;","name":"victory hand","shortname":":v:","category":"people","emoji_order":"1128","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","thank you","peace","diversity","girls night"]},"v_tone1":{"unicode":"270c-1f3fb","unicode_alt":"","code_decimal":"&#9996;&#127995;","name":"victory hand tone 1","shortname":":v_tone1:","category":"people","emoji_order":"1129","aliases":[],"aliases_ascii":[],"keywords":[]},"v_tone2":{"unicode":"270c-1f3fc","unicode_alt":"","code_decimal":"&#9996;&#127996;","name":"victory hand tone 2","shortname":":v_tone2:","category":"people","emoji_order":"1130","aliases":[],"aliases_ascii":[],"keywords":[]},"v_tone3":{"unicode":"270c-1f3fd","unicode_alt":"","code_decimal":"&#9996;&#127997;","name":"victory hand tone 3","shortname":":v_tone3:","category":"people","emoji_order":"1131","aliases":[],"aliases_ascii":[],"keywords":[]},"v_tone4":{"unicode":"270c-1f3fe","unicode_alt":"","code_decimal":"&#9996;&#127998;","name":"victory hand tone 4","shortname":":v_tone4:","category":"people","emoji_order":"1132","aliases":[],"aliases_ascii":[],"keywords":[]},"v_tone5":{"unicode":"270c-1f3ff","unicode_alt":"","code_decimal":"&#9996;&#127999;","name":"victory hand tone 5","shortname":":v_tone5:","category":"people","emoji_order":"1133","aliases":[],"aliases_ascii":[],"keywords":[]},"fingers_crossed":{"unicode":"1f91e","unicode_alt":"","code_decimal":"&#129310;","name":"hand with first and index finger crossed","shortname":":fingers_crossed:","category":"people","emoji_order":"1134","aliases":[":hand_with_index_and_middle_finger_crossed:"],"aliases_ascii":[],"keywords":[]},"fingers_crossed_tone1":{"unicode":"1f91e-1f3fb","unicode_alt":"","code_decimal":"&#129310;&#127995;","name":"hand with index and middle fingers crossed tone 1","shortname":":fingers_crossed_tone1:","category":"people","emoji_order":"1135","aliases":[":hand_with_index_and_middle_fingers_crossed_tone1:"],"aliases_ascii":[],"keywords":[]},"fingers_crossed_tone2":{"unicode":"1f91e-1f3fc","unicode_alt":"","code_decimal":"&#129310;&#127996;","name":"hand with index and middle fingers crossed tone 2","shortname":":fingers_crossed_tone2:","category":"people","emoji_order":"1136","aliases":[":hand_with_index_and_middle_fingers_crossed_tone2:"],"aliases_ascii":[],"keywords":[]},"fingers_crossed_tone3":{"unicode":"1f91e-1f3fd","unicode_alt":"","code_decimal":"&#129310;&#127997;","name":"hand with index and middle fingers crossed tone 3","shortname":":fingers_crossed_tone3:","category":"people","emoji_order":"1137","aliases":[":hand_with_index_and_middle_fingers_crossed_tone3:"],"aliases_ascii":[],"keywords":[]},"fingers_crossed_tone4":{"unicode":"1f91e-1f3fe","unicode_alt":"","code_decimal":"&#129310;&#127998;","name":"hand with index and middle fingers crossed tone 4","shortname":":fingers_crossed_tone4:","category":"people","emoji_order":"1138","aliases":[":hand_with_index_and_middle_fingers_crossed_tone4:"],"aliases_ascii":[],"keywords":[]},"fingers_crossed_tone5":{"unicode":"1f91e-1f3ff","unicode_alt":"","code_decimal":"&#129310;&#127999;","name":"hand with index and middle fingers crossed tone 5","shortname":":fingers_crossed_tone5:","category":"people","emoji_order":"1139","aliases":[":hand_with_index_and_middle_fingers_crossed_tone5:"],"aliases_ascii":[],"keywords":[]},"vulcan":{"unicode":"1f596","unicode_alt":"","code_decimal":"&#128406;","name":"raised hand with part between middle and ring fingers","shortname":":vulcan:","category":"people","emoji_order":"1140","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers:"],"aliases_ascii":[],"keywords":["body","hands","hi","diversity"]},"vulcan_tone1":{"unicode":"1f596-1f3fb","unicode_alt":"","code_decimal":"&#128406;&#127995;","name":"raised hand with part between middle and ring fingers tone 1","shortname":":vulcan_tone1:","category":"people","emoji_order":"1141","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone1:"],"aliases_ascii":[],"keywords":[]},"vulcan_tone2":{"unicode":"1f596-1f3fc","unicode_alt":"","code_decimal":"&#128406;&#127996;","name":"raised hand with part between middle and ring fingers tone 2","shortname":":vulcan_tone2:","category":"people","emoji_order":"1142","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone2:"],"aliases_ascii":[],"keywords":[]},"vulcan_tone3":{"unicode":"1f596-1f3fd","unicode_alt":"","code_decimal":"&#128406;&#127997;","name":"raised hand with part between middle and ring fingers tone 3","shortname":":vulcan_tone3:","category":"people","emoji_order":"1143","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone3:"],"aliases_ascii":[],"keywords":[]},"vulcan_tone4":{"unicode":"1f596-1f3fe","unicode_alt":"","code_decimal":"&#128406;&#127998;","name":"raised hand with part between middle and ring fingers tone 4","shortname":":vulcan_tone4:","category":"people","emoji_order":"1144","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone4:"],"aliases_ascii":[],"keywords":[]},"vulcan_tone5":{"unicode":"1f596-1f3ff","unicode_alt":"","code_decimal":"&#128406;&#127999;","name":"raised hand with part between middle and ring fingers tone 5","shortname":":vulcan_tone5:","category":"people","emoji_order":"1145","aliases":[":raised_hand_with_part_between_middle_and_ring_fingers_tone5:"],"aliases_ascii":[],"keywords":[]},"metal":{"unicode":"1f918","unicode_alt":"","code_decimal":"&#129304;","name":"sign of the horns","shortname":":metal:","category":"people","emoji_order":"1146","aliases":[":sign_of_the_horns:"],"aliases_ascii":[],"keywords":["body","hands","hi","diversity","boys night","parties"]},"metal_tone1":{"unicode":"1f918-1f3fb","unicode_alt":"","code_decimal":"&#129304;&#127995;","name":"sign of the horns tone 1","shortname":":metal_tone1:","category":"people","emoji_order":"1147","aliases":[":sign_of_the_horns_tone1:"],"aliases_ascii":[],"keywords":[]},"metal_tone2":{"unicode":"1f918-1f3fc","unicode_alt":"","code_decimal":"&#129304;&#127996;","name":"sign of the horns tone 2","shortname":":metal_tone2:","category":"people","emoji_order":"1148","aliases":[":sign_of_the_horns_tone2:"],"aliases_ascii":[],"keywords":[]},"metal_tone3":{"unicode":"1f918-1f3fd","unicode_alt":"","code_decimal":"&#129304;&#127997;","name":"sign of the horns tone 3","shortname":":metal_tone3:","category":"people","emoji_order":"1149","aliases":[":sign_of_the_horns_tone3:"],"aliases_ascii":[],"keywords":[]},"metal_tone4":{"unicode":"1f918-1f3fe","unicode_alt":"","code_decimal":"&#129304;&#127998;","name":"sign of the horns tone 4","shortname":":metal_tone4:","category":"people","emoji_order":"1150","aliases":[":sign_of_the_horns_tone4:"],"aliases_ascii":[],"keywords":[]},"metal_tone5":{"unicode":"1f918-1f3ff","unicode_alt":"","code_decimal":"&#129304;&#127999;","name":"sign of the horns tone 5","shortname":":metal_tone5:","category":"people","emoji_order":"1151","aliases":[":sign_of_the_horns_tone5:"],"aliases_ascii":[],"keywords":[]},"call_me":{"unicode":"1f919","unicode_alt":"","code_decimal":"&#129305;","name":"call me hand","shortname":":call_me:","category":"people","emoji_order":"1152","aliases":[":call_me_hand:"],"aliases_ascii":[],"keywords":[]},"call_me_tone1":{"unicode":"1f919-1f3fb","unicode_alt":"","code_decimal":"&#129305;&#127995;","name":"call me hand tone 1","shortname":":call_me_tone1:","category":"people","emoji_order":"1153","aliases":[":call_me_hand_tone1:"],"aliases_ascii":[],"keywords":[]},"call_me_tone2":{"unicode":"1f919-1f3fc","unicode_alt":"","code_decimal":"&#129305;&#127996;","name":"call me hand tone 2","shortname":":call_me_tone2:","category":"people","emoji_order":"1154","aliases":[":call_me_hand_tone2:"],"aliases_ascii":[],"keywords":[]},"call_me_tone3":{"unicode":"1f919-1f3fd","unicode_alt":"","code_decimal":"&#129305;&#127997;","name":"call me hand tone 3","shortname":":call_me_tone3:","category":"people","emoji_order":"1155","aliases":[":call_me_hand_tone3:"],"aliases_ascii":[],"keywords":[]},"call_me_tone4":{"unicode":"1f919-1f3fe","unicode_alt":"","code_decimal":"&#129305;&#127998;","name":"call me hand tone 4","shortname":":call_me_tone4:","category":"people","emoji_order":"1156","aliases":[":call_me_hand_tone4:"],"aliases_ascii":[],"keywords":[]},"call_me_tone5":{"unicode":"1f919-1f3ff","unicode_alt":"","code_decimal":"&#129305;&#127999;","name":"call me hand tone 5","shortname":":call_me_tone5:","category":"people","emoji_order":"1157","aliases":[":call_me_hand_tone5:"],"aliases_ascii":[],"keywords":[]},"hand_splayed":{"unicode":"1f590","unicode_alt":"1f590-fe0f","code_decimal":"&#128400;","name":"raised hand with fingers splayed","shortname":":hand_splayed:","category":"people","emoji_order":"1158","aliases":[":raised_hand_with_fingers_splayed:"],"aliases_ascii":[],"keywords":["body","hands","hi","diversity"]},"hand_splayed_tone1":{"unicode":"1f590-1f3fb","unicode_alt":"","code_decimal":"&#128400;&#127995;","name":"raised hand with fingers splayed tone 1","shortname":":hand_splayed_tone1:","category":"people","emoji_order":"1159","aliases":[":raised_hand_with_fingers_splayed_tone1:"],"aliases_ascii":[],"keywords":[]},"hand_splayed_tone2":{"unicode":"1f590-1f3fc","unicode_alt":"","code_decimal":"&#128400;&#127996;","name":"raised hand with fingers splayed tone 2","shortname":":hand_splayed_tone2:","category":"people","emoji_order":"1160","aliases":[":raised_hand_with_fingers_splayed_tone2:"],"aliases_ascii":[],"keywords":[]},"hand_splayed_tone3":{"unicode":"1f590-1f3fd","unicode_alt":"","code_decimal":"&#128400;&#127997;","name":"raised hand with fingers splayed tone 3","shortname":":hand_splayed_tone3:","category":"people","emoji_order":"1161","aliases":[":raised_hand_with_fingers_splayed_tone3:"],"aliases_ascii":[],"keywords":[]},"hand_splayed_tone4":{"unicode":"1f590-1f3fe","unicode_alt":"","code_decimal":"&#128400;&#127998;","name":"raised hand with fingers splayed tone 4","shortname":":hand_splayed_tone4:","category":"people","emoji_order":"1162","aliases":[":raised_hand_with_fingers_splayed_tone4:"],"aliases_ascii":[],"keywords":[]},"hand_splayed_tone5":{"unicode":"1f590-1f3ff","unicode_alt":"","code_decimal":"&#128400;&#127999;","name":"raised hand with fingers splayed tone 5","shortname":":hand_splayed_tone5:","category":"people","emoji_order":"1163","aliases":[":raised_hand_with_fingers_splayed_tone5:"],"aliases_ascii":[],"keywords":[]},"raised_hand":{"unicode":"270b","unicode_alt":"","code_decimal":"&#9995;","name":"raised hand","shortname":":raised_hand:","category":"people","emoji_order":"1164","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","diversity","girls night"]},"raised_hand_tone1":{"unicode":"270b-1f3fb","unicode_alt":"","code_decimal":"&#9995;&#127995;","name":"raised hand tone 1","shortname":":raised_hand_tone1:","category":"people","emoji_order":"1165","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hand_tone2":{"unicode":"270b-1f3fc","unicode_alt":"","code_decimal":"&#9995;&#127996;","name":"raised hand tone 2","shortname":":raised_hand_tone2:","category":"people","emoji_order":"1166","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hand_tone3":{"unicode":"270b-1f3fd","unicode_alt":"","code_decimal":"&#9995;&#127997;","name":"raised hand tone 3","shortname":":raised_hand_tone3:","category":"people","emoji_order":"1167","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hand_tone4":{"unicode":"270b-1f3fe","unicode_alt":"","code_decimal":"&#9995;&#127998;","name":"raised hand tone 4","shortname":":raised_hand_tone4:","category":"people","emoji_order":"1168","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hand_tone5":{"unicode":"270b-1f3ff","unicode_alt":"","code_decimal":"&#9995;&#127999;","name":"raised hand tone 5","shortname":":raised_hand_tone5:","category":"people","emoji_order":"1169","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_hand":{"unicode":"1f44c","unicode_alt":"","code_decimal":"&#128076;","name":"ok hand sign","shortname":":ok_hand:","category":"people","emoji_order":"1170","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","diversity","perfect","good","beautiful"]},"ok_hand_tone1":{"unicode":"1f44c-1f3fb","unicode_alt":"","code_decimal":"&#128076;&#127995;","name":"ok hand sign tone 1","shortname":":ok_hand_tone1:","category":"people","emoji_order":"1171","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_hand_tone2":{"unicode":"1f44c-1f3fc","unicode_alt":"","code_decimal":"&#128076;&#127996;","name":"ok hand sign tone 2","shortname":":ok_hand_tone2:","category":"people","emoji_order":"1172","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_hand_tone3":{"unicode":"1f44c-1f3fd","unicode_alt":"","code_decimal":"&#128076;&#127997;","name":"ok hand sign tone 3","shortname":":ok_hand_tone3:","category":"people","emoji_order":"1173","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_hand_tone4":{"unicode":"1f44c-1f3fe","unicode_alt":"","code_decimal":"&#128076;&#127998;","name":"ok hand sign tone 4","shortname":":ok_hand_tone4:","category":"people","emoji_order":"1174","aliases":[],"aliases_ascii":[],"keywords":[]},"ok_hand_tone5":{"unicode":"1f44c-1f3ff","unicode_alt":"","code_decimal":"&#128076;&#127999;","name":"ok hand sign tone 5","shortname":":ok_hand_tone5:","category":"people","emoji_order":"1175","aliases":[],"aliases_ascii":[],"keywords":[]},"thumbsup":{"unicode":"1f44d","unicode_alt":"","code_decimal":"&#128077;","name":"thumbs up sign","shortname":":thumbsup:","category":"people","emoji_order":"1176","aliases":[":+1:",":thumbup:"],"aliases_ascii":[],"keywords":["body","hands","hi","luck","thank you","diversity","perfect","good","beautiful"]},"thumbsup_tone1":{"unicode":"1f44d-1f3fb","unicode_alt":"","code_decimal":"&#128077;&#127995;","name":"thumbs up sign tone 1","shortname":":thumbsup_tone1:","category":"people","emoji_order":"1177","aliases":[":+1_tone1:",":thumbup_tone1:"],"aliases_ascii":[],"keywords":[]},"thumbsup_tone2":{"unicode":"1f44d-1f3fc","unicode_alt":"","code_decimal":"&#128077;&#127996;","name":"thumbs up sign tone 2","shortname":":thumbsup_tone2:","category":"people","emoji_order":"1178","aliases":[":+1_tone2:",":thumbup_tone2:"],"aliases_ascii":[],"keywords":[]},"thumbsup_tone3":{"unicode":"1f44d-1f3fd","unicode_alt":"","code_decimal":"&#128077;&#127997;","name":"thumbs up sign tone 3","shortname":":thumbsup_tone3:","category":"people","emoji_order":"1179","aliases":[":+1_tone3:",":thumbup_tone3:"],"aliases_ascii":[],"keywords":[]},"thumbsup_tone4":{"unicode":"1f44d-1f3fe","unicode_alt":"","code_decimal":"&#128077;&#127998;","name":"thumbs up sign tone 4","shortname":":thumbsup_tone4:","category":"people","emoji_order":"1180","aliases":[":+1_tone4:",":thumbup_tone4:"],"aliases_ascii":[],"keywords":[]},"thumbsup_tone5":{"unicode":"1f44d-1f3ff","unicode_alt":"","code_decimal":"&#128077;&#127999;","name":"thumbs up sign tone 5","shortname":":thumbsup_tone5:","category":"people","emoji_order":"1181","aliases":[":+1_tone5:",":thumbup_tone5:"],"aliases_ascii":[],"keywords":[]},"thumbsdown":{"unicode":"1f44e","unicode_alt":"","code_decimal":"&#128078;","name":"thumbs down sign","shortname":":thumbsdown:","category":"people","emoji_order":"1182","aliases":[":-1:",":thumbdown:"],"aliases_ascii":[],"keywords":["body","hands","diversity"]},"thumbsdown_tone1":{"unicode":"1f44e-1f3fb","unicode_alt":"","code_decimal":"&#128078;&#127995;","name":"thumbs down sign tone 1","shortname":":thumbsdown_tone1:","category":"people","emoji_order":"1183","aliases":[":-1_tone1:",":thumbdown_tone1:"],"aliases_ascii":[],"keywords":[]},"thumbsdown_tone2":{"unicode":"1f44e-1f3fc","unicode_alt":"","code_decimal":"&#128078;&#127996;","name":"thumbs down sign tone 2","shortname":":thumbsdown_tone2:","category":"people","emoji_order":"1184","aliases":[":-1_tone2:",":thumbdown_tone2:"],"aliases_ascii":[],"keywords":[]},"thumbsdown_tone3":{"unicode":"1f44e-1f3fd","unicode_alt":"","code_decimal":"&#128078;&#127997;","name":"thumbs down sign tone 3","shortname":":thumbsdown_tone3:","category":"people","emoji_order":"1185","aliases":[":-1_tone3:",":thumbdown_tone3:"],"aliases_ascii":[],"keywords":[]},"thumbsdown_tone4":{"unicode":"1f44e-1f3fe","unicode_alt":"","code_decimal":"&#128078;&#127998;","name":"thumbs down sign tone 4","shortname":":thumbsdown_tone4:","category":"people","emoji_order":"1186","aliases":[":-1_tone4:",":thumbdown_tone4:"],"aliases_ascii":[],"keywords":[]},"thumbsdown_tone5":{"unicode":"1f44e-1f3ff","unicode_alt":"","code_decimal":"&#128078;&#127999;","name":"thumbs down sign tone 5","shortname":":thumbsdown_tone5:","category":"people","emoji_order":"1187","aliases":[":-1_tone5:",":thumbdown_tone5:"],"aliases_ascii":[],"keywords":[]},"fist":{"unicode":"270a","unicode_alt":"","code_decimal":"&#9994;","name":"raised fist","shortname":":fist:","category":"people","emoji_order":"1188","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","fist bump","diversity","condolence"]},"fist_tone1":{"unicode":"270a-1f3fb","unicode_alt":"","code_decimal":"&#9994;&#127995;","name":"raised fist tone 1","shortname":":fist_tone1:","category":"people","emoji_order":"1189","aliases":[],"aliases_ascii":[],"keywords":[]},"fist_tone2":{"unicode":"270a-1f3fc","unicode_alt":"","code_decimal":"&#9994;&#127996;","name":"raised fist tone 2","shortname":":fist_tone2:","category":"people","emoji_order":"1190","aliases":[],"aliases_ascii":[],"keywords":[]},"fist_tone3":{"unicode":"270a-1f3fd","unicode_alt":"","code_decimal":"&#9994;&#127997;","name":"raised fist tone 3","shortname":":fist_tone3:","category":"people","emoji_order":"1191","aliases":[],"aliases_ascii":[],"keywords":[]},"fist_tone4":{"unicode":"270a-1f3fe","unicode_alt":"","code_decimal":"&#9994;&#127998;","name":"raised fist tone 4","shortname":":fist_tone4:","category":"people","emoji_order":"1192","aliases":[],"aliases_ascii":[],"keywords":[]},"fist_tone5":{"unicode":"270a-1f3ff","unicode_alt":"","code_decimal":"&#9994;&#127999;","name":"raised fist tone 5","shortname":":fist_tone5:","category":"people","emoji_order":"1193","aliases":[],"aliases_ascii":[],"keywords":[]},"punch":{"unicode":"1f44a","unicode_alt":"","code_decimal":"&#128074;","name":"fisted hand sign","shortname":":punch:","category":"people","emoji_order":"1194","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","fist bump","diversity","boys night"]},"punch_tone1":{"unicode":"1f44a-1f3fb","unicode_alt":"","code_decimal":"&#128074;&#127995;","name":"fisted hand sign tone 1","shortname":":punch_tone1:","category":"people","emoji_order":"1195","aliases":[],"aliases_ascii":[],"keywords":[]},"punch_tone2":{"unicode":"1f44a-1f3fc","unicode_alt":"","code_decimal":"&#128074;&#127996;","name":"fisted hand sign tone 2","shortname":":punch_tone2:","category":"people","emoji_order":"1196","aliases":[],"aliases_ascii":[],"keywords":[]},"punch_tone3":{"unicode":"1f44a-1f3fd","unicode_alt":"","code_decimal":"&#128074;&#127997;","name":"fisted hand sign tone 3","shortname":":punch_tone3:","category":"people","emoji_order":"1197","aliases":[],"aliases_ascii":[],"keywords":[]},"punch_tone4":{"unicode":"1f44a-1f3fe","unicode_alt":"","code_decimal":"&#128074;&#127998;","name":"fisted hand sign tone 4","shortname":":punch_tone4:","category":"people","emoji_order":"1198","aliases":[],"aliases_ascii":[],"keywords":[]},"punch_tone5":{"unicode":"1f44a-1f3ff","unicode_alt":"","code_decimal":"&#128074;&#127999;","name":"fisted hand sign tone 5","shortname":":punch_tone5:","category":"people","emoji_order":"1199","aliases":[],"aliases_ascii":[],"keywords":[]},"left_facing_fist":{"unicode":"1f91b","unicode_alt":"","code_decimal":"&#129307;","name":"left-facing fist","shortname":":left_facing_fist:","category":"people","emoji_order":"1200","aliases":[":left_fist:"],"aliases_ascii":[],"keywords":[]},"left_facing_fist_tone1":{"unicode":"1f91b-1f3fb","unicode_alt":"","code_decimal":"&#129307;&#127995;","name":"left facing fist tone 1","shortname":":left_facing_fist_tone1:","category":"people","emoji_order":"1201","aliases":[":left_fist_tone1:"],"aliases_ascii":[],"keywords":[]},"left_facing_fist_tone2":{"unicode":"1f91b-1f3fc","unicode_alt":"","code_decimal":"&#129307;&#127996;","name":"left facing fist tone 2","shortname":":left_facing_fist_tone2:","category":"people","emoji_order":"1202","aliases":[":left_fist_tone2:"],"aliases_ascii":[],"keywords":[]},"left_facing_fist_tone3":{"unicode":"1f91b-1f3fd","unicode_alt":"","code_decimal":"&#129307;&#127997;","name":"left facing fist tone 3","shortname":":left_facing_fist_tone3:","category":"people","emoji_order":"1203","aliases":[":left_fist_tone3:"],"aliases_ascii":[],"keywords":[]},"left_facing_fist_tone4":{"unicode":"1f91b-1f3fe","unicode_alt":"","code_decimal":"&#129307;&#127998;","name":"left facing fist tone 4","shortname":":left_facing_fist_tone4:","category":"people","emoji_order":"1204","aliases":[":left_fist_tone4:"],"aliases_ascii":[],"keywords":[]},"left_facing_fist_tone5":{"unicode":"1f91b-1f3ff","unicode_alt":"","code_decimal":"&#129307;&#127999;","name":"left facing fist tone 5","shortname":":left_facing_fist_tone5:","category":"people","emoji_order":"1205","aliases":[":left_fist_tone5:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist":{"unicode":"1f91c","unicode_alt":"","code_decimal":"&#129308;","name":"right-facing fist","shortname":":right_facing_fist:","category":"people","emoji_order":"1206","aliases":[":right_fist:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist_tone1":{"unicode":"1f91c-1f3fb","unicode_alt":"","code_decimal":"&#129308;&#127995;","name":"right facing fist tone 1","shortname":":right_facing_fist_tone1:","category":"people","emoji_order":"1207","aliases":[":right_fist_tone1:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist_tone2":{"unicode":"1f91c-1f3fc","unicode_alt":"","code_decimal":"&#129308;&#127996;","name":"right facing fist tone 2","shortname":":right_facing_fist_tone2:","category":"people","emoji_order":"1208","aliases":[":right_fist_tone2:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist_tone3":{"unicode":"1f91c-1f3fd","unicode_alt":"","code_decimal":"&#129308;&#127997;","name":"right facing fist tone 3","shortname":":right_facing_fist_tone3:","category":"people","emoji_order":"1209","aliases":[":right_fist_tone3:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist_tone4":{"unicode":"1f91c-1f3fe","unicode_alt":"","code_decimal":"&#129308;&#127998;","name":"right facing fist tone 4","shortname":":right_facing_fist_tone4:","category":"people","emoji_order":"1210","aliases":[":right_fist_tone4:"],"aliases_ascii":[],"keywords":[]},"right_facing_fist_tone5":{"unicode":"1f91c-1f3ff","unicode_alt":"","code_decimal":"&#129308;&#127999;","name":"right facing fist tone 5","shortname":":right_facing_fist_tone5:","category":"people","emoji_order":"1211","aliases":[":right_fist_tone5:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand":{"unicode":"1f91a","unicode_alt":"","code_decimal":"&#129306;","name":"raised back of hand","shortname":":raised_back_of_hand:","category":"people","emoji_order":"1212","aliases":[":back_of_hand:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand_tone1":{"unicode":"1f91a-1f3fb","unicode_alt":"","code_decimal":"&#129306;&#127995;","name":"raised back of hand tone 1","shortname":":raised_back_of_hand_tone1:","category":"people","emoji_order":"1213","aliases":[":back_of_hand_tone1:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand_tone2":{"unicode":"1f91a-1f3fc","unicode_alt":"","code_decimal":"&#129306;&#127996;","name":"raised back of hand tone 2","shortname":":raised_back_of_hand_tone2:","category":"people","emoji_order":"1214","aliases":[":back_of_hand_tone2:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand_tone3":{"unicode":"1f91a-1f3fd","unicode_alt":"","code_decimal":"&#129306;&#127997;","name":"raised back of hand tone 3","shortname":":raised_back_of_hand_tone3:","category":"people","emoji_order":"1215","aliases":[":back_of_hand_tone3:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand_tone4":{"unicode":"1f91a-1f3fe","unicode_alt":"","code_decimal":"&#129306;&#127998;","name":"raised back of hand tone 4","shortname":":raised_back_of_hand_tone4:","category":"people","emoji_order":"1216","aliases":[":back_of_hand_tone4:"],"aliases_ascii":[],"keywords":[]},"raised_back_of_hand_tone5":{"unicode":"1f91a-1f3ff","unicode_alt":"","code_decimal":"&#129306;&#127999;","name":"raised back of hand tone 5","shortname":":raised_back_of_hand_tone5:","category":"people","emoji_order":"1217","aliases":[":back_of_hand_tone5:"],"aliases_ascii":[],"keywords":[]},"wave":{"unicode":"1f44b","unicode_alt":"","code_decimal":"&#128075;","name":"waving hand sign","shortname":":wave:","category":"people","emoji_order":"1218","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","diversity"]},"wave_tone1":{"unicode":"1f44b-1f3fb","unicode_alt":"","code_decimal":"&#128075;&#127995;","name":"waving hand sign tone 1","shortname":":wave_tone1:","category":"people","emoji_order":"1219","aliases":[],"aliases_ascii":[],"keywords":[]},"wave_tone2":{"unicode":"1f44b-1f3fc","unicode_alt":"","code_decimal":"&#128075;&#127996;","name":"waving hand sign tone 2","shortname":":wave_tone2:","category":"people","emoji_order":"1220","aliases":[],"aliases_ascii":[],"keywords":[]},"wave_tone3":{"unicode":"1f44b-1f3fd","unicode_alt":"","code_decimal":"&#128075;&#127997;","name":"waving hand sign tone 3","shortname":":wave_tone3:","category":"people","emoji_order":"1221","aliases":[],"aliases_ascii":[],"keywords":[]},"wave_tone4":{"unicode":"1f44b-1f3fe","unicode_alt":"","code_decimal":"&#128075;&#127998;","name":"waving hand sign tone 4","shortname":":wave_tone4:","category":"people","emoji_order":"1222","aliases":[],"aliases_ascii":[],"keywords":[]},"wave_tone5":{"unicode":"1f44b-1f3ff","unicode_alt":"","code_decimal":"&#128075;&#127999;","name":"waving hand sign tone 5","shortname":":wave_tone5:","category":"people","emoji_order":"1223","aliases":[],"aliases_ascii":[],"keywords":[]},"clap":{"unicode":"1f44f","unicode_alt":"","code_decimal":"&#128079;","name":"clapping hands sign","shortname":":clap:","category":"people","emoji_order":"1224","aliases":[],"aliases_ascii":[],"keywords":["body","hands","win","diversity","good","beautiful"]},"clap_tone1":{"unicode":"1f44f-1f3fb","unicode_alt":"","code_decimal":"&#128079;&#127995;","name":"clapping hands sign tone 1","shortname":":clap_tone1:","category":"people","emoji_order":"1225","aliases":[],"aliases_ascii":[],"keywords":[]},"clap_tone2":{"unicode":"1f44f-1f3fc","unicode_alt":"","code_decimal":"&#128079;&#127996;","name":"clapping hands sign tone 2","shortname":":clap_tone2:","category":"people","emoji_order":"1226","aliases":[],"aliases_ascii":[],"keywords":[]},"clap_tone3":{"unicode":"1f44f-1f3fd","unicode_alt":"","code_decimal":"&#128079;&#127997;","name":"clapping hands sign tone 3","shortname":":clap_tone3:","category":"people","emoji_order":"1227","aliases":[],"aliases_ascii":[],"keywords":[]},"clap_tone4":{"unicode":"1f44f-1f3fe","unicode_alt":"","code_decimal":"&#128079;&#127998;","name":"clapping hands sign tone 4","shortname":":clap_tone4:","category":"people","emoji_order":"1228","aliases":[],"aliases_ascii":[],"keywords":[]},"clap_tone5":{"unicode":"1f44f-1f3ff","unicode_alt":"","code_decimal":"&#128079;&#127999;","name":"clapping hands sign tone 5","shortname":":clap_tone5:","category":"people","emoji_order":"1229","aliases":[],"aliases_ascii":[],"keywords":[]},"writing_hand":{"unicode":"270d","unicode_alt":"270d-fe0f","code_decimal":"&#9997;","name":"writing hand","shortname":":writing_hand:","category":"people","emoji_order":"1230","aliases":[],"aliases_ascii":[],"keywords":["body","hands","write","diversity"]},"writing_hand_tone1":{"unicode":"270d-1f3fb","unicode_alt":"","code_decimal":"&#9997;&#127995;","name":"writing hand tone 1","shortname":":writing_hand_tone1:","category":"people","emoji_order":"1231","aliases":[],"aliases_ascii":[],"keywords":[]},"writing_hand_tone2":{"unicode":"270d-1f3fc","unicode_alt":"","code_decimal":"&#9997;&#127996;","name":"writing hand tone 2","shortname":":writing_hand_tone2:","category":"people","emoji_order":"1232","aliases":[],"aliases_ascii":[],"keywords":[]},"writing_hand_tone3":{"unicode":"270d-1f3fd","unicode_alt":"","code_decimal":"&#9997;&#127997;","name":"writing hand tone 3","shortname":":writing_hand_tone3:","category":"people","emoji_order":"1233","aliases":[],"aliases_ascii":[],"keywords":[]},"writing_hand_tone4":{"unicode":"270d-1f3fe","unicode_alt":"","code_decimal":"&#9997;&#127998;","name":"writing hand tone 4","shortname":":writing_hand_tone4:","category":"people","emoji_order":"1234","aliases":[],"aliases_ascii":[],"keywords":[]},"writing_hand_tone5":{"unicode":"270d-1f3ff","unicode_alt":"","code_decimal":"&#9997;&#127999;","name":"writing hand tone 5","shortname":":writing_hand_tone5:","category":"people","emoji_order":"1235","aliases":[],"aliases_ascii":[],"keywords":[]},"open_hands":{"unicode":"1f450","unicode_alt":"","code_decimal":"&#128080;","name":"open hands sign","shortname":":open_hands:","category":"people","emoji_order":"1236","aliases":[],"aliases_ascii":[],"keywords":["body","hands","diversity","condolence"]},"open_hands_tone1":{"unicode":"1f450-1f3fb","unicode_alt":"","code_decimal":"&#128080;&#127995;","name":"open hands sign tone 1","shortname":":open_hands_tone1:","category":"people","emoji_order":"1237","aliases":[],"aliases_ascii":[],"keywords":[]},"open_hands_tone2":{"unicode":"1f450-1f3fc","unicode_alt":"","code_decimal":"&#128080;&#127996;","name":"open hands sign tone 2","shortname":":open_hands_tone2:","category":"people","emoji_order":"1238","aliases":[],"aliases_ascii":[],"keywords":[]},"open_hands_tone3":{"unicode":"1f450-1f3fd","unicode_alt":"","code_decimal":"&#128080;&#127997;","name":"open hands sign tone 3","shortname":":open_hands_tone3:","category":"people","emoji_order":"1239","aliases":[],"aliases_ascii":[],"keywords":[]},"open_hands_tone4":{"unicode":"1f450-1f3fe","unicode_alt":"","code_decimal":"&#128080;&#127998;","name":"open hands sign tone 4","shortname":":open_hands_tone4:","category":"people","emoji_order":"1240","aliases":[],"aliases_ascii":[],"keywords":[]},"open_hands_tone5":{"unicode":"1f450-1f3ff","unicode_alt":"","code_decimal":"&#128080;&#127999;","name":"open hands sign tone 5","shortname":":open_hands_tone5:","category":"people","emoji_order":"1241","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hands":{"unicode":"1f64c","unicode_alt":"","code_decimal":"&#128588;","name":"person raising both hands in celebration","shortname":":raised_hands:","category":"people","emoji_order":"1242","aliases":[],"aliases_ascii":[],"keywords":["body","hands","diversity","perfect","good","parties"]},"raised_hands_tone1":{"unicode":"1f64c-1f3fb","unicode_alt":"","code_decimal":"&#128588;&#127995;","name":"person raising both hands in celebration tone 1","shortname":":raised_hands_tone1:","category":"people","emoji_order":"1243","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hands_tone2":{"unicode":"1f64c-1f3fc","unicode_alt":"","code_decimal":"&#128588;&#127996;","name":"person raising both hands in celebration tone 2","shortname":":raised_hands_tone2:","category":"people","emoji_order":"1244","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hands_tone3":{"unicode":"1f64c-1f3fd","unicode_alt":"","code_decimal":"&#128588;&#127997;","name":"person raising both hands in celebration tone 3","shortname":":raised_hands_tone3:","category":"people","emoji_order":"1245","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hands_tone4":{"unicode":"1f64c-1f3fe","unicode_alt":"","code_decimal":"&#128588;&#127998;","name":"person raising both hands in celebration tone 4","shortname":":raised_hands_tone4:","category":"people","emoji_order":"1246","aliases":[],"aliases_ascii":[],"keywords":[]},"raised_hands_tone5":{"unicode":"1f64c-1f3ff","unicode_alt":"","code_decimal":"&#128588;&#127999;","name":"person raising both hands in celebration tone 5","shortname":":raised_hands_tone5:","category":"people","emoji_order":"1247","aliases":[],"aliases_ascii":[],"keywords":[]},"pray":{"unicode":"1f64f","unicode_alt":"","code_decimal":"&#128591;","name":"person with folded hands","shortname":":pray:","category":"people","emoji_order":"1248","aliases":[],"aliases_ascii":[],"keywords":["body","hands","hi","luck","thank you","pray","diversity","scientology"]},"pray_tone1":{"unicode":"1f64f-1f3fb","unicode_alt":"","code_decimal":"&#128591;&#127995;","name":"person with folded hands tone 1","shortname":":pray_tone1:","category":"people","emoji_order":"1249","aliases":[],"aliases_ascii":[],"keywords":[]},"pray_tone2":{"unicode":"1f64f-1f3fc","unicode_alt":"","code_decimal":"&#128591;&#127996;","name":"person with folded hands tone 2","shortname":":pray_tone2:","category":"people","emoji_order":"1250","aliases":[],"aliases_ascii":[],"keywords":[]},"pray_tone3":{"unicode":"1f64f-1f3fd","unicode_alt":"","code_decimal":"&#128591;&#127997;","name":"person with folded hands tone 3","shortname":":pray_tone3:","category":"people","emoji_order":"1251","aliases":[],"aliases_ascii":[],"keywords":[]},"pray_tone4":{"unicode":"1f64f-1f3fe","unicode_alt":"","code_decimal":"&#128591;&#127998;","name":"person with folded hands tone 4","shortname":":pray_tone4:","category":"people","emoji_order":"1252","aliases":[],"aliases_ascii":[],"keywords":[]},"pray_tone5":{"unicode":"1f64f-1f3ff","unicode_alt":"","code_decimal":"&#128591;&#127999;","name":"person with folded hands tone 5","shortname":":pray_tone5:","category":"people","emoji_order":"1253","aliases":[],"aliases_ascii":[],"keywords":[]},"handshake":{"unicode":"1f91d","unicode_alt":"","code_decimal":"&#129309;","name":"handshake","shortname":":handshake:","category":"people","emoji_order":"1254","aliases":[":shaking_hands:"],"aliases_ascii":[],"keywords":[]},"handshake_tone1":{"unicode":"1f91d-1f3fb","unicode_alt":"","code_decimal":"&#129309;&#127995;","name":"handshake tone 1","shortname":":handshake_tone1:","category":"people","emoji_order":"1255","aliases":[":shaking_hands_tone1:"],"aliases_ascii":[],"keywords":[]},"handshake_tone2":{"unicode":"1f91d-1f3fc","unicode_alt":"","code_decimal":"&#129309;&#127996;","name":"handshake tone 2","shortname":":handshake_tone2:","category":"people","emoji_order":"1256","aliases":[":shaking_hands_tone2:"],"aliases_ascii":[],"keywords":[]},"handshake_tone3":{"unicode":"1f91d-1f3fd","unicode_alt":"","code_decimal":"&#129309;&#127997;","name":"handshake tone 3","shortname":":handshake_tone3:","category":"people","emoji_order":"1257","aliases":[":shaking_hands_tone3:"],"aliases_ascii":[],"keywords":[]},"handshake_tone4":{"unicode":"1f91d-1f3fe","unicode_alt":"","code_decimal":"&#129309;&#127998;","name":"handshake tone 4","shortname":":handshake_tone4:","category":"people","emoji_order":"1258","aliases":[":shaking_hands_tone4:"],"aliases_ascii":[],"keywords":[]},"handshake_tone5":{"unicode":"1f91d-1f3ff","unicode_alt":"","code_decimal":"&#129309;&#127999;","name":"handshake tone 5","shortname":":handshake_tone5:","category":"people","emoji_order":"1259","aliases":[":shaking_hands_tone5:"],"aliases_ascii":[],"keywords":[]},"nail_care":{"unicode":"1f485","unicode_alt":"","code_decimal":"&#128133;","name":"nail polish","shortname":":nail_care:","category":"people","emoji_order":"1260","aliases":[],"aliases_ascii":[],"keywords":["women","body","hands","nailpolish","diversity","girls night"]},"nail_care_tone1":{"unicode":"1f485-1f3fb","unicode_alt":"","code_decimal":"&#128133;&#127995;","name":"nail polish tone 1","shortname":":nail_care_tone1:","category":"people","emoji_order":"1261","aliases":[],"aliases_ascii":[],"keywords":[]},"nail_care_tone2":{"unicode":"1f485-1f3fc","unicode_alt":"","code_decimal":"&#128133;&#127996;","name":"nail polish tone 2","shortname":":nail_care_tone2:","category":"people","emoji_order":"1262","aliases":[],"aliases_ascii":[],"keywords":[]},"nail_care_tone3":{"unicode":"1f485-1f3fd","unicode_alt":"","code_decimal":"&#128133;&#127997;","name":"nail polish tone 3","shortname":":nail_care_tone3:","category":"people","emoji_order":"1263","aliases":[],"aliases_ascii":[],"keywords":[]},"nail_care_tone4":{"unicode":"1f485-1f3fe","unicode_alt":"","code_decimal":"&#128133;&#127998;","name":"nail polish tone 4","shortname":":nail_care_tone4:","category":"people","emoji_order":"1264","aliases":[],"aliases_ascii":[],"keywords":[]},"nail_care_tone5":{"unicode":"1f485-1f3ff","unicode_alt":"","code_decimal":"&#128133;&#127999;","name":"nail polish tone 5","shortname":":nail_care_tone5:","category":"people","emoji_order":"1265","aliases":[],"aliases_ascii":[],"keywords":[]},"ear":{"unicode":"1f442","unicode_alt":"","code_decimal":"&#128066;","name":"ear","shortname":":ear:","category":"people","emoji_order":"1266","aliases":[],"aliases_ascii":[],"keywords":["body","diversity"]},"ear_tone1":{"unicode":"1f442-1f3fb","unicode_alt":"","code_decimal":"&#128066;&#127995;","name":"ear tone 1","shortname":":ear_tone1:","category":"people","emoji_order":"1267","aliases":[],"aliases_ascii":[],"keywords":[]},"ear_tone2":{"unicode":"1f442-1f3fc","unicode_alt":"","code_decimal":"&#128066;&#127996;","name":"ear tone 2","shortname":":ear_tone2:","category":"people","emoji_order":"1268","aliases":[],"aliases_ascii":[],"keywords":[]},"ear_tone3":{"unicode":"1f442-1f3fd","unicode_alt":"","code_decimal":"&#128066;&#127997;","name":"ear tone 3","shortname":":ear_tone3:","category":"people","emoji_order":"1269","aliases":[],"aliases_ascii":[],"keywords":[]},"ear_tone4":{"unicode":"1f442-1f3fe","unicode_alt":"","code_decimal":"&#128066;&#127998;","name":"ear tone 4","shortname":":ear_tone4:","category":"people","emoji_order":"1270","aliases":[],"aliases_ascii":[],"keywords":[]},"ear_tone5":{"unicode":"1f442-1f3ff","unicode_alt":"","code_decimal":"&#128066;&#127999;","name":"ear tone 5","shortname":":ear_tone5:","category":"people","emoji_order":"1271","aliases":[],"aliases_ascii":[],"keywords":[]},"nose":{"unicode":"1f443","unicode_alt":"","code_decimal":"&#128067;","name":"nose","shortname":":nose:","category":"people","emoji_order":"1272","aliases":[],"aliases_ascii":[],"keywords":["body","diversity"]},"nose_tone1":{"unicode":"1f443-1f3fb","unicode_alt":"","code_decimal":"&#128067;&#127995;","name":"nose tone 1","shortname":":nose_tone1:","category":"people","emoji_order":"1273","aliases":[],"aliases_ascii":[],"keywords":[]},"nose_tone2":{"unicode":"1f443-1f3fc","unicode_alt":"","code_decimal":"&#128067;&#127996;","name":"nose tone 2","shortname":":nose_tone2:","category":"people","emoji_order":"1274","aliases":[],"aliases_ascii":[],"keywords":[]},"nose_tone3":{"unicode":"1f443-1f3fd","unicode_alt":"","code_decimal":"&#128067;&#127997;","name":"nose tone 3","shortname":":nose_tone3:","category":"people","emoji_order":"1275","aliases":[],"aliases_ascii":[],"keywords":[]},"nose_tone4":{"unicode":"1f443-1f3fe","unicode_alt":"","code_decimal":"&#128067;&#127998;","name":"nose tone 4","shortname":":nose_tone4:","category":"people","emoji_order":"1276","aliases":[],"aliases_ascii":[],"keywords":[]},"nose_tone5":{"unicode":"1f443-1f3ff","unicode_alt":"","code_decimal":"&#128067;&#127999;","name":"nose tone 5","shortname":":nose_tone5:","category":"people","emoji_order":"1277","aliases":[],"aliases_ascii":[],"keywords":[]},"footprints":{"unicode":"1f463","unicode_alt":"","code_decimal":"&#128099;","name":"footprints","shortname":":footprints:","category":"people","emoji_order":"1278","aliases":[],"aliases_ascii":[],"keywords":[]},"eyes":{"unicode":"1f440","unicode_alt":"","code_decimal":"&#128064;","name":"eyes","shortname":":eyes:","category":"people","emoji_order":"1279","aliases":[],"aliases_ascii":[],"keywords":["body","eyes"]},"eye":{"unicode":"1f441","unicode_alt":"1f441-fe0f","code_decimal":"&#128065;","name":"eye","shortname":":eye:","category":"people","emoji_order":"1280","aliases":[],"aliases_ascii":[],"keywords":["body","eyes"]},"eye_in_speech_bubble":{"unicode":"1f441-1f5e8","unicode_alt":"1f441-200d-1f5e8","code_decimal":"&#128065;&#128488;","name":"eye in speech bubble","shortname":":eye_in_speech_bubble:","category":"symbols","emoji_order":"1281","aliases":[],"aliases_ascii":[],"keywords":["object","symbol","eyes","talk"]},"tongue":{"unicode":"1f445","unicode_alt":"","code_decimal":"&#128069;","name":"tongue","shortname":":tongue:","category":"people","emoji_order":"1282","aliases":[],"aliases_ascii":[],"keywords":["body","sexy","lip"]},"lips":{"unicode":"1f444","unicode_alt":"","code_decimal":"&#128068;","name":"mouth","shortname":":lips:","category":"people","emoji_order":"1283","aliases":[],"aliases_ascii":[],"keywords":["women","body","sexy","lip"]},"kiss":{"unicode":"1f48b","unicode_alt":"","code_decimal":"&#128139;","name":"kiss mark","shortname":":kiss:","category":"people","emoji_order":"1284","aliases":[],"aliases_ascii":[],"keywords":["women","love","sexy","lip","beautiful","girls night"]},"cupid":{"unicode":"1f498","unicode_alt":"","code_decimal":"&#128152;","name":"heart with arrow","shortname":":cupid:","category":"symbols","emoji_order":"1285","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"heart":{"unicode":"2764","unicode_alt":"2764-fe0f","code_decimal":"&#10084;","name":"heavy black heart","shortname":":heart:","category":"symbols","emoji_order":"1286","aliases":[],"aliases_ascii":["<3"],"keywords":["love","symbol","parties"]},"heartbeat":{"unicode":"1f493","unicode_alt":"","code_decimal":"&#128147;","name":"beating heart","shortname":":heartbeat:","category":"symbols","emoji_order":"1287","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"broken_heart":{"unicode":"1f494","unicode_alt":"","code_decimal":"&#128148;","name":"broken heart","shortname":":broken_heart:","category":"symbols","emoji_order":"1288","aliases":[],"aliases_ascii":["<\/3"],"keywords":["love","symbol","heartbreak"]},"two_hearts":{"unicode":"1f495","unicode_alt":"","code_decimal":"&#128149;","name":"two hearts","shortname":":two_hearts:","category":"symbols","emoji_order":"1289","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"sparkling_heart":{"unicode":"1f496","unicode_alt":"","code_decimal":"&#128150;","name":"sparkling heart","shortname":":sparkling_heart:","category":"symbols","emoji_order":"1290","aliases":[],"aliases_ascii":[],"keywords":["love","symbol","girls night"]},"heartpulse":{"unicode":"1f497","unicode_alt":"","code_decimal":"&#128151;","name":"growing heart","shortname":":heartpulse:","category":"symbols","emoji_order":"1291","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"blue_heart":{"unicode":"1f499","unicode_alt":"","code_decimal":"&#128153;","name":"blue heart","shortname":":blue_heart:","category":"symbols","emoji_order":"1292","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"green_heart":{"unicode":"1f49a","unicode_alt":"","code_decimal":"&#128154;","name":"green heart","shortname":":green_heart:","category":"symbols","emoji_order":"1293","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"yellow_heart":{"unicode":"1f49b","unicode_alt":"","code_decimal":"&#128155;","name":"yellow heart","shortname":":yellow_heart:","category":"symbols","emoji_order":"1294","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"purple_heart":{"unicode":"1f49c","unicode_alt":"","code_decimal":"&#128156;","name":"purple heart","shortname":":purple_heart:","category":"symbols","emoji_order":"1295","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"black_heart":{"unicode":"1f5a4","unicode_alt":"","code_decimal":"&#128420;","name":"black heart","shortname":":black_heart:","category":"symbols","emoji_order":"1296","aliases":[],"aliases_ascii":[],"keywords":[]},"gift_heart":{"unicode":"1f49d","unicode_alt":"","code_decimal":"&#128157;","name":"heart with ribbon","shortname":":gift_heart:","category":"symbols","emoji_order":"1297","aliases":[],"aliases_ascii":[],"keywords":["love","symbol","condolence"]},"revolving_hearts":{"unicode":"1f49e","unicode_alt":"","code_decimal":"&#128158;","name":"revolving hearts","shortname":":revolving_hearts:","category":"symbols","emoji_order":"1298","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"heart_decoration":{"unicode":"1f49f","unicode_alt":"","code_decimal":"&#128159;","name":"heart decoration","shortname":":heart_decoration:","category":"symbols","emoji_order":"1299","aliases":[],"aliases_ascii":[],"keywords":["love","symbol"]},"heart_exclamation":{"unicode":"2763","unicode_alt":"2763-fe0f","code_decimal":"&#10083;","name":"heavy heart exclamation mark ornament","shortname":":heart_exclamation:","category":"symbols","emoji_order":"1300","aliases":[":heavy_heart_exclamation_mark_ornament:"],"aliases_ascii":[],"keywords":["love","symbol"]},"love_letter":{"unicode":"1f48c","unicode_alt":"","code_decimal":"&#128140;","name":"love letter","shortname":":love_letter:","category":"objects","emoji_order":"1301","aliases":[],"aliases_ascii":[],"keywords":["object"]},"zzz":{"unicode":"1f4a4","unicode_alt":"","code_decimal":"&#128164;","name":"sleeping symbol","shortname":":zzz:","category":"people","emoji_order":"1302","aliases":[],"aliases_ascii":[],"keywords":["tired","goodnight"]},"anger":{"unicode":"1f4a2","unicode_alt":"","code_decimal":"&#128162;","name":"anger symbol","shortname":":anger:","category":"symbols","emoji_order":"1303","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"bomb":{"unicode":"1f4a3","unicode_alt":"","code_decimal":"&#128163;","name":"bomb","shortname":":bomb:","category":"objects","emoji_order":"1304","aliases":[],"aliases_ascii":[],"keywords":["object","weapon","dead","blast"]},"boom":{"unicode":"1f4a5","unicode_alt":"","code_decimal":"&#128165;","name":"collision symbol","shortname":":boom:","category":"symbols","emoji_order":"1305","aliases":[],"aliases_ascii":[],"keywords":["symbol","blast"]},"sweat_drops":{"unicode":"1f4a6","unicode_alt":"","code_decimal":"&#128166;","name":"splashing sweat symbol","shortname":":sweat_drops:","category":"nature","emoji_order":"1306","aliases":[],"aliases_ascii":[],"keywords":["rain","stressed","sweat"]},"dash":{"unicode":"1f4a8","unicode_alt":"","code_decimal":"&#128168;","name":"dash symbol","shortname":":dash:","category":"nature","emoji_order":"1307","aliases":[],"aliases_ascii":[],"keywords":["cloud","cold","smoking"]},"dizzy":{"unicode":"1f4ab","unicode_alt":"","code_decimal":"&#128171;","name":"dizzy symbol","shortname":":dizzy:","category":"symbols","emoji_order":"1308","aliases":[],"aliases_ascii":[],"keywords":["star","symbol"]},"speech_balloon":{"unicode":"1f4ac","unicode_alt":"","code_decimal":"&#128172;","name":"speech balloon","shortname":":speech_balloon:","category":"symbols","emoji_order":"1309","aliases":[],"aliases_ascii":[],"keywords":["symbol","free speech"]},"speech_left":{"unicode":"1f5e8","unicode_alt":"1f5e8-fe0f","code_decimal":"&#128488;","name":"left speech bubble","shortname":":speech_left:","category":"symbols","emoji_order":"1310","aliases":[":left_speech_bubble:"],"aliases_ascii":[],"keywords":[]},"anger_right":{"unicode":"1f5ef","unicode_alt":"1f5ef-fe0f","code_decimal":"&#128495;","name":"right anger bubble","shortname":":anger_right:","category":"symbols","emoji_order":"1311","aliases":[":right_anger_bubble:"],"aliases_ascii":[],"keywords":["symbol"]},"thought_balloon":{"unicode":"1f4ad","unicode_alt":"","code_decimal":"&#128173;","name":"thought balloon","shortname":":thought_balloon:","category":"symbols","emoji_order":"1312","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"hole":{"unicode":"1f573","unicode_alt":"1f573-fe0f","code_decimal":"&#128371;","name":"hole","shortname":":hole:","category":"objects","emoji_order":"1313","aliases":[],"aliases_ascii":[],"keywords":["object"]},"eyeglasses":{"unicode":"1f453","unicode_alt":"","code_decimal":"&#128083;","name":"eyeglasses","shortname":":eyeglasses:","category":"people","emoji_order":"1314","aliases":[],"aliases_ascii":[],"keywords":["fashion","glasses","accessories"]},"dark_sunglasses":{"unicode":"1f576","unicode_alt":"1f576-fe0f","code_decimal":"&#128374;","name":"dark sunglasses","shortname":":dark_sunglasses:","category":"people","emoji_order":"1315","aliases":[],"aliases_ascii":[],"keywords":["fashion","glasses","accessories"]},"necktie":{"unicode":"1f454","unicode_alt":"","code_decimal":"&#128084;","name":"necktie","shortname":":necktie:","category":"people","emoji_order":"1316","aliases":[],"aliases_ascii":[],"keywords":["fashion"]},"shirt":{"unicode":"1f455","unicode_alt":"","code_decimal":"&#128085;","name":"t-shirt","shortname":":shirt:","category":"people","emoji_order":"1317","aliases":[],"aliases_ascii":[],"keywords":["fashion"]},"jeans":{"unicode":"1f456","unicode_alt":"","code_decimal":"&#128086;","name":"jeans","shortname":":jeans:","category":"people","emoji_order":"1318","aliases":[],"aliases_ascii":[],"keywords":["fashion"]},"dress":{"unicode":"1f457","unicode_alt":"","code_decimal":"&#128087;","name":"dress","shortname":":dress:","category":"people","emoji_order":"1319","aliases":[],"aliases_ascii":[],"keywords":["women","fashion","sexy","girls night"]},"kimono":{"unicode":"1f458","unicode_alt":"","code_decimal":"&#128088;","name":"kimono","shortname":":kimono:","category":"people","emoji_order":"1320","aliases":[],"aliases_ascii":[],"keywords":["fashion"]},"bikini":{"unicode":"1f459","unicode_alt":"","code_decimal":"&#128089;","name":"bikini","shortname":":bikini:","category":"people","emoji_order":"1321","aliases":[],"aliases_ascii":[],"keywords":["women","fashion","sexy","vacation","tropical","swim"]},"womans_clothes":{"unicode":"1f45a","unicode_alt":"","code_decimal":"&#128090;","name":"womans clothes","shortname":":womans_clothes:","category":"people","emoji_order":"1322","aliases":[],"aliases_ascii":[],"keywords":["women","fashion"]},"purse":{"unicode":"1f45b","unicode_alt":"","code_decimal":"&#128091;","name":"purse","shortname":":purse:","category":"people","emoji_order":"1323","aliases":[],"aliases_ascii":[],"keywords":["bag","women","fashion","accessories","money"]},"handbag":{"unicode":"1f45c","unicode_alt":"","code_decimal":"&#128092;","name":"handbag","shortname":":handbag:","category":"people","emoji_order":"1324","aliases":[],"aliases_ascii":[],"keywords":["bag","women","fashion","vacation","accessories"]},"pouch":{"unicode":"1f45d","unicode_alt":"","code_decimal":"&#128093;","name":"pouch","shortname":":pouch:","category":"people","emoji_order":"1325","aliases":[],"aliases_ascii":[],"keywords":["bag","women","fashion","accessories"]},"shopping_bags":{"unicode":"1f6cd","unicode_alt":"1f6cd-fe0f","code_decimal":"&#128717;","name":"shopping bags","shortname":":shopping_bags:","category":"objects","emoji_order":"1326","aliases":[],"aliases_ascii":[],"keywords":["object","birthday","parties"]},"school_satchel":{"unicode":"1f392","unicode_alt":"","code_decimal":"&#127890;","name":"school satchel","shortname":":school_satchel:","category":"people","emoji_order":"1327","aliases":[],"aliases_ascii":[],"keywords":["bag","fashion","office","vacation","accessories"]},"mans_shoe":{"unicode":"1f45e","unicode_alt":"","code_decimal":"&#128094;","name":"mans shoe","shortname":":mans_shoe:","category":"people","emoji_order":"1328","aliases":[],"aliases_ascii":[],"keywords":["fashion","shoe","accessories"]},"athletic_shoe":{"unicode":"1f45f","unicode_alt":"","code_decimal":"&#128095;","name":"athletic shoe","shortname":":athletic_shoe:","category":"people","emoji_order":"1329","aliases":[],"aliases_ascii":[],"keywords":["fashion","shoe","accessories","boys night"]},"high_heel":{"unicode":"1f460","unicode_alt":"","code_decimal":"&#128096;","name":"high-heeled shoe","shortname":":high_heel:","category":"people","emoji_order":"1330","aliases":[],"aliases_ascii":[],"keywords":["women","fashion","shoe","sexy","accessories","girls night"]},"sandal":{"unicode":"1f461","unicode_alt":"","code_decimal":"&#128097;","name":"womans sandal","shortname":":sandal:","category":"people","emoji_order":"1331","aliases":[],"aliases_ascii":[],"keywords":["fashion","shoe","accessories"]},"boot":{"unicode":"1f462","unicode_alt":"","code_decimal":"&#128098;","name":"womans boots","shortname":":boot:","category":"people","emoji_order":"1332","aliases":[],"aliases_ascii":[],"keywords":["women","fashion","shoe","sexy","accessories"]},"crown":{"unicode":"1f451","unicode_alt":"","code_decimal":"&#128081;","name":"crown","shortname":":crown:","category":"people","emoji_order":"1333","aliases":[],"aliases_ascii":[],"keywords":["object","gem","accessories"]},"womans_hat":{"unicode":"1f452","unicode_alt":"","code_decimal":"&#128082;","name":"womans hat","shortname":":womans_hat:","category":"people","emoji_order":"1334","aliases":[],"aliases_ascii":[],"keywords":["women","fashion","accessories"]},"tophat":{"unicode":"1f3a9","unicode_alt":"","code_decimal":"&#127913;","name":"top hat","shortname":":tophat:","category":"people","emoji_order":"1335","aliases":[],"aliases_ascii":[],"keywords":["hat","fashion","accessories"]},"mortar_board":{"unicode":"1f393","unicode_alt":"","code_decimal":"&#127891;","name":"graduation cap","shortname":":mortar_board:","category":"people","emoji_order":"1336","aliases":[],"aliases_ascii":[],"keywords":["hat","office","accessories"]},"helmet_with_cross":{"unicode":"26d1","unicode_alt":"26d1-fe0f","code_decimal":"&#9937;","name":"helmet with white cross","shortname":":helmet_with_cross:","category":"people","emoji_order":"1337","aliases":[":helmet_with_white_cross:"],"aliases_ascii":[],"keywords":["object","hat","accessories","job"]},"prayer_beads":{"unicode":"1f4ff","unicode_alt":"","code_decimal":"&#128255;","name":"prayer beads","shortname":":prayer_beads:","category":"objects","emoji_order":"1338","aliases":[],"aliases_ascii":[],"keywords":["object","rosary"]},"lipstick":{"unicode":"1f484","unicode_alt":"","code_decimal":"&#128132;","name":"lipstick","shortname":":lipstick:","category":"people","emoji_order":"1339","aliases":[],"aliases_ascii":[],"keywords":["object","women","fashion","sexy","lip"]},"ring":{"unicode":"1f48d","unicode_alt":"","code_decimal":"&#128141;","name":"ring","shortname":":ring:","category":"people","emoji_order":"1340","aliases":[],"aliases_ascii":[],"keywords":["wedding","object","fashion","gem","accessories"]},"gem":{"unicode":"1f48e","unicode_alt":"","code_decimal":"&#128142;","name":"gem stone","shortname":":gem:","category":"objects","emoji_order":"1341","aliases":[],"aliases_ascii":[],"keywords":["object","gem"]},"monkey_face":{"unicode":"1f435","unicode_alt":"","code_decimal":"&#128053;","name":"monkey face","shortname":":monkey_face:","category":"nature","emoji_order":"1342","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"monkey":{"unicode":"1f412","unicode_alt":"","code_decimal":"&#128018;","name":"monkey","shortname":":monkey:","category":"nature","emoji_order":"1343","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"gorilla":{"unicode":"1f98d","unicode_alt":"","code_decimal":"&#129421;","name":"gorilla","shortname":":gorilla:","category":"nature","emoji_order":"1344","aliases":[],"aliases_ascii":[],"keywords":[]},"dog":{"unicode":"1f436","unicode_alt":"","code_decimal":"&#128054;","name":"dog face","shortname":":dog:","category":"nature","emoji_order":"1345","aliases":[],"aliases_ascii":[],"keywords":["dog","pug","animal"]},"dog2":{"unicode":"1f415","unicode_alt":"","code_decimal":"&#128021;","name":"dog","shortname":":dog2:","category":"nature","emoji_order":"1346","aliases":[],"aliases_ascii":[],"keywords":["dog","pug","animal"]},"poodle":{"unicode":"1f429","unicode_alt":"","code_decimal":"&#128041;","name":"poodle","shortname":":poodle:","category":"nature","emoji_order":"1347","aliases":[],"aliases_ascii":[],"keywords":["dog","animal"]},"wolf":{"unicode":"1f43a","unicode_alt":"","code_decimal":"&#128058;","name":"wolf face","shortname":":wolf:","category":"nature","emoji_order":"1348","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","animal"]},"fox":{"unicode":"1f98a","unicode_alt":"","code_decimal":"&#129418;","name":"fox face","shortname":":fox:","category":"nature","emoji_order":"1349","aliases":[":fox_face:"],"aliases_ascii":[],"keywords":[]},"cat":{"unicode":"1f431","unicode_alt":"","code_decimal":"&#128049;","name":"cat face","shortname":":cat:","category":"nature","emoji_order":"1350","aliases":[],"aliases_ascii":[],"keywords":["halloween","vagina","cat","animal"]},"cat2":{"unicode":"1f408","unicode_alt":"","code_decimal":"&#128008;","name":"cat","shortname":":cat2:","category":"nature","emoji_order":"1351","aliases":[],"aliases_ascii":[],"keywords":["halloween","cat","animal"]},"lion_face":{"unicode":"1f981","unicode_alt":"","code_decimal":"&#129409;","name":"lion face","shortname":":lion_face:","category":"nature","emoji_order":"1352","aliases":[":lion:"],"aliases_ascii":[],"keywords":["wildlife","roar","cat","animal"]},"tiger":{"unicode":"1f42f","unicode_alt":"","code_decimal":"&#128047;","name":"tiger face","shortname":":tiger:","category":"nature","emoji_order":"1353","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","cat","animal"]},"tiger2":{"unicode":"1f405","unicode_alt":"","code_decimal":"&#128005;","name":"tiger","shortname":":tiger2:","category":"nature","emoji_order":"1354","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","animal"]},"leopard":{"unicode":"1f406","unicode_alt":"","code_decimal":"&#128006;","name":"leopard","shortname":":leopard:","category":"nature","emoji_order":"1355","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","animal"]},"horse":{"unicode":"1f434","unicode_alt":"","code_decimal":"&#128052;","name":"horse face","shortname":":horse:","category":"nature","emoji_order":"1356","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"racehorse":{"unicode":"1f40e","unicode_alt":"","code_decimal":"&#128014;","name":"horse","shortname":":racehorse:","category":"nature","emoji_order":"1357","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"deer":{"unicode":"1f98c","unicode_alt":"","code_decimal":"&#129420;","name":"deer","shortname":":deer:","category":"nature","emoji_order":"1358","aliases":[],"aliases_ascii":[],"keywords":[]},"unicorn":{"unicode":"1f984","unicode_alt":"","code_decimal":"&#129412;","name":"unicorn face","shortname":":unicorn:","category":"nature","emoji_order":"1359","aliases":[":unicorn_face:"],"aliases_ascii":[],"keywords":["animal"]},"cow":{"unicode":"1f42e","unicode_alt":"","code_decimal":"&#128046;","name":"cow face","shortname":":cow:","category":"nature","emoji_order":"1360","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"ox":{"unicode":"1f402","unicode_alt":"","code_decimal":"&#128002;","name":"ox","shortname":":ox:","category":"nature","emoji_order":"1361","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"water_buffalo":{"unicode":"1f403","unicode_alt":"","code_decimal":"&#128003;","name":"water buffalo","shortname":":water_buffalo:","category":"nature","emoji_order":"1362","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"cow2":{"unicode":"1f404","unicode_alt":"","code_decimal":"&#128004;","name":"cow","shortname":":cow2:","category":"nature","emoji_order":"1363","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"pig":{"unicode":"1f437","unicode_alt":"","code_decimal":"&#128055;","name":"pig face","shortname":":pig:","category":"nature","emoji_order":"1364","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"pig2":{"unicode":"1f416","unicode_alt":"","code_decimal":"&#128022;","name":"pig","shortname":":pig2:","category":"nature","emoji_order":"1365","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"boar":{"unicode":"1f417","unicode_alt":"","code_decimal":"&#128023;","name":"boar","shortname":":boar:","category":"nature","emoji_order":"1366","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"pig_nose":{"unicode":"1f43d","unicode_alt":"","code_decimal":"&#128061;","name":"pig nose","shortname":":pig_nose:","category":"nature","emoji_order":"1367","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"ram":{"unicode":"1f40f","unicode_alt":"","code_decimal":"&#128015;","name":"ram","shortname":":ram:","category":"nature","emoji_order":"1368","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"sheep":{"unicode":"1f411","unicode_alt":"","code_decimal":"&#128017;","name":"sheep","shortname":":sheep:","category":"nature","emoji_order":"1369","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"goat":{"unicode":"1f410","unicode_alt":"","code_decimal":"&#128016;","name":"goat","shortname":":goat:","category":"nature","emoji_order":"1370","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"dromedary_camel":{"unicode":"1f42a","unicode_alt":"","code_decimal":"&#128042;","name":"dromedary camel","shortname":":dromedary_camel:","category":"nature","emoji_order":"1371","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"camel":{"unicode":"1f42b","unicode_alt":"","code_decimal":"&#128043;","name":"bactrian camel","shortname":":camel:","category":"nature","emoji_order":"1372","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal","hump day"]},"elephant":{"unicode":"1f418","unicode_alt":"","code_decimal":"&#128024;","name":"elephant","shortname":":elephant:","category":"nature","emoji_order":"1373","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"rhino":{"unicode":"1f98f","unicode_alt":"","code_decimal":"&#129423;","name":"rhinoceros","shortname":":rhino:","category":"nature","emoji_order":"1374","aliases":[":rhinoceros:"],"aliases_ascii":[],"keywords":[]},"mouse":{"unicode":"1f42d","unicode_alt":"","code_decimal":"&#128045;","name":"mouse face","shortname":":mouse:","category":"nature","emoji_order":"1375","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"mouse2":{"unicode":"1f401","unicode_alt":"","code_decimal":"&#128001;","name":"mouse","shortname":":mouse2:","category":"nature","emoji_order":"1376","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"rat":{"unicode":"1f400","unicode_alt":"","code_decimal":"&#128000;","name":"rat","shortname":":rat:","category":"nature","emoji_order":"1377","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"hamster":{"unicode":"1f439","unicode_alt":"","code_decimal":"&#128057;","name":"hamster face","shortname":":hamster:","category":"nature","emoji_order":"1378","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"rabbit":{"unicode":"1f430","unicode_alt":"","code_decimal":"&#128048;","name":"rabbit face","shortname":":rabbit:","category":"nature","emoji_order":"1379","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"rabbit2":{"unicode":"1f407","unicode_alt":"","code_decimal":"&#128007;","name":"rabbit","shortname":":rabbit2:","category":"nature","emoji_order":"1380","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"chipmunk":{"unicode":"1f43f","unicode_alt":"1f43f-fe0f","code_decimal":"&#128063;","name":"chipmunk","shortname":":chipmunk:","category":"nature","emoji_order":"1381","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"bat":{"unicode":"1f987","unicode_alt":"","code_decimal":"&#129415;","name":"bat","shortname":":bat:","category":"nature","emoji_order":"1382","aliases":[],"aliases_ascii":[],"keywords":[]},"bear":{"unicode":"1f43b","unicode_alt":"","code_decimal":"&#128059;","name":"bear face","shortname":":bear:","category":"nature","emoji_order":"1383","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","animal"]},"koala":{"unicode":"1f428","unicode_alt":"","code_decimal":"&#128040;","name":"koala","shortname":":koala:","category":"nature","emoji_order":"1384","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"panda_face":{"unicode":"1f43c","unicode_alt":"","code_decimal":"&#128060;","name":"panda face","shortname":":panda_face:","category":"nature","emoji_order":"1385","aliases":[],"aliases_ascii":[],"keywords":["wildlife","roar","animal"]},"feet":{"unicode":"1f43e","unicode_alt":"","code_decimal":"&#128062;","name":"paw prints","shortname":":feet:","category":"nature","emoji_order":"1386","aliases":[":paw_prints:"],"aliases_ascii":[],"keywords":["animal"]},"turkey":{"unicode":"1f983","unicode_alt":"","code_decimal":"&#129411;","name":"turkey","shortname":":turkey:","category":"nature","emoji_order":"1387","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"chicken":{"unicode":"1f414","unicode_alt":"","code_decimal":"&#128020;","name":"chicken","shortname":":chicken:","category":"nature","emoji_order":"1388","aliases":[],"aliases_ascii":[],"keywords":["animal","chicken"]},"rooster":{"unicode":"1f413","unicode_alt":"","code_decimal":"&#128019;","name":"rooster","shortname":":rooster:","category":"nature","emoji_order":"1389","aliases":[],"aliases_ascii":[],"keywords":["animal"]},"hatching_chick":{"unicode":"1f423","unicode_alt":"","code_decimal":"&#128035;","name":"hatching chick","shortname":":hatching_chick:","category":"nature","emoji_order":"1390","aliases":[],"aliases_ascii":[],"keywords":["animal","chicken"]},"baby_chick":{"unicode":"1f424","unicode_alt":"","code_decimal":"&#128036;","name":"baby chick","shortname":":baby_chick:","category":"nature","emoji_order":"1391","aliases":[],"aliases_ascii":[],"keywords":["animal","chicken"]},"hatched_chick":{"unicode":"1f425","unicode_alt":"","code_decimal":"&#128037;","name":"front-facing baby chick","shortname":":hatched_chick:","category":"nature","emoji_order":"1392","aliases":[],"aliases_ascii":[],"keywords":["animal","chicken"]},"bird":{"unicode":"1f426","unicode_alt":"","code_decimal":"&#128038;","name":"bird","shortname":":bird:","category":"nature","emoji_order":"1393","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"penguin":{"unicode":"1f427","unicode_alt":"","code_decimal":"&#128039;","name":"penguin","shortname":":penguin:","category":"nature","emoji_order":"1394","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"dove":{"unicode":"1f54a","unicode_alt":"1f54a-fe0f","code_decimal":"&#128330;","name":"dove of peace","shortname":":dove:","category":"nature","emoji_order":"1395","aliases":[":dove_of_peace:"],"aliases_ascii":[],"keywords":["animal"]},"eagle":{"unicode":"1f985","unicode_alt":"","code_decimal":"&#129413;","name":"eagle","shortname":":eagle:","category":"nature","emoji_order":"1396","aliases":[],"aliases_ascii":[],"keywords":[]},"duck":{"unicode":"1f986","unicode_alt":"","code_decimal":"&#129414;","name":"duck","shortname":":duck:","category":"nature","emoji_order":"1397","aliases":[],"aliases_ascii":[],"keywords":[]},"owl":{"unicode":"1f989","unicode_alt":"","code_decimal":"&#129417;","name":"owl","shortname":":owl:","category":"nature","emoji_order":"1398","aliases":[],"aliases_ascii":[],"keywords":[]},"frog":{"unicode":"1f438","unicode_alt":"","code_decimal":"&#128056;","name":"frog face","shortname":":frog:","category":"nature","emoji_order":"1399","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"crocodile":{"unicode":"1f40a","unicode_alt":"","code_decimal":"&#128010;","name":"crocodile","shortname":":crocodile:","category":"nature","emoji_order":"1400","aliases":[],"aliases_ascii":[],"keywords":["wildlife","reptile","animal"]},"turtle":{"unicode":"1f422","unicode_alt":"","code_decimal":"&#128034;","name":"turtle","shortname":":turtle:","category":"nature","emoji_order":"1401","aliases":[],"aliases_ascii":[],"keywords":["wildlife","reptile","animal"]},"lizard":{"unicode":"1f98e","unicode_alt":"","code_decimal":"&#129422;","name":"lizard","shortname":":lizard:","category":"nature","emoji_order":"1402","aliases":[],"aliases_ascii":[],"keywords":[]},"snake":{"unicode":"1f40d","unicode_alt":"","code_decimal":"&#128013;","name":"snake","shortname":":snake:","category":"nature","emoji_order":"1403","aliases":[],"aliases_ascii":[],"keywords":["wildlife","reptile","animal","creationism"]},"dragon_face":{"unicode":"1f432","unicode_alt":"","code_decimal":"&#128050;","name":"dragon face","shortname":":dragon_face:","category":"nature","emoji_order":"1404","aliases":[],"aliases_ascii":[],"keywords":["roar","monster","reptile","animal"]},"dragon":{"unicode":"1f409","unicode_alt":"","code_decimal":"&#128009;","name":"dragon","shortname":":dragon:","category":"nature","emoji_order":"1405","aliases":[],"aliases_ascii":[],"keywords":["roar","reptile","animal"]},"whale":{"unicode":"1f433","unicode_alt":"","code_decimal":"&#128051;","name":"spouting whale","shortname":":whale:","category":"nature","emoji_order":"1406","aliases":[],"aliases_ascii":[],"keywords":["wildlife","tropical","whales","animal"]},"whale2":{"unicode":"1f40b","unicode_alt":"","code_decimal":"&#128011;","name":"whale","shortname":":whale2:","category":"nature","emoji_order":"1407","aliases":[],"aliases_ascii":[],"keywords":["wildlife","tropical","whales","animal"]},"dolphin":{"unicode":"1f42c","unicode_alt":"","code_decimal":"&#128044;","name":"dolphin","shortname":":dolphin:","category":"nature","emoji_order":"1408","aliases":[],"aliases_ascii":[],"keywords":["wildlife","tropical","animal"]},"fish":{"unicode":"1f41f","unicode_alt":"","code_decimal":"&#128031;","name":"fish","shortname":":fish:","category":"nature","emoji_order":"1409","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"tropical_fish":{"unicode":"1f420","unicode_alt":"","code_decimal":"&#128032;","name":"tropical fish","shortname":":tropical_fish:","category":"nature","emoji_order":"1410","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"blowfish":{"unicode":"1f421","unicode_alt":"","code_decimal":"&#128033;","name":"blowfish","shortname":":blowfish:","category":"nature","emoji_order":"1411","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"shark":{"unicode":"1f988","unicode_alt":"","code_decimal":"&#129416;","name":"shark","shortname":":shark:","category":"nature","emoji_order":"1412","aliases":[],"aliases_ascii":[],"keywords":[]},"octopus":{"unicode":"1f419","unicode_alt":"","code_decimal":"&#128025;","name":"octopus","shortname":":octopus:","category":"nature","emoji_order":"1413","aliases":[],"aliases_ascii":[],"keywords":["wildlife","animal"]},"shell":{"unicode":"1f41a","unicode_alt":"","code_decimal":"&#128026;","name":"spiral shell","shortname":":shell:","category":"nature","emoji_order":"1414","aliases":[],"aliases_ascii":[],"keywords":[]},"crab":{"unicode":"1f980","unicode_alt":"","code_decimal":"&#129408;","name":"crab","shortname":":crab:","category":"nature","emoji_order":"1415","aliases":[],"aliases_ascii":[],"keywords":["tropical","animal"]},"shrimp":{"unicode":"1f990","unicode_alt":"","code_decimal":"&#129424;","name":"shrimp","shortname":":shrimp:","category":"nature","emoji_order":"1416","aliases":[],"aliases_ascii":[],"keywords":[]},"squid":{"unicode":"1f991","unicode_alt":"","code_decimal":"&#129425;","name":"squid","shortname":":squid:","category":"nature","emoji_order":"1417","aliases":[],"aliases_ascii":[],"keywords":[]},"butterfly":{"unicode":"1f98b","unicode_alt":"","code_decimal":"&#129419;","name":"butterfly","shortname":":butterfly:","category":"nature","emoji_order":"1418","aliases":[],"aliases_ascii":[],"keywords":[]},"snail":{"unicode":"1f40c","unicode_alt":"","code_decimal":"&#128012;","name":"snail","shortname":":snail:","category":"nature","emoji_order":"1419","aliases":[],"aliases_ascii":[],"keywords":["insects","animal"]},"bug":{"unicode":"1f41b","unicode_alt":"","code_decimal":"&#128027;","name":"bug","shortname":":bug:","category":"nature","emoji_order":"1420","aliases":[],"aliases_ascii":[],"keywords":["insects","animal"]},"ant":{"unicode":"1f41c","unicode_alt":"","code_decimal":"&#128028;","name":"ant","shortname":":ant:","category":"nature","emoji_order":"1421","aliases":[],"aliases_ascii":[],"keywords":["insects","animal"]},"bee":{"unicode":"1f41d","unicode_alt":"","code_decimal":"&#128029;","name":"honeybee","shortname":":bee:","category":"nature","emoji_order":"1422","aliases":[],"aliases_ascii":[],"keywords":["insects","animal"]},"beetle":{"unicode":"1f41e","unicode_alt":"","code_decimal":"&#128030;","name":"lady beetle","shortname":":beetle:","category":"nature","emoji_order":"1423","aliases":[],"aliases_ascii":[],"keywords":["insects","animal"]},"spider":{"unicode":"1f577","unicode_alt":"1f577-fe0f","code_decimal":"&#128375;","name":"spider","shortname":":spider:","category":"nature","emoji_order":"1424","aliases":[],"aliases_ascii":[],"keywords":["insects","halloween","animal"]},"spider_web":{"unicode":"1f578","unicode_alt":"1f578-fe0f","code_decimal":"&#128376;","name":"spider web","shortname":":spider_web:","category":"nature","emoji_order":"1425","aliases":[],"aliases_ascii":[],"keywords":["halloween"]},"scorpion":{"unicode":"1f982","unicode_alt":"","code_decimal":"&#129410;","name":"scorpion","shortname":":scorpion:","category":"nature","emoji_order":"1426","aliases":[],"aliases_ascii":[],"keywords":["insects","reptile","animal"]},"bouquet":{"unicode":"1f490","unicode_alt":"","code_decimal":"&#128144;","name":"bouquet","shortname":":bouquet:","category":"nature","emoji_order":"1427","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant","rip","condolence"]},"cherry_blossom":{"unicode":"1f338","unicode_alt":"","code_decimal":"&#127800;","name":"cherry blossom","shortname":":cherry_blossom:","category":"nature","emoji_order":"1428","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant","tropical"]},"white_flower":{"unicode":"1f4ae","unicode_alt":"","code_decimal":"&#128174;","name":"white flower","shortname":":white_flower:","category":"symbols","emoji_order":"1429","aliases":[],"aliases_ascii":[],"keywords":["flower","symbol"]},"rosette":{"unicode":"1f3f5","unicode_alt":"1f3f5-fe0f","code_decimal":"&#127989;","name":"rosette","shortname":":rosette:","category":"nature","emoji_order":"1430","aliases":[],"aliases_ascii":[],"keywords":["tropical"]},"rose":{"unicode":"1f339","unicode_alt":"","code_decimal":"&#127801;","name":"rose","shortname":":rose:","category":"nature","emoji_order":"1431","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant","rip","condolence","beautiful"]},"wilted_rose":{"unicode":"1f940","unicode_alt":"","code_decimal":"&#129344;","name":"wilted flower","shortname":":wilted_rose:","category":"nature","emoji_order":"1432","aliases":[":wilted_flower:"],"aliases_ascii":[],"keywords":[]},"hibiscus":{"unicode":"1f33a","unicode_alt":"","code_decimal":"&#127802;","name":"hibiscus","shortname":":hibiscus:","category":"nature","emoji_order":"1433","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant","tropical"]},"sunflower":{"unicode":"1f33b","unicode_alt":"","code_decimal":"&#127803;","name":"sunflower","shortname":":sunflower:","category":"nature","emoji_order":"1434","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant"]},"blossom":{"unicode":"1f33c","unicode_alt":"","code_decimal":"&#127804;","name":"blossom","shortname":":blossom:","category":"nature","emoji_order":"1435","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant"]},"tulip":{"unicode":"1f337","unicode_alt":"","code_decimal":"&#127799;","name":"tulip","shortname":":tulip:","category":"nature","emoji_order":"1436","aliases":[],"aliases_ascii":[],"keywords":["nature","flower","plant","vagina","girls night"]},"seedling":{"unicode":"1f331","unicode_alt":"","code_decimal":"&#127793;","name":"seedling","shortname":":seedling:","category":"nature","emoji_order":"1437","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"evergreen_tree":{"unicode":"1f332","unicode_alt":"","code_decimal":"&#127794;","name":"evergreen tree","shortname":":evergreen_tree:","category":"nature","emoji_order":"1438","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","holidays","christmas","camp","trees"]},"deciduous_tree":{"unicode":"1f333","unicode_alt":"","code_decimal":"&#127795;","name":"deciduous tree","shortname":":deciduous_tree:","category":"nature","emoji_order":"1439","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","camp","trees"]},"palm_tree":{"unicode":"1f334","unicode_alt":"","code_decimal":"&#127796;","name":"palm tree","shortname":":palm_tree:","category":"nature","emoji_order":"1440","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","tropical","trees"]},"cactus":{"unicode":"1f335","unicode_alt":"","code_decimal":"&#127797;","name":"cactus","shortname":":cactus:","category":"nature","emoji_order":"1441","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","trees"]},"ear_of_rice":{"unicode":"1f33e","unicode_alt":"","code_decimal":"&#127806;","name":"ear of rice","shortname":":ear_of_rice:","category":"nature","emoji_order":"1442","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"herb":{"unicode":"1f33f","unicode_alt":"","code_decimal":"&#127807;","name":"herb","shortname":":herb:","category":"nature","emoji_order":"1443","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"shamrock":{"unicode":"2618","unicode_alt":"2618-fe0f","code_decimal":"&#9752;","name":"shamrock","shortname":":shamrock:","category":"nature","emoji_order":"1444","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","luck","leaf"]},"four_leaf_clover":{"unicode":"1f340","unicode_alt":"","code_decimal":"&#127808;","name":"four leaf clover","shortname":":four_leaf_clover:","category":"nature","emoji_order":"1445","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","luck","leaf","sol"]},"maple_leaf":{"unicode":"1f341","unicode_alt":"","code_decimal":"&#127809;","name":"maple leaf","shortname":":maple_leaf:","category":"nature","emoji_order":"1446","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"fallen_leaf":{"unicode":"1f342","unicode_alt":"","code_decimal":"&#127810;","name":"fallen leaf","shortname":":fallen_leaf:","category":"nature","emoji_order":"1447","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"leaves":{"unicode":"1f343","unicode_alt":"","code_decimal":"&#127811;","name":"leaf fluttering in wind","shortname":":leaves:","category":"nature","emoji_order":"1448","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","leaf"]},"grapes":{"unicode":"1f347","unicode_alt":"","code_decimal":"&#127815;","name":"grapes","shortname":":grapes:","category":"food","emoji_order":"1449","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"melon":{"unicode":"1f348","unicode_alt":"","code_decimal":"&#127816;","name":"melon","shortname":":melon:","category":"food","emoji_order":"1450","aliases":[],"aliases_ascii":[],"keywords":["fruit","boobs","food"]},"watermelon":{"unicode":"1f349","unicode_alt":"","code_decimal":"&#127817;","name":"watermelon","shortname":":watermelon:","category":"food","emoji_order":"1451","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"tangerine":{"unicode":"1f34a","unicode_alt":"","code_decimal":"&#127818;","name":"tangerine","shortname":":tangerine:","category":"food","emoji_order":"1452","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"lemon":{"unicode":"1f34b","unicode_alt":"","code_decimal":"&#127819;","name":"lemon","shortname":":lemon:","category":"food","emoji_order":"1453","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"banana":{"unicode":"1f34c","unicode_alt":"","code_decimal":"&#127820;","name":"banana","shortname":":banana:","category":"food","emoji_order":"1454","aliases":[],"aliases_ascii":[],"keywords":["fruit","penis","food"]},"pineapple":{"unicode":"1f34d","unicode_alt":"","code_decimal":"&#127821;","name":"pineapple","shortname":":pineapple:","category":"food","emoji_order":"1455","aliases":[],"aliases_ascii":[],"keywords":["fruit","food","tropical"]},"apple":{"unicode":"1f34e","unicode_alt":"","code_decimal":"&#127822;","name":"red apple","shortname":":apple:","category":"food","emoji_order":"1456","aliases":[],"aliases_ascii":[],"keywords":["fruit","food","creationism"]},"green_apple":{"unicode":"1f34f","unicode_alt":"","code_decimal":"&#127823;","name":"green apple","shortname":":green_apple:","category":"food","emoji_order":"1457","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"pear":{"unicode":"1f350","unicode_alt":"","code_decimal":"&#127824;","name":"pear","shortname":":pear:","category":"food","emoji_order":"1458","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"peach":{"unicode":"1f351","unicode_alt":"","code_decimal":"&#127825;","name":"peach","shortname":":peach:","category":"food","emoji_order":"1459","aliases":[],"aliases_ascii":[],"keywords":["fruit","butt","food"]},"cherries":{"unicode":"1f352","unicode_alt":"","code_decimal":"&#127826;","name":"cherries","shortname":":cherries:","category":"food","emoji_order":"1460","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"strawberry":{"unicode":"1f353","unicode_alt":"","code_decimal":"&#127827;","name":"strawberry","shortname":":strawberry:","category":"food","emoji_order":"1461","aliases":[],"aliases_ascii":[],"keywords":["fruit","food"]},"kiwi":{"unicode":"1f95d","unicode_alt":"","code_decimal":"&#129373;","name":"kiwifruit","shortname":":kiwi:","category":"food","emoji_order":"1462","aliases":[":kiwifruit:"],"aliases_ascii":[],"keywords":[]},"tomato":{"unicode":"1f345","unicode_alt":"","code_decimal":"&#127813;","name":"tomato","shortname":":tomato:","category":"food","emoji_order":"1463","aliases":[],"aliases_ascii":[],"keywords":["fruit","vegetables","food"]},"avocado":{"unicode":"1f951","unicode_alt":"","code_decimal":"&#129361;","name":"avocado","shortname":":avocado:","category":"food","emoji_order":"1464","aliases":[],"aliases_ascii":[],"keywords":[]},"eggplant":{"unicode":"1f346","unicode_alt":"","code_decimal":"&#127814;","name":"aubergine","shortname":":eggplant:","category":"food","emoji_order":"1465","aliases":[],"aliases_ascii":[],"keywords":["vegetables","penis","food"]},"potato":{"unicode":"1f954","unicode_alt":"","code_decimal":"&#129364;","name":"potato","shortname":":potato:","category":"food","emoji_order":"1466","aliases":[],"aliases_ascii":[],"keywords":[]},"carrot":{"unicode":"1f955","unicode_alt":"","code_decimal":"&#129365;","name":"carrot","shortname":":carrot:","category":"food","emoji_order":"1467","aliases":[],"aliases_ascii":[],"keywords":[]},"corn":{"unicode":"1f33d","unicode_alt":"","code_decimal":"&#127805;","name":"ear of maize","shortname":":corn:","category":"food","emoji_order":"1468","aliases":[],"aliases_ascii":[],"keywords":["vegetables","food"]},"hot_pepper":{"unicode":"1f336","unicode_alt":"1f336-fe0f","code_decimal":"&#127798;","name":"hot pepper","shortname":":hot_pepper:","category":"food","emoji_order":"1469","aliases":[],"aliases_ascii":[],"keywords":["vegetables","food"]},"cucumber":{"unicode":"1f952","unicode_alt":"","code_decimal":"&#129362;","name":"cucumber","shortname":":cucumber:","category":"food","emoji_order":"1470","aliases":[],"aliases_ascii":[],"keywords":[]},"mushroom":{"unicode":"1f344","unicode_alt":"","code_decimal":"&#127812;","name":"mushroom","shortname":":mushroom:","category":"nature","emoji_order":"1471","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","drugs"]},"peanuts":{"unicode":"1f95c","unicode_alt":"","code_decimal":"&#129372;","name":"peanuts","shortname":":peanuts:","category":"food","emoji_order":"1472","aliases":[":shelled_peanut:"],"aliases_ascii":[],"keywords":[]},"chestnut":{"unicode":"1f330","unicode_alt":"","code_decimal":"&#127792;","name":"chestnut","shortname":":chestnut:","category":"nature","emoji_order":"1473","aliases":[],"aliases_ascii":[],"keywords":["nature","plant"]},"bread":{"unicode":"1f35e","unicode_alt":"","code_decimal":"&#127838;","name":"bread","shortname":":bread:","category":"food","emoji_order":"1474","aliases":[],"aliases_ascii":[],"keywords":["food"]},"croissant":{"unicode":"1f950","unicode_alt":"","code_decimal":"&#129360;","name":"croissant","shortname":":croissant:","category":"food","emoji_order":"1475","aliases":[],"aliases_ascii":[],"keywords":[]},"french_bread":{"unicode":"1f956","unicode_alt":"","code_decimal":"&#129366;","name":"baguette bread","shortname":":french_bread:","category":"food","emoji_order":"1476","aliases":[":baguette_bread:"],"aliases_ascii":[],"keywords":[]},"pancakes":{"unicode":"1f95e","unicode_alt":"","code_decimal":"&#129374;","name":"pancakes","shortname":":pancakes:","category":"food","emoji_order":"1477","aliases":[],"aliases_ascii":[],"keywords":[]},"cheese":{"unicode":"1f9c0","unicode_alt":"","code_decimal":"&#129472;","name":"cheese wedge","shortname":":cheese:","category":"food","emoji_order":"1478","aliases":[":cheese_wedge:"],"aliases_ascii":[],"keywords":["food"]},"meat_on_bone":{"unicode":"1f356","unicode_alt":"","code_decimal":"&#127830;","name":"meat on bone","shortname":":meat_on_bone:","category":"food","emoji_order":"1479","aliases":[],"aliases_ascii":[],"keywords":["food"]},"poultry_leg":{"unicode":"1f357","unicode_alt":"","code_decimal":"&#127831;","name":"poultry leg","shortname":":poultry_leg:","category":"food","emoji_order":"1480","aliases":[],"aliases_ascii":[],"keywords":["food","holidays"]},"bacon":{"unicode":"1f953","unicode_alt":"","code_decimal":"&#129363;","name":"bacon","shortname":":bacon:","category":"food","emoji_order":"1481","aliases":[],"aliases_ascii":[],"keywords":["pig"]},"hamburger":{"unicode":"1f354","unicode_alt":"","code_decimal":"&#127828;","name":"hamburger","shortname":":hamburger:","category":"food","emoji_order":"1482","aliases":[],"aliases_ascii":[],"keywords":["america","food"]},"fries":{"unicode":"1f35f","unicode_alt":"","code_decimal":"&#127839;","name":"french fries","shortname":":fries:","category":"food","emoji_order":"1483","aliases":[],"aliases_ascii":[],"keywords":["america","food"]},"pizza":{"unicode":"1f355","unicode_alt":"","code_decimal":"&#127829;","name":"slice of pizza","shortname":":pizza:","category":"food","emoji_order":"1484","aliases":[],"aliases_ascii":[],"keywords":["italian","food","boys night"]},"hotdog":{"unicode":"1f32d","unicode_alt":"","code_decimal":"&#127789;","name":"hot dog","shortname":":hotdog:","category":"food","emoji_order":"1485","aliases":[":hot_dog:"],"aliases_ascii":[],"keywords":["america","food"]},"taco":{"unicode":"1f32e","unicode_alt":"","code_decimal":"&#127790;","name":"taco","shortname":":taco:","category":"food","emoji_order":"1486","aliases":[],"aliases_ascii":[],"keywords":["food","mexican","vagina"]},"burrito":{"unicode":"1f32f","unicode_alt":"","code_decimal":"&#127791;","name":"burrito","shortname":":burrito:","category":"food","emoji_order":"1487","aliases":[],"aliases_ascii":[],"keywords":["food","mexican"]},"stuffed_flatbread":{"unicode":"1f959","unicode_alt":"","code_decimal":"&#129369;","name":"stuffed flatbread","shortname":":stuffed_flatbread:","category":"food","emoji_order":"1488","aliases":[":stuffed_pita:"],"aliases_ascii":[],"keywords":[]},"egg":{"unicode":"1f95a","unicode_alt":"","code_decimal":"&#129370;","name":"egg","shortname":":egg:","category":"food","emoji_order":"1489","aliases":[],"aliases_ascii":[],"keywords":[]},"cooking":{"unicode":"1f373","unicode_alt":"","code_decimal":"&#127859;","name":"cooking","shortname":":cooking:","category":"food","emoji_order":"1490","aliases":[],"aliases_ascii":[],"keywords":["food"]},"shallow_pan_of_food":{"unicode":"1f958","unicode_alt":"","code_decimal":"&#129368;","name":"shallow pan of food","shortname":":shallow_pan_of_food:","category":"food","emoji_order":"1491","aliases":[":paella:"],"aliases_ascii":[],"keywords":["pan of food"]},"stew":{"unicode":"1f372","unicode_alt":"","code_decimal":"&#127858;","name":"pot of food","shortname":":stew:","category":"food","emoji_order":"1492","aliases":[],"aliases_ascii":[],"keywords":["food","steam"]},"salad":{"unicode":"1f957","unicode_alt":"","code_decimal":"&#129367;","name":"green salad","shortname":":salad:","category":"food","emoji_order":"1493","aliases":[":green_salad:"],"aliases_ascii":[],"keywords":[]},"popcorn":{"unicode":"1f37f","unicode_alt":"","code_decimal":"&#127871;","name":"popcorn","shortname":":popcorn:","category":"food","emoji_order":"1494","aliases":[],"aliases_ascii":[],"keywords":["food","parties"]},"bento":{"unicode":"1f371","unicode_alt":"","code_decimal":"&#127857;","name":"bento box","shortname":":bento:","category":"food","emoji_order":"1495","aliases":[],"aliases_ascii":[],"keywords":["object","sushi","japan","food"]},"rice_cracker":{"unicode":"1f358","unicode_alt":"","code_decimal":"&#127832;","name":"rice cracker","shortname":":rice_cracker:","category":"food","emoji_order":"1496","aliases":[],"aliases_ascii":[],"keywords":["sushi","food"]},"rice_ball":{"unicode":"1f359","unicode_alt":"","code_decimal":"&#127833;","name":"rice ball","shortname":":rice_ball:","category":"food","emoji_order":"1497","aliases":[],"aliases_ascii":[],"keywords":["sushi","japan","food"]},"rice":{"unicode":"1f35a","unicode_alt":"","code_decimal":"&#127834;","name":"cooked rice","shortname":":rice:","category":"food","emoji_order":"1498","aliases":[],"aliases_ascii":[],"keywords":["sushi","japan","food"]},"curry":{"unicode":"1f35b","unicode_alt":"","code_decimal":"&#127835;","name":"curry and rice","shortname":":curry:","category":"food","emoji_order":"1499","aliases":[],"aliases_ascii":[],"keywords":["food"]},"ramen":{"unicode":"1f35c","unicode_alt":"","code_decimal":"&#127836;","name":"steaming bowl","shortname":":ramen:","category":"food","emoji_order":"1500","aliases":[],"aliases_ascii":[],"keywords":["noodles","ramen","japan","food"]},"spaghetti":{"unicode":"1f35d","unicode_alt":"","code_decimal":"&#127837;","name":"spaghetti","shortname":":spaghetti:","category":"food","emoji_order":"1501","aliases":[],"aliases_ascii":[],"keywords":["noodles","pasta","italian","food"]},"sweet_potato":{"unicode":"1f360","unicode_alt":"","code_decimal":"&#127840;","name":"roasted sweet potato","shortname":":sweet_potato:","category":"food","emoji_order":"1502","aliases":[],"aliases_ascii":[],"keywords":["vegetables","food"]},"oden":{"unicode":"1f362","unicode_alt":"","code_decimal":"&#127842;","name":"oden","shortname":":oden:","category":"food","emoji_order":"1503","aliases":[],"aliases_ascii":[],"keywords":["food"]},"sushi":{"unicode":"1f363","unicode_alt":"","code_decimal":"&#127843;","name":"sushi","shortname":":sushi:","category":"food","emoji_order":"1504","aliases":[],"aliases_ascii":[],"keywords":["sushi","japan","food"]},"fried_shrimp":{"unicode":"1f364","unicode_alt":"","code_decimal":"&#127844;","name":"fried shrimp","shortname":":fried_shrimp:","category":"food","emoji_order":"1505","aliases":[],"aliases_ascii":[],"keywords":["food"]},"fish_cake":{"unicode":"1f365","unicode_alt":"","code_decimal":"&#127845;","name":"fish cake with swirl design","shortname":":fish_cake:","category":"food","emoji_order":"1506","aliases":[],"aliases_ascii":[],"keywords":["sushi","food"]},"dango":{"unicode":"1f361","unicode_alt":"","code_decimal":"&#127841;","name":"dango","shortname":":dango:","category":"food","emoji_order":"1507","aliases":[],"aliases_ascii":[],"keywords":["food"]},"icecream":{"unicode":"1f366","unicode_alt":"","code_decimal":"&#127846;","name":"soft ice cream","shortname":":icecream:","category":"food","emoji_order":"1508","aliases":[],"aliases_ascii":[],"keywords":["food"]},"shaved_ice":{"unicode":"1f367","unicode_alt":"","code_decimal":"&#127847;","name":"shaved ice","shortname":":shaved_ice:","category":"food","emoji_order":"1509","aliases":[],"aliases_ascii":[],"keywords":["food"]},"ice_cream":{"unicode":"1f368","unicode_alt":"","code_decimal":"&#127848;","name":"ice cream","shortname":":ice_cream:","category":"food","emoji_order":"1510","aliases":[],"aliases_ascii":[],"keywords":["food"]},"doughnut":{"unicode":"1f369","unicode_alt":"","code_decimal":"&#127849;","name":"doughnut","shortname":":doughnut:","category":"food","emoji_order":"1511","aliases":[],"aliases_ascii":[],"keywords":["food"]},"cookie":{"unicode":"1f36a","unicode_alt":"","code_decimal":"&#127850;","name":"cookie","shortname":":cookie:","category":"food","emoji_order":"1512","aliases":[],"aliases_ascii":[],"keywords":["food","vagina"]},"birthday":{"unicode":"1f382","unicode_alt":"","code_decimal":"&#127874;","name":"birthday cake","shortname":":birthday:","category":"food","emoji_order":"1513","aliases":[],"aliases_ascii":[],"keywords":["birthday","food","parties"]},"cake":{"unicode":"1f370","unicode_alt":"","code_decimal":"&#127856;","name":"shortcake","shortname":":cake:","category":"food","emoji_order":"1514","aliases":[],"aliases_ascii":[],"keywords":["food"]},"chocolate_bar":{"unicode":"1f36b","unicode_alt":"","code_decimal":"&#127851;","name":"chocolate bar","shortname":":chocolate_bar:","category":"food","emoji_order":"1515","aliases":[],"aliases_ascii":[],"keywords":["food","halloween"]},"candy":{"unicode":"1f36c","unicode_alt":"","code_decimal":"&#127852;","name":"candy","shortname":":candy:","category":"food","emoji_order":"1516","aliases":[],"aliases_ascii":[],"keywords":["food","halloween"]},"lollipop":{"unicode":"1f36d","unicode_alt":"","code_decimal":"&#127853;","name":"lollipop","shortname":":lollipop:","category":"food","emoji_order":"1517","aliases":[],"aliases_ascii":[],"keywords":["food","halloween"]},"custard":{"unicode":"1f36e","unicode_alt":"","code_decimal":"&#127854;","name":"custard","shortname":":custard:","category":"food","emoji_order":"1518","aliases":[":pudding:",":flan:"],"aliases_ascii":[],"keywords":["food"]},"honey_pot":{"unicode":"1f36f","unicode_alt":"","code_decimal":"&#127855;","name":"honey pot","shortname":":honey_pot:","category":"food","emoji_order":"1519","aliases":[],"aliases_ascii":[],"keywords":["food","vagina"]},"baby_bottle":{"unicode":"1f37c","unicode_alt":"","code_decimal":"&#127868;","name":"baby bottle","shortname":":baby_bottle:","category":"food","emoji_order":"1520","aliases":[],"aliases_ascii":[],"keywords":["drink","object","food","baby"]},"milk":{"unicode":"1f95b","unicode_alt":"","code_decimal":"&#129371;","name":"glass of milk","shortname":":milk:","category":"food","emoji_order":"1521","aliases":[":glass_of_milk:"],"aliases_ascii":[],"keywords":[]},"coffee":{"unicode":"2615","unicode_alt":"2615-fe0f","code_decimal":"&#9749;","name":"hot beverage","shortname":":coffee:","category":"food","emoji_order":"1522","aliases":[],"aliases_ascii":[],"keywords":["drink","caffeine","steam","morning"]},"tea":{"unicode":"1f375","unicode_alt":"","code_decimal":"&#127861;","name":"teacup without handle","shortname":":tea:","category":"food","emoji_order":"1523","aliases":[],"aliases_ascii":[],"keywords":["drink","japan","caffeine","steam","morning"]},"sake":{"unicode":"1f376","unicode_alt":"","code_decimal":"&#127862;","name":"sake bottle and cup","shortname":":sake:","category":"food","emoji_order":"1524","aliases":[],"aliases_ascii":[],"keywords":["drink","japan","sake","alcohol","girls night"]},"champagne":{"unicode":"1f37e","unicode_alt":"","code_decimal":"&#127870;","name":"bottle with popping cork","shortname":":champagne:","category":"food","emoji_order":"1525","aliases":[":bottle_with_popping_cork:"],"aliases_ascii":[],"keywords":["drink","cheers","alcohol","parties"]},"wine_glass":{"unicode":"1f377","unicode_alt":"","code_decimal":"&#127863;","name":"wine glass","shortname":":wine_glass:","category":"food","emoji_order":"1526","aliases":[],"aliases_ascii":[],"keywords":["drink","italian","alcohol","girls night","parties"]},"cocktail":{"unicode":"1f378","unicode_alt":"","code_decimal":"&#127864;","name":"cocktail glass","shortname":":cocktail:","category":"food","emoji_order":"1527","aliases":[],"aliases_ascii":[],"keywords":["drink","cocktail","alcohol","girls night","parties"]},"tropical_drink":{"unicode":"1f379","unicode_alt":"","code_decimal":"&#127865;","name":"tropical drink","shortname":":tropical_drink:","category":"food","emoji_order":"1528","aliases":[],"aliases_ascii":[],"keywords":["drink","cocktail","tropical","alcohol"]},"beer":{"unicode":"1f37a","unicode_alt":"","code_decimal":"&#127866;","name":"beer mug","shortname":":beer:","category":"food","emoji_order":"1529","aliases":[],"aliases_ascii":[],"keywords":["drink","beer","alcohol","parties"]},"beers":{"unicode":"1f37b","unicode_alt":"","code_decimal":"&#127867;","name":"clinking beer mugs","shortname":":beers:","category":"food","emoji_order":"1530","aliases":[],"aliases_ascii":[],"keywords":["drink","cheers","beer","alcohol","thank you","boys night","parties"]},"champagne_glass":{"unicode":"1f942","unicode_alt":"","code_decimal":"&#129346;","name":"clinking glasses","shortname":":champagne_glass:","category":"food","emoji_order":"1531","aliases":[":clinking_glass:"],"aliases_ascii":[],"keywords":[]},"tumbler_glass":{"unicode":"1f943","unicode_alt":"","code_decimal":"&#129347;","name":"tumbler glass","shortname":":tumbler_glass:","category":"food","emoji_order":"1532","aliases":[":whisky:"],"aliases_ascii":[],"keywords":["booze"]},"fork_knife_plate":{"unicode":"1f37d","unicode_alt":"1f37d-fe0f","code_decimal":"&#127869;","name":"fork and knife with plate","shortname":":fork_knife_plate:","category":"food","emoji_order":"1533","aliases":[":fork_and_knife_with_plate:"],"aliases_ascii":[],"keywords":["object","food"]},"fork_and_knife":{"unicode":"1f374","unicode_alt":"","code_decimal":"&#127860;","name":"fork and knife","shortname":":fork_and_knife:","category":"food","emoji_order":"1534","aliases":[],"aliases_ascii":[],"keywords":["object","weapon","food"]},"spoon":{"unicode":"1f944","unicode_alt":"","code_decimal":"&#129348;","name":"spoon","shortname":":spoon:","category":"food","emoji_order":"1535","aliases":[],"aliases_ascii":[],"keywords":[]},"knife":{"unicode":"1f52a","unicode_alt":"","code_decimal":"&#128298;","name":"hocho","shortname":":knife:","category":"objects","emoji_order":"1536","aliases":[],"aliases_ascii":[],"keywords":["object","weapon"]},"amphora":{"unicode":"1f3fa","unicode_alt":"","code_decimal":"&#127994;","name":"amphora","shortname":":amphora:","category":"objects","emoji_order":"1537","aliases":[],"aliases_ascii":[],"keywords":["object"]},"earth_africa":{"unicode":"1f30d","unicode_alt":"","code_decimal":"&#127757;","name":"earth globe europe-africa","shortname":":earth_africa:","category":"nature","emoji_order":"1538","aliases":[],"aliases_ascii":[],"keywords":["map","vacation","globe"]},"earth_americas":{"unicode":"1f30e","unicode_alt":"","code_decimal":"&#127758;","name":"earth globe americas","shortname":":earth_americas:","category":"nature","emoji_order":"1539","aliases":[],"aliases_ascii":[],"keywords":["map","vacation","globe"]},"earth_asia":{"unicode":"1f30f","unicode_alt":"","code_decimal":"&#127759;","name":"earth globe asia-australia","shortname":":earth_asia:","category":"nature","emoji_order":"1540","aliases":[],"aliases_ascii":[],"keywords":["map","vacation","globe"]},"globe_with_meridians":{"unicode":"1f310","unicode_alt":"","code_decimal":"&#127760;","name":"globe with meridians","shortname":":globe_with_meridians:","category":"symbols","emoji_order":"1541","aliases":[],"aliases_ascii":[],"keywords":["symbol","globe"]},"map":{"unicode":"1f5fa","unicode_alt":"1f5fa-fe0f","code_decimal":"&#128506;","name":"world map","shortname":":map:","category":"objects","emoji_order":"1542","aliases":[":world_map:"],"aliases_ascii":[],"keywords":["travel","map","vacation"]},"japan":{"unicode":"1f5fe","unicode_alt":"","code_decimal":"&#128510;","name":"silhouette of japan","shortname":":japan:","category":"travel","emoji_order":"1543","aliases":[],"aliases_ascii":[],"keywords":["places","travel","map","vacation","tropical"]},"mountain_snow":{"unicode":"1f3d4","unicode_alt":"1f3d4-fe0f","code_decimal":"&#127956;","name":"snow capped mountain","shortname":":mountain_snow:","category":"travel","emoji_order":"1544","aliases":[":snow_capped_mountain:"],"aliases_ascii":[],"keywords":["places","travel","vacation","cold","camp"]},"mountain":{"unicode":"26f0","unicode_alt":"26f0-fe0f","code_decimal":"&#9968;","name":"mountain","shortname":":mountain:","category":"travel","emoji_order":"1545","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","camp"]},"volcano":{"unicode":"1f30b","unicode_alt":"","code_decimal":"&#127755;","name":"volcano","shortname":":volcano:","category":"travel","emoji_order":"1546","aliases":[],"aliases_ascii":[],"keywords":["places","tropical"]},"mount_fuji":{"unicode":"1f5fb","unicode_alt":"","code_decimal":"&#128507;","name":"mount fuji","shortname":":mount_fuji:","category":"travel","emoji_order":"1547","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","cold","camp"]},"camping":{"unicode":"1f3d5","unicode_alt":"1f3d5-fe0f","code_decimal":"&#127957;","name":"camping","shortname":":camping:","category":"travel","emoji_order":"1548","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","camp"]},"beach":{"unicode":"1f3d6","unicode_alt":"1f3d6-fe0f","code_decimal":"&#127958;","name":"beach with umbrella","shortname":":beach:","category":"travel","emoji_order":"1549","aliases":[":beach_with_umbrella:"],"aliases_ascii":[],"keywords":["places","travel","vacation","tropical","beach","swim"]},"desert":{"unicode":"1f3dc","unicode_alt":"1f3dc-fe0f","code_decimal":"&#127964;","name":"desert","shortname":":desert:","category":"travel","emoji_order":"1550","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","hot"]},"island":{"unicode":"1f3dd","unicode_alt":"1f3dd-fe0f","code_decimal":"&#127965;","name":"desert island","shortname":":island:","category":"travel","emoji_order":"1551","aliases":[":desert_island:"],"aliases_ascii":[],"keywords":["places","travel","vacation","tropical","beach","swim"]},"park":{"unicode":"1f3de","unicode_alt":"1f3de-fe0f","code_decimal":"&#127966;","name":"national park","shortname":":park:","category":"travel","emoji_order":"1552","aliases":[":national_park:"],"aliases_ascii":[],"keywords":["travel","vacation","park","camp"]},"stadium":{"unicode":"1f3df","unicode_alt":"1f3df-fe0f","code_decimal":"&#127967;","name":"stadium","shortname":":stadium:","category":"travel","emoji_order":"1553","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","vacation","boys night"]},"classical_building":{"unicode":"1f3db","unicode_alt":"1f3db-fe0f","code_decimal":"&#127963;","name":"classical building","shortname":":classical_building:","category":"travel","emoji_order":"1554","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","vacation"]},"construction_site":{"unicode":"1f3d7","unicode_alt":"1f3d7-fe0f","code_decimal":"&#127959;","name":"building construction","shortname":":construction_site:","category":"travel","emoji_order":"1555","aliases":[":building_construction:"],"aliases_ascii":[],"keywords":["building","crane"]},"homes":{"unicode":"1f3d8","unicode_alt":"1f3d8-fe0f","code_decimal":"&#127960;","name":"house buildings","shortname":":homes:","category":"travel","emoji_order":"1556","aliases":[":house_buildings:"],"aliases_ascii":[],"keywords":["places","building","house"]},"cityscape":{"unicode":"1f3d9","unicode_alt":"1f3d9-fe0f","code_decimal":"&#127961;","name":"cityscape","shortname":":cityscape:","category":"travel","emoji_order":"1557","aliases":[],"aliases_ascii":[],"keywords":["places","building","vacation"]},"house_abandoned":{"unicode":"1f3da","unicode_alt":"1f3da-fe0f","code_decimal":"&#127962;","name":"derelict house building","shortname":":house_abandoned:","category":"travel","emoji_order":"1558","aliases":[":derelict_house_building:"],"aliases_ascii":[],"keywords":["places","building","house"]},"house":{"unicode":"1f3e0","unicode_alt":"","code_decimal":"&#127968;","name":"house building","shortname":":house:","category":"travel","emoji_order":"1559","aliases":[],"aliases_ascii":[],"keywords":["places","building","house"]},"house_with_garden":{"unicode":"1f3e1","unicode_alt":"","code_decimal":"&#127969;","name":"house with garden","shortname":":house_with_garden:","category":"travel","emoji_order":"1560","aliases":[],"aliases_ascii":[],"keywords":["places","building","house"]},"office":{"unicode":"1f3e2","unicode_alt":"","code_decimal":"&#127970;","name":"office building","shortname":":office:","category":"travel","emoji_order":"1561","aliases":[],"aliases_ascii":[],"keywords":["places","building","work"]},"post_office":{"unicode":"1f3e3","unicode_alt":"","code_decimal":"&#127971;","name":"japanese post office","shortname":":post_office:","category":"travel","emoji_order":"1562","aliases":[],"aliases_ascii":[],"keywords":["places","building","post office"]},"european_post_office":{"unicode":"1f3e4","unicode_alt":"","code_decimal":"&#127972;","name":"european post office","shortname":":european_post_office:","category":"travel","emoji_order":"1563","aliases":[],"aliases_ascii":[],"keywords":["places","building","post office"]},"hospital":{"unicode":"1f3e5","unicode_alt":"","code_decimal":"&#127973;","name":"hospital","shortname":":hospital:","category":"travel","emoji_order":"1564","aliases":[],"aliases_ascii":[],"keywords":["places","building","health","911"]},"bank":{"unicode":"1f3e6","unicode_alt":"","code_decimal":"&#127974;","name":"bank","shortname":":bank:","category":"travel","emoji_order":"1565","aliases":[],"aliases_ascii":[],"keywords":["places","building"]},"hotel":{"unicode":"1f3e8","unicode_alt":"","code_decimal":"&#127976;","name":"hotel","shortname":":hotel:","category":"travel","emoji_order":"1566","aliases":[],"aliases_ascii":[],"keywords":["places","building","vacation"]},"love_hotel":{"unicode":"1f3e9","unicode_alt":"","code_decimal":"&#127977;","name":"love hotel","shortname":":love_hotel:","category":"travel","emoji_order":"1567","aliases":[],"aliases_ascii":[],"keywords":["places","building","love"]},"convenience_store":{"unicode":"1f3ea","unicode_alt":"","code_decimal":"&#127978;","name":"convenience store","shortname":":convenience_store:","category":"travel","emoji_order":"1568","aliases":[],"aliases_ascii":[],"keywords":["places","building"]},"school":{"unicode":"1f3eb","unicode_alt":"","code_decimal":"&#127979;","name":"school","shortname":":school:","category":"travel","emoji_order":"1569","aliases":[],"aliases_ascii":[],"keywords":["places","building"]},"department_store":{"unicode":"1f3ec","unicode_alt":"","code_decimal":"&#127980;","name":"department store","shortname":":department_store:","category":"travel","emoji_order":"1570","aliases":[],"aliases_ascii":[],"keywords":["places","building"]},"factory":{"unicode":"1f3ed","unicode_alt":"","code_decimal":"&#127981;","name":"factory","shortname":":factory:","category":"travel","emoji_order":"1571","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","steam"]},"japanese_castle":{"unicode":"1f3ef","unicode_alt":"","code_decimal":"&#127983;","name":"japanese castle","shortname":":japanese_castle:","category":"travel","emoji_order":"1572","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","vacation"]},"european_castle":{"unicode":"1f3f0","unicode_alt":"","code_decimal":"&#127984;","name":"european castle","shortname":":european_castle:","category":"travel","emoji_order":"1573","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","vacation"]},"wedding":{"unicode":"1f492","unicode_alt":"","code_decimal":"&#128146;","name":"wedding","shortname":":wedding:","category":"travel","emoji_order":"1574","aliases":[],"aliases_ascii":[],"keywords":["places","wedding","building","love","parties"]},"tokyo_tower":{"unicode":"1f5fc","unicode_alt":"","code_decimal":"&#128508;","name":"tokyo tower","shortname":":tokyo_tower:","category":"travel","emoji_order":"1575","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","eiffel tower"]},"statue_of_liberty":{"unicode":"1f5fd","unicode_alt":"","code_decimal":"&#128509;","name":"statue of liberty","shortname":":statue_of_liberty:","category":"travel","emoji_order":"1576","aliases":[],"aliases_ascii":[],"keywords":["places","america","travel","vacation","statue of liberty","free speech"]},"church":{"unicode":"26ea","unicode_alt":"26ea-fe0f","code_decimal":"&#9962;","name":"church","shortname":":church:","category":"travel","emoji_order":"1577","aliases":[],"aliases_ascii":[],"keywords":["places","wedding","religion","building","condolence"]},"mosque":{"unicode":"1f54c","unicode_alt":"","code_decimal":"&#128332;","name":"mosque","shortname":":mosque:","category":"travel","emoji_order":"1578","aliases":[],"aliases_ascii":[],"keywords":["places","religion","building","vacation","condolence"]},"synagogue":{"unicode":"1f54d","unicode_alt":"","code_decimal":"&#128333;","name":"synagogue","shortname":":synagogue:","category":"travel","emoji_order":"1579","aliases":[],"aliases_ascii":[],"keywords":["places","religion","building","travel","vacation","condolence"]},"shinto_shrine":{"unicode":"26e9","unicode_alt":"26e9-fe0f","code_decimal":"&#9961;","name":"shinto shrine","shortname":":shinto_shrine:","category":"travel","emoji_order":"1580","aliases":[],"aliases_ascii":[],"keywords":["places","building","travel","vacation"]},"kaaba":{"unicode":"1f54b","unicode_alt":"","code_decimal":"&#128331;","name":"kaaba","shortname":":kaaba:","category":"travel","emoji_order":"1581","aliases":[],"aliases_ascii":[],"keywords":["places","religion","building","condolence"]},"fountain":{"unicode":"26f2","unicode_alt":"26f2-fe0f","code_decimal":"&#9970;","name":"fountain","shortname":":fountain:","category":"travel","emoji_order":"1582","aliases":[],"aliases_ascii":[],"keywords":["travel","vacation"]},"tent":{"unicode":"26fa","unicode_alt":"26fa-fe0f","code_decimal":"&#9978;","name":"tent","shortname":":tent:","category":"travel","emoji_order":"1583","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","camp"]},"foggy":{"unicode":"1f301","unicode_alt":"","code_decimal":"&#127745;","name":"foggy","shortname":":foggy:","category":"travel","emoji_order":"1584","aliases":[],"aliases_ascii":[],"keywords":["places","building","sky","travel","vacation"]},"night_with_stars":{"unicode":"1f303","unicode_alt":"","code_decimal":"&#127747;","name":"night with stars","shortname":":night_with_stars:","category":"travel","emoji_order":"1585","aliases":[],"aliases_ascii":[],"keywords":["places","building","sky","vacation","goodnight"]},"sunrise_over_mountains":{"unicode":"1f304","unicode_alt":"","code_decimal":"&#127748;","name":"sunrise over mountains","shortname":":sunrise_over_mountains:","category":"travel","emoji_order":"1586","aliases":[],"aliases_ascii":[],"keywords":["places","sky","travel","vacation","day","sun","camp","morning"]},"sunrise":{"unicode":"1f305","unicode_alt":"","code_decimal":"&#127749;","name":"sunrise","shortname":":sunrise:","category":"travel","emoji_order":"1587","aliases":[],"aliases_ascii":[],"keywords":["places","sky","travel","vacation","tropical","day","sun","hump day","morning"]},"city_dusk":{"unicode":"1f306","unicode_alt":"","code_decimal":"&#127750;","name":"cityscape at dusk","shortname":":city_dusk:","category":"travel","emoji_order":"1588","aliases":[],"aliases_ascii":[],"keywords":["places","building"]},"city_sunset":{"unicode":"1f307","unicode_alt":"","code_decimal":"&#127751;","name":"sunset over buildings","shortname":":city_sunset:","category":"travel","emoji_order":"1589","aliases":[":city_sunrise:"],"aliases_ascii":[],"keywords":["places","building","sky","vacation"]},"bridge_at_night":{"unicode":"1f309","unicode_alt":"","code_decimal":"&#127753;","name":"bridge at night","shortname":":bridge_at_night:","category":"travel","emoji_order":"1590","aliases":[],"aliases_ascii":[],"keywords":["places","travel","vacation","goodnight"]},"hotsprings":{"unicode":"2668","unicode_alt":"2668-fe0f","code_decimal":"&#9832;","name":"hot springs","shortname":":hotsprings:","category":"symbols","emoji_order":"1591","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"milky_way":{"unicode":"1f30c","unicode_alt":"","code_decimal":"&#127756;","name":"milky way","shortname":":milky_way:","category":"travel","emoji_order":"1592","aliases":[],"aliases_ascii":[],"keywords":["places","space","sky","travel","vacation"]},"carousel_horse":{"unicode":"1f3a0","unicode_alt":"","code_decimal":"&#127904;","name":"carousel horse","shortname":":carousel_horse:","category":"travel","emoji_order":"1593","aliases":[],"aliases_ascii":[],"keywords":["places","object","vacation","roller coaster","carousel"]},"ferris_wheel":{"unicode":"1f3a1","unicode_alt":"","code_decimal":"&#127905;","name":"ferris wheel","shortname":":ferris_wheel:","category":"travel","emoji_order":"1594","aliases":[],"aliases_ascii":[],"keywords":["places","vacation","ferris wheel"]},"roller_coaster":{"unicode":"1f3a2","unicode_alt":"","code_decimal":"&#127906;","name":"roller coaster","shortname":":roller_coaster:","category":"travel","emoji_order":"1595","aliases":[],"aliases_ascii":[],"keywords":["places","vacation","roller coaster"]},"barber":{"unicode":"1f488","unicode_alt":"","code_decimal":"&#128136;","name":"barber pole","shortname":":barber:","category":"objects","emoji_order":"1596","aliases":[],"aliases_ascii":[],"keywords":["object"]},"circus_tent":{"unicode":"1f3aa","unicode_alt":"","code_decimal":"&#127914;","name":"circus tent","shortname":":circus_tent:","category":"activity","emoji_order":"1597","aliases":[],"aliases_ascii":[],"keywords":["circus tent"]},"performing_arts":{"unicode":"1f3ad","unicode_alt":"","code_decimal":"&#127917;","name":"performing arts","shortname":":performing_arts:","category":"activity","emoji_order":"1598","aliases":[],"aliases_ascii":[],"keywords":["theatre","movie"]},"frame_photo":{"unicode":"1f5bc","unicode_alt":"1f5bc-fe0f","code_decimal":"&#128444;","name":"frame with picture","shortname":":frame_photo:","category":"objects","emoji_order":"1599","aliases":[":frame_with_picture:"],"aliases_ascii":[],"keywords":["travel","vacation"]},"art":{"unicode":"1f3a8","unicode_alt":"","code_decimal":"&#127912;","name":"artist palette","shortname":":art:","category":"activity","emoji_order":"1600","aliases":[],"aliases_ascii":[],"keywords":[]},"slot_machine":{"unicode":"1f3b0","unicode_alt":"","code_decimal":"&#127920;","name":"slot machine","shortname":":slot_machine:","category":"activity","emoji_order":"1601","aliases":[],"aliases_ascii":[],"keywords":["game","boys night"]},"steam_locomotive":{"unicode":"1f682","unicode_alt":"","code_decimal":"&#128642;","name":"steam locomotive","shortname":":steam_locomotive:","category":"travel","emoji_order":"1602","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train","steam"]},"railway_car":{"unicode":"1f683","unicode_alt":"","code_decimal":"&#128643;","name":"railway car","shortname":":railway_car:","category":"travel","emoji_order":"1603","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"bullettrain_side":{"unicode":"1f684","unicode_alt":"","code_decimal":"&#128644;","name":"high-speed train","shortname":":bullettrain_side:","category":"travel","emoji_order":"1604","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"bullettrain_front":{"unicode":"1f685","unicode_alt":"","code_decimal":"&#128645;","name":"high-speed train with bullet nose","shortname":":bullettrain_front:","category":"travel","emoji_order":"1605","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"train2":{"unicode":"1f686","unicode_alt":"","code_decimal":"&#128646;","name":"train","shortname":":train2:","category":"travel","emoji_order":"1606","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"metro":{"unicode":"1f687","unicode_alt":"","code_decimal":"&#128647;","name":"metro","shortname":":metro:","category":"travel","emoji_order":"1607","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"light_rail":{"unicode":"1f688","unicode_alt":"","code_decimal":"&#128648;","name":"light rail","shortname":":light_rail:","category":"travel","emoji_order":"1608","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"station":{"unicode":"1f689","unicode_alt":"","code_decimal":"&#128649;","name":"station","shortname":":station:","category":"travel","emoji_order":"1609","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"tram":{"unicode":"1f68a","unicode_alt":"","code_decimal":"&#128650;","name":"tram","shortname":":tram:","category":"travel","emoji_order":"1610","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"monorail":{"unicode":"1f69d","unicode_alt":"","code_decimal":"&#128669;","name":"monorail","shortname":":monorail:","category":"travel","emoji_order":"1611","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train","vacation"]},"mountain_railway":{"unicode":"1f69e","unicode_alt":"","code_decimal":"&#128670;","name":"mountain railway","shortname":":mountain_railway:","category":"travel","emoji_order":"1612","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"train":{"unicode":"1f68b","unicode_alt":"","code_decimal":"&#128651;","name":"tram car","shortname":":train:","category":"travel","emoji_order":"1613","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"bus":{"unicode":"1f68c","unicode_alt":"","code_decimal":"&#128652;","name":"bus","shortname":":bus:","category":"travel","emoji_order":"1614","aliases":[],"aliases_ascii":[],"keywords":["transportation","bus","office"]},"oncoming_bus":{"unicode":"1f68d","unicode_alt":"","code_decimal":"&#128653;","name":"oncoming bus","shortname":":oncoming_bus:","category":"travel","emoji_order":"1615","aliases":[],"aliases_ascii":[],"keywords":["transportation","bus","travel"]},"trolleybus":{"unicode":"1f68e","unicode_alt":"","code_decimal":"&#128654;","name":"trolleybus","shortname":":trolleybus:","category":"travel","emoji_order":"1616","aliases":[],"aliases_ascii":[],"keywords":["transportation","bus","travel"]},"minibus":{"unicode":"1f690","unicode_alt":"","code_decimal":"&#128656;","name":"minibus","shortname":":minibus:","category":"travel","emoji_order":"1617","aliases":[],"aliases_ascii":[],"keywords":["transportation","bus"]},"ambulance":{"unicode":"1f691","unicode_alt":"","code_decimal":"&#128657;","name":"ambulance","shortname":":ambulance:","category":"travel","emoji_order":"1618","aliases":[],"aliases_ascii":[],"keywords":["transportation","911"]},"fire_engine":{"unicode":"1f692","unicode_alt":"","code_decimal":"&#128658;","name":"fire engine","shortname":":fire_engine:","category":"travel","emoji_order":"1619","aliases":[],"aliases_ascii":[],"keywords":["transportation","truck","911"]},"police_car":{"unicode":"1f693","unicode_alt":"","code_decimal":"&#128659;","name":"police car","shortname":":police_car:","category":"travel","emoji_order":"1620","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","police","911"]},"oncoming_police_car":{"unicode":"1f694","unicode_alt":"","code_decimal":"&#128660;","name":"oncoming police car","shortname":":oncoming_police_car:","category":"travel","emoji_order":"1621","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","police","911"]},"taxi":{"unicode":"1f695","unicode_alt":"","code_decimal":"&#128661;","name":"taxi","shortname":":taxi:","category":"travel","emoji_order":"1622","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","travel"]},"oncoming_taxi":{"unicode":"1f696","unicode_alt":"","code_decimal":"&#128662;","name":"oncoming taxi","shortname":":oncoming_taxi:","category":"travel","emoji_order":"1623","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","travel"]},"red_car":{"unicode":"1f697","unicode_alt":"","code_decimal":"&#128663;","name":"automobile","shortname":":red_car:","category":"travel","emoji_order":"1624","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","travel"]},"oncoming_automobile":{"unicode":"1f698","unicode_alt":"","code_decimal":"&#128664;","name":"oncoming automobile","shortname":":oncoming_automobile:","category":"travel","emoji_order":"1625","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","travel"]},"blue_car":{"unicode":"1f699","unicode_alt":"","code_decimal":"&#128665;","name":"recreational vehicle","shortname":":blue_car:","category":"travel","emoji_order":"1626","aliases":[],"aliases_ascii":[],"keywords":["transportation","car","travel"]},"truck":{"unicode":"1f69a","unicode_alt":"","code_decimal":"&#128666;","name":"delivery truck","shortname":":truck:","category":"travel","emoji_order":"1627","aliases":[],"aliases_ascii":[],"keywords":["transportation","truck"]},"articulated_lorry":{"unicode":"1f69b","unicode_alt":"","code_decimal":"&#128667;","name":"articulated lorry","shortname":":articulated_lorry:","category":"travel","emoji_order":"1628","aliases":[],"aliases_ascii":[],"keywords":["transportation","truck"]},"tractor":{"unicode":"1f69c","unicode_alt":"","code_decimal":"&#128668;","name":"tractor","shortname":":tractor:","category":"travel","emoji_order":"1629","aliases":[],"aliases_ascii":[],"keywords":["transportation"]},"bike":{"unicode":"1f6b2","unicode_alt":"","code_decimal":"&#128690;","name":"bicycle","shortname":":bike:","category":"travel","emoji_order":"1630","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","bike"]},"scooter":{"unicode":"1f6f4","unicode_alt":"","code_decimal":"&#128756;","name":"scooter","shortname":":scooter:","category":"travel","emoji_order":"1631","aliases":[],"aliases_ascii":[],"keywords":[]},"motor_scooter":{"unicode":"1f6f5","unicode_alt":"","code_decimal":"&#128757;","name":"motor scooter","shortname":":motor_scooter:","category":"travel","emoji_order":"1632","aliases":[":motorbike:"],"aliases_ascii":[],"keywords":["moped"]},"busstop":{"unicode":"1f68f","unicode_alt":"","code_decimal":"&#128655;","name":"bus stop","shortname":":busstop:","category":"travel","emoji_order":"1633","aliases":[],"aliases_ascii":[],"keywords":["object"]},"motorway":{"unicode":"1f6e3","unicode_alt":"1f6e3-fe0f","code_decimal":"&#128739;","name":"motorway","shortname":":motorway:","category":"travel","emoji_order":"1634","aliases":[],"aliases_ascii":[],"keywords":["travel","vacation","camp"]},"railway_track":{"unicode":"1f6e4","unicode_alt":"1f6e4-fe0f","code_decimal":"&#128740;","name":"railway track","shortname":":railway_track:","category":"travel","emoji_order":"1635","aliases":[":railroad_track:"],"aliases_ascii":[],"keywords":["travel","train","vacation"]},"fuelpump":{"unicode":"26fd","unicode_alt":"26fd-fe0f","code_decimal":"&#9981;","name":"fuel pump","shortname":":fuelpump:","category":"travel","emoji_order":"1636","aliases":[],"aliases_ascii":[],"keywords":["object","gas pump"]},"rotating_light":{"unicode":"1f6a8","unicode_alt":"","code_decimal":"&#128680;","name":"police cars revolving light","shortname":":rotating_light:","category":"travel","emoji_order":"1637","aliases":[],"aliases_ascii":[],"keywords":["transportation","object","police","911"]},"traffic_light":{"unicode":"1f6a5","unicode_alt":"","code_decimal":"&#128677;","name":"horizontal traffic light","shortname":":traffic_light:","category":"travel","emoji_order":"1638","aliases":[],"aliases_ascii":[],"keywords":["object","stop light"]},"vertical_traffic_light":{"unicode":"1f6a6","unicode_alt":"","code_decimal":"&#128678;","name":"vertical traffic light","shortname":":vertical_traffic_light:","category":"travel","emoji_order":"1639","aliases":[],"aliases_ascii":[],"keywords":["object","stop light"]},"construction":{"unicode":"1f6a7","unicode_alt":"","code_decimal":"&#128679;","name":"construction sign","shortname":":construction:","category":"travel","emoji_order":"1640","aliases":[],"aliases_ascii":[],"keywords":["object"]},"octagonal_sign":{"unicode":"1f6d1","unicode_alt":"","code_decimal":"&#128721;","name":"octagonal sign","shortname":":octagonal_sign:","category":"symbols","emoji_order":"1641","aliases":[":stop_sign:"],"aliases_ascii":[],"keywords":[]},"anchor":{"unicode":"2693","unicode_alt":"2693-fe0f","code_decimal":"&#9875;","name":"anchor","shortname":":anchor:","category":"travel","emoji_order":"1642","aliases":[],"aliases_ascii":[],"keywords":["object","travel","boat","vacation"]},"sailboat":{"unicode":"26f5","unicode_alt":"26f5-fe0f","code_decimal":"&#9973;","name":"sailboat","shortname":":sailboat:","category":"travel","emoji_order":"1643","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","boat","vacation"]},"canoe":{"unicode":"1f6f6","unicode_alt":"","code_decimal":"&#128758;","name":"canoe","shortname":":canoe:","category":"travel","emoji_order":"1644","aliases":[":kayak:"],"aliases_ascii":[],"keywords":[]},"speedboat":{"unicode":"1f6a4","unicode_alt":"","code_decimal":"&#128676;","name":"speedboat","shortname":":speedboat:","category":"travel","emoji_order":"1645","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","boat","vacation","tropical"]},"cruise_ship":{"unicode":"1f6f3","unicode_alt":"1f6f3-fe0f","code_decimal":"&#128755;","name":"passenger ship","shortname":":cruise_ship:","category":"travel","emoji_order":"1646","aliases":[":passenger_ship:"],"aliases_ascii":[],"keywords":["transportation","travel","boat","vacation"]},"ferry":{"unicode":"26f4","unicode_alt":"26f4-fe0f","code_decimal":"&#9972;","name":"ferry","shortname":":ferry:","category":"travel","emoji_order":"1647","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","boat","vacation"]},"motorboat":{"unicode":"1f6e5","unicode_alt":"1f6e5-fe0f","code_decimal":"&#128741;","name":"motorboat","shortname":":motorboat:","category":"travel","emoji_order":"1648","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","boat"]},"ship":{"unicode":"1f6a2","unicode_alt":"","code_decimal":"&#128674;","name":"ship","shortname":":ship:","category":"travel","emoji_order":"1649","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","boat","vacation"]},"airplane":{"unicode":"2708","unicode_alt":"2708-fe0f","code_decimal":"&#9992;","name":"airplane","shortname":":airplane:","category":"travel","emoji_order":"1650","aliases":[],"aliases_ascii":[],"keywords":["transportation","plane","travel","vacation","fly"]},"airplane_small":{"unicode":"1f6e9","unicode_alt":"1f6e9-fe0f","code_decimal":"&#128745;","name":"small airplane","shortname":":airplane_small:","category":"travel","emoji_order":"1651","aliases":[":small_airplane:"],"aliases_ascii":[],"keywords":["transportation","plane","travel","vacation","fly"]},"airplane_departure":{"unicode":"1f6eb","unicode_alt":"","code_decimal":"&#128747;","name":"airplane departure","shortname":":airplane_departure:","category":"travel","emoji_order":"1652","aliases":[],"aliases_ascii":[],"keywords":["transportation","plane","travel","vacation","fly"]},"airplane_arriving":{"unicode":"1f6ec","unicode_alt":"","code_decimal":"&#128748;","name":"airplane arriving","shortname":":airplane_arriving:","category":"travel","emoji_order":"1653","aliases":[],"aliases_ascii":[],"keywords":["transportation","plane","travel","vacation","fly"]},"seat":{"unicode":"1f4ba","unicode_alt":"","code_decimal":"&#128186;","name":"seat","shortname":":seat:","category":"travel","emoji_order":"1654","aliases":[],"aliases_ascii":[],"keywords":["transportation","object","travel","vacation"]},"helicopter":{"unicode":"1f681","unicode_alt":"","code_decimal":"&#128641;","name":"helicopter","shortname":":helicopter:","category":"travel","emoji_order":"1655","aliases":[],"aliases_ascii":[],"keywords":["transportation","plane","travel","fly"]},"suspension_railway":{"unicode":"1f69f","unicode_alt":"","code_decimal":"&#128671;","name":"suspension railway","shortname":":suspension_railway:","category":"travel","emoji_order":"1656","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"mountain_cableway":{"unicode":"1f6a0","unicode_alt":"","code_decimal":"&#128672;","name":"mountain cableway","shortname":":mountain_cableway:","category":"travel","emoji_order":"1657","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"aerial_tramway":{"unicode":"1f6a1","unicode_alt":"","code_decimal":"&#128673;","name":"aerial tramway","shortname":":aerial_tramway:","category":"travel","emoji_order":"1658","aliases":[],"aliases_ascii":[],"keywords":["transportation","travel","train"]},"rocket":{"unicode":"1f680","unicode_alt":"","code_decimal":"&#128640;","name":"rocket","shortname":":rocket:","category":"travel","emoji_order":"1659","aliases":[],"aliases_ascii":[],"keywords":["transportation","object","space","fly","blast"]},"satellite_orbital":{"unicode":"1f6f0","unicode_alt":"1f6f0-fe0f","code_decimal":"&#128752;","name":"satellite","shortname":":satellite_orbital:","category":"travel","emoji_order":"1660","aliases":[],"aliases_ascii":[],"keywords":["object"]},"bellhop":{"unicode":"1f6ce","unicode_alt":"1f6ce-fe0f","code_decimal":"&#128718;","name":"bellhop bell","shortname":":bellhop:","category":"objects","emoji_order":"1661","aliases":[":bellhop_bell:"],"aliases_ascii":[],"keywords":["object"]},"door":{"unicode":"1f6aa","unicode_alt":"","code_decimal":"&#128682;","name":"door","shortname":":door:","category":"objects","emoji_order":"1662","aliases":[],"aliases_ascii":[],"keywords":["object"]},"sleeping_accommodation":{"unicode":"1f6cc","unicode_alt":"","code_decimal":"&#128716;","name":"sleeping accommodation","shortname":":sleeping_accommodation:","category":"objects","emoji_order":"1663","aliases":[],"aliases_ascii":[],"keywords":["tired"]},"bed":{"unicode":"1f6cf","unicode_alt":"1f6cf-fe0f","code_decimal":"&#128719;","name":"bed","shortname":":bed:","category":"objects","emoji_order":"1669","aliases":[],"aliases_ascii":[],"keywords":["object","tired"]},"couch":{"unicode":"1f6cb","unicode_alt":"1f6cb-fe0f","code_decimal":"&#128715;","name":"couch and lamp","shortname":":couch:","category":"objects","emoji_order":"1670","aliases":[":couch_and_lamp:"],"aliases_ascii":[],"keywords":["object"]},"toilet":{"unicode":"1f6bd","unicode_alt":"","code_decimal":"&#128701;","name":"toilet","shortname":":toilet:","category":"objects","emoji_order":"1671","aliases":[],"aliases_ascii":[],"keywords":["object","bathroom"]},"shower":{"unicode":"1f6bf","unicode_alt":"","code_decimal":"&#128703;","name":"shower","shortname":":shower:","category":"objects","emoji_order":"1672","aliases":[],"aliases_ascii":[],"keywords":["object","bathroom"]},"bath":{"unicode":"1f6c0","unicode_alt":"","code_decimal":"&#128704;","name":"bath","shortname":":bath:","category":"activity","emoji_order":"1673","aliases":[],"aliases_ascii":[],"keywords":["bathroom","tired","diversity","steam"]},"bath_tone1":{"unicode":"1f6c0-1f3fb","unicode_alt":"","code_decimal":"&#128704;&#127995;","name":"bath tone 1","shortname":":bath_tone1:","category":"activity","emoji_order":"1674","aliases":[],"aliases_ascii":[],"keywords":[]},"bath_tone2":{"unicode":"1f6c0-1f3fc","unicode_alt":"","code_decimal":"&#128704;&#127996;","name":"bath tone 2","shortname":":bath_tone2:","category":"activity","emoji_order":"1675","aliases":[],"aliases_ascii":[],"keywords":[]},"bath_tone3":{"unicode":"1f6c0-1f3fd","unicode_alt":"","code_decimal":"&#128704;&#127997;","name":"bath tone 3","shortname":":bath_tone3:","category":"activity","emoji_order":"1676","aliases":[],"aliases_ascii":[],"keywords":[]},"bath_tone4":{"unicode":"1f6c0-1f3fe","unicode_alt":"","code_decimal":"&#128704;&#127998;","name":"bath tone 4","shortname":":bath_tone4:","category":"activity","emoji_order":"1677","aliases":[],"aliases_ascii":[],"keywords":[]},"bath_tone5":{"unicode":"1f6c0-1f3ff","unicode_alt":"","code_decimal":"&#128704;&#127999;","name":"bath tone 5","shortname":":bath_tone5:","category":"activity","emoji_order":"1678","aliases":[],"aliases_ascii":[],"keywords":[]},"bathtub":{"unicode":"1f6c1","unicode_alt":"","code_decimal":"&#128705;","name":"bathtub","shortname":":bathtub:","category":"objects","emoji_order":"1679","aliases":[],"aliases_ascii":[],"keywords":["object","bathroom","tired","steam"]},"hourglass":{"unicode":"231b","unicode_alt":"231b-fe0f","code_decimal":"&#8987;","name":"hourglass","shortname":":hourglass:","category":"objects","emoji_order":"1680","aliases":[],"aliases_ascii":[],"keywords":["object","time"]},"hourglass_flowing_sand":{"unicode":"23f3","unicode_alt":"","code_decimal":"&#9203;","name":"hourglass with flowing sand","shortname":":hourglass_flowing_sand:","category":"objects","emoji_order":"1681","aliases":[],"aliases_ascii":[],"keywords":["object","time"]},"watch":{"unicode":"231a","unicode_alt":"231a-fe0f","code_decimal":"&#8986;","name":"watch","shortname":":watch:","category":"objects","emoji_order":"1682","aliases":[],"aliases_ascii":[],"keywords":["electronics","time"]},"alarm_clock":{"unicode":"23f0","unicode_alt":"","code_decimal":"&#9200;","name":"alarm clock","shortname":":alarm_clock:","category":"objects","emoji_order":"1683","aliases":[],"aliases_ascii":[],"keywords":["object","time"]},"stopwatch":{"unicode":"23f1","unicode_alt":"23f1-fe0f","code_decimal":"&#9201;","name":"stopwatch","shortname":":stopwatch:","category":"objects","emoji_order":"1684","aliases":[],"aliases_ascii":[],"keywords":["electronics","time"]},"timer":{"unicode":"23f2","unicode_alt":"23f2-fe0f","code_decimal":"&#9202;","name":"timer clock","shortname":":timer:","category":"objects","emoji_order":"1685","aliases":[":timer_clock:"],"aliases_ascii":[],"keywords":["object","time"]},"clock":{"unicode":"1f570","unicode_alt":"1f570-fe0f","code_decimal":"&#128368;","name":"mantlepiece clock","shortname":":clock:","category":"objects","emoji_order":"1686","aliases":[":mantlepiece_clock:"],"aliases_ascii":[],"keywords":["object","time"]},"clock12":{"unicode":"1f55b","unicode_alt":"","code_decimal":"&#128347;","name":"clock face twelve oclock","shortname":":clock12:","category":"symbols","emoji_order":"1687","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock1230":{"unicode":"1f567","unicode_alt":"","code_decimal":"&#128359;","name":"clock face twelve-thirty","shortname":":clock1230:","category":"symbols","emoji_order":"1688","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock1":{"unicode":"1f550","unicode_alt":"","code_decimal":"&#128336;","name":"clock face one oclock","shortname":":clock1:","category":"symbols","emoji_order":"1689","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock130":{"unicode":"1f55c","unicode_alt":"","code_decimal":"&#128348;","name":"clock face one-thirty","shortname":":clock130:","category":"symbols","emoji_order":"1690","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock2":{"unicode":"1f551","unicode_alt":"","code_decimal":"&#128337;","name":"clock face two oclock","shortname":":clock2:","category":"symbols","emoji_order":"1691","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock230":{"unicode":"1f55d","unicode_alt":"","code_decimal":"&#128349;","name":"clock face two-thirty","shortname":":clock230:","category":"symbols","emoji_order":"1692","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock3":{"unicode":"1f552","unicode_alt":"","code_decimal":"&#128338;","name":"clock face three oclock","shortname":":clock3:","category":"symbols","emoji_order":"1693","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock330":{"unicode":"1f55e","unicode_alt":"","code_decimal":"&#128350;","name":"clock face three-thirty","shortname":":clock330:","category":"symbols","emoji_order":"1694","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock4":{"unicode":"1f553","unicode_alt":"","code_decimal":"&#128339;","name":"clock face four oclock","shortname":":clock4:","category":"symbols","emoji_order":"1695","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock430":{"unicode":"1f55f","unicode_alt":"","code_decimal":"&#128351;","name":"clock face four-thirty","shortname":":clock430:","category":"symbols","emoji_order":"1696","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock5":{"unicode":"1f554","unicode_alt":"","code_decimal":"&#128340;","name":"clock face five oclock","shortname":":clock5:","category":"symbols","emoji_order":"1697","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock530":{"unicode":"1f560","unicode_alt":"","code_decimal":"&#128352;","name":"clock face five-thirty","shortname":":clock530:","category":"symbols","emoji_order":"1698","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock6":{"unicode":"1f555","unicode_alt":"","code_decimal":"&#128341;","name":"clock face six oclock","shortname":":clock6:","category":"symbols","emoji_order":"1699","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock630":{"unicode":"1f561","unicode_alt":"","code_decimal":"&#128353;","name":"clock face six-thirty","shortname":":clock630:","category":"symbols","emoji_order":"1700","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock7":{"unicode":"1f556","unicode_alt":"","code_decimal":"&#128342;","name":"clock face seven oclock","shortname":":clock7:","category":"symbols","emoji_order":"1701","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock730":{"unicode":"1f562","unicode_alt":"","code_decimal":"&#128354;","name":"clock face seven-thirty","shortname":":clock730:","category":"symbols","emoji_order":"1702","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock8":{"unicode":"1f557","unicode_alt":"","code_decimal":"&#128343;","name":"clock face eight oclock","shortname":":clock8:","category":"symbols","emoji_order":"1703","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock830":{"unicode":"1f563","unicode_alt":"","code_decimal":"&#128355;","name":"clock face eight-thirty","shortname":":clock830:","category":"symbols","emoji_order":"1704","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock9":{"unicode":"1f558","unicode_alt":"","code_decimal":"&#128344;","name":"clock face nine oclock","shortname":":clock9:","category":"symbols","emoji_order":"1705","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock930":{"unicode":"1f564","unicode_alt":"","code_decimal":"&#128356;","name":"clock face nine-thirty","shortname":":clock930:","category":"symbols","emoji_order":"1706","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock10":{"unicode":"1f559","unicode_alt":"","code_decimal":"&#128345;","name":"clock face ten oclock","shortname":":clock10:","category":"symbols","emoji_order":"1707","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock1030":{"unicode":"1f565","unicode_alt":"","code_decimal":"&#128357;","name":"clock face ten-thirty","shortname":":clock1030:","category":"symbols","emoji_order":"1708","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock11":{"unicode":"1f55a","unicode_alt":"","code_decimal":"&#128346;","name":"clock face eleven oclock","shortname":":clock11:","category":"symbols","emoji_order":"1709","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"clock1130":{"unicode":"1f566","unicode_alt":"","code_decimal":"&#128358;","name":"clock face eleven-thirty","shortname":":clock1130:","category":"symbols","emoji_order":"1710","aliases":[],"aliases_ascii":[],"keywords":["symbol","time"]},"new_moon":{"unicode":"1f311","unicode_alt":"","code_decimal":"&#127761;","name":"new moon symbol","shortname":":new_moon:","category":"nature","emoji_order":"1711","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"waxing_crescent_moon":{"unicode":"1f312","unicode_alt":"","code_decimal":"&#127762;","name":"waxing crescent moon symbol","shortname":":waxing_crescent_moon:","category":"nature","emoji_order":"1712","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"first_quarter_moon":{"unicode":"1f313","unicode_alt":"","code_decimal":"&#127763;","name":"first quarter moon symbol","shortname":":first_quarter_moon:","category":"nature","emoji_order":"1713","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"waxing_gibbous_moon":{"unicode":"1f314","unicode_alt":"","code_decimal":"&#127764;","name":"waxing gibbous moon symbol","shortname":":waxing_gibbous_moon:","category":"nature","emoji_order":"1714","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"full_moon":{"unicode":"1f315","unicode_alt":"","code_decimal":"&#127765;","name":"full moon symbol","shortname":":full_moon:","category":"nature","emoji_order":"1715","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"waning_gibbous_moon":{"unicode":"1f316","unicode_alt":"","code_decimal":"&#127766;","name":"waning gibbous moon symbol","shortname":":waning_gibbous_moon:","category":"nature","emoji_order":"1716","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"last_quarter_moon":{"unicode":"1f317","unicode_alt":"","code_decimal":"&#127767;","name":"last quarter moon symbol","shortname":":last_quarter_moon:","category":"nature","emoji_order":"1717","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"waning_crescent_moon":{"unicode":"1f318","unicode_alt":"","code_decimal":"&#127768;","name":"waning crescent moon symbol","shortname":":waning_crescent_moon:","category":"nature","emoji_order":"1718","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"crescent_moon":{"unicode":"1f319","unicode_alt":"","code_decimal":"&#127769;","name":"crescent moon","shortname":":crescent_moon:","category":"nature","emoji_order":"1719","aliases":[],"aliases_ascii":[],"keywords":["space","sky","goodnight","moon"]},"new_moon_with_face":{"unicode":"1f31a","unicode_alt":"","code_decimal":"&#127770;","name":"new moon with face","shortname":":new_moon_with_face:","category":"nature","emoji_order":"1720","aliases":[],"aliases_ascii":[],"keywords":["space","sky","goodnight","moon"]},"first_quarter_moon_with_face":{"unicode":"1f31b","unicode_alt":"","code_decimal":"&#127771;","name":"first quarter moon with face","shortname":":first_quarter_moon_with_face:","category":"nature","emoji_order":"1721","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"last_quarter_moon_with_face":{"unicode":"1f31c","unicode_alt":"","code_decimal":"&#127772;","name":"last quarter moon with face","shortname":":last_quarter_moon_with_face:","category":"nature","emoji_order":"1722","aliases":[],"aliases_ascii":[],"keywords":["space","sky","moon"]},"thermometer":{"unicode":"1f321","unicode_alt":"1f321-fe0f","code_decimal":"&#127777;","name":"thermometer","shortname":":thermometer:","category":"objects","emoji_order":"1723","aliases":[],"aliases_ascii":[],"keywords":["object","science","health","hot"]},"sunny":{"unicode":"2600","unicode_alt":"2600-fe0f","code_decimal":"&#9728;","name":"black sun with rays","shortname":":sunny:","category":"nature","emoji_order":"1724","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","day","sun","hot","morning"]},"full_moon_with_face":{"unicode":"1f31d","unicode_alt":"","code_decimal":"&#127773;","name":"full moon with face","shortname":":full_moon_with_face:","category":"nature","emoji_order":"1725","aliases":[],"aliases_ascii":[],"keywords":["space","sky","goodnight","moon"]},"sun_with_face":{"unicode":"1f31e","unicode_alt":"","code_decimal":"&#127774;","name":"sun with face","shortname":":sun_with_face:","category":"nature","emoji_order":"1726","aliases":[],"aliases_ascii":[],"keywords":["sky","day","sun","hump day","morning"]},"star":{"unicode":"2b50","unicode_alt":"2b50-fe0f","code_decimal":"&#11088;","name":"white medium star","shortname":":star:","category":"nature","emoji_order":"1727","aliases":[],"aliases_ascii":[],"keywords":["space","sky","star"]},"star2":{"unicode":"1f31f","unicode_alt":"","code_decimal":"&#127775;","name":"glowing star","shortname":":star2:","category":"nature","emoji_order":"1728","aliases":[],"aliases_ascii":[],"keywords":["space","sky","star"]},"stars":{"unicode":"1f320","unicode_alt":"","code_decimal":"&#127776;","name":"shooting star","shortname":":stars:","category":"travel","emoji_order":"1729","aliases":[],"aliases_ascii":[],"keywords":["space"]},"cloud":{"unicode":"2601","unicode_alt":"2601-fe0f","code_decimal":"&#9729;","name":"cloud","shortname":":cloud:","category":"nature","emoji_order":"1730","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","cloud","cold","rain"]},"partly_sunny":{"unicode":"26c5","unicode_alt":"26c5-fe0f","code_decimal":"&#9925;","name":"sun behind cloud","shortname":":partly_sunny:","category":"nature","emoji_order":"1731","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","cloud","sun"]},"thunder_cloud_rain":{"unicode":"26c8","unicode_alt":"26c8-fe0f","code_decimal":"&#9928;","name":"thunder cloud and rain","shortname":":thunder_cloud_rain:","category":"nature","emoji_order":"1732","aliases":[":thunder_cloud_and_rain:"],"aliases_ascii":[],"keywords":["weather","sky","cloud","cold","rain"]},"white_sun_small_cloud":{"unicode":"1f324","unicode_alt":"1f324-fe0f","code_decimal":"&#127780;","name":"white sun with small cloud","shortname":":white_sun_small_cloud:","category":"nature","emoji_order":"1733","aliases":[":white_sun_with_small_cloud:"],"aliases_ascii":[],"keywords":["weather","sky","cloud","sun"]},"white_sun_cloud":{"unicode":"1f325","unicode_alt":"1f325-fe0f","code_decimal":"&#127781;","name":"white sun behind cloud","shortname":":white_sun_cloud:","category":"nature","emoji_order":"1734","aliases":[":white_sun_behind_cloud:"],"aliases_ascii":[],"keywords":["weather","sky","cloud","cold","sun"]},"white_sun_rain_cloud":{"unicode":"1f326","unicode_alt":"1f326-fe0f","code_decimal":"&#127782;","name":"white sun behind cloud with rain","shortname":":white_sun_rain_cloud:","category":"nature","emoji_order":"1735","aliases":[":white_sun_behind_cloud_with_rain:"],"aliases_ascii":[],"keywords":["weather","sky","cloud","cold","rain","sun"]},"cloud_rain":{"unicode":"1f327","unicode_alt":"1f327-fe0f","code_decimal":"&#127783;","name":"cloud with rain","shortname":":cloud_rain:","category":"nature","emoji_order":"1736","aliases":[":cloud_with_rain:"],"aliases_ascii":[],"keywords":["weather","winter","sky","cloud","cold","rain"]},"cloud_snow":{"unicode":"1f328","unicode_alt":"1f328-fe0f","code_decimal":"&#127784;","name":"cloud with snow","shortname":":cloud_snow:","category":"nature","emoji_order":"1737","aliases":[":cloud_with_snow:"],"aliases_ascii":[],"keywords":["weather","winter","sky","cloud","cold","snow"]},"cloud_lightning":{"unicode":"1f329","unicode_alt":"1f329-fe0f","code_decimal":"&#127785;","name":"cloud with lightning","shortname":":cloud_lightning:","category":"nature","emoji_order":"1738","aliases":[":cloud_with_lightning:"],"aliases_ascii":[],"keywords":["weather","sky","cloud","cold","rain"]},"cloud_tornado":{"unicode":"1f32a","unicode_alt":"1f32a-fe0f","code_decimal":"&#127786;","name":"cloud with tornado","shortname":":cloud_tornado:","category":"nature","emoji_order":"1739","aliases":[":cloud_with_tornado:"],"aliases_ascii":[],"keywords":["weather","sky","cold"]},"fog":{"unicode":"1f32b","unicode_alt":"1f32b-fe0f","code_decimal":"&#127787;","name":"fog","shortname":":fog:","category":"nature","emoji_order":"1740","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","cold"]},"wind_blowing_face":{"unicode":"1f32c","unicode_alt":"1f32c-fe0f","code_decimal":"&#127788;","name":"wind blowing face","shortname":":wind_blowing_face:","category":"nature","emoji_order":"1741","aliases":[],"aliases_ascii":[],"keywords":["weather","cold"]},"cyclone":{"unicode":"1f300","unicode_alt":"","code_decimal":"&#127744;","name":"cyclone","shortname":":cyclone:","category":"symbols","emoji_order":"1742","aliases":[],"aliases_ascii":[],"keywords":["symbol","drugs"]},"rainbow":{"unicode":"1f308","unicode_alt":"","code_decimal":"&#127752;","name":"rainbow","shortname":":rainbow:","category":"travel","emoji_order":"1743","aliases":[],"aliases_ascii":[],"keywords":["weather","gay","sky","rain"]},"closed_umbrella":{"unicode":"1f302","unicode_alt":"","code_decimal":"&#127746;","name":"closed umbrella","shortname":":closed_umbrella:","category":"people","emoji_order":"1744","aliases":[],"aliases_ascii":[],"keywords":["object","sky","rain","accessories"]},"umbrella2":{"unicode":"2602","unicode_alt":"2602-fe0f","code_decimal":"&#9730;","name":"umbrella","shortname":":umbrella2:","category":"nature","emoji_order":"1745","aliases":[],"aliases_ascii":[],"keywords":["weather","object","sky","cold"]},"umbrella":{"unicode":"2614","unicode_alt":"2614-fe0f","code_decimal":"&#9748;","name":"umbrella with rain drops","shortname":":umbrella:","category":"nature","emoji_order":"1746","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","cold","rain"]},"beach_umbrella":{"unicode":"26f1","unicode_alt":"26f1-fe0f","code_decimal":"&#9969;","name":"umbrella on ground","shortname":":beach_umbrella:","category":"objects","emoji_order":"1747","aliases":[":umbrella_on_ground:"],"aliases_ascii":[],"keywords":["travel","vacation","tropical"]},"zap":{"unicode":"26a1","unicode_alt":"26a1-fe0f","code_decimal":"&#9889;","name":"high voltage sign","shortname":":zap:","category":"nature","emoji_order":"1748","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","diarrhea"]},"snowflake":{"unicode":"2744","unicode_alt":"2744-fe0f","code_decimal":"&#10052;","name":"snowflake","shortname":":snowflake:","category":"nature","emoji_order":"1749","aliases":[],"aliases_ascii":[],"keywords":["weather","winter","sky","holidays","cold","snow"]},"snowman2":{"unicode":"2603","unicode_alt":"2603-fe0f","code_decimal":"&#9731;","name":"snowman","shortname":":snowman2:","category":"nature","emoji_order":"1750","aliases":[],"aliases_ascii":[],"keywords":["weather","winter","holidays","christmas","cold","snow"]},"snowman":{"unicode":"26c4","unicode_alt":"26c4-fe0f","code_decimal":"&#9924;","name":"snowman without snow","shortname":":snowman:","category":"nature","emoji_order":"1751","aliases":[],"aliases_ascii":[],"keywords":["weather","winter","holidays","cold","snow"]},"comet":{"unicode":"2604","unicode_alt":"2604-fe0f","code_decimal":"&#9732;","name":"comet","shortname":":comet:","category":"nature","emoji_order":"1752","aliases":[],"aliases_ascii":[],"keywords":["space","sky"]},"fire":{"unicode":"1f525","unicode_alt":"","code_decimal":"&#128293;","name":"fire","shortname":":fire:","category":"nature","emoji_order":"1753","aliases":[":flame:"],"aliases_ascii":[],"keywords":["wth","hot"]},"droplet":{"unicode":"1f4a7","unicode_alt":"","code_decimal":"&#128167;","name":"droplet","shortname":":droplet:","category":"nature","emoji_order":"1754","aliases":[],"aliases_ascii":[],"keywords":["weather","sky","rain"]},"ocean":{"unicode":"1f30a","unicode_alt":"","code_decimal":"&#127754;","name":"water wave","shortname":":ocean:","category":"nature","emoji_order":"1755","aliases":[],"aliases_ascii":[],"keywords":["weather","boat","tropical","swim"]},"jack_o_lantern":{"unicode":"1f383","unicode_alt":"","code_decimal":"&#127875;","name":"jack-o-lantern","shortname":":jack_o_lantern:","category":"nature","emoji_order":"1756","aliases":[],"aliases_ascii":[],"keywords":["holidays","halloween"]},"christmas_tree":{"unicode":"1f384","unicode_alt":"","code_decimal":"&#127876;","name":"christmas tree","shortname":":christmas_tree:","category":"nature","emoji_order":"1757","aliases":[],"aliases_ascii":[],"keywords":["plant","holidays","christmas","trees"]},"fireworks":{"unicode":"1f386","unicode_alt":"","code_decimal":"&#127878;","name":"fireworks","shortname":":fireworks:","category":"travel","emoji_order":"1758","aliases":[],"aliases_ascii":[],"keywords":["parties"]},"sparkler":{"unicode":"1f387","unicode_alt":"","code_decimal":"&#127879;","name":"firework sparkler","shortname":":sparkler:","category":"travel","emoji_order":"1759","aliases":[],"aliases_ascii":[],"keywords":["parties"]},"sparkles":{"unicode":"2728","unicode_alt":"","code_decimal":"&#10024;","name":"sparkles","shortname":":sparkles:","category":"nature","emoji_order":"1760","aliases":[],"aliases_ascii":[],"keywords":["star","girls night"]},"balloon":{"unicode":"1f388","unicode_alt":"","code_decimal":"&#127880;","name":"balloon","shortname":":balloon:","category":"objects","emoji_order":"1761","aliases":[],"aliases_ascii":[],"keywords":["object","birthday","good","parties"]},"tada":{"unicode":"1f389","unicode_alt":"","code_decimal":"&#127881;","name":"party popper","shortname":":tada:","category":"objects","emoji_order":"1762","aliases":[],"aliases_ascii":[],"keywords":["object","birthday","holidays","cheers","good","girls night","boys night","parties"]},"confetti_ball":{"unicode":"1f38a","unicode_alt":"","code_decimal":"&#127882;","name":"confetti ball","shortname":":confetti_ball:","category":"objects","emoji_order":"1763","aliases":[],"aliases_ascii":[],"keywords":["object","birthday","holidays","cheers","girls night","boys night","parties"]},"tanabata_tree":{"unicode":"1f38b","unicode_alt":"","code_decimal":"&#127883;","name":"tanabata tree","shortname":":tanabata_tree:","category":"nature","emoji_order":"1764","aliases":[],"aliases_ascii":[],"keywords":["nature","plant","trees"]},"bamboo":{"unicode":"1f38d","unicode_alt":"","code_decimal":"&#127885;","name":"pine decoration","shortname":":bamboo:","category":"nature","emoji_order":"1765","aliases":[],"aliases_ascii":[],"keywords":["nature","plant"]},"dolls":{"unicode":"1f38e","unicode_alt":"","code_decimal":"&#127886;","name":"japanese dolls","shortname":":dolls:","category":"objects","emoji_order":"1766","aliases":[],"aliases_ascii":[],"keywords":["people","japan"]},"flags":{"unicode":"1f38f","unicode_alt":"","code_decimal":"&#127887;","name":"carp streamer","shortname":":flags:","category":"objects","emoji_order":"1767","aliases":[],"aliases_ascii":[],"keywords":["object","japan"]},"wind_chime":{"unicode":"1f390","unicode_alt":"","code_decimal":"&#127888;","name":"wind chime","shortname":":wind_chime:","category":"objects","emoji_order":"1768","aliases":[],"aliases_ascii":[],"keywords":["object","japan"]},"rice_scene":{"unicode":"1f391","unicode_alt":"","code_decimal":"&#127889;","name":"moon viewing ceremony","shortname":":rice_scene:","category":"travel","emoji_order":"1769","aliases":[],"aliases_ascii":[],"keywords":["places","space","sky","travel"]},"ribbon":{"unicode":"1f380","unicode_alt":"","code_decimal":"&#127872;","name":"ribbon","shortname":":ribbon:","category":"objects","emoji_order":"1770","aliases":[],"aliases_ascii":[],"keywords":["object","gift","birthday"]},"gift":{"unicode":"1f381","unicode_alt":"","code_decimal":"&#127873;","name":"wrapped present","shortname":":gift:","category":"objects","emoji_order":"1771","aliases":[],"aliases_ascii":[],"keywords":["object","gift","birthday","holidays","christmas","parties"]},"reminder_ribbon":{"unicode":"1f397","unicode_alt":"1f397-fe0f","code_decimal":"&#127895;","name":"reminder ribbon","shortname":":reminder_ribbon:","category":"activity","emoji_order":"1772","aliases":[],"aliases_ascii":[],"keywords":["award"]},"tickets":{"unicode":"1f39f","unicode_alt":"1f39f-fe0f","code_decimal":"&#127903;","name":"admission tickets","shortname":":tickets:","category":"activity","emoji_order":"1773","aliases":[":admission_tickets:"],"aliases_ascii":[],"keywords":["theatre","movie","parties"]},"ticket":{"unicode":"1f3ab","unicode_alt":"","code_decimal":"&#127915;","name":"ticket","shortname":":ticket:","category":"activity","emoji_order":"1774","aliases":[],"aliases_ascii":[],"keywords":["theatre","movie","parties"]},"military_medal":{"unicode":"1f396","unicode_alt":"1f396-fe0f","code_decimal":"&#127894;","name":"military medal","shortname":":military_medal:","category":"activity","emoji_order":"1775","aliases":[],"aliases_ascii":[],"keywords":["object","award","win"]},"trophy":{"unicode":"1f3c6","unicode_alt":"","code_decimal":"&#127942;","name":"trophy","shortname":":trophy:","category":"activity","emoji_order":"1776","aliases":[],"aliases_ascii":[],"keywords":["object","game","award","win","perfect","parties"]},"medal":{"unicode":"1f3c5","unicode_alt":"","code_decimal":"&#127941;","name":"sports medal","shortname":":medal:","category":"activity","emoji_order":"1777","aliases":[":sports_medal:"],"aliases_ascii":[],"keywords":["object","award","sport","win","perfect"]},"first_place":{"unicode":"1f947","unicode_alt":"","code_decimal":"&#129351;","name":"first place medal","shortname":":first_place:","category":"activity","emoji_order":"1778","aliases":[":first_place_medal:"],"aliases_ascii":[],"keywords":[]},"second_place":{"unicode":"1f948","unicode_alt":"","code_decimal":"&#129352;","name":"second place medal","shortname":":second_place:","category":"activity","emoji_order":"1779","aliases":[":second_place_medal:"],"aliases_ascii":[],"keywords":[]},"third_place":{"unicode":"1f949","unicode_alt":"","code_decimal":"&#129353;","name":"third place medal","shortname":":third_place:","category":"activity","emoji_order":"1780","aliases":[":third_place_medal:"],"aliases_ascii":[],"keywords":[]},"soccer":{"unicode":"26bd","unicode_alt":"26bd-fe0f","code_decimal":"&#9917;","name":"soccer ball","shortname":":soccer:","category":"activity","emoji_order":"1781","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","soccer","football"]},"baseball":{"unicode":"26be","unicode_alt":"26be-fe0f","code_decimal":"&#9918;","name":"baseball","shortname":":baseball:","category":"activity","emoji_order":"1782","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","baseball"]},"basketball":{"unicode":"1f3c0","unicode_alt":"","code_decimal":"&#127936;","name":"basketball and hoop","shortname":":basketball:","category":"activity","emoji_order":"1783","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","basketball"]},"volleyball":{"unicode":"1f3d0","unicode_alt":"","code_decimal":"&#127952;","name":"volleyball","shortname":":volleyball:","category":"activity","emoji_order":"1784","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","volleyball"]},"football":{"unicode":"1f3c8","unicode_alt":"","code_decimal":"&#127944;","name":"american football","shortname":":football:","category":"activity","emoji_order":"1785","aliases":[],"aliases_ascii":[],"keywords":["america","game","ball","sport","football"]},"rugby_football":{"unicode":"1f3c9","unicode_alt":"","code_decimal":"&#127945;","name":"rugby football","shortname":":rugby_football:","category":"activity","emoji_order":"1786","aliases":[],"aliases_ascii":[],"keywords":["game","sport","football"]},"tennis":{"unicode":"1f3be","unicode_alt":"","code_decimal":"&#127934;","name":"tennis racquet and ball","shortname":":tennis:","category":"activity","emoji_order":"1787","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","tennis"]},"8ball":{"unicode":"1f3b1","unicode_alt":"","code_decimal":"&#127921;","name":"billiards","shortname":":8ball:","category":"activity","emoji_order":"1788","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","billiards","luck","boys night"]},"bowling":{"unicode":"1f3b3","unicode_alt":"","code_decimal":"&#127923;","name":"bowling","shortname":":bowling:","category":"activity","emoji_order":"1789","aliases":[],"aliases_ascii":[],"keywords":["game","ball","sport","boys night"]},"cricket":{"unicode":"1f3cf","unicode_alt":"","code_decimal":"&#127951;","name":"cricket bat and ball","shortname":":cricket:","category":"activity","emoji_order":"1790","aliases":[":cricket_bat_ball:"],"aliases_ascii":[],"keywords":["ball","sport","cricket"]},"field_hockey":{"unicode":"1f3d1","unicode_alt":"","code_decimal":"&#127953;","name":"field hockey stick and ball","shortname":":field_hockey:","category":"activity","emoji_order":"1791","aliases":[],"aliases_ascii":[],"keywords":["ball","sport","hockey"]},"hockey":{"unicode":"1f3d2","unicode_alt":"","code_decimal":"&#127954;","name":"ice hockey stick and puck","shortname":":hockey:","category":"activity","emoji_order":"1792","aliases":[],"aliases_ascii":[],"keywords":["game","sport","hockey"]},"ping_pong":{"unicode":"1f3d3","unicode_alt":"","code_decimal":"&#127955;","name":"table tennis paddle and ball","shortname":":ping_pong:","category":"activity","emoji_order":"1793","aliases":[":table_tennis:"],"aliases_ascii":[],"keywords":["game","ball","sport","ping pong"]},"badminton":{"unicode":"1f3f8","unicode_alt":"","code_decimal":"&#127992;","name":"badminton racquet","shortname":":badminton:","category":"activity","emoji_order":"1794","aliases":[],"aliases_ascii":[],"keywords":["game","sport","badminton"]},"boxing_glove":{"unicode":"1f94a","unicode_alt":"","code_decimal":"&#129354;","name":"boxing glove","shortname":":boxing_glove:","category":"activity","emoji_order":"1795","aliases":[":boxing_gloves:"],"aliases_ascii":[],"keywords":[]},"martial_arts_uniform":{"unicode":"1f94b","unicode_alt":"","code_decimal":"&#129355;","name":"martial arts uniform","shortname":":martial_arts_uniform:","category":"activity","emoji_order":"1796","aliases":[":karate_uniform:"],"aliases_ascii":[],"keywords":[]},"goal":{"unicode":"1f945","unicode_alt":"","code_decimal":"&#129349;","name":"goal net","shortname":":goal:","category":"activity","emoji_order":"1797","aliases":[":goal_net:"],"aliases_ascii":[],"keywords":[]},"dart":{"unicode":"1f3af","unicode_alt":"","code_decimal":"&#127919;","name":"direct hit","shortname":":dart:","category":"activity","emoji_order":"1798","aliases":[],"aliases_ascii":[],"keywords":["game","sport","boys night"]},"golf":{"unicode":"26f3","unicode_alt":"26f3-fe0f","code_decimal":"&#9971;","name":"flag in hole","shortname":":golf:","category":"activity","emoji_order":"1799","aliases":[],"aliases_ascii":[],"keywords":["game","ball","vacation","sport","golf"]},"ice_skate":{"unicode":"26f8","unicode_alt":"26f8-fe0f","code_decimal":"&#9976;","name":"ice skate","shortname":":ice_skate:","category":"activity","emoji_order":"1800","aliases":[],"aliases_ascii":[],"keywords":["cold","sport","ice skating"]},"fishing_pole_and_fish":{"unicode":"1f3a3","unicode_alt":"","code_decimal":"&#127907;","name":"fishing pole and fish","shortname":":fishing_pole_and_fish:","category":"activity","emoji_order":"1801","aliases":[],"aliases_ascii":[],"keywords":["vacation","sport","fishing"]},"running_shirt_with_sash":{"unicode":"1f3bd","unicode_alt":"","code_decimal":"&#127933;","name":"running shirt with sash","shortname":":running_shirt_with_sash:","category":"activity","emoji_order":"1802","aliases":[],"aliases_ascii":[],"keywords":["award"]},"ski":{"unicode":"1f3bf","unicode_alt":"","code_decimal":"&#127935;","name":"ski and ski boot","shortname":":ski:","category":"activity","emoji_order":"1803","aliases":[],"aliases_ascii":[],"keywords":["cold","sport","skiing"]},"video_game":{"unicode":"1f3ae","unicode_alt":"","code_decimal":"&#127918;","name":"video game","shortname":":video_game:","category":"activity","emoji_order":"1804","aliases":[],"aliases_ascii":[],"keywords":["electronics","game","boys night"]},"joystick":{"unicode":"1f579","unicode_alt":"1f579-fe0f","code_decimal":"&#128377;","name":"joystick","shortname":":joystick:","category":"objects","emoji_order":"1805","aliases":[],"aliases_ascii":[],"keywords":["electronics","game","boys night"]},"game_die":{"unicode":"1f3b2","unicode_alt":"","code_decimal":"&#127922;","name":"game die","shortname":":game_die:","category":"activity","emoji_order":"1806","aliases":[],"aliases_ascii":[],"keywords":["object","game","boys night"]},"spades":{"unicode":"2660","unicode_alt":"2660-fe0f","code_decimal":"&spades;","name":"black spade suit","shortname":":spades:","category":"symbols","emoji_order":"1807","aliases":[],"aliases_ascii":[],"keywords":["symbol","game"]},"hearts":{"unicode":"2665","unicode_alt":"2665-fe0f","code_decimal":"&hearts;","name":"black heart suit","shortname":":hearts:","category":"symbols","emoji_order":"1808","aliases":[],"aliases_ascii":[],"keywords":["love","symbol","game"]},"diamonds":{"unicode":"2666","unicode_alt":"2666-fe0f","code_decimal":"&diams;","name":"black diamond suit","shortname":":diamonds:","category":"symbols","emoji_order":"1809","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","game"]},"clubs":{"unicode":"2663","unicode_alt":"2663-fe0f","code_decimal":"&clubs;","name":"black club suit","shortname":":clubs:","category":"symbols","emoji_order":"1810","aliases":[],"aliases_ascii":[],"keywords":["symbol","game"]},"black_joker":{"unicode":"1f0cf","unicode_alt":"","code_decimal":"&#127183;","name":"playing card black joker","shortname":":black_joker:","category":"symbols","emoji_order":"1811","aliases":[],"aliases_ascii":[],"keywords":["object","symbol","game"]},"mahjong":{"unicode":"1f004","unicode_alt":"1f004-fe0f","code_decimal":"&#126980;","name":"mahjong tile red dragon","shortname":":mahjong:","category":"symbols","emoji_order":"1812","aliases":[],"aliases_ascii":[],"keywords":["object","symbol","game"]},"flower_playing_cards":{"unicode":"1f3b4","unicode_alt":"","code_decimal":"&#127924;","name":"flower playing cards","shortname":":flower_playing_cards:","category":"symbols","emoji_order":"1813","aliases":[],"aliases_ascii":[],"keywords":["object","symbol"]},"mute":{"unicode":"1f507","unicode_alt":"","code_decimal":"&#128263;","name":"speaker with cancellation stroke","shortname":":mute:","category":"symbols","emoji_order":"1814","aliases":[],"aliases_ascii":[],"keywords":["alarm","symbol"]},"speaker":{"unicode":"1f508","unicode_alt":"","code_decimal":"&#128264;","name":"speaker","shortname":":speaker:","category":"symbols","emoji_order":"1815","aliases":[],"aliases_ascii":[],"keywords":["alarm","symbol"]},"sound":{"unicode":"1f509","unicode_alt":"","code_decimal":"&#128265;","name":"speaker with one sound wave","shortname":":sound:","category":"symbols","emoji_order":"1816","aliases":[],"aliases_ascii":[],"keywords":["alarm","symbol"]},"loud_sound":{"unicode":"1f50a","unicode_alt":"","code_decimal":"&#128266;","name":"speaker with three sound waves","shortname":":loud_sound:","category":"symbols","emoji_order":"1817","aliases":[],"aliases_ascii":[],"keywords":["alarm","symbol"]},"loudspeaker":{"unicode":"1f4e2","unicode_alt":"","code_decimal":"&#128226;","name":"public address loudspeaker","shortname":":loudspeaker:","category":"symbols","emoji_order":"1818","aliases":[],"aliases_ascii":[],"keywords":["object","alarm","symbol"]},"mega":{"unicode":"1f4e3","unicode_alt":"","code_decimal":"&#128227;","name":"cheering megaphone","shortname":":mega:","category":"symbols","emoji_order":"1819","aliases":[],"aliases_ascii":[],"keywords":["object","sport"]},"postal_horn":{"unicode":"1f4ef","unicode_alt":"","code_decimal":"&#128239;","name":"postal horn","shortname":":postal_horn:","category":"objects","emoji_order":"1820","aliases":[],"aliases_ascii":[],"keywords":["object"]},"bell":{"unicode":"1f514","unicode_alt":"","code_decimal":"&#128276;","name":"bell","shortname":":bell:","category":"symbols","emoji_order":"1821","aliases":[],"aliases_ascii":[],"keywords":["object","alarm","symbol"]},"no_bell":{"unicode":"1f515","unicode_alt":"","code_decimal":"&#128277;","name":"bell with cancellation stroke","shortname":":no_bell:","category":"symbols","emoji_order":"1822","aliases":[],"aliases_ascii":[],"keywords":["alarm","symbol"]},"musical_score":{"unicode":"1f3bc","unicode_alt":"","code_decimal":"&#127932;","name":"musical score","shortname":":musical_score:","category":"activity","emoji_order":"1823","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"musical_note":{"unicode":"1f3b5","unicode_alt":"","code_decimal":"&#127925;","name":"musical note","shortname":":musical_note:","category":"symbols","emoji_order":"1824","aliases":[],"aliases_ascii":[],"keywords":["instruments","symbol"]},"notes":{"unicode":"1f3b6","unicode_alt":"","code_decimal":"&#127926;","name":"multiple musical notes","shortname":":notes:","category":"symbols","emoji_order":"1825","aliases":[],"aliases_ascii":[],"keywords":["instruments","symbol"]},"microphone2":{"unicode":"1f399","unicode_alt":"1f399-fe0f","code_decimal":"&#127897;","name":"studio microphone","shortname":":microphone2:","category":"objects","emoji_order":"1826","aliases":[":studio_microphone:"],"aliases_ascii":[],"keywords":["electronics","object"]},"level_slider":{"unicode":"1f39a","unicode_alt":"1f39a-fe0f","code_decimal":"&#127898;","name":"level slider","shortname":":level_slider:","category":"objects","emoji_order":"1827","aliases":[],"aliases_ascii":[],"keywords":[]},"control_knobs":{"unicode":"1f39b","unicode_alt":"1f39b-fe0f","code_decimal":"&#127899;","name":"control knobs","shortname":":control_knobs:","category":"objects","emoji_order":"1828","aliases":[],"aliases_ascii":[],"keywords":["time"]},"microphone":{"unicode":"1f3a4","unicode_alt":"","code_decimal":"&#127908;","name":"microphone","shortname":":microphone:","category":"activity","emoji_order":"1829","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"headphones":{"unicode":"1f3a7","unicode_alt":"","code_decimal":"&#127911;","name":"headphone","shortname":":headphones:","category":"activity","emoji_order":"1830","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"radio":{"unicode":"1f4fb","unicode_alt":"","code_decimal":"&#128251;","name":"radio","shortname":":radio:","category":"objects","emoji_order":"1831","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"saxophone":{"unicode":"1f3b7","unicode_alt":"","code_decimal":"&#127927;","name":"saxophone","shortname":":saxophone:","category":"activity","emoji_order":"1832","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"guitar":{"unicode":"1f3b8","unicode_alt":"","code_decimal":"&#127928;","name":"guitar","shortname":":guitar:","category":"activity","emoji_order":"1833","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"musical_keyboard":{"unicode":"1f3b9","unicode_alt":"","code_decimal":"&#127929;","name":"musical keyboard","shortname":":musical_keyboard:","category":"activity","emoji_order":"1834","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"trumpet":{"unicode":"1f3ba","unicode_alt":"","code_decimal":"&#127930;","name":"trumpet","shortname":":trumpet:","category":"activity","emoji_order":"1835","aliases":[],"aliases_ascii":[],"keywords":["instruments"]},"violin":{"unicode":"1f3bb","unicode_alt":"","code_decimal":"&#127931;","name":"violin","shortname":":violin:","category":"activity","emoji_order":"1836","aliases":[],"aliases_ascii":[],"keywords":["instruments","sarcastic"]},"drum":{"unicode":"1f941","unicode_alt":"","code_decimal":"&#129345;","name":"drum with drumsticks","shortname":":drum:","category":"activity","emoji_order":"1837","aliases":[":drum_with_drumsticks:"],"aliases_ascii":[],"keywords":[]},"iphone":{"unicode":"1f4f1","unicode_alt":"","code_decimal":"&#128241;","name":"mobile phone","shortname":":iphone:","category":"objects","emoji_order":"1838","aliases":[],"aliases_ascii":[],"keywords":["electronics","phone","selfie"]},"calling":{"unicode":"1f4f2","unicode_alt":"","code_decimal":"&#128242;","name":"mobile phone with rightwards arrow at left","shortname":":calling:","category":"objects","emoji_order":"1839","aliases":[],"aliases_ascii":[],"keywords":["electronics","phone","selfie"]},"telephone":{"unicode":"260e","unicode_alt":"260e-fe0f","code_decimal":"&#9742;","name":"black telephone","shortname":":telephone:","category":"objects","emoji_order":"1840","aliases":[],"aliases_ascii":[],"keywords":["electronics","phone"]},"telephone_receiver":{"unicode":"1f4de","unicode_alt":"","code_decimal":"&#128222;","name":"telephone receiver","shortname":":telephone_receiver:","category":"objects","emoji_order":"1841","aliases":[],"aliases_ascii":[],"keywords":["electronics","phone"]},"pager":{"unicode":"1f4df","unicode_alt":"","code_decimal":"&#128223;","name":"pager","shortname":":pager:","category":"objects","emoji_order":"1842","aliases":[],"aliases_ascii":[],"keywords":["electronics","work"]},"fax":{"unicode":"1f4e0","unicode_alt":"","code_decimal":"&#128224;","name":"fax machine","shortname":":fax:","category":"objects","emoji_order":"1843","aliases":[],"aliases_ascii":[],"keywords":["electronics","work","office"]},"battery":{"unicode":"1f50b","unicode_alt":"","code_decimal":"&#128267;","name":"battery","shortname":":battery:","category":"objects","emoji_order":"1844","aliases":[],"aliases_ascii":[],"keywords":["object"]},"electric_plug":{"unicode":"1f50c","unicode_alt":"","code_decimal":"&#128268;","name":"electric plug","shortname":":electric_plug:","category":"objects","emoji_order":"1845","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"computer":{"unicode":"1f4bb","unicode_alt":"","code_decimal":"&#128187;","name":"personal computer","shortname":":computer:","category":"objects","emoji_order":"1846","aliases":[],"aliases_ascii":[],"keywords":["electronics","work","office"]},"desktop":{"unicode":"1f5a5","unicode_alt":"1f5a5-fe0f","code_decimal":"&#128421;","name":"desktop computer","shortname":":desktop:","category":"objects","emoji_order":"1847","aliases":[":desktop_computer:"],"aliases_ascii":[],"keywords":["electronics","work"]},"printer":{"unicode":"1f5a8","unicode_alt":"1f5a8-fe0f","code_decimal":"&#128424;","name":"printer","shortname":":printer:","category":"objects","emoji_order":"1848","aliases":[],"aliases_ascii":[],"keywords":["electronics","work","office"]},"keyboard":{"unicode":"2328","unicode_alt":"2328-fe0f","code_decimal":"&#9000;","name":"keyboard","shortname":":keyboard:","category":"objects","emoji_order":"1849","aliases":[],"aliases_ascii":[],"keywords":["electronics","work","office"]},"mouse_three_button":{"unicode":"1f5b1","unicode_alt":"1f5b1-fe0f","code_decimal":"&#128433;","name":"three button mouse","shortname":":mouse_three_button:","category":"objects","emoji_order":"1850","aliases":[":three_button_mouse:"],"aliases_ascii":[],"keywords":["electronics","work","game","office"]},"trackball":{"unicode":"1f5b2","unicode_alt":"1f5b2-fe0f","code_decimal":"&#128434;","name":"trackball","shortname":":trackball:","category":"objects","emoji_order":"1851","aliases":[],"aliases_ascii":[],"keywords":["electronics","work","game","office"]},"minidisc":{"unicode":"1f4bd","unicode_alt":"","code_decimal":"&#128189;","name":"minidisc","shortname":":minidisc:","category":"objects","emoji_order":"1852","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"floppy_disk":{"unicode":"1f4be","unicode_alt":"","code_decimal":"&#128190;","name":"floppy disk","shortname":":floppy_disk:","category":"objects","emoji_order":"1853","aliases":[],"aliases_ascii":[],"keywords":["electronics","office"]},"cd":{"unicode":"1f4bf","unicode_alt":"","code_decimal":"&#128191;","name":"optical disc","shortname":":cd:","category":"objects","emoji_order":"1854","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"dvd":{"unicode":"1f4c0","unicode_alt":"","code_decimal":"&#128192;","name":"dvd","shortname":":dvd:","category":"objects","emoji_order":"1855","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"movie_camera":{"unicode":"1f3a5","unicode_alt":"","code_decimal":"&#127909;","name":"movie camera","shortname":":movie_camera:","category":"objects","emoji_order":"1856","aliases":[],"aliases_ascii":[],"keywords":["object","camera","movie"]},"film_frames":{"unicode":"1f39e","unicode_alt":"1f39e-fe0f","code_decimal":"&#127902;","name":"film frames","shortname":":film_frames:","category":"objects","emoji_order":"1857","aliases":[],"aliases_ascii":[],"keywords":["object","camera","movie"]},"projector":{"unicode":"1f4fd","unicode_alt":"1f4fd-fe0f","code_decimal":"&#128253;","name":"film projector","shortname":":projector:","category":"objects","emoji_order":"1858","aliases":[":film_projector:"],"aliases_ascii":[],"keywords":["object","camera","movie"]},"clapper":{"unicode":"1f3ac","unicode_alt":"","code_decimal":"&#127916;","name":"clapper board","shortname":":clapper:","category":"activity","emoji_order":"1859","aliases":[],"aliases_ascii":[],"keywords":["movie"]},"tv":{"unicode":"1f4fa","unicode_alt":"","code_decimal":"&#128250;","name":"television","shortname":":tv:","category":"objects","emoji_order":"1860","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"camera":{"unicode":"1f4f7","unicode_alt":"","code_decimal":"&#128247;","name":"camera","shortname":":camera:","category":"objects","emoji_order":"1861","aliases":[],"aliases_ascii":[],"keywords":["electronics","camera","selfie"]},"camera_with_flash":{"unicode":"1f4f8","unicode_alt":"","code_decimal":"&#128248;","name":"camera with flash","shortname":":camera_with_flash:","category":"objects","emoji_order":"1862","aliases":[],"aliases_ascii":[],"keywords":["electronics","camera"]},"video_camera":{"unicode":"1f4f9","unicode_alt":"","code_decimal":"&#128249;","name":"video camera","shortname":":video_camera:","category":"objects","emoji_order":"1863","aliases":[],"aliases_ascii":[],"keywords":["electronics","camera","movie"]},"vhs":{"unicode":"1f4fc","unicode_alt":"","code_decimal":"&#128252;","name":"videocassette","shortname":":vhs:","category":"objects","emoji_order":"1864","aliases":[],"aliases_ascii":[],"keywords":["electronics"]},"mag":{"unicode":"1f50d","unicode_alt":"","code_decimal":"&#128269;","name":"left-pointing magnifying glass","shortname":":mag:","category":"objects","emoji_order":"1865","aliases":[],"aliases_ascii":[],"keywords":["object"]},"mag_right":{"unicode":"1f50e","unicode_alt":"","code_decimal":"&#128270;","name":"right-pointing magnifying glass","shortname":":mag_right:","category":"objects","emoji_order":"1866","aliases":[],"aliases_ascii":[],"keywords":["object"]},"microscope":{"unicode":"1f52c","unicode_alt":"","code_decimal":"&#128300;","name":"microscope","shortname":":microscope:","category":"objects","emoji_order":"1867","aliases":[],"aliases_ascii":[],"keywords":["object","science"]},"telescope":{"unicode":"1f52d","unicode_alt":"","code_decimal":"&#128301;","name":"telescope","shortname":":telescope:","category":"objects","emoji_order":"1868","aliases":[],"aliases_ascii":[],"keywords":["object","space","science"]},"satellite":{"unicode":"1f4e1","unicode_alt":"","code_decimal":"&#128225;","name":"satellite antenna","shortname":":satellite:","category":"objects","emoji_order":"1869","aliases":[],"aliases_ascii":[],"keywords":["object"]},"candle":{"unicode":"1f56f","unicode_alt":"1f56f-fe0f","code_decimal":"&#128367;","name":"candle","shortname":":candle:","category":"objects","emoji_order":"1870","aliases":[],"aliases_ascii":[],"keywords":["object"]},"bulb":{"unicode":"1f4a1","unicode_alt":"","code_decimal":"&#128161;","name":"electric light bulb","shortname":":bulb:","category":"objects","emoji_order":"1871","aliases":[],"aliases_ascii":[],"keywords":["object","science"]},"flashlight":{"unicode":"1f526","unicode_alt":"","code_decimal":"&#128294;","name":"electric torch","shortname":":flashlight:","category":"objects","emoji_order":"1872","aliases":[],"aliases_ascii":[],"keywords":["electronics","object"]},"izakaya_lantern":{"unicode":"1f3ee","unicode_alt":"","code_decimal":"&#127982;","name":"izakaya lantern","shortname":":izakaya_lantern:","category":"objects","emoji_order":"1873","aliases":[],"aliases_ascii":[],"keywords":["object","japan"]},"notebook_with_decorative_cover":{"unicode":"1f4d4","unicode_alt":"","code_decimal":"&#128212;","name":"notebook with decorative cover","shortname":":notebook_with_decorative_cover:","category":"objects","emoji_order":"1874","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"closed_book":{"unicode":"1f4d5","unicode_alt":"","code_decimal":"&#128213;","name":"closed book","shortname":":closed_book:","category":"objects","emoji_order":"1875","aliases":[],"aliases_ascii":[],"keywords":["object","office","write","book"]},"book":{"unicode":"1f4d6","unicode_alt":"","code_decimal":"&#128214;","name":"open book","shortname":":book:","category":"objects","emoji_order":"1876","aliases":[],"aliases_ascii":[],"keywords":["object","office","write","book"]},"green_book":{"unicode":"1f4d7","unicode_alt":"","code_decimal":"&#128215;","name":"green book","shortname":":green_book:","category":"objects","emoji_order":"1877","aliases":[],"aliases_ascii":[],"keywords":["object","office","book"]},"blue_book":{"unicode":"1f4d8","unicode_alt":"","code_decimal":"&#128216;","name":"blue book","shortname":":blue_book:","category":"objects","emoji_order":"1878","aliases":[],"aliases_ascii":[],"keywords":["object","office","write","book"]},"orange_book":{"unicode":"1f4d9","unicode_alt":"","code_decimal":"&#128217;","name":"orange book","shortname":":orange_book:","category":"objects","emoji_order":"1879","aliases":[],"aliases_ascii":[],"keywords":["object","office","write","book"]},"books":{"unicode":"1f4da","unicode_alt":"","code_decimal":"&#128218;","name":"books","shortname":":books:","category":"objects","emoji_order":"1880","aliases":[],"aliases_ascii":[],"keywords":["object","office","write","book"]},"notebook":{"unicode":"1f4d3","unicode_alt":"","code_decimal":"&#128211;","name":"notebook","shortname":":notebook:","category":"objects","emoji_order":"1881","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"ledger":{"unicode":"1f4d2","unicode_alt":"","code_decimal":"&#128210;","name":"ledger","shortname":":ledger:","category":"objects","emoji_order":"1882","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"page_with_curl":{"unicode":"1f4c3","unicode_alt":"","code_decimal":"&#128195;","name":"page with curl","shortname":":page_with_curl:","category":"objects","emoji_order":"1883","aliases":[],"aliases_ascii":[],"keywords":["office","write"]},"scroll":{"unicode":"1f4dc","unicode_alt":"","code_decimal":"&#128220;","name":"scroll","shortname":":scroll:","category":"objects","emoji_order":"1884","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"page_facing_up":{"unicode":"1f4c4","unicode_alt":"","code_decimal":"&#128196;","name":"page facing up","shortname":":page_facing_up:","category":"objects","emoji_order":"1885","aliases":[],"aliases_ascii":[],"keywords":["work","office","write"]},"newspaper":{"unicode":"1f4f0","unicode_alt":"","code_decimal":"&#128240;","name":"newspaper","shortname":":newspaper:","category":"objects","emoji_order":"1886","aliases":[],"aliases_ascii":[],"keywords":["office","write"]},"newspaper2":{"unicode":"1f5de","unicode_alt":"1f5de-fe0f","code_decimal":"&#128478;","name":"rolled-up newspaper","shortname":":newspaper2:","category":"objects","emoji_order":"1887","aliases":[":rolled_up_newspaper:"],"aliases_ascii":[],"keywords":["office","write"]},"bookmark_tabs":{"unicode":"1f4d1","unicode_alt":"","code_decimal":"&#128209;","name":"bookmark tabs","shortname":":bookmark_tabs:","category":"objects","emoji_order":"1888","aliases":[],"aliases_ascii":[],"keywords":["office","write"]},"bookmark":{"unicode":"1f516","unicode_alt":"","code_decimal":"&#128278;","name":"bookmark","shortname":":bookmark:","category":"objects","emoji_order":"1889","aliases":[],"aliases_ascii":[],"keywords":["object","book"]},"label":{"unicode":"1f3f7","unicode_alt":"1f3f7-fe0f","code_decimal":"&#127991;","name":"label","shortname":":label:","category":"objects","emoji_order":"1890","aliases":[],"aliases_ascii":[],"keywords":["object"]},"moneybag":{"unicode":"1f4b0","unicode_alt":"","code_decimal":"&#128176;","name":"money bag","shortname":":moneybag:","category":"objects","emoji_order":"1891","aliases":[],"aliases_ascii":[],"keywords":["bag","award","money"]},"yen":{"unicode":"1f4b4","unicode_alt":"","code_decimal":"&#128180;","name":"banknote with yen sign","shortname":":yen:","category":"objects","emoji_order":"1892","aliases":[],"aliases_ascii":[],"keywords":["money"]},"dollar":{"unicode":"1f4b5","unicode_alt":"","code_decimal":"&#128181;","name":"banknote with dollar sign","shortname":":dollar:","category":"objects","emoji_order":"1893","aliases":[],"aliases_ascii":[],"keywords":["money"]},"euro":{"unicode":"1f4b6","unicode_alt":"","code_decimal":"&#128182;","name":"banknote with euro sign","shortname":":euro:","category":"objects","emoji_order":"1894","aliases":[],"aliases_ascii":[],"keywords":["money"]},"pound":{"unicode":"1f4b7","unicode_alt":"","code_decimal":"&#128183;","name":"banknote with pound sign","shortname":":pound:","category":"objects","emoji_order":"1895","aliases":[],"aliases_ascii":[],"keywords":["money"]},"money_with_wings":{"unicode":"1f4b8","unicode_alt":"","code_decimal":"&#128184;","name":"money with wings","shortname":":money_with_wings:","category":"objects","emoji_order":"1896","aliases":[],"aliases_ascii":[],"keywords":["money","boys night"]},"credit_card":{"unicode":"1f4b3","unicode_alt":"","code_decimal":"&#128179;","name":"credit card","shortname":":credit_card:","category":"objects","emoji_order":"1897","aliases":[],"aliases_ascii":[],"keywords":["object","money","boys night"]},"chart":{"unicode":"1f4b9","unicode_alt":"","code_decimal":"&#128185;","name":"chart with upwards trend and yen sign","shortname":":chart:","category":"symbols","emoji_order":"1898","aliases":[],"aliases_ascii":[],"keywords":["symbol","money"]},"currency_exchange":{"unicode":"1f4b1","unicode_alt":"","code_decimal":"&#128177;","name":"currency exchange","shortname":":currency_exchange:","category":"symbols","emoji_order":"1899","aliases":[],"aliases_ascii":[],"keywords":["symbol","money"]},"heavy_dollar_sign":{"unicode":"1f4b2","unicode_alt":"","code_decimal":"&#128178;","name":"heavy dollar sign","shortname":":heavy_dollar_sign:","category":"symbols","emoji_order":"1900","aliases":[],"aliases_ascii":[],"keywords":["math","symbol","money"]},"envelope":{"unicode":"2709","unicode_alt":"2709-fe0f","code_decimal":"&#9993;","name":"envelope","shortname":":envelope:","category":"objects","emoji_order":"1901","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"e-mail":{"unicode":"1f4e7","unicode_alt":"","code_decimal":"&#128231;","name":"e-mail symbol","shortname":":e-mail:","category":"objects","emoji_order":"1902","aliases":[":email:"],"aliases_ascii":[],"keywords":["office"]},"incoming_envelope":{"unicode":"1f4e8","unicode_alt":"","code_decimal":"&#128232;","name":"incoming envelope","shortname":":incoming_envelope:","category":"objects","emoji_order":"1903","aliases":[],"aliases_ascii":[],"keywords":["object"]},"envelope_with_arrow":{"unicode":"1f4e9","unicode_alt":"","code_decimal":"&#128233;","name":"envelope with downwards arrow above","shortname":":envelope_with_arrow:","category":"objects","emoji_order":"1904","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"outbox_tray":{"unicode":"1f4e4","unicode_alt":"","code_decimal":"&#128228;","name":"outbox tray","shortname":":outbox_tray:","category":"objects","emoji_order":"1905","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"inbox_tray":{"unicode":"1f4e5","unicode_alt":"","code_decimal":"&#128229;","name":"inbox tray","shortname":":inbox_tray:","category":"objects","emoji_order":"1906","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"package":{"unicode":"1f4e6","unicode_alt":"","code_decimal":"&#128230;","name":"package","shortname":":package:","category":"objects","emoji_order":"1907","aliases":[],"aliases_ascii":[],"keywords":["object","gift","office"]},"mailbox":{"unicode":"1f4eb","unicode_alt":"","code_decimal":"&#128235;","name":"closed mailbox with raised flag","shortname":":mailbox:","category":"objects","emoji_order":"1908","aliases":[],"aliases_ascii":[],"keywords":["object"]},"mailbox_closed":{"unicode":"1f4ea","unicode_alt":"","code_decimal":"&#128234;","name":"closed mailbox with lowered flag","shortname":":mailbox_closed:","category":"objects","emoji_order":"1909","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"mailbox_with_mail":{"unicode":"1f4ec","unicode_alt":"","code_decimal":"&#128236;","name":"open mailbox with raised flag","shortname":":mailbox_with_mail:","category":"objects","emoji_order":"1910","aliases":[],"aliases_ascii":[],"keywords":["object"]},"mailbox_with_no_mail":{"unicode":"1f4ed","unicode_alt":"","code_decimal":"&#128237;","name":"open mailbox with lowered flag","shortname":":mailbox_with_no_mail:","category":"objects","emoji_order":"1911","aliases":[],"aliases_ascii":[],"keywords":["object"]},"postbox":{"unicode":"1f4ee","unicode_alt":"","code_decimal":"&#128238;","name":"postbox","shortname":":postbox:","category":"objects","emoji_order":"1912","aliases":[],"aliases_ascii":[],"keywords":["object"]},"ballot_box":{"unicode":"1f5f3","unicode_alt":"1f5f3-fe0f","code_decimal":"&#128499;","name":"ballot box with ballot","shortname":":ballot_box:","category":"objects","emoji_order":"1913","aliases":[":ballot_box_with_ballot:"],"aliases_ascii":[],"keywords":["object","office"]},"pencil2":{"unicode":"270f","unicode_alt":"270f-fe0f","code_decimal":"&#9999;","name":"pencil","shortname":":pencil2:","category":"objects","emoji_order":"1914","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"black_nib":{"unicode":"2712","unicode_alt":"2712-fe0f","code_decimal":"&#10002;","name":"black nib","shortname":":black_nib:","category":"objects","emoji_order":"1915","aliases":[],"aliases_ascii":[],"keywords":["object","office","write"]},"pen_fountain":{"unicode":"1f58b","unicode_alt":"1f58b-fe0f","code_decimal":"&#128395;","name":"lower left fountain pen","shortname":":pen_fountain:","category":"objects","emoji_order":"1916","aliases":[":lower_left_fountain_pen:"],"aliases_ascii":[],"keywords":["object","office","write"]},"pen_ballpoint":{"unicode":"1f58a","unicode_alt":"1f58a-fe0f","code_decimal":"&#128394;","name":"lower left ballpoint pen","shortname":":pen_ballpoint:","category":"objects","emoji_order":"1917","aliases":[":lower_left_ballpoint_pen:"],"aliases_ascii":[],"keywords":["object","office","write"]},"paintbrush":{"unicode":"1f58c","unicode_alt":"1f58c-fe0f","code_decimal":"&#128396;","name":"lower left paintbrush","shortname":":paintbrush:","category":"objects","emoji_order":"1918","aliases":[":lower_left_paintbrush:"],"aliases_ascii":[],"keywords":["object","office","write"]},"crayon":{"unicode":"1f58d","unicode_alt":"1f58d-fe0f","code_decimal":"&#128397;","name":"lower left crayon","shortname":":crayon:","category":"objects","emoji_order":"1919","aliases":[":lower_left_crayon:"],"aliases_ascii":[],"keywords":["object","office","write"]},"pencil":{"unicode":"1f4dd","unicode_alt":"","code_decimal":"&#128221;","name":"memo","shortname":":pencil:","category":"objects","emoji_order":"1920","aliases":[],"aliases_ascii":[],"keywords":["work","office","write"]},"briefcase":{"unicode":"1f4bc","unicode_alt":"","code_decimal":"&#128188;","name":"briefcase","shortname":":briefcase:","category":"people","emoji_order":"1921","aliases":[],"aliases_ascii":[],"keywords":["bag","work","accessories","nutcase","job"]},"file_folder":{"unicode":"1f4c1","unicode_alt":"","code_decimal":"&#128193;","name":"file folder","shortname":":file_folder:","category":"objects","emoji_order":"1922","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"open_file_folder":{"unicode":"1f4c2","unicode_alt":"","code_decimal":"&#128194;","name":"open file folder","shortname":":open_file_folder:","category":"objects","emoji_order":"1923","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"dividers":{"unicode":"1f5c2","unicode_alt":"1f5c2-fe0f","code_decimal":"&#128450;","name":"card index dividers","shortname":":dividers:","category":"objects","emoji_order":"1924","aliases":[":card_index_dividers:"],"aliases_ascii":[],"keywords":["work","office"]},"date":{"unicode":"1f4c5","unicode_alt":"","code_decimal":"&#128197;","name":"calendar","shortname":":date:","category":"objects","emoji_order":"1925","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"calendar":{"unicode":"1f4c6","unicode_alt":"","code_decimal":"&#128198;","name":"tear-off calendar","shortname":":calendar:","category":"objects","emoji_order":"1926","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"notepad_spiral":{"unicode":"1f5d2","unicode_alt":"1f5d2-fe0f","code_decimal":"&#128466;","name":"spiral note pad","shortname":":notepad_spiral:","category":"objects","emoji_order":"1927","aliases":[":spiral_note_pad:"],"aliases_ascii":[],"keywords":["work","office","write"]},"calendar_spiral":{"unicode":"1f5d3","unicode_alt":"1f5d3-fe0f","code_decimal":"&#128467;","name":"spiral calendar pad","shortname":":calendar_spiral:","category":"objects","emoji_order":"1928","aliases":[":spiral_calendar_pad:"],"aliases_ascii":[],"keywords":["object","office"]},"card_index":{"unicode":"1f4c7","unicode_alt":"","code_decimal":"&#128199;","name":"card index","shortname":":card_index:","category":"objects","emoji_order":"1929","aliases":[],"aliases_ascii":[],"keywords":["object","work","office"]},"chart_with_upwards_trend":{"unicode":"1f4c8","unicode_alt":"","code_decimal":"&#128200;","name":"chart with upwards trend","shortname":":chart_with_upwards_trend:","category":"objects","emoji_order":"1930","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"chart_with_downwards_trend":{"unicode":"1f4c9","unicode_alt":"","code_decimal":"&#128201;","name":"chart with downwards trend","shortname":":chart_with_downwards_trend:","category":"objects","emoji_order":"1931","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"bar_chart":{"unicode":"1f4ca","unicode_alt":"","code_decimal":"&#128202;","name":"bar chart","shortname":":bar_chart:","category":"objects","emoji_order":"1932","aliases":[],"aliases_ascii":[],"keywords":["work","office"]},"clipboard":{"unicode":"1f4cb","unicode_alt":"","code_decimal":"&#128203;","name":"clipboard","shortname":":clipboard:","category":"objects","emoji_order":"1933","aliases":[],"aliases_ascii":[],"keywords":["object","work","office","write"]},"pushpin":{"unicode":"1f4cc","unicode_alt":"","code_decimal":"&#128204;","name":"pushpin","shortname":":pushpin:","category":"objects","emoji_order":"1934","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"round_pushpin":{"unicode":"1f4cd","unicode_alt":"","code_decimal":"&#128205;","name":"round pushpin","shortname":":round_pushpin:","category":"objects","emoji_order":"1935","aliases":[],"aliases_ascii":[],"keywords":["object","office"]},"paperclip":{"unicode":"1f4ce","unicode_alt":"","code_decimal":"&#128206;","name":"paperclip","shortname":":paperclip:","category":"objects","emoji_order":"1936","aliases":[],"aliases_ascii":[],"keywords":["object","work","office"]},"paperclips":{"unicode":"1f587","unicode_alt":"1f587-fe0f","code_decimal":"&#128391;","name":"linked paperclips","shortname":":paperclips:","category":"objects","emoji_order":"1937","aliases":[":linked_paperclips:"],"aliases_ascii":[],"keywords":["object","work","office"]},"straight_ruler":{"unicode":"1f4cf","unicode_alt":"","code_decimal":"&#128207;","name":"straight ruler","shortname":":straight_ruler:","category":"objects","emoji_order":"1938","aliases":[],"aliases_ascii":[],"keywords":["object","tool","office"]},"triangular_ruler":{"unicode":"1f4d0","unicode_alt":"","code_decimal":"&#128208;","name":"triangular ruler","shortname":":triangular_ruler:","category":"objects","emoji_order":"1939","aliases":[],"aliases_ascii":[],"keywords":["object","tool","office"]},"scissors":{"unicode":"2702","unicode_alt":"2702-fe0f","code_decimal":"&#9986;","name":"black scissors","shortname":":scissors:","category":"objects","emoji_order":"1940","aliases":[],"aliases_ascii":[],"keywords":["object","tool","weapon","office"]},"card_box":{"unicode":"1f5c3","unicode_alt":"1f5c3-fe0f","code_decimal":"&#128451;","name":"card file box","shortname":":card_box:","category":"objects","emoji_order":"1941","aliases":[":card_file_box:"],"aliases_ascii":[],"keywords":["object","work","office"]},"file_cabinet":{"unicode":"1f5c4","unicode_alt":"1f5c4-fe0f","code_decimal":"&#128452;","name":"file cabinet","shortname":":file_cabinet:","category":"objects","emoji_order":"1942","aliases":[],"aliases_ascii":[],"keywords":["object","work","office"]},"wastebasket":{"unicode":"1f5d1","unicode_alt":"1f5d1-fe0f","code_decimal":"&#128465;","name":"wastebasket","shortname":":wastebasket:","category":"objects","emoji_order":"1943","aliases":[],"aliases_ascii":[],"keywords":["object","work"]},"lock":{"unicode":"1f512","unicode_alt":"","code_decimal":"&#128274;","name":"lock","shortname":":lock:","category":"objects","emoji_order":"1944","aliases":[],"aliases_ascii":[],"keywords":["object","lock"]},"unlock":{"unicode":"1f513","unicode_alt":"","code_decimal":"&#128275;","name":"open lock","shortname":":unlock:","category":"objects","emoji_order":"1945","aliases":[],"aliases_ascii":[],"keywords":["object","lock"]},"lock_with_ink_pen":{"unicode":"1f50f","unicode_alt":"","code_decimal":"&#128271;","name":"lock with ink pen","shortname":":lock_with_ink_pen:","category":"objects","emoji_order":"1946","aliases":[],"aliases_ascii":[],"keywords":["object","lock"]},"closed_lock_with_key":{"unicode":"1f510","unicode_alt":"","code_decimal":"&#128272;","name":"closed lock with key","shortname":":closed_lock_with_key:","category":"objects","emoji_order":"1947","aliases":[],"aliases_ascii":[],"keywords":["object","lock"]},"key":{"unicode":"1f511","unicode_alt":"","code_decimal":"&#128273;","name":"key","shortname":":key:","category":"objects","emoji_order":"1948","aliases":[],"aliases_ascii":[],"keywords":["object","lock"]},"key2":{"unicode":"1f5dd","unicode_alt":"1f5dd-fe0f","code_decimal":"&#128477;","name":"old key","shortname":":key2:","category":"objects","emoji_order":"1949","aliases":[":old_key:"],"aliases_ascii":[],"keywords":["object","lock"]},"hammer":{"unicode":"1f528","unicode_alt":"","code_decimal":"&#128296;","name":"hammer","shortname":":hammer:","category":"objects","emoji_order":"1950","aliases":[],"aliases_ascii":[],"keywords":["object","tool","weapon"]},"pick":{"unicode":"26cf","unicode_alt":"26cf-fe0f","code_decimal":"&#9935;","name":"pick","shortname":":pick:","category":"objects","emoji_order":"1951","aliases":[],"aliases_ascii":[],"keywords":["object","tool","weapon"]},"hammer_pick":{"unicode":"2692","unicode_alt":"2692-fe0f","code_decimal":"&#9874;","name":"hammer and pick","shortname":":hammer_pick:","category":"objects","emoji_order":"1952","aliases":[":hammer_and_pick:"],"aliases_ascii":[],"keywords":["object","tool","weapon"]},"tools":{"unicode":"1f6e0","unicode_alt":"1f6e0-fe0f","code_decimal":"&#128736;","name":"hammer and wrench","shortname":":tools:","category":"objects","emoji_order":"1953","aliases":[":hammer_and_wrench:"],"aliases_ascii":[],"keywords":["object","tool"]},"dagger":{"unicode":"1f5e1","unicode_alt":"1f5e1-fe0f","code_decimal":"&#128481;","name":"dagger knife","shortname":":dagger:","category":"objects","emoji_order":"1954","aliases":[":dagger_knife:"],"aliases_ascii":[],"keywords":["object","weapon"]},"crossed_swords":{"unicode":"2694","unicode_alt":"2694-fe0f","code_decimal":"&#9876;","name":"crossed swords","shortname":":crossed_swords:","category":"objects","emoji_order":"1955","aliases":[],"aliases_ascii":[],"keywords":["object","weapon"]},"gun":{"unicode":"1f52b","unicode_alt":"","code_decimal":"&#128299;","name":"pistol","shortname":":gun:","category":"objects","emoji_order":"1956","aliases":[],"aliases_ascii":[],"keywords":["object","weapon","dead","gun","sarcastic"]},"bow_and_arrow":{"unicode":"1f3f9","unicode_alt":"","code_decimal":"&#127993;","name":"bow and arrow","shortname":":bow_and_arrow:","category":"activity","emoji_order":"1957","aliases":[":archery:"],"aliases_ascii":[],"keywords":["weapon","sport"]},"shield":{"unicode":"1f6e1","unicode_alt":"1f6e1-fe0f","code_decimal":"&#128737;","name":"shield","shortname":":shield:","category":"objects","emoji_order":"1958","aliases":[],"aliases_ascii":[],"keywords":["object"]},"wrench":{"unicode":"1f527","unicode_alt":"","code_decimal":"&#128295;","name":"wrench","shortname":":wrench:","category":"objects","emoji_order":"1959","aliases":[],"aliases_ascii":[],"keywords":["object","tool"]},"nut_and_bolt":{"unicode":"1f529","unicode_alt":"","code_decimal":"&#128297;","name":"nut and bolt","shortname":":nut_and_bolt:","category":"objects","emoji_order":"1960","aliases":[],"aliases_ascii":[],"keywords":["object","tool","nutcase"]},"gear":{"unicode":"2699","unicode_alt":"2699-fe0f","code_decimal":"&#9881;","name":"gear","shortname":":gear:","category":"objects","emoji_order":"1961","aliases":[],"aliases_ascii":[],"keywords":["object","tool"]},"compression":{"unicode":"1f5dc","unicode_alt":"1f5dc-fe0f","code_decimal":"&#128476;","name":"compression","shortname":":compression:","category":"objects","emoji_order":"1962","aliases":[],"aliases_ascii":[],"keywords":[]},"alembic":{"unicode":"2697","unicode_alt":"2697-fe0f","code_decimal":"&#9879;","name":"alembic","shortname":":alembic:","category":"objects","emoji_order":"1963","aliases":[],"aliases_ascii":[],"keywords":["object","science"]},"scales":{"unicode":"2696","unicode_alt":"2696-fe0f","code_decimal":"&#9878;","name":"scales","shortname":":scales:","category":"objects","emoji_order":"1964","aliases":[],"aliases_ascii":[],"keywords":["object"]},"link":{"unicode":"1f517","unicode_alt":"","code_decimal":"&#128279;","name":"link symbol","shortname":":link:","category":"objects","emoji_order":"1965","aliases":[],"aliases_ascii":[],"keywords":["symbol","office"]},"chains":{"unicode":"26d3","unicode_alt":"26d3-fe0f","code_decimal":"&#9939;","name":"chains","shortname":":chains:","category":"objects","emoji_order":"1966","aliases":[],"aliases_ascii":[],"keywords":["object","tool"]},"syringe":{"unicode":"1f489","unicode_alt":"","code_decimal":"&#128137;","name":"syringe","shortname":":syringe:","category":"objects","emoji_order":"1967","aliases":[],"aliases_ascii":[],"keywords":["object","weapon","health","drugs"]},"pill":{"unicode":"1f48a","unicode_alt":"","code_decimal":"&#128138;","name":"pill","shortname":":pill:","category":"objects","emoji_order":"1968","aliases":[],"aliases_ascii":[],"keywords":["object","health","drugs"]},"smoking":{"unicode":"1f6ac","unicode_alt":"","code_decimal":"&#128684;","name":"smoking symbol","shortname":":smoking:","category":"objects","emoji_order":"1969","aliases":[],"aliases_ascii":[],"keywords":["symbol","drugs","smoking"]},"coffin":{"unicode":"26b0","unicode_alt":"26b0-fe0f","code_decimal":"&#9904;","name":"coffin","shortname":":coffin:","category":"objects","emoji_order":"1970","aliases":[],"aliases_ascii":[],"keywords":["object","dead","rip"]},"urn":{"unicode":"26b1","unicode_alt":"26b1-fe0f","code_decimal":"&#9905;","name":"funeral urn","shortname":":urn:","category":"objects","emoji_order":"1971","aliases":[":funeral_urn:"],"aliases_ascii":[],"keywords":["object","dead","rip"]},"moyai":{"unicode":"1f5ff","unicode_alt":"","code_decimal":"&#128511;","name":"moyai","shortname":":moyai:","category":"objects","emoji_order":"1972","aliases":[],"aliases_ascii":[],"keywords":["travel","vacation"]},"oil":{"unicode":"1f6e2","unicode_alt":"1f6e2-fe0f","code_decimal":"&#128738;","name":"oil drum","shortname":":oil:","category":"objects","emoji_order":"1973","aliases":[":oil_drum:"],"aliases_ascii":[],"keywords":["object"]},"crystal_ball":{"unicode":"1f52e","unicode_alt":"","code_decimal":"&#128302;","name":"crystal ball","shortname":":crystal_ball:","category":"objects","emoji_order":"1974","aliases":[],"aliases_ascii":[],"keywords":["object","ball"]},"shopping_cart":{"unicode":"1f6d2","unicode_alt":"","code_decimal":"&#128722;","name":"shopping trolley","shortname":":shopping_cart:","category":"objects","emoji_order":"1975","aliases":[":shopping_trolley:"],"aliases_ascii":[],"keywords":[]},"atm":{"unicode":"1f3e7","unicode_alt":"","code_decimal":"&#127975;","name":"automated teller machine","shortname":":atm:","category":"symbols","emoji_order":"1976","aliases":[],"aliases_ascii":[],"keywords":["electronics","symbol","money"]},"put_litter_in_its_place":{"unicode":"1f6ae","unicode_alt":"","code_decimal":"&#128686;","name":"put litter in its place symbol","shortname":":put_litter_in_its_place:","category":"symbols","emoji_order":"1977","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"potable_water":{"unicode":"1f6b0","unicode_alt":"","code_decimal":"&#128688;","name":"potable water symbol","shortname":":potable_water:","category":"symbols","emoji_order":"1978","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"wheelchair":{"unicode":"267f","unicode_alt":"267f-fe0f","code_decimal":"&#9855;","name":"wheelchair symbol","shortname":":wheelchair:","category":"symbols","emoji_order":"1979","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"mens":{"unicode":"1f6b9","unicode_alt":"","code_decimal":"&#128697;","name":"mens symbol","shortname":":mens:","category":"symbols","emoji_order":"1980","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"womens":{"unicode":"1f6ba","unicode_alt":"","code_decimal":"&#128698;","name":"womens symbol","shortname":":womens:","category":"symbols","emoji_order":"1981","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"restroom":{"unicode":"1f6bb","unicode_alt":"","code_decimal":"&#128699;","name":"restroom","shortname":":restroom:","category":"symbols","emoji_order":"1982","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"baby_symbol":{"unicode":"1f6bc","unicode_alt":"","code_decimal":"&#128700;","name":"baby symbol","shortname":":baby_symbol:","category":"symbols","emoji_order":"1983","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"wc":{"unicode":"1f6be","unicode_alt":"","code_decimal":"&#128702;","name":"water closet","shortname":":wc:","category":"symbols","emoji_order":"1984","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"passport_control":{"unicode":"1f6c2","unicode_alt":"","code_decimal":"&#128706;","name":"passport control","shortname":":passport_control:","category":"symbols","emoji_order":"1985","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"customs":{"unicode":"1f6c3","unicode_alt":"","code_decimal":"&#128707;","name":"customs","shortname":":customs:","category":"symbols","emoji_order":"1986","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"baggage_claim":{"unicode":"1f6c4","unicode_alt":"","code_decimal":"&#128708;","name":"baggage claim","shortname":":baggage_claim:","category":"symbols","emoji_order":"1987","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"left_luggage":{"unicode":"1f6c5","unicode_alt":"","code_decimal":"&#128709;","name":"left luggage","shortname":":left_luggage:","category":"symbols","emoji_order":"1988","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"warning":{"unicode":"26a0","unicode_alt":"26a0-fe0f","code_decimal":"&#9888;","name":"warning sign","shortname":":warning:","category":"symbols","emoji_order":"1989","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"children_crossing":{"unicode":"1f6b8","unicode_alt":"","code_decimal":"&#128696;","name":"children crossing","shortname":":children_crossing:","category":"symbols","emoji_order":"1990","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"no_entry":{"unicode":"26d4","unicode_alt":"26d4-fe0f","code_decimal":"&#9940;","name":"no entry","shortname":":no_entry:","category":"symbols","emoji_order":"1991","aliases":[],"aliases_ascii":[],"keywords":["symbol","circle"]},"no_entry_sign":{"unicode":"1f6ab","unicode_alt":"","code_decimal":"&#128683;","name":"no entry sign","shortname":":no_entry_sign:","category":"symbols","emoji_order":"1992","aliases":[],"aliases_ascii":[],"keywords":["symbol","circle"]},"no_bicycles":{"unicode":"1f6b3","unicode_alt":"","code_decimal":"&#128691;","name":"no bicycles","shortname":":no_bicycles:","category":"symbols","emoji_order":"1993","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"no_smoking":{"unicode":"1f6ad","unicode_alt":"","code_decimal":"&#128685;","name":"no smoking symbol","shortname":":no_smoking:","category":"symbols","emoji_order":"1994","aliases":[],"aliases_ascii":[],"keywords":["symbol","smoking"]},"do_not_litter":{"unicode":"1f6af","unicode_alt":"","code_decimal":"&#128687;","name":"do not litter symbol","shortname":":do_not_litter:","category":"symbols","emoji_order":"1995","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"non-potable_water":{"unicode":"1f6b1","unicode_alt":"","code_decimal":"&#128689;","name":"non-potable water symbol","shortname":":non-potable_water:","category":"symbols","emoji_order":"1996","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"no_pedestrians":{"unicode":"1f6b7","unicode_alt":"","code_decimal":"&#128695;","name":"no pedestrians","shortname":":no_pedestrians:","category":"symbols","emoji_order":"1997","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"no_mobile_phones":{"unicode":"1f4f5","unicode_alt":"","code_decimal":"&#128245;","name":"no mobile phones","shortname":":no_mobile_phones:","category":"symbols","emoji_order":"1998","aliases":[],"aliases_ascii":[],"keywords":["symbol","phone"]},"underage":{"unicode":"1f51e","unicode_alt":"","code_decimal":"&#128286;","name":"no one under eighteen symbol","shortname":":underage:","category":"symbols","emoji_order":"1999","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"radioactive":{"unicode":"2622","unicode_alt":"2622-fe0f","code_decimal":"&#9762;","name":"radioactive sign","shortname":":radioactive:","category":"symbols","emoji_order":"2000","aliases":[":radioactive_sign:"],"aliases_ascii":[],"keywords":["symbol","science"]},"biohazard":{"unicode":"2623","unicode_alt":"2623-fe0f","code_decimal":"&#9763;","name":"biohazard sign","shortname":":biohazard:","category":"symbols","emoji_order":"2001","aliases":[":biohazard_sign:"],"aliases_ascii":[],"keywords":["symbol","science"]},"arrow_up":{"unicode":"2b06","unicode_alt":"2b06-fe0f","code_decimal":"&#11014;","name":"upwards black arrow","shortname":":arrow_up:","category":"symbols","emoji_order":"2002","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_upper_right":{"unicode":"2197","unicode_alt":"2197-fe0f","code_decimal":"&#8599;","name":"north east arrow","shortname":":arrow_upper_right:","category":"symbols","emoji_order":"2003","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_right":{"unicode":"27a1","unicode_alt":"27a1-fe0f","code_decimal":"&#10145;","name":"black rightwards arrow","shortname":":arrow_right:","category":"symbols","emoji_order":"2004","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_lower_right":{"unicode":"2198","unicode_alt":"2198-fe0f","code_decimal":"&#8600;","name":"south east arrow","shortname":":arrow_lower_right:","category":"symbols","emoji_order":"2005","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_down":{"unicode":"2b07","unicode_alt":"2b07-fe0f","code_decimal":"&#11015;","name":"downwards black arrow","shortname":":arrow_down:","category":"symbols","emoji_order":"2006","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_lower_left":{"unicode":"2199","unicode_alt":"2199-fe0f","code_decimal":"&#8601;","name":"south west arrow","shortname":":arrow_lower_left:","category":"symbols","emoji_order":"2007","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_left":{"unicode":"2b05","unicode_alt":"2b05-fe0f","code_decimal":"&#11013;","name":"leftwards black arrow","shortname":":arrow_left:","category":"symbols","emoji_order":"2008","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_upper_left":{"unicode":"2196","unicode_alt":"2196-fe0f","code_decimal":"&#8598;","name":"north west arrow","shortname":":arrow_upper_left:","category":"symbols","emoji_order":"2009","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_up_down":{"unicode":"2195","unicode_alt":"2195-fe0f","code_decimal":"&#8597;","name":"up down arrow","shortname":":arrow_up_down:","category":"symbols","emoji_order":"2010","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"left_right_arrow":{"unicode":"2194","unicode_alt":"2194-fe0f","code_decimal":"&harr;","name":"left right arrow","shortname":":left_right_arrow:","category":"symbols","emoji_order":"2011","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"leftwards_arrow_with_hook":{"unicode":"21a9","unicode_alt":"21a9-fe0f","code_decimal":"&#8617;","name":"leftwards arrow with hook","shortname":":leftwards_arrow_with_hook:","category":"symbols","emoji_order":"2012","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_right_hook":{"unicode":"21aa","unicode_alt":"21aa-fe0f","code_decimal":"&#8618;","name":"rightwards arrow with hook","shortname":":arrow_right_hook:","category":"symbols","emoji_order":"2013","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_heading_up":{"unicode":"2934","unicode_alt":"2934-fe0f","code_decimal":"&#10548;","name":"arrow pointing rightwards then curving upwards","shortname":":arrow_heading_up:","category":"symbols","emoji_order":"2014","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_heading_down":{"unicode":"2935","unicode_alt":"2935-fe0f","code_decimal":"&#10549;","name":"arrow pointing rightwards then curving downwards","shortname":":arrow_heading_down:","category":"symbols","emoji_order":"2015","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrows_clockwise":{"unicode":"1f503","unicode_alt":"","code_decimal":"&#128259;","name":"clockwise downwards and upwards open circle arrows","shortname":":arrows_clockwise:","category":"symbols","emoji_order":"2016","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrows_counterclockwise":{"unicode":"1f504","unicode_alt":"","code_decimal":"&#128260;","name":"anticlockwise downwards and upwards open circle arrows","shortname":":arrows_counterclockwise:","category":"symbols","emoji_order":"2017","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"back":{"unicode":"1f519","unicode_alt":"","code_decimal":"&#128281;","name":"back with leftwards arrow above","shortname":":back:","category":"symbols","emoji_order":"2018","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"end":{"unicode":"1f51a","unicode_alt":"","code_decimal":"&#128282;","name":"end with leftwards arrow above","shortname":":end:","category":"symbols","emoji_order":"2019","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"on":{"unicode":"1f51b","unicode_alt":"","code_decimal":"&#128283;","name":"on with exclamation mark with left right arrow abo","shortname":":on:","category":"symbols","emoji_order":"2020","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"soon":{"unicode":"1f51c","unicode_alt":"","code_decimal":"&#128284;","name":"soon with rightwards arrow above","shortname":":soon:","category":"symbols","emoji_order":"2021","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"top":{"unicode":"1f51d","unicode_alt":"","code_decimal":"&#128285;","name":"top with upwards arrow above","shortname":":top:","category":"symbols","emoji_order":"2022","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"place_of_worship":{"unicode":"1f6d0","unicode_alt":"","code_decimal":"&#128720;","name":"place of worship","shortname":":place_of_worship:","category":"symbols","emoji_order":"2023","aliases":[":worship_symbol:"],"aliases_ascii":[],"keywords":["religion","symbol","pray"]},"atom":{"unicode":"269b","unicode_alt":"269b-fe0f","code_decimal":"&#9883;","name":"atom symbol","shortname":":atom:","category":"symbols","emoji_order":"2024","aliases":[":atom_symbol:"],"aliases_ascii":[],"keywords":["symbol","science"]},"om_symbol":{"unicode":"1f549","unicode_alt":"1f549-fe0f","code_decimal":"&#128329;","name":"om symbol","shortname":":om_symbol:","category":"symbols","emoji_order":"2025","aliases":[],"aliases_ascii":[],"keywords":["religion","symbol"]},"star_of_david":{"unicode":"2721","unicode_alt":"2721-fe0f","code_decimal":"&#10017;","name":"star of david","shortname":":star_of_david:","category":"symbols","emoji_order":"2026","aliases":[],"aliases_ascii":[],"keywords":["religion","jew","star","symbol"]},"wheel_of_dharma":{"unicode":"2638","unicode_alt":"2638-fe0f","code_decimal":"&#9784;","name":"wheel of dharma","shortname":":wheel_of_dharma:","category":"symbols","emoji_order":"2027","aliases":[],"aliases_ascii":[],"keywords":["religion","symbol"]},"yin_yang":{"unicode":"262f","unicode_alt":"262f-fe0f","code_decimal":"&#9775;","name":"yin yang","shortname":":yin_yang:","category":"symbols","emoji_order":"2028","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"cross":{"unicode":"271d","unicode_alt":"271d-fe0f","code_decimal":"&#10013;","name":"latin cross","shortname":":cross:","category":"symbols","emoji_order":"2029","aliases":[":latin_cross:"],"aliases_ascii":[],"keywords":["religion","symbol"]},"orthodox_cross":{"unicode":"2626","unicode_alt":"2626-fe0f","code_decimal":"&#9766;","name":"orthodox cross","shortname":":orthodox_cross:","category":"symbols","emoji_order":"2030","aliases":[],"aliases_ascii":[],"keywords":["religion","symbol"]},"star_and_crescent":{"unicode":"262a","unicode_alt":"262a-fe0f","code_decimal":"&#9770;","name":"star and crescent","shortname":":star_and_crescent:","category":"symbols","emoji_order":"2031","aliases":[],"aliases_ascii":[],"keywords":["religion","symbol"]},"peace":{"unicode":"262e","unicode_alt":"262e-fe0f","code_decimal":"&#9774;","name":"peace symbol","shortname":":peace:","category":"symbols","emoji_order":"2032","aliases":[":peace_symbol:"],"aliases_ascii":[],"keywords":["symbol","peace","drugs"]},"menorah":{"unicode":"1f54e","unicode_alt":"","code_decimal":"&#128334;","name":"menorah with nine branches","shortname":":menorah:","category":"symbols","emoji_order":"2033","aliases":[],"aliases_ascii":[],"keywords":["religion","object","jew","symbol","holidays"]},"six_pointed_star":{"unicode":"1f52f","unicode_alt":"","code_decimal":"&#128303;","name":"six pointed star with middle dot","shortname":":six_pointed_star:","category":"symbols","emoji_order":"2034","aliases":[],"aliases_ascii":[],"keywords":["religion","jew","star","symbol"]},"aries":{"unicode":"2648","unicode_alt":"2648-fe0f","code_decimal":"&#9800;","name":"aries","shortname":":aries:","category":"symbols","emoji_order":"2035","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"taurus":{"unicode":"2649","unicode_alt":"2649-fe0f","code_decimal":"&#9801;","name":"taurus","shortname":":taurus:","category":"symbols","emoji_order":"2036","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"gemini":{"unicode":"264a","unicode_alt":"264a-fe0f","code_decimal":"&#9802;","name":"gemini","shortname":":gemini:","category":"symbols","emoji_order":"2037","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"cancer":{"unicode":"264b","unicode_alt":"264b-fe0f","code_decimal":"&#9803;","name":"cancer","shortname":":cancer:","category":"symbols","emoji_order":"2038","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"leo":{"unicode":"264c","unicode_alt":"264c-fe0f","code_decimal":"&#9804;","name":"leo","shortname":":leo:","category":"symbols","emoji_order":"2039","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"virgo":{"unicode":"264d","unicode_alt":"264d-fe0f","code_decimal":"&#9805;","name":"virgo","shortname":":virgo:","category":"symbols","emoji_order":"2040","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"libra":{"unicode":"264e","unicode_alt":"264e-fe0f","code_decimal":"&#9806;","name":"libra","shortname":":libra:","category":"symbols","emoji_order":"2041","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"scorpius":{"unicode":"264f","unicode_alt":"264f-fe0f","code_decimal":"&#9807;","name":"scorpius","shortname":":scorpius:","category":"symbols","emoji_order":"2042","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"sagittarius":{"unicode":"2650","unicode_alt":"2650-fe0f","code_decimal":"&#9808;","name":"sagittarius","shortname":":sagittarius:","category":"symbols","emoji_order":"2043","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"capricorn":{"unicode":"2651","unicode_alt":"2651-fe0f","code_decimal":"&#9809;","name":"capricorn","shortname":":capricorn:","category":"symbols","emoji_order":"2044","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"aquarius":{"unicode":"2652","unicode_alt":"2652-fe0f","code_decimal":"&#9810;","name":"aquarius","shortname":":aquarius:","category":"symbols","emoji_order":"2045","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"pisces":{"unicode":"2653","unicode_alt":"2653-fe0f","code_decimal":"&#9811;","name":"pisces","shortname":":pisces:","category":"symbols","emoji_order":"2046","aliases":[],"aliases_ascii":[],"keywords":["zodiac","symbol"]},"ophiuchus":{"unicode":"26ce","unicode_alt":"","code_decimal":"&#9934;","name":"ophiuchus","shortname":":ophiuchus:","category":"symbols","emoji_order":"2047","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"twisted_rightwards_arrows":{"unicode":"1f500","unicode_alt":"","code_decimal":"&#128256;","name":"twisted rightwards arrows","shortname":":twisted_rightwards_arrows:","category":"symbols","emoji_order":"2048","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"repeat":{"unicode":"1f501","unicode_alt":"","code_decimal":"&#128257;","name":"clockwise rightwards and leftwards open circle arrows","shortname":":repeat:","category":"symbols","emoji_order":"2049","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"repeat_one":{"unicode":"1f502","unicode_alt":"","code_decimal":"&#128258;","name":"clockwise rightwards and leftwards open circle arrows with circled one overlay","shortname":":repeat_one:","category":"symbols","emoji_order":"2050","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_forward":{"unicode":"25b6","unicode_alt":"25b6-fe0f","code_decimal":"&#9654;","name":"black right-pointing triangle","shortname":":arrow_forward:","category":"symbols","emoji_order":"2051","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol","triangle"]},"fast_forward":{"unicode":"23e9","unicode_alt":"","code_decimal":"&#9193;","name":"black right-pointing double triangle","shortname":":fast_forward:","category":"symbols","emoji_order":"2052","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"track_next":{"unicode":"23ed","unicode_alt":"23ed-fe0f","code_decimal":"&#9197;","name":"black right-pointing double triangle with vertical bar","shortname":":track_next:","category":"symbols","emoji_order":"2053","aliases":[":next_track:"],"aliases_ascii":[],"keywords":["arrow","symbol"]},"play_pause":{"unicode":"23ef","unicode_alt":"23ef-fe0f","code_decimal":"&#9199;","name":"black right-pointing double triangle with double vertical bar","shortname":":play_pause:","category":"symbols","emoji_order":"2054","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_backward":{"unicode":"25c0","unicode_alt":"25c0-fe0f","code_decimal":"&#9664;","name":"black left-pointing triangle","shortname":":arrow_backward:","category":"symbols","emoji_order":"2055","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol","triangle"]},"rewind":{"unicode":"23ea","unicode_alt":"","code_decimal":"&#9194;","name":"black left-pointing double triangle","shortname":":rewind:","category":"symbols","emoji_order":"2056","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"track_previous":{"unicode":"23ee","unicode_alt":"23ee-fe0f","code_decimal":"&#9198;","name":"black left-pointing double triangle with vertical bar","shortname":":track_previous:","category":"symbols","emoji_order":"2057","aliases":[":previous_track:"],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_up_small":{"unicode":"1f53c","unicode_alt":"","code_decimal":"&#128316;","name":"up-pointing small red triangle","shortname":":arrow_up_small:","category":"symbols","emoji_order":"2058","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol","triangle"]},"arrow_double_up":{"unicode":"23eb","unicode_alt":"","code_decimal":"&#9195;","name":"black up-pointing double triangle","shortname":":arrow_double_up:","category":"symbols","emoji_order":"2059","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"arrow_down_small":{"unicode":"1f53d","unicode_alt":"","code_decimal":"&#128317;","name":"down-pointing small red triangle","shortname":":arrow_down_small:","category":"symbols","emoji_order":"2060","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol","triangle"]},"arrow_double_down":{"unicode":"23ec","unicode_alt":"","code_decimal":"&#9196;","name":"black down-pointing double triangle","shortname":":arrow_double_down:","category":"symbols","emoji_order":"2061","aliases":[],"aliases_ascii":[],"keywords":["arrow","symbol"]},"pause_button":{"unicode":"23f8","unicode_alt":"23f8-fe0f","code_decimal":"&#9208;","name":"double vertical bar","shortname":":pause_button:","category":"symbols","emoji_order":"2062","aliases":[":double_vertical_bar:"],"aliases_ascii":[],"keywords":["symbol"]},"stop_button":{"unicode":"23f9","unicode_alt":"23f9-fe0f","code_decimal":"&#9209;","name":"black square for stop","shortname":":stop_button:","category":"symbols","emoji_order":"2063","aliases":[],"aliases_ascii":[],"keywords":["symbol","square"]},"record_button":{"unicode":"23fa","unicode_alt":"23fa-fe0f","code_decimal":"&#9210;","name":"black circle for record","shortname":":record_button:","category":"symbols","emoji_order":"2064","aliases":[],"aliases_ascii":[],"keywords":["symbol","circle"]},"eject":{"unicode":"23cf","unicode_alt":"23cf-fe0f","code_decimal":"&#9167;","name":"eject symbol","shortname":":eject:","category":"symbols","emoji_order":"2065","aliases":[":eject_symbol:"],"aliases_ascii":[],"keywords":[]},"cinema":{"unicode":"1f3a6","unicode_alt":"","code_decimal":"&#127910;","name":"cinema","shortname":":cinema:","category":"symbols","emoji_order":"2066","aliases":[],"aliases_ascii":[],"keywords":["symbol","camera","movie"]},"low_brightness":{"unicode":"1f505","unicode_alt":"","code_decimal":"&#128261;","name":"low brightness symbol","shortname":":low_brightness:","category":"symbols","emoji_order":"2067","aliases":[],"aliases_ascii":[],"keywords":["symbol","sun"]},"high_brightness":{"unicode":"1f506","unicode_alt":"","code_decimal":"&#128262;","name":"high brightness symbol","shortname":":high_brightness:","category":"symbols","emoji_order":"2068","aliases":[],"aliases_ascii":[],"keywords":["symbol","sun"]},"signal_strength":{"unicode":"1f4f6","unicode_alt":"","code_decimal":"&#128246;","name":"antenna with bars","shortname":":signal_strength:","category":"symbols","emoji_order":"2069","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"vibration_mode":{"unicode":"1f4f3","unicode_alt":"","code_decimal":"&#128243;","name":"vibration mode","shortname":":vibration_mode:","category":"symbols","emoji_order":"2070","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"mobile_phone_off":{"unicode":"1f4f4","unicode_alt":"","code_decimal":"&#128244;","name":"mobile phone off","shortname":":mobile_phone_off:","category":"symbols","emoji_order":"2071","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"recycle":{"unicode":"267b","unicode_alt":"267b-fe0f","code_decimal":"&#9851;","name":"black universal recycling symbol","shortname":":recycle:","category":"symbols","emoji_order":"2072","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"name_badge":{"unicode":"1f4db","unicode_alt":"","code_decimal":"&#128219;","name":"name badge","shortname":":name_badge:","category":"symbols","emoji_order":"2073","aliases":[],"aliases_ascii":[],"keywords":["work"]},"fleur-de-lis":{"unicode":"269c","unicode_alt":"269c-fe0f","code_decimal":"&#9884;","name":"fleur-de-lis","shortname":":fleur-de-lis:","category":"symbols","emoji_order":"2074","aliases":[],"aliases_ascii":[],"keywords":["object","symbol"]},"beginner":{"unicode":"1f530","unicode_alt":"","code_decimal":"&#128304;","name":"japanese symbol for beginner","shortname":":beginner:","category":"symbols","emoji_order":"2075","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"trident":{"unicode":"1f531","unicode_alt":"","code_decimal":"&#128305;","name":"trident emblem","shortname":":trident:","category":"symbols","emoji_order":"2076","aliases":[],"aliases_ascii":[],"keywords":["object","symbol"]},"o":{"unicode":"2b55","unicode_alt":"2b55-fe0f","code_decimal":"&#11093;","name":"heavy large circle","shortname":":o:","category":"symbols","emoji_order":"2077","aliases":[],"aliases_ascii":[],"keywords":["symbol","circle"]},"white_check_mark":{"unicode":"2705","unicode_alt":"","code_decimal":"&#9989;","name":"white heavy check mark","shortname":":white_check_mark:","category":"symbols","emoji_order":"2078","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"ballot_box_with_check":{"unicode":"2611","unicode_alt":"2611-fe0f","code_decimal":"&#9745;","name":"ballot box with check","shortname":":ballot_box_with_check:","category":"symbols","emoji_order":"2079","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"heavy_check_mark":{"unicode":"2714","unicode_alt":"2714-fe0f","code_decimal":"&#10004;","name":"heavy check mark","shortname":":heavy_check_mark:","category":"symbols","emoji_order":"2080","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"heavy_multiplication_x":{"unicode":"2716","unicode_alt":"2716-fe0f","code_decimal":"&#10006;","name":"heavy multiplication x","shortname":":heavy_multiplication_x:","category":"symbols","emoji_order":"2081","aliases":[],"aliases_ascii":[],"keywords":["math","symbol"]},"x":{"unicode":"274c","unicode_alt":"","code_decimal":"&#10060;","name":"cross mark","shortname":":x:","category":"symbols","emoji_order":"2082","aliases":[],"aliases_ascii":[],"keywords":["symbol","sol"]},"negative_squared_cross_mark":{"unicode":"274e","unicode_alt":"","code_decimal":"&#10062;","name":"negative squared cross mark","shortname":":negative_squared_cross_mark:","category":"symbols","emoji_order":"2083","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"heavy_plus_sign":{"unicode":"2795","unicode_alt":"","code_decimal":"&#10133;","name":"heavy plus sign","shortname":":heavy_plus_sign:","category":"symbols","emoji_order":"2084","aliases":[],"aliases_ascii":[],"keywords":["math","symbol"]},"heavy_minus_sign":{"unicode":"2796","unicode_alt":"","code_decimal":"&#10134;","name":"heavy minus sign","shortname":":heavy_minus_sign:","category":"symbols","emoji_order":"2088","aliases":[],"aliases_ascii":[],"keywords":["math","symbol"]},"heavy_division_sign":{"unicode":"2797","unicode_alt":"","code_decimal":"&#10135;","name":"heavy division sign","shortname":":heavy_division_sign:","category":"symbols","emoji_order":"2089","aliases":[],"aliases_ascii":[],"keywords":["math","symbol"]},"curly_loop":{"unicode":"27b0","unicode_alt":"","code_decimal":"&#10160;","name":"curly loop","shortname":":curly_loop:","category":"symbols","emoji_order":"2090","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"loop":{"unicode":"27bf","unicode_alt":"","code_decimal":"&#10175;","name":"double curly loop","shortname":":loop:","category":"symbols","emoji_order":"2091","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"part_alternation_mark":{"unicode":"303d","unicode_alt":"303d-fe0f","code_decimal":"&#12349;","name":"part alternation mark","shortname":":part_alternation_mark:","category":"symbols","emoji_order":"2092","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"eight_spoked_asterisk":{"unicode":"2733","unicode_alt":"2733-fe0f","code_decimal":"&#10035;","name":"eight spoked asterisk","shortname":":eight_spoked_asterisk:","category":"symbols","emoji_order":"2093","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"eight_pointed_black_star":{"unicode":"2734","unicode_alt":"2734-fe0f","code_decimal":"&#10036;","name":"eight pointed black star","shortname":":eight_pointed_black_star:","category":"symbols","emoji_order":"2094","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"sparkle":{"unicode":"2747","unicode_alt":"2747-fe0f","code_decimal":"&#10055;","name":"sparkle","shortname":":sparkle:","category":"symbols","emoji_order":"2095","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"bangbang":{"unicode":"203c","unicode_alt":"203c-fe0f","code_decimal":"&#8252;","name":"double exclamation mark","shortname":":bangbang:","category":"symbols","emoji_order":"2096","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"interrobang":{"unicode":"2049","unicode_alt":"2049-fe0f","code_decimal":"&#8265;","name":"exclamation question mark","shortname":":interrobang:","category":"symbols","emoji_order":"2097","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"question":{"unicode":"2753","unicode_alt":"","code_decimal":"&#10067;","name":"black question mark ornament","shortname":":question:","category":"symbols","emoji_order":"2098","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation","wth"]},"grey_question":{"unicode":"2754","unicode_alt":"","code_decimal":"&#10068;","name":"white question mark ornament","shortname":":grey_question:","category":"symbols","emoji_order":"2099","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"grey_exclamation":{"unicode":"2755","unicode_alt":"","code_decimal":"&#10069;","name":"white exclamation mark ornament","shortname":":grey_exclamation:","category":"symbols","emoji_order":"2100","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"exclamation":{"unicode":"2757","unicode_alt":"2757-fe0f","code_decimal":"&#10071;","name":"heavy exclamation mark symbol","shortname":":exclamation:","category":"symbols","emoji_order":"2101","aliases":[],"aliases_ascii":[],"keywords":["symbol","punctuation"]},"wavy_dash":{"unicode":"3030","unicode_alt":"3030-fe0f","code_decimal":"&#12336;","name":"wavy dash","shortname":":wavy_dash:","category":"symbols","emoji_order":"2102","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"copyright":{"unicode":"00a9","unicode_alt":"00a9-fe0f","code_decimal":"&copy;","name":"copyright sign","shortname":":copyright:","category":"symbols","emoji_order":"2103","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"registered":{"unicode":"00ae","unicode_alt":"00ae-fe0f","code_decimal":"&reg;","name":"registered sign","shortname":":registered:","category":"symbols","emoji_order":"2104","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"tm":{"unicode":"2122","unicode_alt":"2122-fe0f","code_decimal":"&trade;","name":"trade mark sign","shortname":":tm:","category":"symbols","emoji_order":"2105","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"hash":{"unicode":"0023-20e3","unicode_alt":"0023-fe0f-20e3","code_decimal":"#&#8419;","name":"keycap number sign","shortname":":hash:","category":"symbols","emoji_order":"2106","aliases":[],"aliases_ascii":[],"keywords":["number","symbol"]},"asterisk":{"unicode":"002a-20e3","unicode_alt":"002a-fe0f-20e3","code_decimal":"*&#8419;","name":"keycap asterisk","shortname":":asterisk:","category":"symbols","emoji_order":"2107","aliases":[":keycap_asterisk:"],"aliases_ascii":[],"keywords":["symbol"]},"zero":{"unicode":"0030-20e3","unicode_alt":"0030-fe0f-20e3","code_decimal":"0&#8419;","name":"keycap digit zero","shortname":":zero:","category":"symbols","emoji_order":"2108","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"one":{"unicode":"0031-20e3","unicode_alt":"0031-fe0f-20e3","code_decimal":"1&#8419;","name":"keycap digit one","shortname":":one:","category":"symbols","emoji_order":"2109","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"two":{"unicode":"0032-20e3","unicode_alt":"0032-fe0f-20e3","code_decimal":"2&#8419;","name":"keycap digit two","shortname":":two:","category":"symbols","emoji_order":"2110","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"three":{"unicode":"0033-20e3","unicode_alt":"0033-fe0f-20e3","code_decimal":"3&#8419;","name":"keycap digit three","shortname":":three:","category":"symbols","emoji_order":"2111","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"four":{"unicode":"0034-20e3","unicode_alt":"0034-fe0f-20e3","code_decimal":"4&#8419;","name":"keycap digit four","shortname":":four:","category":"symbols","emoji_order":"2112","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"five":{"unicode":"0035-20e3","unicode_alt":"0035-fe0f-20e3","code_decimal":"5&#8419;","name":"keycap digit five","shortname":":five:","category":"symbols","emoji_order":"2113","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"six":{"unicode":"0036-20e3","unicode_alt":"0036-fe0f-20e3","code_decimal":"6&#8419;","name":"keycap digit six","shortname":":six:","category":"symbols","emoji_order":"2114","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"seven":{"unicode":"0037-20e3","unicode_alt":"0037-fe0f-20e3","code_decimal":"7&#8419;","name":"keycap digit seven","shortname":":seven:","category":"symbols","emoji_order":"2115","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"eight":{"unicode":"0038-20e3","unicode_alt":"0038-fe0f-20e3","code_decimal":"8&#8419;","name":"keycap digit eight","shortname":":eight:","category":"symbols","emoji_order":"2116","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"nine":{"unicode":"0039-20e3","unicode_alt":"0039-fe0f-20e3","code_decimal":"9&#8419;","name":"keycap digit nine","shortname":":nine:","category":"symbols","emoji_order":"2117","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"keycap_ten":{"unicode":"1f51f","unicode_alt":"","code_decimal":"&#128287;","name":"keycap ten","shortname":":keycap_ten:","category":"symbols","emoji_order":"2118","aliases":[],"aliases_ascii":[],"keywords":["number","math","symbol"]},"100":{"unicode":"1f4af","unicode_alt":"","code_decimal":"&#128175;","name":"hundred points symbol","shortname":":100:","category":"symbols","emoji_order":"2119","aliases":[],"aliases_ascii":[],"keywords":["symbol","wow","win","perfect","parties"]},"capital_abcd":{"unicode":"1f520","unicode_alt":"","code_decimal":"&#128288;","name":"input symbol for latin capital letters","shortname":":capital_abcd:","category":"symbols","emoji_order":"2120","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"abcd":{"unicode":"1f521","unicode_alt":"","code_decimal":"&#128289;","name":"input symbol for latin small letters","shortname":":abcd:","category":"symbols","emoji_order":"2121","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"1234":{"unicode":"1f522","unicode_alt":"","code_decimal":"&#128290;","name":"input symbol for numbers","shortname":":1234:","category":"symbols","emoji_order":"2122","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"symbols":{"unicode":"1f523","unicode_alt":"","code_decimal":"&#128291;","name":"input symbol for symbols","shortname":":symbols:","category":"symbols","emoji_order":"2123","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"abc":{"unicode":"1f524","unicode_alt":"","code_decimal":"&#128292;","name":"input symbol for latin letters","shortname":":abc:","category":"symbols","emoji_order":"2124","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"a":{"unicode":"1f170","unicode_alt":"","code_decimal":"&#127344;","name":"negative squared latin capital letter a","shortname":":a:","category":"symbols","emoji_order":"2125","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"ab":{"unicode":"1f18e","unicode_alt":"","code_decimal":"&#127374;","name":"negative squared ab","shortname":":ab:","category":"symbols","emoji_order":"2126","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"b":{"unicode":"1f171","unicode_alt":"","code_decimal":"&#127345;","name":"negative squared latin capital letter b","shortname":":b:","category":"symbols","emoji_order":"2127","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"cl":{"unicode":"1f191","unicode_alt":"","code_decimal":"&#127377;","name":"squared cl","shortname":":cl:","category":"symbols","emoji_order":"2128","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"cool":{"unicode":"1f192","unicode_alt":"","code_decimal":"&#127378;","name":"squared cool","shortname":":cool:","category":"symbols","emoji_order":"2129","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"free":{"unicode":"1f193","unicode_alt":"","code_decimal":"&#127379;","name":"squared free","shortname":":free:","category":"symbols","emoji_order":"2130","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"information_source":{"unicode":"2139","unicode_alt":"2139-fe0f","code_decimal":"&#8505;","name":"information source","shortname":":information_source:","category":"symbols","emoji_order":"2131","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"id":{"unicode":"1f194","unicode_alt":"","code_decimal":"&#127380;","name":"squared id","shortname":":id:","category":"symbols","emoji_order":"2132","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"m":{"unicode":"24c2","unicode_alt":"24c2-fe0f","code_decimal":"&#9410;","name":"circled latin capital letter m","shortname":":m:","category":"symbols","emoji_order":"2133","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"new":{"unicode":"1f195","unicode_alt":"","code_decimal":"&#127381;","name":"squared new","shortname":":new:","category":"symbols","emoji_order":"2134","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"ng":{"unicode":"1f196","unicode_alt":"","code_decimal":"&#127382;","name":"squared ng","shortname":":ng:","category":"symbols","emoji_order":"2135","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"o2":{"unicode":"1f17e","unicode_alt":"","code_decimal":"&#127358;","name":"negative squared latin capital letter o","shortname":":o2:","category":"symbols","emoji_order":"2136","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"ok":{"unicode":"1f197","unicode_alt":"","code_decimal":"&#127383;","name":"squared ok","shortname":":ok:","category":"symbols","emoji_order":"2137","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"parking":{"unicode":"1f17f","unicode_alt":"1f17f-fe0f","code_decimal":"&#127359;","name":"negative squared latin capital letter p","shortname":":parking:","category":"symbols","emoji_order":"2138","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"sos":{"unicode":"1f198","unicode_alt":"","code_decimal":"&#127384;","name":"squared sos","shortname":":sos:","category":"symbols","emoji_order":"2139","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"up":{"unicode":"1f199","unicode_alt":"","code_decimal":"&#127385;","name":"squared up with exclamation mark","shortname":":up:","category":"symbols","emoji_order":"2140","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"vs":{"unicode":"1f19a","unicode_alt":"","code_decimal":"&#127386;","name":"squared vs","shortname":":vs:","category":"symbols","emoji_order":"2141","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"koko":{"unicode":"1f201","unicode_alt":"","code_decimal":"&#127489;","name":"squared katakana koko","shortname":":koko:","category":"symbols","emoji_order":"2142","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"sa":{"unicode":"1f202","unicode_alt":"1f202-fe0f","code_decimal":"&#127490;","name":"squared katakana sa","shortname":":sa:","category":"symbols","emoji_order":"2143","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u6708":{"unicode":"1f237","unicode_alt":"1f237-fe0f","code_decimal":"&#127543;","name":"squared cjk unified ideograph-6708","shortname":":u6708:","category":"symbols","emoji_order":"2144","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u6709":{"unicode":"1f236","unicode_alt":"","code_decimal":"&#127542;","name":"squared cjk unified ideograph-6709","shortname":":u6709:","category":"symbols","emoji_order":"2145","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u6307":{"unicode":"1f22f","unicode_alt":"1f22f-fe0f","code_decimal":"&#127535;","name":"squared cjk unified ideograph-6307","shortname":":u6307:","category":"symbols","emoji_order":"2146","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"ideograph_advantage":{"unicode":"1f250","unicode_alt":"","code_decimal":"&#127568;","name":"circled ideograph advantage","shortname":":ideograph_advantage:","category":"symbols","emoji_order":"2147","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"u5272":{"unicode":"1f239","unicode_alt":"","code_decimal":"&#127545;","name":"squared cjk unified ideograph-5272","shortname":":u5272:","category":"symbols","emoji_order":"2148","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u7121":{"unicode":"1f21a","unicode_alt":"1f21a-fe0f","code_decimal":"&#127514;","name":"squared cjk unified ideograph-7121","shortname":":u7121:","category":"symbols","emoji_order":"2149","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u7981":{"unicode":"1f232","unicode_alt":"","code_decimal":"&#127538;","name":"squared cjk unified ideograph-7981","shortname":":u7981:","category":"symbols","emoji_order":"2150","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"accept":{"unicode":"1f251","unicode_alt":"","code_decimal":"&#127569;","name":"circled ideograph accept","shortname":":accept:","category":"symbols","emoji_order":"2151","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u7533":{"unicode":"1f238","unicode_alt":"","code_decimal":"&#127544;","name":"squared cjk unified ideograph-7533","shortname":":u7533:","category":"symbols","emoji_order":"2152","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u5408":{"unicode":"1f234","unicode_alt":"","code_decimal":"&#127540;","name":"squared cjk unified ideograph-5408","shortname":":u5408:","category":"symbols","emoji_order":"2153","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"u7a7a":{"unicode":"1f233","unicode_alt":"","code_decimal":"&#127539;","name":"squared cjk unified ideograph-7a7a","shortname":":u7a7a:","category":"symbols","emoji_order":"2154","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"congratulations":{"unicode":"3297","unicode_alt":"3297-fe0f","code_decimal":"&#12951;","name":"circled ideograph congratulation","shortname":":congratulations:","category":"symbols","emoji_order":"2155","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"secret":{"unicode":"3299","unicode_alt":"3299-fe0f","code_decimal":"&#12953;","name":"circled ideograph secret","shortname":":secret:","category":"symbols","emoji_order":"2156","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"u55b6":{"unicode":"1f23a","unicode_alt":"","code_decimal":"&#127546;","name":"squared cjk unified ideograph-55b6","shortname":":u55b6:","category":"symbols","emoji_order":"2157","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"u6e80":{"unicode":"1f235","unicode_alt":"","code_decimal":"&#127541;","name":"squared cjk unified ideograph-6e80","shortname":":u6e80:","category":"symbols","emoji_order":"2158","aliases":[],"aliases_ascii":[],"keywords":["japan","symbol"]},"black_small_square":{"unicode":"25aa","unicode_alt":"25aa-fe0f","code_decimal":"&#9642;","name":"black small square","shortname":":black_small_square:","category":"symbols","emoji_order":"2159","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_small_square":{"unicode":"25ab","unicode_alt":"25ab-fe0f","code_decimal":"&#9643;","name":"white small square","shortname":":white_small_square:","category":"symbols","emoji_order":"2160","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_medium_square":{"unicode":"25fb","unicode_alt":"25fb-fe0f","code_decimal":"&#9723;","name":"white medium square","shortname":":white_medium_square:","category":"symbols","emoji_order":"2161","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"black_medium_square":{"unicode":"25fc","unicode_alt":"25fc-fe0f","code_decimal":"&#9724;","name":"black medium square","shortname":":black_medium_square:","category":"symbols","emoji_order":"2162","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_medium_small_square":{"unicode":"25fd","unicode_alt":"25fd-fe0f","code_decimal":"&#9725;","name":"white medium small square","shortname":":white_medium_small_square:","category":"symbols","emoji_order":"2163","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"black_medium_small_square":{"unicode":"25fe","unicode_alt":"25fe-fe0f","code_decimal":"&#9726;","name":"black medium small square","shortname":":black_medium_small_square:","category":"symbols","emoji_order":"2164","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"black_large_square":{"unicode":"2b1b","unicode_alt":"2b1b-fe0f","code_decimal":"&#11035;","name":"black large square","shortname":":black_large_square:","category":"symbols","emoji_order":"2165","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_large_square":{"unicode":"2b1c","unicode_alt":"2b1c-fe0f","code_decimal":"&#11036;","name":"white large square","shortname":":white_large_square:","category":"symbols","emoji_order":"2166","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"large_orange_diamond":{"unicode":"1f536","unicode_alt":"","code_decimal":"&#128310;","name":"large orange diamond","shortname":":large_orange_diamond:","category":"symbols","emoji_order":"2167","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol"]},"large_blue_diamond":{"unicode":"1f537","unicode_alt":"","code_decimal":"&#128311;","name":"large blue diamond","shortname":":large_blue_diamond:","category":"symbols","emoji_order":"2168","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol"]},"small_orange_diamond":{"unicode":"1f538","unicode_alt":"","code_decimal":"&#128312;","name":"small orange diamond","shortname":":small_orange_diamond:","category":"symbols","emoji_order":"2169","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol"]},"small_blue_diamond":{"unicode":"1f539","unicode_alt":"","code_decimal":"&#128313;","name":"small blue diamond","shortname":":small_blue_diamond:","category":"symbols","emoji_order":"2170","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol"]},"small_red_triangle":{"unicode":"1f53a","unicode_alt":"","code_decimal":"&#128314;","name":"up-pointing red triangle","shortname":":small_red_triangle:","category":"symbols","emoji_order":"2171","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","triangle"]},"small_red_triangle_down":{"unicode":"1f53b","unicode_alt":"","code_decimal":"&#128315;","name":"down-pointing red triangle","shortname":":small_red_triangle_down:","category":"symbols","emoji_order":"2172","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","triangle"]},"diamond_shape_with_a_dot_inside":{"unicode":"1f4a0","unicode_alt":"","code_decimal":"&#128160;","name":"diamond shape with a dot inside","shortname":":diamond_shape_with_a_dot_inside:","category":"symbols","emoji_order":"2173","aliases":[],"aliases_ascii":[],"keywords":["symbol"]},"radio_button":{"unicode":"1f518","unicode_alt":"","code_decimal":"&#128280;","name":"radio button","shortname":":radio_button:","category":"symbols","emoji_order":"2174","aliases":[],"aliases_ascii":[],"keywords":["symbol","circle"]},"black_square_button":{"unicode":"1f532","unicode_alt":"","code_decimal":"&#128306;","name":"black square button","shortname":":black_square_button:","category":"symbols","emoji_order":"2175","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_square_button":{"unicode":"1f533","unicode_alt":"","code_decimal":"&#128307;","name":"white square button","shortname":":white_square_button:","category":"symbols","emoji_order":"2176","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","square"]},"white_circle":{"unicode":"26aa","unicode_alt":"26aa-fe0f","code_decimal":"&#9898;","name":"white circle","shortname":":white_circle:","category":"symbols","emoji_order":"2177","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","circle"]},"black_circle":{"unicode":"26ab","unicode_alt":"26ab-fe0f","code_decimal":"&#9899;","name":"black circle","shortname":":black_circle:","category":"symbols","emoji_order":"2178","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","circle"]},"red_circle":{"unicode":"1f534","unicode_alt":"","code_decimal":"&#128308;","name":"red circle","shortname":":red_circle:","category":"symbols","emoji_order":"2179","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","circle"]},"blue_circle":{"unicode":"1f535","unicode_alt":"","code_decimal":"&#128309;","name":"blue circle","shortname":":blue_circle:","category":"symbols","emoji_order":"2180","aliases":[],"aliases_ascii":[],"keywords":["shapes","symbol","circle"]},"checkered_flag":{"unicode":"1f3c1","unicode_alt":"","code_decimal":"&#127937;","name":"chequered flag","shortname":":checkered_flag:","category":"travel","emoji_order":"2181","aliases":[],"aliases_ascii":[],"keywords":["object"]},"triangular_flag_on_post":{"unicode":"1f6a9","unicode_alt":"","code_decimal":"&#128681;","name":"triangular flag on post","shortname":":triangular_flag_on_post:","category":"objects","emoji_order":"2182","aliases":[],"aliases_ascii":[],"keywords":["object"]},"crossed_flags":{"unicode":"1f38c","unicode_alt":"","code_decimal":"&#127884;","name":"crossed flags","shortname":":crossed_flags:","category":"objects","emoji_order":"2183","aliases":[],"aliases_ascii":[],"keywords":["object","japan"]},"flag_black":{"unicode":"1f3f4","unicode_alt":"","code_decimal":"&#127988;","name":"waving black flag","shortname":":flag_black:","category":"objects","emoji_order":"2184","aliases":[":waving_black_flag:"],"aliases_ascii":[],"keywords":["object"]},"flag_white":{"unicode":"1f3f3","unicode_alt":"1f3f3-fe0f","code_decimal":"&#127987;","name":"waving white flag","shortname":":flag_white:","category":"objects","emoji_order":"2185","aliases":[":waving_white_flag:"],"aliases_ascii":[],"keywords":["object"]},"rainbow_flag":{"unicode":"1f3f3-1f308","unicode_alt":"","code_decimal":"&#127987;&#127752;","name":"rainbow_flag","shortname":":rainbow_flag:","category":"objects","emoji_order":"2186","aliases":[":gay_pride_flag:"],"aliases_ascii":[],"keywords":[]},"flag_ac":{"unicode":"1f1e6-1f1e8","unicode_alt":"","code_decimal":"&#127462;&#127464;","name":"ascension","shortname":":flag_ac:","category":"flags","emoji_order":"2187","aliases":[":ac:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ad":{"unicode":"1f1e6-1f1e9","unicode_alt":"","code_decimal":"&#127462;&#127465;","name":"andorra","shortname":":flag_ad:","category":"flags","emoji_order":"2188","aliases":[":ad:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ae":{"unicode":"1f1e6-1f1ea","unicode_alt":"","code_decimal":"&#127462;&#127466;","name":"the united arab emirates","shortname":":flag_ae:","category":"flags","emoji_order":"2189","aliases":[":ae:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_af":{"unicode":"1f1e6-1f1eb","unicode_alt":"","code_decimal":"&#127462;&#127467;","name":"afghanistan","shortname":":flag_af:","category":"flags","emoji_order":"2190","aliases":[":af:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ag":{"unicode":"1f1e6-1f1ec","unicode_alt":"","code_decimal":"&#127462;&#127468;","name":"antigua and barbuda","shortname":":flag_ag:","category":"flags","emoji_order":"2191","aliases":[":ag:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ai":{"unicode":"1f1e6-1f1ee","unicode_alt":"","code_decimal":"&#127462;&#127470;","name":"anguilla","shortname":":flag_ai:","category":"flags","emoji_order":"2192","aliases":[":ai:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_al":{"unicode":"1f1e6-1f1f1","unicode_alt":"","code_decimal":"&#127462;&#127473;","name":"albania","shortname":":flag_al:","category":"flags","emoji_order":"2193","aliases":[":al:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_am":{"unicode":"1f1e6-1f1f2","unicode_alt":"","code_decimal":"&#127462;&#127474;","name":"armenia","shortname":":flag_am:","category":"flags","emoji_order":"2194","aliases":[":am:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ao":{"unicode":"1f1e6-1f1f4","unicode_alt":"","code_decimal":"&#127462;&#127476;","name":"angola","shortname":":flag_ao:","category":"flags","emoji_order":"2195","aliases":[":ao:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_aq":{"unicode":"1f1e6-1f1f6","unicode_alt":"","code_decimal":"&#127462;&#127478;","name":"antarctica","shortname":":flag_aq:","category":"flags","emoji_order":"2196","aliases":[":aq:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ar":{"unicode":"1f1e6-1f1f7","unicode_alt":"","code_decimal":"&#127462;&#127479;","name":"argentina","shortname":":flag_ar:","category":"flags","emoji_order":"2197","aliases":[":ar:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_as":{"unicode":"1f1e6-1f1f8","unicode_alt":"","code_decimal":"&#127462;&#127480;","name":"american samoa","shortname":":flag_as:","category":"flags","emoji_order":"2198","aliases":[":as:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_at":{"unicode":"1f1e6-1f1f9","unicode_alt":"","code_decimal":"&#127462;&#127481;","name":"austria","shortname":":flag_at:","category":"flags","emoji_order":"2199","aliases":[":at:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_au":{"unicode":"1f1e6-1f1fa","unicode_alt":"","code_decimal":"&#127462;&#127482;","name":"australia","shortname":":flag_au:","category":"flags","emoji_order":"2200","aliases":[":au:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_aw":{"unicode":"1f1e6-1f1fc","unicode_alt":"","code_decimal":"&#127462;&#127484;","name":"aruba","shortname":":flag_aw:","category":"flags","emoji_order":"2201","aliases":[":aw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ax":{"unicode":"1f1e6-1f1fd","unicode_alt":"","code_decimal":"&#127462;&#127485;","name":"\u00e5land islands","shortname":":flag_ax:","category":"flags","emoji_order":"2202","aliases":[":ax:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_az":{"unicode":"1f1e6-1f1ff","unicode_alt":"","code_decimal":"&#127462;&#127487;","name":"azerbaijan","shortname":":flag_az:","category":"flags","emoji_order":"2203","aliases":[":az:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ba":{"unicode":"1f1e7-1f1e6","unicode_alt":"","code_decimal":"&#127463;&#127462;","name":"bosnia and herzegovina","shortname":":flag_ba:","category":"flags","emoji_order":"2204","aliases":[":ba:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bb":{"unicode":"1f1e7-1f1e7","unicode_alt":"","code_decimal":"&#127463;&#127463;","name":"barbados","shortname":":flag_bb:","category":"flags","emoji_order":"2205","aliases":[":bb:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bd":{"unicode":"1f1e7-1f1e9","unicode_alt":"","code_decimal":"&#127463;&#127465;","name":"bangladesh","shortname":":flag_bd:","category":"flags","emoji_order":"2206","aliases":[":bd:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_be":{"unicode":"1f1e7-1f1ea","unicode_alt":"","code_decimal":"&#127463;&#127466;","name":"belgium","shortname":":flag_be:","category":"flags","emoji_order":"2207","aliases":[":be:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bf":{"unicode":"1f1e7-1f1eb","unicode_alt":"","code_decimal":"&#127463;&#127467;","name":"burkina faso","shortname":":flag_bf:","category":"flags","emoji_order":"2208","aliases":[":bf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bg":{"unicode":"1f1e7-1f1ec","unicode_alt":"","code_decimal":"&#127463;&#127468;","name":"bulgaria","shortname":":flag_bg:","category":"flags","emoji_order":"2209","aliases":[":bg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bh":{"unicode":"1f1e7-1f1ed","unicode_alt":"","code_decimal":"&#127463;&#127469;","name":"bahrain","shortname":":flag_bh:","category":"flags","emoji_order":"2210","aliases":[":bh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bi":{"unicode":"1f1e7-1f1ee","unicode_alt":"","code_decimal":"&#127463;&#127470;","name":"burundi","shortname":":flag_bi:","category":"flags","emoji_order":"2211","aliases":[":bi:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bj":{"unicode":"1f1e7-1f1ef","unicode_alt":"","code_decimal":"&#127463;&#127471;","name":"benin","shortname":":flag_bj:","category":"flags","emoji_order":"2212","aliases":[":bj:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bl":{"unicode":"1f1e7-1f1f1","unicode_alt":"","code_decimal":"&#127463;&#127473;","name":"saint barth\u00e9lemy","shortname":":flag_bl:","category":"flags","emoji_order":"2213","aliases":[":bl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bm":{"unicode":"1f1e7-1f1f2","unicode_alt":"","code_decimal":"&#127463;&#127474;","name":"bermuda","shortname":":flag_bm:","category":"flags","emoji_order":"2214","aliases":[":bm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bn":{"unicode":"1f1e7-1f1f3","unicode_alt":"","code_decimal":"&#127463;&#127475;","name":"brunei","shortname":":flag_bn:","category":"flags","emoji_order":"2215","aliases":[":bn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bo":{"unicode":"1f1e7-1f1f4","unicode_alt":"","code_decimal":"&#127463;&#127476;","name":"bolivia","shortname":":flag_bo:","category":"flags","emoji_order":"2216","aliases":[":bo:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bq":{"unicode":"1f1e7-1f1f6","unicode_alt":"","code_decimal":"&#127463;&#127478;","name":"caribbean netherlands","shortname":":flag_bq:","category":"flags","emoji_order":"2217","aliases":[":bq:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_br":{"unicode":"1f1e7-1f1f7","unicode_alt":"","code_decimal":"&#127463;&#127479;","name":"brazil","shortname":":flag_br:","category":"flags","emoji_order":"2218","aliases":[":br:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bs":{"unicode":"1f1e7-1f1f8","unicode_alt":"","code_decimal":"&#127463;&#127480;","name":"the bahamas","shortname":":flag_bs:","category":"flags","emoji_order":"2219","aliases":[":bs:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bt":{"unicode":"1f1e7-1f1f9","unicode_alt":"","code_decimal":"&#127463;&#127481;","name":"bhutan","shortname":":flag_bt:","category":"flags","emoji_order":"2220","aliases":[":bt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bv":{"unicode":"1f1e7-1f1fb","unicode_alt":"","code_decimal":"&#127463;&#127483;","name":"bouvet island","shortname":":flag_bv:","category":"flags","emoji_order":"2221","aliases":[":bv:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bw":{"unicode":"1f1e7-1f1fc","unicode_alt":"","code_decimal":"&#127463;&#127484;","name":"botswana","shortname":":flag_bw:","category":"flags","emoji_order":"2222","aliases":[":bw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_by":{"unicode":"1f1e7-1f1fe","unicode_alt":"","code_decimal":"&#127463;&#127486;","name":"belarus","shortname":":flag_by:","category":"flags","emoji_order":"2223","aliases":[":by:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_bz":{"unicode":"1f1e7-1f1ff","unicode_alt":"","code_decimal":"&#127463;&#127487;","name":"belize","shortname":":flag_bz:","category":"flags","emoji_order":"2224","aliases":[":bz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ca":{"unicode":"1f1e8-1f1e6","unicode_alt":"","code_decimal":"&#127464;&#127462;","name":"canada","shortname":":flag_ca:","category":"flags","emoji_order":"2225","aliases":[":ca:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cc":{"unicode":"1f1e8-1f1e8","unicode_alt":"","code_decimal":"&#127464;&#127464;","name":"cocos (keeling) islands","shortname":":flag_cc:","category":"flags","emoji_order":"2226","aliases":[":cc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cd":{"unicode":"1f1e8-1f1e9","unicode_alt":"","code_decimal":"&#127464;&#127465;","name":"the democratic republic of the congo","shortname":":flag_cd:","category":"flags","emoji_order":"2227","aliases":[":congo:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cf":{"unicode":"1f1e8-1f1eb","unicode_alt":"","code_decimal":"&#127464;&#127467;","name":"central african republic","shortname":":flag_cf:","category":"flags","emoji_order":"2228","aliases":[":cf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cg":{"unicode":"1f1e8-1f1ec","unicode_alt":"","code_decimal":"&#127464;&#127468;","name":"the republic of the congo","shortname":":flag_cg:","category":"flags","emoji_order":"2229","aliases":[":cg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ch":{"unicode":"1f1e8-1f1ed","unicode_alt":"","code_decimal":"&#127464;&#127469;","name":"switzerland","shortname":":flag_ch:","category":"flags","emoji_order":"2230","aliases":[":ch:"],"aliases_ascii":[],"keywords":["country","neutral","flag"]},"flag_ci":{"unicode":"1f1e8-1f1ee","unicode_alt":"","code_decimal":"&#127464;&#127470;","name":"c\u00f4te d\u2019ivoire","shortname":":flag_ci:","category":"flags","emoji_order":"2231","aliases":[":ci:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ck":{"unicode":"1f1e8-1f1f0","unicode_alt":"","code_decimal":"&#127464;&#127472;","name":"cook islands","shortname":":flag_ck:","category":"flags","emoji_order":"2232","aliases":[":ck:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cl":{"unicode":"1f1e8-1f1f1","unicode_alt":"","code_decimal":"&#127464;&#127473;","name":"chile","shortname":":flag_cl:","category":"flags","emoji_order":"2233","aliases":[":chile:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cm":{"unicode":"1f1e8-1f1f2","unicode_alt":"","code_decimal":"&#127464;&#127474;","name":"cameroon","shortname":":flag_cm:","category":"flags","emoji_order":"2234","aliases":[":cm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cn":{"unicode":"1f1e8-1f1f3","unicode_alt":"","code_decimal":"&#127464;&#127475;","name":"china","shortname":":flag_cn:","category":"flags","emoji_order":"2235","aliases":[":cn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_co":{"unicode":"1f1e8-1f1f4","unicode_alt":"","code_decimal":"&#127464;&#127476;","name":"colombia","shortname":":flag_co:","category":"flags","emoji_order":"2236","aliases":[":co:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cp":{"unicode":"1f1e8-1f1f5","unicode_alt":"","code_decimal":"&#127464;&#127477;","name":"clipperton island","shortname":":flag_cp:","category":"flags","emoji_order":"2237","aliases":[":cp:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cr":{"unicode":"1f1e8-1f1f7","unicode_alt":"","code_decimal":"&#127464;&#127479;","name":"costa rica","shortname":":flag_cr:","category":"flags","emoji_order":"2238","aliases":[":cr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cu":{"unicode":"1f1e8-1f1fa","unicode_alt":"","code_decimal":"&#127464;&#127482;","name":"cuba","shortname":":flag_cu:","category":"flags","emoji_order":"2239","aliases":[":cu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cv":{"unicode":"1f1e8-1f1fb","unicode_alt":"","code_decimal":"&#127464;&#127483;","name":"cape verde","shortname":":flag_cv:","category":"flags","emoji_order":"2240","aliases":[":cv:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cw":{"unicode":"1f1e8-1f1fc","unicode_alt":"","code_decimal":"&#127464;&#127484;","name":"cura\u00e7ao","shortname":":flag_cw:","category":"flags","emoji_order":"2241","aliases":[":cw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cx":{"unicode":"1f1e8-1f1fd","unicode_alt":"","code_decimal":"&#127464;&#127485;","name":"christmas island","shortname":":flag_cx:","category":"flags","emoji_order":"2242","aliases":[":cx:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cy":{"unicode":"1f1e8-1f1fe","unicode_alt":"","code_decimal":"&#127464;&#127486;","name":"cyprus","shortname":":flag_cy:","category":"flags","emoji_order":"2243","aliases":[":cy:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_cz":{"unicode":"1f1e8-1f1ff","unicode_alt":"","code_decimal":"&#127464;&#127487;","name":"the czech republic","shortname":":flag_cz:","category":"flags","emoji_order":"2244","aliases":[":cz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_de":{"unicode":"1f1e9-1f1ea","unicode_alt":"","code_decimal":"&#127465;&#127466;","name":"germany","shortname":":flag_de:","category":"flags","emoji_order":"2245","aliases":[":de:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_dg":{"unicode":"1f1e9-1f1ec","unicode_alt":"","code_decimal":"&#127465;&#127468;","name":"diego garcia","shortname":":flag_dg:","category":"flags","emoji_order":"2246","aliases":[":dg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_dj":{"unicode":"1f1e9-1f1ef","unicode_alt":"","code_decimal":"&#127465;&#127471;","name":"djibouti","shortname":":flag_dj:","category":"flags","emoji_order":"2247","aliases":[":dj:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_dk":{"unicode":"1f1e9-1f1f0","unicode_alt":"","code_decimal":"&#127465;&#127472;","name":"denmark","shortname":":flag_dk:","category":"flags","emoji_order":"2248","aliases":[":dk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_dm":{"unicode":"1f1e9-1f1f2","unicode_alt":"","code_decimal":"&#127465;&#127474;","name":"dominica","shortname":":flag_dm:","category":"flags","emoji_order":"2249","aliases":[":dm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_do":{"unicode":"1f1e9-1f1f4","unicode_alt":"","code_decimal":"&#127465;&#127476;","name":"the dominican republic","shortname":":flag_do:","category":"flags","emoji_order":"2250","aliases":[":do:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_dz":{"unicode":"1f1e9-1f1ff","unicode_alt":"","code_decimal":"&#127465;&#127487;","name":"algeria","shortname":":flag_dz:","category":"flags","emoji_order":"2251","aliases":[":dz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ea":{"unicode":"1f1ea-1f1e6","unicode_alt":"","code_decimal":"&#127466;&#127462;","name":"ceuta, melilla","shortname":":flag_ea:","category":"flags","emoji_order":"2252","aliases":[":ea:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ec":{"unicode":"1f1ea-1f1e8","unicode_alt":"","code_decimal":"&#127466;&#127464;","name":"ecuador","shortname":":flag_ec:","category":"flags","emoji_order":"2253","aliases":[":ec:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ee":{"unicode":"1f1ea-1f1ea","unicode_alt":"","code_decimal":"&#127466;&#127466;","name":"estonia","shortname":":flag_ee:","category":"flags","emoji_order":"2254","aliases":[":ee:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_eg":{"unicode":"1f1ea-1f1ec","unicode_alt":"","code_decimal":"&#127466;&#127468;","name":"egypt","shortname":":flag_eg:","category":"flags","emoji_order":"2255","aliases":[":eg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_eh":{"unicode":"1f1ea-1f1ed","unicode_alt":"","code_decimal":"&#127466;&#127469;","name":"western sahara","shortname":":flag_eh:","category":"flags","emoji_order":"2256","aliases":[":eh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_er":{"unicode":"1f1ea-1f1f7","unicode_alt":"","code_decimal":"&#127466;&#127479;","name":"eritrea","shortname":":flag_er:","category":"flags","emoji_order":"2257","aliases":[":er:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_es":{"unicode":"1f1ea-1f1f8","unicode_alt":"","code_decimal":"&#127466;&#127480;","name":"spain","shortname":":flag_es:","category":"flags","emoji_order":"2258","aliases":[":es:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_et":{"unicode":"1f1ea-1f1f9","unicode_alt":"","code_decimal":"&#127466;&#127481;","name":"ethiopia","shortname":":flag_et:","category":"flags","emoji_order":"2259","aliases":[":et:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_eu":{"unicode":"1f1ea-1f1fa","unicode_alt":"","code_decimal":"&#127466;&#127482;","name":"european union","shortname":":flag_eu:","category":"flags","emoji_order":"2260","aliases":[":eu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fi":{"unicode":"1f1eb-1f1ee","unicode_alt":"","code_decimal":"&#127467;&#127470;","name":"finland","shortname":":flag_fi:","category":"flags","emoji_order":"2261","aliases":[":fi:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fj":{"unicode":"1f1eb-1f1ef","unicode_alt":"","code_decimal":"&#127467;&#127471;","name":"fiji","shortname":":flag_fj:","category":"flags","emoji_order":"2262","aliases":[":fj:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fk":{"unicode":"1f1eb-1f1f0","unicode_alt":"","code_decimal":"&#127467;&#127472;","name":"falkland islands","shortname":":flag_fk:","category":"flags","emoji_order":"2263","aliases":[":fk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fm":{"unicode":"1f1eb-1f1f2","unicode_alt":"","code_decimal":"&#127467;&#127474;","name":"micronesia","shortname":":flag_fm:","category":"flags","emoji_order":"2264","aliases":[":fm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fo":{"unicode":"1f1eb-1f1f4","unicode_alt":"","code_decimal":"&#127467;&#127476;","name":"faroe islands","shortname":":flag_fo:","category":"flags","emoji_order":"2265","aliases":[":fo:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_fr":{"unicode":"1f1eb-1f1f7","unicode_alt":"","code_decimal":"&#127467;&#127479;","name":"france","shortname":":flag_fr:","category":"flags","emoji_order":"2266","aliases":[":fr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ga":{"unicode":"1f1ec-1f1e6","unicode_alt":"","code_decimal":"&#127468;&#127462;","name":"gabon","shortname":":flag_ga:","category":"flags","emoji_order":"2267","aliases":[":ga:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gb":{"unicode":"1f1ec-1f1e7","unicode_alt":"","code_decimal":"&#127468;&#127463;","name":"great britain","shortname":":flag_gb:","category":"flags","emoji_order":"2268","aliases":[":gb:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gd":{"unicode":"1f1ec-1f1e9","unicode_alt":"","code_decimal":"&#127468;&#127465;","name":"grenada","shortname":":flag_gd:","category":"flags","emoji_order":"2269","aliases":[":gd:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ge":{"unicode":"1f1ec-1f1ea","unicode_alt":"","code_decimal":"&#127468;&#127466;","name":"georgia","shortname":":flag_ge:","category":"flags","emoji_order":"2270","aliases":[":ge:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gf":{"unicode":"1f1ec-1f1eb","unicode_alt":"","code_decimal":"&#127468;&#127467;","name":"french guiana","shortname":":flag_gf:","category":"flags","emoji_order":"2271","aliases":[":gf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gg":{"unicode":"1f1ec-1f1ec","unicode_alt":"","code_decimal":"&#127468;&#127468;","name":"guernsey","shortname":":flag_gg:","category":"flags","emoji_order":"2272","aliases":[":gg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gh":{"unicode":"1f1ec-1f1ed","unicode_alt":"","code_decimal":"&#127468;&#127469;","name":"ghana","shortname":":flag_gh:","category":"flags","emoji_order":"2273","aliases":[":gh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gi":{"unicode":"1f1ec-1f1ee","unicode_alt":"","code_decimal":"&#127468;&#127470;","name":"gibraltar","shortname":":flag_gi:","category":"flags","emoji_order":"2274","aliases":[":gi:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gl":{"unicode":"1f1ec-1f1f1","unicode_alt":"","code_decimal":"&#127468;&#127473;","name":"greenland","shortname":":flag_gl:","category":"flags","emoji_order":"2275","aliases":[":gl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gm":{"unicode":"1f1ec-1f1f2","unicode_alt":"","code_decimal":"&#127468;&#127474;","name":"the gambia","shortname":":flag_gm:","category":"flags","emoji_order":"2276","aliases":[":gm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gn":{"unicode":"1f1ec-1f1f3","unicode_alt":"","code_decimal":"&#127468;&#127475;","name":"guinea","shortname":":flag_gn:","category":"flags","emoji_order":"2277","aliases":[":gn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gp":{"unicode":"1f1ec-1f1f5","unicode_alt":"","code_decimal":"&#127468;&#127477;","name":"guadeloupe","shortname":":flag_gp:","category":"flags","emoji_order":"2278","aliases":[":gp:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gq":{"unicode":"1f1ec-1f1f6","unicode_alt":"","code_decimal":"&#127468;&#127478;","name":"equatorial guinea","shortname":":flag_gq:","category":"flags","emoji_order":"2279","aliases":[":gq:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gr":{"unicode":"1f1ec-1f1f7","unicode_alt":"","code_decimal":"&#127468;&#127479;","name":"greece","shortname":":flag_gr:","category":"flags","emoji_order":"2280","aliases":[":gr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gs":{"unicode":"1f1ec-1f1f8","unicode_alt":"","code_decimal":"&#127468;&#127480;","name":"south georgia","shortname":":flag_gs:","category":"flags","emoji_order":"2281","aliases":[":gs:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gt":{"unicode":"1f1ec-1f1f9","unicode_alt":"","code_decimal":"&#127468;&#127481;","name":"guatemala","shortname":":flag_gt:","category":"flags","emoji_order":"2282","aliases":[":gt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gu":{"unicode":"1f1ec-1f1fa","unicode_alt":"","code_decimal":"&#127468;&#127482;","name":"guam","shortname":":flag_gu:","category":"flags","emoji_order":"2283","aliases":[":gu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gw":{"unicode":"1f1ec-1f1fc","unicode_alt":"","code_decimal":"&#127468;&#127484;","name":"guinea-bissau","shortname":":flag_gw:","category":"flags","emoji_order":"2284","aliases":[":gw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_gy":{"unicode":"1f1ec-1f1fe","unicode_alt":"","code_decimal":"&#127468;&#127486;","name":"guyana","shortname":":flag_gy:","category":"flags","emoji_order":"2285","aliases":[":gy:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_hk":{"unicode":"1f1ed-1f1f0","unicode_alt":"","code_decimal":"&#127469;&#127472;","name":"hong kong","shortname":":flag_hk:","category":"flags","emoji_order":"2286","aliases":[":hk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_hm":{"unicode":"1f1ed-1f1f2","unicode_alt":"","code_decimal":"&#127469;&#127474;","name":"heard island and mcdonald islands","shortname":":flag_hm:","category":"flags","emoji_order":"2287","aliases":[":hm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_hn":{"unicode":"1f1ed-1f1f3","unicode_alt":"","code_decimal":"&#127469;&#127475;","name":"honduras","shortname":":flag_hn:","category":"flags","emoji_order":"2288","aliases":[":hn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_hr":{"unicode":"1f1ed-1f1f7","unicode_alt":"","code_decimal":"&#127469;&#127479;","name":"croatia","shortname":":flag_hr:","category":"flags","emoji_order":"2289","aliases":[":hr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ht":{"unicode":"1f1ed-1f1f9","unicode_alt":"","code_decimal":"&#127469;&#127481;","name":"haiti","shortname":":flag_ht:","category":"flags","emoji_order":"2290","aliases":[":ht:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_hu":{"unicode":"1f1ed-1f1fa","unicode_alt":"","code_decimal":"&#127469;&#127482;","name":"hungary","shortname":":flag_hu:","category":"flags","emoji_order":"2291","aliases":[":hu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ic":{"unicode":"1f1ee-1f1e8","unicode_alt":"","code_decimal":"&#127470;&#127464;","name":"canary islands","shortname":":flag_ic:","category":"flags","emoji_order":"2292","aliases":[":ic:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_id":{"unicode":"1f1ee-1f1e9","unicode_alt":"","code_decimal":"&#127470;&#127465;","name":"indonesia","shortname":":flag_id:","category":"flags","emoji_order":"2293","aliases":[":indonesia:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ie":{"unicode":"1f1ee-1f1ea","unicode_alt":"","code_decimal":"&#127470;&#127466;","name":"ireland","shortname":":flag_ie:","category":"flags","emoji_order":"2294","aliases":[":ie:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_il":{"unicode":"1f1ee-1f1f1","unicode_alt":"","code_decimal":"&#127470;&#127473;","name":"israel","shortname":":flag_il:","category":"flags","emoji_order":"2295","aliases":[":il:"],"aliases_ascii":[],"keywords":["jew","country","flag"]},"flag_im":{"unicode":"1f1ee-1f1f2","unicode_alt":"","code_decimal":"&#127470;&#127474;","name":"isle of man","shortname":":flag_im:","category":"flags","emoji_order":"2296","aliases":[":im:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_in":{"unicode":"1f1ee-1f1f3","unicode_alt":"","code_decimal":"&#127470;&#127475;","name":"india","shortname":":flag_in:","category":"flags","emoji_order":"2297","aliases":[":in:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_io":{"unicode":"1f1ee-1f1f4","unicode_alt":"","code_decimal":"&#127470;&#127476;","name":"british indian ocean territory","shortname":":flag_io:","category":"flags","emoji_order":"2298","aliases":[":io:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_iq":{"unicode":"1f1ee-1f1f6","unicode_alt":"","code_decimal":"&#127470;&#127478;","name":"iraq","shortname":":flag_iq:","category":"flags","emoji_order":"2299","aliases":[":iq:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ir":{"unicode":"1f1ee-1f1f7","unicode_alt":"","code_decimal":"&#127470;&#127479;","name":"iran","shortname":":flag_ir:","category":"flags","emoji_order":"2300","aliases":[":ir:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_is":{"unicode":"1f1ee-1f1f8","unicode_alt":"","code_decimal":"&#127470;&#127480;","name":"iceland","shortname":":flag_is:","category":"flags","emoji_order":"2301","aliases":[":is:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_it":{"unicode":"1f1ee-1f1f9","unicode_alt":"","code_decimal":"&#127470;&#127481;","name":"italy","shortname":":flag_it:","category":"flags","emoji_order":"2302","aliases":[":it:"],"aliases_ascii":[],"keywords":["italian","country","flag"]},"flag_je":{"unicode":"1f1ef-1f1ea","unicode_alt":"","code_decimal":"&#127471;&#127466;","name":"jersey","shortname":":flag_je:","category":"flags","emoji_order":"2303","aliases":[":je:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_jm":{"unicode":"1f1ef-1f1f2","unicode_alt":"","code_decimal":"&#127471;&#127474;","name":"jamaica","shortname":":flag_jm:","category":"flags","emoji_order":"2304","aliases":[":jm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_jo":{"unicode":"1f1ef-1f1f4","unicode_alt":"","code_decimal":"&#127471;&#127476;","name":"jordan","shortname":":flag_jo:","category":"flags","emoji_order":"2305","aliases":[":jo:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_jp":{"unicode":"1f1ef-1f1f5","unicode_alt":"","code_decimal":"&#127471;&#127477;","name":"japan","shortname":":flag_jp:","category":"flags","emoji_order":"2306","aliases":[":jp:"],"aliases_ascii":[],"keywords":["japan","country","flag"]},"flag_ke":{"unicode":"1f1f0-1f1ea","unicode_alt":"","code_decimal":"&#127472;&#127466;","name":"kenya","shortname":":flag_ke:","category":"flags","emoji_order":"2307","aliases":[":ke:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kg":{"unicode":"1f1f0-1f1ec","unicode_alt":"","code_decimal":"&#127472;&#127468;","name":"kyrgyzstan","shortname":":flag_kg:","category":"flags","emoji_order":"2308","aliases":[":kg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kh":{"unicode":"1f1f0-1f1ed","unicode_alt":"","code_decimal":"&#127472;&#127469;","name":"cambodia","shortname":":flag_kh:","category":"flags","emoji_order":"2309","aliases":[":kh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ki":{"unicode":"1f1f0-1f1ee","unicode_alt":"","code_decimal":"&#127472;&#127470;","name":"kiribati","shortname":":flag_ki:","category":"flags","emoji_order":"2310","aliases":[":ki:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_km":{"unicode":"1f1f0-1f1f2","unicode_alt":"","code_decimal":"&#127472;&#127474;","name":"the comoros","shortname":":flag_km:","category":"flags","emoji_order":"2311","aliases":[":km:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kn":{"unicode":"1f1f0-1f1f3","unicode_alt":"","code_decimal":"&#127472;&#127475;","name":"saint kitts and nevis","shortname":":flag_kn:","category":"flags","emoji_order":"2312","aliases":[":kn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kp":{"unicode":"1f1f0-1f1f5","unicode_alt":"","code_decimal":"&#127472;&#127477;","name":"north korea","shortname":":flag_kp:","category":"flags","emoji_order":"2313","aliases":[":kp:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kr":{"unicode":"1f1f0-1f1f7","unicode_alt":"","code_decimal":"&#127472;&#127479;","name":"korea","shortname":":flag_kr:","category":"flags","emoji_order":"2314","aliases":[":kr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kw":{"unicode":"1f1f0-1f1fc","unicode_alt":"","code_decimal":"&#127472;&#127484;","name":"kuwait","shortname":":flag_kw:","category":"flags","emoji_order":"2315","aliases":[":kw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ky":{"unicode":"1f1f0-1f1fe","unicode_alt":"","code_decimal":"&#127472;&#127486;","name":"cayman islands","shortname":":flag_ky:","category":"flags","emoji_order":"2316","aliases":[":ky:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_kz":{"unicode":"1f1f0-1f1ff","unicode_alt":"","code_decimal":"&#127472;&#127487;","name":"kazakhstan","shortname":":flag_kz:","category":"flags","emoji_order":"2317","aliases":[":kz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_la":{"unicode":"1f1f1-1f1e6","unicode_alt":"","code_decimal":"&#127473;&#127462;","name":"laos","shortname":":flag_la:","category":"flags","emoji_order":"2318","aliases":[":la:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lb":{"unicode":"1f1f1-1f1e7","unicode_alt":"","code_decimal":"&#127473;&#127463;","name":"lebanon","shortname":":flag_lb:","category":"flags","emoji_order":"2319","aliases":[":lb:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lc":{"unicode":"1f1f1-1f1e8","unicode_alt":"","code_decimal":"&#127473;&#127464;","name":"saint lucia","shortname":":flag_lc:","category":"flags","emoji_order":"2320","aliases":[":lc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_li":{"unicode":"1f1f1-1f1ee","unicode_alt":"","code_decimal":"&#127473;&#127470;","name":"liechtenstein","shortname":":flag_li:","category":"flags","emoji_order":"2321","aliases":[":li:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lk":{"unicode":"1f1f1-1f1f0","unicode_alt":"","code_decimal":"&#127473;&#127472;","name":"sri lanka","shortname":":flag_lk:","category":"flags","emoji_order":"2322","aliases":[":lk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lr":{"unicode":"1f1f1-1f1f7","unicode_alt":"","code_decimal":"&#127473;&#127479;","name":"liberia","shortname":":flag_lr:","category":"flags","emoji_order":"2323","aliases":[":lr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ls":{"unicode":"1f1f1-1f1f8","unicode_alt":"","code_decimal":"&#127473;&#127480;","name":"lesotho","shortname":":flag_ls:","category":"flags","emoji_order":"2324","aliases":[":ls:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lt":{"unicode":"1f1f1-1f1f9","unicode_alt":"","code_decimal":"&#127473;&#127481;","name":"lithuania","shortname":":flag_lt:","category":"flags","emoji_order":"2325","aliases":[":lt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lu":{"unicode":"1f1f1-1f1fa","unicode_alt":"","code_decimal":"&#127473;&#127482;","name":"luxembourg","shortname":":flag_lu:","category":"flags","emoji_order":"2326","aliases":[":lu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_lv":{"unicode":"1f1f1-1f1fb","unicode_alt":"","code_decimal":"&#127473;&#127483;","name":"latvia","shortname":":flag_lv:","category":"flags","emoji_order":"2327","aliases":[":lv:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ly":{"unicode":"1f1f1-1f1fe","unicode_alt":"","code_decimal":"&#127473;&#127486;","name":"libya","shortname":":flag_ly:","category":"flags","emoji_order":"2328","aliases":[":ly:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ma":{"unicode":"1f1f2-1f1e6","unicode_alt":"","code_decimal":"&#127474;&#127462;","name":"morocco","shortname":":flag_ma:","category":"flags","emoji_order":"2329","aliases":[":ma:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mc":{"unicode":"1f1f2-1f1e8","unicode_alt":"","code_decimal":"&#127474;&#127464;","name":"monaco","shortname":":flag_mc:","category":"flags","emoji_order":"2330","aliases":[":mc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_md":{"unicode":"1f1f2-1f1e9","unicode_alt":"","code_decimal":"&#127474;&#127465;","name":"moldova","shortname":":flag_md:","category":"flags","emoji_order":"2331","aliases":[":md:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_me":{"unicode":"1f1f2-1f1ea","unicode_alt":"","code_decimal":"&#127474;&#127466;","name":"montenegro","shortname":":flag_me:","category":"flags","emoji_order":"2332","aliases":[":me:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mf":{"unicode":"1f1f2-1f1eb","unicode_alt":"","code_decimal":"&#127474;&#127467;","name":"saint martin","shortname":":flag_mf:","category":"flags","emoji_order":"2333","aliases":[":mf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mg":{"unicode":"1f1f2-1f1ec","unicode_alt":"","code_decimal":"&#127474;&#127468;","name":"madagascar","shortname":":flag_mg:","category":"flags","emoji_order":"2334","aliases":[":mg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mh":{"unicode":"1f1f2-1f1ed","unicode_alt":"","code_decimal":"&#127474;&#127469;","name":"the marshall islands","shortname":":flag_mh:","category":"flags","emoji_order":"2335","aliases":[":mh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mk":{"unicode":"1f1f2-1f1f0","unicode_alt":"","code_decimal":"&#127474;&#127472;","name":"macedonia","shortname":":flag_mk:","category":"flags","emoji_order":"2336","aliases":[":mk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ml":{"unicode":"1f1f2-1f1f1","unicode_alt":"","code_decimal":"&#127474;&#127473;","name":"mali","shortname":":flag_ml:","category":"flags","emoji_order":"2337","aliases":[":ml:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mm":{"unicode":"1f1f2-1f1f2","unicode_alt":"","code_decimal":"&#127474;&#127474;","name":"myanmar","shortname":":flag_mm:","category":"flags","emoji_order":"2338","aliases":[":mm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mn":{"unicode":"1f1f2-1f1f3","unicode_alt":"","code_decimal":"&#127474;&#127475;","name":"mongolia","shortname":":flag_mn:","category":"flags","emoji_order":"2339","aliases":[":mn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mo":{"unicode":"1f1f2-1f1f4","unicode_alt":"","code_decimal":"&#127474;&#127476;","name":"macau","shortname":":flag_mo:","category":"flags","emoji_order":"2340","aliases":[":mo:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mp":{"unicode":"1f1f2-1f1f5","unicode_alt":"","code_decimal":"&#127474;&#127477;","name":"northern mariana islands","shortname":":flag_mp:","category":"flags","emoji_order":"2341","aliases":[":mp:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mq":{"unicode":"1f1f2-1f1f6","unicode_alt":"","code_decimal":"&#127474;&#127478;","name":"martinique","shortname":":flag_mq:","category":"flags","emoji_order":"2342","aliases":[":mq:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mr":{"unicode":"1f1f2-1f1f7","unicode_alt":"","code_decimal":"&#127474;&#127479;","name":"mauritania","shortname":":flag_mr:","category":"flags","emoji_order":"2343","aliases":[":mr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ms":{"unicode":"1f1f2-1f1f8","unicode_alt":"","code_decimal":"&#127474;&#127480;","name":"montserrat","shortname":":flag_ms:","category":"flags","emoji_order":"2344","aliases":[":ms:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mt":{"unicode":"1f1f2-1f1f9","unicode_alt":"","code_decimal":"&#127474;&#127481;","name":"malta","shortname":":flag_mt:","category":"flags","emoji_order":"2345","aliases":[":mt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mu":{"unicode":"1f1f2-1f1fa","unicode_alt":"","code_decimal":"&#127474;&#127482;","name":"mauritius","shortname":":flag_mu:","category":"flags","emoji_order":"2346","aliases":[":mu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mv":{"unicode":"1f1f2-1f1fb","unicode_alt":"","code_decimal":"&#127474;&#127483;","name":"maldives","shortname":":flag_mv:","category":"flags","emoji_order":"2347","aliases":[":mv:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mw":{"unicode":"1f1f2-1f1fc","unicode_alt":"","code_decimal":"&#127474;&#127484;","name":"malawi","shortname":":flag_mw:","category":"flags","emoji_order":"2348","aliases":[":mw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mx":{"unicode":"1f1f2-1f1fd","unicode_alt":"","code_decimal":"&#127474;&#127485;","name":"mexico","shortname":":flag_mx:","category":"flags","emoji_order":"2349","aliases":[":mx:"],"aliases_ascii":[],"keywords":["country","mexican","flag"]},"flag_my":{"unicode":"1f1f2-1f1fe","unicode_alt":"","code_decimal":"&#127474;&#127486;","name":"malaysia","shortname":":flag_my:","category":"flags","emoji_order":"2350","aliases":[":my:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_mz":{"unicode":"1f1f2-1f1ff","unicode_alt":"","code_decimal":"&#127474;&#127487;","name":"mozambique","shortname":":flag_mz:","category":"flags","emoji_order":"2351","aliases":[":mz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_na":{"unicode":"1f1f3-1f1e6","unicode_alt":"","code_decimal":"&#127475;&#127462;","name":"namibia","shortname":":flag_na:","category":"flags","emoji_order":"2352","aliases":[":na:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nc":{"unicode":"1f1f3-1f1e8","unicode_alt":"","code_decimal":"&#127475;&#127464;","name":"new caledonia","shortname":":flag_nc:","category":"flags","emoji_order":"2353","aliases":[":nc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ne":{"unicode":"1f1f3-1f1ea","unicode_alt":"","code_decimal":"&#127475;&#127466;","name":"niger","shortname":":flag_ne:","category":"flags","emoji_order":"2354","aliases":[":ne:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nf":{"unicode":"1f1f3-1f1eb","unicode_alt":"","code_decimal":"&#127475;&#127467;","name":"norfolk island","shortname":":flag_nf:","category":"flags","emoji_order":"2355","aliases":[":nf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ng":{"unicode":"1f1f3-1f1ec","unicode_alt":"","code_decimal":"&#127475;&#127468;","name":"nigeria","shortname":":flag_ng:","category":"flags","emoji_order":"2356","aliases":[":nigeria:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ni":{"unicode":"1f1f3-1f1ee","unicode_alt":"","code_decimal":"&#127475;&#127470;","name":"nicaragua","shortname":":flag_ni:","category":"flags","emoji_order":"2357","aliases":[":ni:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nl":{"unicode":"1f1f3-1f1f1","unicode_alt":"","code_decimal":"&#127475;&#127473;","name":"the netherlands","shortname":":flag_nl:","category":"flags","emoji_order":"2358","aliases":[":nl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_no":{"unicode":"1f1f3-1f1f4","unicode_alt":"","code_decimal":"&#127475;&#127476;","name":"norway","shortname":":flag_no:","category":"flags","emoji_order":"2359","aliases":[":no:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_np":{"unicode":"1f1f3-1f1f5","unicode_alt":"","code_decimal":"&#127475;&#127477;","name":"nepal","shortname":":flag_np:","category":"flags","emoji_order":"2360","aliases":[":np:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nr":{"unicode":"1f1f3-1f1f7","unicode_alt":"","code_decimal":"&#127475;&#127479;","name":"nauru","shortname":":flag_nr:","category":"flags","emoji_order":"2361","aliases":[":nr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nu":{"unicode":"1f1f3-1f1fa","unicode_alt":"","code_decimal":"&#127475;&#127482;","name":"niue","shortname":":flag_nu:","category":"flags","emoji_order":"2362","aliases":[":nu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_nz":{"unicode":"1f1f3-1f1ff","unicode_alt":"","code_decimal":"&#127475;&#127487;","name":"new zealand","shortname":":flag_nz:","category":"flags","emoji_order":"2363","aliases":[":nz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_om":{"unicode":"1f1f4-1f1f2","unicode_alt":"","code_decimal":"&#127476;&#127474;","name":"oman","shortname":":flag_om:","category":"flags","emoji_order":"2364","aliases":[":om:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pa":{"unicode":"1f1f5-1f1e6","unicode_alt":"","code_decimal":"&#127477;&#127462;","name":"panama","shortname":":flag_pa:","category":"flags","emoji_order":"2365","aliases":[":pa:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pe":{"unicode":"1f1f5-1f1ea","unicode_alt":"","code_decimal":"&#127477;&#127466;","name":"peru","shortname":":flag_pe:","category":"flags","emoji_order":"2366","aliases":[":pe:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pf":{"unicode":"1f1f5-1f1eb","unicode_alt":"","code_decimal":"&#127477;&#127467;","name":"french polynesia","shortname":":flag_pf:","category":"flags","emoji_order":"2367","aliases":[":pf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pg":{"unicode":"1f1f5-1f1ec","unicode_alt":"","code_decimal":"&#127477;&#127468;","name":"papua new guinea","shortname":":flag_pg:","category":"flags","emoji_order":"2368","aliases":[":pg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ph":{"unicode":"1f1f5-1f1ed","unicode_alt":"","code_decimal":"&#127477;&#127469;","name":"the philippines","shortname":":flag_ph:","category":"flags","emoji_order":"2369","aliases":[":ph:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pk":{"unicode":"1f1f5-1f1f0","unicode_alt":"","code_decimal":"&#127477;&#127472;","name":"pakistan","shortname":":flag_pk:","category":"flags","emoji_order":"2370","aliases":[":pk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pl":{"unicode":"1f1f5-1f1f1","unicode_alt":"","code_decimal":"&#127477;&#127473;","name":"poland","shortname":":flag_pl:","category":"flags","emoji_order":"2371","aliases":[":pl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pm":{"unicode":"1f1f5-1f1f2","unicode_alt":"","code_decimal":"&#127477;&#127474;","name":"saint pierre and miquelon","shortname":":flag_pm:","category":"flags","emoji_order":"2372","aliases":[":pm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pn":{"unicode":"1f1f5-1f1f3","unicode_alt":"","code_decimal":"&#127477;&#127475;","name":"pitcairn","shortname":":flag_pn:","category":"flags","emoji_order":"2373","aliases":[":pn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pr":{"unicode":"1f1f5-1f1f7","unicode_alt":"","code_decimal":"&#127477;&#127479;","name":"puerto rico","shortname":":flag_pr:","category":"flags","emoji_order":"2374","aliases":[":pr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ps":{"unicode":"1f1f5-1f1f8","unicode_alt":"","code_decimal":"&#127477;&#127480;","name":"palestinian authority","shortname":":flag_ps:","category":"flags","emoji_order":"2375","aliases":[":ps:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pt":{"unicode":"1f1f5-1f1f9","unicode_alt":"","code_decimal":"&#127477;&#127481;","name":"portugal","shortname":":flag_pt:","category":"flags","emoji_order":"2376","aliases":[":pt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_pw":{"unicode":"1f1f5-1f1fc","unicode_alt":"","code_decimal":"&#127477;&#127484;","name":"palau","shortname":":flag_pw:","category":"flags","emoji_order":"2377","aliases":[":pw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_py":{"unicode":"1f1f5-1f1fe","unicode_alt":"","code_decimal":"&#127477;&#127486;","name":"paraguay","shortname":":flag_py:","category":"flags","emoji_order":"2378","aliases":[":py:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_qa":{"unicode":"1f1f6-1f1e6","unicode_alt":"","code_decimal":"&#127478;&#127462;","name":"qatar","shortname":":flag_qa:","category":"flags","emoji_order":"2379","aliases":[":qa:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_re":{"unicode":"1f1f7-1f1ea","unicode_alt":"","code_decimal":"&#127479;&#127466;","name":"r\u00e9union","shortname":":flag_re:","category":"flags","emoji_order":"2380","aliases":[":re:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ro":{"unicode":"1f1f7-1f1f4","unicode_alt":"","code_decimal":"&#127479;&#127476;","name":"romania","shortname":":flag_ro:","category":"flags","emoji_order":"2381","aliases":[":ro:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_rs":{"unicode":"1f1f7-1f1f8","unicode_alt":"","code_decimal":"&#127479;&#127480;","name":"serbia","shortname":":flag_rs:","category":"flags","emoji_order":"2382","aliases":[":rs:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ru":{"unicode":"1f1f7-1f1fa","unicode_alt":"","code_decimal":"&#127479;&#127482;","name":"russia","shortname":":flag_ru:","category":"flags","emoji_order":"2383","aliases":[":ru:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_rw":{"unicode":"1f1f7-1f1fc","unicode_alt":"","code_decimal":"&#127479;&#127484;","name":"rwanda","shortname":":flag_rw:","category":"flags","emoji_order":"2384","aliases":[":rw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sa":{"unicode":"1f1f8-1f1e6","unicode_alt":"","code_decimal":"&#127480;&#127462;","name":"saudi arabia","shortname":":flag_sa:","category":"flags","emoji_order":"2385","aliases":[":saudiarabia:",":saudi:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sb":{"unicode":"1f1f8-1f1e7","unicode_alt":"","code_decimal":"&#127480;&#127463;","name":"the solomon islands","shortname":":flag_sb:","category":"flags","emoji_order":"2386","aliases":[":sb:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sc":{"unicode":"1f1f8-1f1e8","unicode_alt":"","code_decimal":"&#127480;&#127464;","name":"the seychelles","shortname":":flag_sc:","category":"flags","emoji_order":"2387","aliases":[":sc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sd":{"unicode":"1f1f8-1f1e9","unicode_alt":"","code_decimal":"&#127480;&#127465;","name":"sudan","shortname":":flag_sd:","category":"flags","emoji_order":"2388","aliases":[":sd:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_se":{"unicode":"1f1f8-1f1ea","unicode_alt":"","code_decimal":"&#127480;&#127466;","name":"sweden","shortname":":flag_se:","category":"flags","emoji_order":"2389","aliases":[":se:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sg":{"unicode":"1f1f8-1f1ec","unicode_alt":"","code_decimal":"&#127480;&#127468;","name":"singapore","shortname":":flag_sg:","category":"flags","emoji_order":"2390","aliases":[":sg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sh":{"unicode":"1f1f8-1f1ed","unicode_alt":"","code_decimal":"&#127480;&#127469;","name":"saint helena","shortname":":flag_sh:","category":"flags","emoji_order":"2391","aliases":[":sh:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_si":{"unicode":"1f1f8-1f1ee","unicode_alt":"","code_decimal":"&#127480;&#127470;","name":"slovenia","shortname":":flag_si:","category":"flags","emoji_order":"2392","aliases":[":si:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sj":{"unicode":"1f1f8-1f1ef","unicode_alt":"","code_decimal":"&#127480;&#127471;","name":"svalbard and jan mayen","shortname":":flag_sj:","category":"flags","emoji_order":"2393","aliases":[":sj:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sk":{"unicode":"1f1f8-1f1f0","unicode_alt":"","code_decimal":"&#127480;&#127472;","name":"slovakia","shortname":":flag_sk:","category":"flags","emoji_order":"2394","aliases":[":sk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sl":{"unicode":"1f1f8-1f1f1","unicode_alt":"","code_decimal":"&#127480;&#127473;","name":"sierra leone","shortname":":flag_sl:","category":"flags","emoji_order":"2395","aliases":[":sl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sm":{"unicode":"1f1f8-1f1f2","unicode_alt":"","code_decimal":"&#127480;&#127474;","name":"san marino","shortname":":flag_sm:","category":"flags","emoji_order":"2396","aliases":[":sm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sn":{"unicode":"1f1f8-1f1f3","unicode_alt":"","code_decimal":"&#127480;&#127475;","name":"senegal","shortname":":flag_sn:","category":"flags","emoji_order":"2397","aliases":[":sn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_so":{"unicode":"1f1f8-1f1f4","unicode_alt":"","code_decimal":"&#127480;&#127476;","name":"somalia","shortname":":flag_so:","category":"flags","emoji_order":"2398","aliases":[":so:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sr":{"unicode":"1f1f8-1f1f7","unicode_alt":"","code_decimal":"&#127480;&#127479;","name":"suriname","shortname":":flag_sr:","category":"flags","emoji_order":"2399","aliases":[":sr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ss":{"unicode":"1f1f8-1f1f8","unicode_alt":"","code_decimal":"&#127480;&#127480;","name":"south sudan","shortname":":flag_ss:","category":"flags","emoji_order":"2400","aliases":[":ss:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_st":{"unicode":"1f1f8-1f1f9","unicode_alt":"","code_decimal":"&#127480;&#127481;","name":"s\u00e3o tom\u00e9 and pr\u00edncipe","shortname":":flag_st:","category":"flags","emoji_order":"2401","aliases":[":st:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sv":{"unicode":"1f1f8-1f1fb","unicode_alt":"","code_decimal":"&#127480;&#127483;","name":"el salvador","shortname":":flag_sv:","category":"flags","emoji_order":"2402","aliases":[":sv:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sx":{"unicode":"1f1f8-1f1fd","unicode_alt":"","code_decimal":"&#127480;&#127485;","name":"sint maarten","shortname":":flag_sx:","category":"flags","emoji_order":"2403","aliases":[":sx:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sy":{"unicode":"1f1f8-1f1fe","unicode_alt":"","code_decimal":"&#127480;&#127486;","name":"syria","shortname":":flag_sy:","category":"flags","emoji_order":"2404","aliases":[":sy:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_sz":{"unicode":"1f1f8-1f1ff","unicode_alt":"","code_decimal":"&#127480;&#127487;","name":"swaziland","shortname":":flag_sz:","category":"flags","emoji_order":"2405","aliases":[":sz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ta":{"unicode":"1f1f9-1f1e6","unicode_alt":"","code_decimal":"&#127481;&#127462;","name":"tristan da cunha","shortname":":flag_ta:","category":"flags","emoji_order":"2406","aliases":[":ta:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tc":{"unicode":"1f1f9-1f1e8","unicode_alt":"","code_decimal":"&#127481;&#127464;","name":"turks and caicos islands","shortname":":flag_tc:","category":"flags","emoji_order":"2407","aliases":[":tc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_td":{"unicode":"1f1f9-1f1e9","unicode_alt":"","code_decimal":"&#127481;&#127465;","name":"chad","shortname":":flag_td:","category":"flags","emoji_order":"2408","aliases":[":td:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tf":{"unicode":"1f1f9-1f1eb","unicode_alt":"","code_decimal":"&#127481;&#127467;","name":"french southern territories","shortname":":flag_tf:","category":"flags","emoji_order":"2409","aliases":[":tf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tg":{"unicode":"1f1f9-1f1ec","unicode_alt":"","code_decimal":"&#127481;&#127468;","name":"togo","shortname":":flag_tg:","category":"flags","emoji_order":"2410","aliases":[":tg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_th":{"unicode":"1f1f9-1f1ed","unicode_alt":"","code_decimal":"&#127481;&#127469;","name":"thailand","shortname":":flag_th:","category":"flags","emoji_order":"2411","aliases":[":th:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tj":{"unicode":"1f1f9-1f1ef","unicode_alt":"","code_decimal":"&#127481;&#127471;","name":"tajikistan","shortname":":flag_tj:","category":"flags","emoji_order":"2412","aliases":[":tj:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tk":{"unicode":"1f1f9-1f1f0","unicode_alt":"","code_decimal":"&#127481;&#127472;","name":"tokelau","shortname":":flag_tk:","category":"flags","emoji_order":"2413","aliases":[":tk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tl":{"unicode":"1f1f9-1f1f1","unicode_alt":"","code_decimal":"&#127481;&#127473;","name":"timor-leste","shortname":":flag_tl:","category":"flags","emoji_order":"2414","aliases":[":tl:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tm":{"unicode":"1f1f9-1f1f2","unicode_alt":"","code_decimal":"&#127481;&#127474;","name":"turkmenistan","shortname":":flag_tm:","category":"flags","emoji_order":"2415","aliases":[":turkmenistan:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tn":{"unicode":"1f1f9-1f1f3","unicode_alt":"","code_decimal":"&#127481;&#127475;","name":"tunisia","shortname":":flag_tn:","category":"flags","emoji_order":"2416","aliases":[":tn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_to":{"unicode":"1f1f9-1f1f4","unicode_alt":"","code_decimal":"&#127481;&#127476;","name":"tonga","shortname":":flag_to:","category":"flags","emoji_order":"2417","aliases":[":to:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tr":{"unicode":"1f1f9-1f1f7","unicode_alt":"","code_decimal":"&#127481;&#127479;","name":"turkey","shortname":":flag_tr:","category":"flags","emoji_order":"2418","aliases":[":tr:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tt":{"unicode":"1f1f9-1f1f9","unicode_alt":"","code_decimal":"&#127481;&#127481;","name":"trinidad and tobago","shortname":":flag_tt:","category":"flags","emoji_order":"2419","aliases":[":tt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tv":{"unicode":"1f1f9-1f1fb","unicode_alt":"","code_decimal":"&#127481;&#127483;","name":"tuvalu","shortname":":flag_tv:","category":"flags","emoji_order":"2420","aliases":[":tuvalu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tw":{"unicode":"1f1f9-1f1fc","unicode_alt":"","code_decimal":"&#127481;&#127484;","name":"the republic of china","shortname":":flag_tw:","category":"flags","emoji_order":"2421","aliases":[":tw:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_tz":{"unicode":"1f1f9-1f1ff","unicode_alt":"","code_decimal":"&#127481;&#127487;","name":"tanzania","shortname":":flag_tz:","category":"flags","emoji_order":"2422","aliases":[":tz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ua":{"unicode":"1f1fa-1f1e6","unicode_alt":"","code_decimal":"&#127482;&#127462;","name":"ukraine","shortname":":flag_ua:","category":"flags","emoji_order":"2423","aliases":[":ua:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ug":{"unicode":"1f1fa-1f1ec","unicode_alt":"","code_decimal":"&#127482;&#127468;","name":"uganda","shortname":":flag_ug:","category":"flags","emoji_order":"2424","aliases":[":ug:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_um":{"unicode":"1f1fa-1f1f2","unicode_alt":"","code_decimal":"&#127482;&#127474;","name":"united states minor outlying islands","shortname":":flag_um:","category":"flags","emoji_order":"2425","aliases":[":um:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_us":{"unicode":"1f1fa-1f1f8","unicode_alt":"","code_decimal":"&#127482;&#127480;","name":"united states","shortname":":flag_us:","category":"flags","emoji_order":"2427","aliases":[":us:"],"aliases_ascii":[],"keywords":["america","country","flag"]},"flag_uy":{"unicode":"1f1fa-1f1fe","unicode_alt":"","code_decimal":"&#127482;&#127486;","name":"uruguay","shortname":":flag_uy:","category":"flags","emoji_order":"2428","aliases":[":uy:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_uz":{"unicode":"1f1fa-1f1ff","unicode_alt":"","code_decimal":"&#127482;&#127487;","name":"uzbekistan","shortname":":flag_uz:","category":"flags","emoji_order":"2429","aliases":[":uz:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_va":{"unicode":"1f1fb-1f1e6","unicode_alt":"","code_decimal":"&#127483;&#127462;","name":"the vatican city","shortname":":flag_va:","category":"flags","emoji_order":"2430","aliases":[":va:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_vc":{"unicode":"1f1fb-1f1e8","unicode_alt":"","code_decimal":"&#127483;&#127464;","name":"saint vincent and the grenadines","shortname":":flag_vc:","category":"flags","emoji_order":"2431","aliases":[":vc:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ve":{"unicode":"1f1fb-1f1ea","unicode_alt":"","code_decimal":"&#127483;&#127466;","name":"venezuela","shortname":":flag_ve:","category":"flags","emoji_order":"2432","aliases":[":ve:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_vg":{"unicode":"1f1fb-1f1ec","unicode_alt":"","code_decimal":"&#127483;&#127468;","name":"british virgin islands","shortname":":flag_vg:","category":"flags","emoji_order":"2433","aliases":[":vg:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_vi":{"unicode":"1f1fb-1f1ee","unicode_alt":"","code_decimal":"&#127483;&#127470;","name":"u.s. virgin islands","shortname":":flag_vi:","category":"flags","emoji_order":"2434","aliases":[":vi:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_vn":{"unicode":"1f1fb-1f1f3","unicode_alt":"","code_decimal":"&#127483;&#127475;","name":"vietnam","shortname":":flag_vn:","category":"flags","emoji_order":"2435","aliases":[":vn:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_vu":{"unicode":"1f1fb-1f1fa","unicode_alt":"","code_decimal":"&#127483;&#127482;","name":"vanuatu","shortname":":flag_vu:","category":"flags","emoji_order":"2436","aliases":[":vu:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_wf":{"unicode":"1f1fc-1f1eb","unicode_alt":"","code_decimal":"&#127484;&#127467;","name":"wallis and futuna","shortname":":flag_wf:","category":"flags","emoji_order":"2437","aliases":[":wf:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ws":{"unicode":"1f1fc-1f1f8","unicode_alt":"","code_decimal":"&#127484;&#127480;","name":"samoa","shortname":":flag_ws:","category":"flags","emoji_order":"2438","aliases":[":ws:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_xk":{"unicode":"1f1fd-1f1f0","unicode_alt":"","code_decimal":"&#127485;&#127472;","name":"kosovo","shortname":":flag_xk:","category":"flags","emoji_order":"2439","aliases":[":xk:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_ye":{"unicode":"1f1fe-1f1ea","unicode_alt":"","code_decimal":"&#127486;&#127466;","name":"yemen","shortname":":flag_ye:","category":"flags","emoji_order":"2440","aliases":[":ye:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_yt":{"unicode":"1f1fe-1f1f9","unicode_alt":"","code_decimal":"&#127486;&#127481;","name":"mayotte","shortname":":flag_yt:","category":"flags","emoji_order":"2441","aliases":[":yt:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_za":{"unicode":"1f1ff-1f1e6","unicode_alt":"","code_decimal":"&#127487;&#127462;","name":"south africa","shortname":":flag_za:","category":"flags","emoji_order":"2442","aliases":[":za:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_zm":{"unicode":"1f1ff-1f1f2","unicode_alt":"","code_decimal":"&#127487;&#127474;","name":"zambia","shortname":":flag_zm:","category":"flags","emoji_order":"2443","aliases":[":zm:"],"aliases_ascii":[],"keywords":["country","flag"]},"flag_zw":{"unicode":"1f1ff-1f1fc","unicode_alt":"","code_decimal":"&#127487;&#127484;","name":"zimbabwe","shortname":":flag_zw:","category":"flags","emoji_order":"2444","aliases":[":zw:"],"aliases_ascii":[],"keywords":["country","flag"]},"regional_indicator_z":{"unicode":"1f1ff","unicode_alt":"","code_decimal":"&#127487;","name":"regional indicator symbol letter z","shortname":":regional_indicator_z:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_y":{"unicode":"1f1fe","unicode_alt":"","code_decimal":"&#127486;","name":"regional indicator symbol letter y","shortname":":regional_indicator_y:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_x":{"unicode":"1f1fd","unicode_alt":"","code_decimal":"&#127485;","name":"regional indicator symbol letter x","shortname":":regional_indicator_x:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_w":{"unicode":"1f1fc","unicode_alt":"","code_decimal":"&#127484;","name":"regional indicator symbol letter w","shortname":":regional_indicator_w:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_v":{"unicode":"1f1fb","unicode_alt":"","code_decimal":"&#127483;","name":"regional indicator symbol letter v","shortname":":regional_indicator_v:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_u":{"unicode":"1f1fa","unicode_alt":"","code_decimal":"&#127482;","name":"regional indicator symbol letter u","shortname":":regional_indicator_u:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_t":{"unicode":"1f1f9","unicode_alt":"","code_decimal":"&#127481;","name":"regional indicator symbol letter t","shortname":":regional_indicator_t:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_s":{"unicode":"1f1f8","unicode_alt":"","code_decimal":"&#127480;","name":"regional indicator symbol letter s","shortname":":regional_indicator_s:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_r":{"unicode":"1f1f7","unicode_alt":"","code_decimal":"&#127479;","name":"regional indicator symbol letter r","shortname":":regional_indicator_r:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_q":{"unicode":"1f1f6","unicode_alt":"","code_decimal":"&#127478;","name":"regional indicator symbol letter q","shortname":":regional_indicator_q:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_p":{"unicode":"1f1f5","unicode_alt":"","code_decimal":"&#127477;","name":"regional indicator symbol letter p","shortname":":regional_indicator_p:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_o":{"unicode":"1f1f4","unicode_alt":"","code_decimal":"&#127476;","name":"regional indicator symbol letter o","shortname":":regional_indicator_o:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_n":{"unicode":"1f1f3","unicode_alt":"","code_decimal":"&#127475;","name":"regional indicator symbol letter n","shortname":":regional_indicator_n:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_m":{"unicode":"1f1f2","unicode_alt":"","code_decimal":"&#127474;","name":"regional indicator symbol letter m","shortname":":regional_indicator_m:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_l":{"unicode":"1f1f1","unicode_alt":"","code_decimal":"&#127473;","name":"regional indicator symbol letter l","shortname":":regional_indicator_l:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_k":{"unicode":"1f1f0","unicode_alt":"","code_decimal":"&#127472;","name":"regional indicator symbol letter k","shortname":":regional_indicator_k:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_j":{"unicode":"1f1ef","unicode_alt":"","code_decimal":"&#127471;","name":"regional indicator symbol letter j","shortname":":regional_indicator_j:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_i":{"unicode":"1f1ee","unicode_alt":"","code_decimal":"&#127470;","name":"regional indicator symbol letter i","shortname":":regional_indicator_i:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_h":{"unicode":"1f1ed","unicode_alt":"","code_decimal":"&#127469;","name":"regional indicator symbol letter h","shortname":":regional_indicator_h:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_g":{"unicode":"1f1ec","unicode_alt":"","code_decimal":"&#127468;","name":"regional indicator symbol letter g","shortname":":regional_indicator_g:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_f":{"unicode":"1f1eb","unicode_alt":"","code_decimal":"&#127467;","name":"regional indicator symbol letter f","shortname":":regional_indicator_f:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_e":{"unicode":"1f1ea","unicode_alt":"","code_decimal":"&#127466;","name":"regional indicator symbol letter e","shortname":":regional_indicator_e:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_d":{"unicode":"1f1e9","unicode_alt":"","code_decimal":"&#127465;","name":"regional indicator symbol letter d","shortname":":regional_indicator_d:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_c":{"unicode":"1f1e8","unicode_alt":"","code_decimal":"&#127464;","name":"regional indicator symbol letter c","shortname":":regional_indicator_c:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_b":{"unicode":"1f1e7","unicode_alt":"","code_decimal":"&#127463;","name":"regional indicator symbol letter b","shortname":":regional_indicator_b:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]},"regional_indicator_a":{"unicode":"1f1e6","unicode_alt":"","code_decimal":"&#127462;","name":"regional indicator symbol letter a","shortname":":regional_indicator_a:","category":"regional","emoji_order":"12345","aliases":[],"aliases_ascii":[],"keywords":[]}}
\ No newline at end of file
diff --git a/spec/lib/emoji_spec.rb b/spec/lib/emoji_spec.rb
new file mode 100644
index 000000000..04931ccfb
--- /dev/null
+++ b/spec/lib/emoji_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe Emoji do
+  describe '#unicode' do
+    it 'returns a unicode for a shortcode' do
+      expect(Emoji.instance.unicode(':joy:')).to eq '😂'
+    end
+  end
+
+  describe '#names' do
+    it 'returns an array' do
+      expect(Emoji.instance.names).to be_an Array
+    end
+  end
+end

From 7bf7ed6123ad6e29f1356f58be0dbe89deed841b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 21 Jul 2017 05:28:51 +0200
Subject: [PATCH 303/382] Fix #3220 - Show avatar/header on edit profile page
 (#4288)

---
 app/javascript/styles/accounts.scss        | 9 +++++++++
 app/javascript/styles/forms.scss           | 4 ++++
 app/views/settings/profiles/show.html.haml | 9 ++++++++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index 801817d80..d5c18e1e3 100644
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -26,6 +26,15 @@
     z-index: 1;
   }
 
+  &.compact {
+    padding: 30px 0;
+    border-radius: 4px;
+
+    .avatar {
+      margin-bottom: 0;
+    }
+  }
+
   .name {
     display: block;
     font-size: 20px;
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index e1de36d55..c467aa7db 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -40,6 +40,10 @@ code {
     }
   }
 
+  .card {
+    margin-bottom: 15px;
+  }
+
   strong {
     font-weight: 500;
   }
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 2b846006f..e0fb613f8 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -7,10 +7,17 @@
   .fields-group
     = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
     = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe
+
+  .card.compact{ style: "background-image: url(#{@account.header.url(:original)})" }
+    .avatar= image_tag @account.avatar.url(:original)
+
+  .fields-group
     = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar')
+
     = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
 
-  = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
+  .fields-group
+    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit

From dbaa6a0e13b66ebd7cb0a622db55471f63da3d2f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 21 Jul 2017 12:45:13 +0200
Subject: [PATCH 304/382] Fix intermittent test failures due to accidentally
 reused class instance between threads (#4287)

---
 spec/services/resolve_remote_account_service_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/services/resolve_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb
index ab5d3c6e5..c3b902b34 100644
--- a/spec/services/resolve_remote_account_service_spec.rb
+++ b/spec/services/resolve_remote_account_service_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe ResolveRemoteAccountService do
       Thread.new do
         true while wait_for_start
         begin
-          return_values << subject.call('foo@localdomain.com')
+          return_values << ResolveRemoteAccountService.new.call('foo@localdomain.com')
         rescue ActiveRecord::RecordNotUnique
           fail_occurred = true
         end

From f2390e2803248ba8e37ee5bd50c36051552773e3 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 21 Jul 2017 19:47:16 +0900
Subject: [PATCH 305/382] Dynamicaly change avatar and header bg from account
 setting (#4289)

---
 app/javascript/packs/public.js      | 14 ++++++++++++++
 app/javascript/styles/accounts.scss |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index a2ed086f1..da1f550fc 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -88,6 +88,20 @@ function main() {
       noteCounter.textContent = 160 - length(target.value);
     }
   });
+
+  delegate(document, '#account_avatar', 'change', ({ target }) => {
+    const avatar = document.querySelector('.card.compact .avatar img');
+    const [file] = target.files || [];
+    const url = URL.createObjectURL(file);
+    avatar.src = url;
+  });
+
+  delegate(document, '#account_header', 'change', ({ target }) => {
+    const header = document.querySelector('.card.compact');
+    const [file] = target.files || [];
+    const url = URL.createObjectURL(file);
+    header.style.backgroundImage = `url(${url})`;
+  });
 }
 
 loadPolyfills().then(main).catch(error => {
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index d5c18e1e3..99eb5ebea 100644
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -32,6 +32,10 @@
 
     .avatar {
       margin-bottom: 0;
+
+      img {
+        object-fit: cover;
+      }
     }
   }
 

From 399f9f4a4ec9f7a405d0ca6317e66cbe79fa28ef Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 21 Jul 2017 13:40:48 +0200
Subject: [PATCH 306/382] Update Goldfinger gem to 2.0 (#4286)

- No masking of HTTP::Error and OpenSSL::SSL::SSLError
- No longer accepts non-HTTPS WebFinger endpoints
---
 Gemfile      |  2 +-
 Gemfile.lock | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 86f092080..f4182bff5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
 gem 'doorkeeper', '~> 4.2'
 gem 'fast_blank', '~> 1.0'
-gem 'goldfinger', '~> 1.2'
+gem 'goldfinger', '~> 2.0'
 gem 'hiredis', '~> 0.6'
 gem 'redis-namespace', '~> 1.5'
 gem 'htmlentities', '~> 4.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f0621f5f..8ed079753 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -166,10 +166,11 @@ GEM
     gemoji (3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    goldfinger (1.2.0)
-      addressable (~> 2.4)
-      http (~> 2.0)
-      nokogiri (~> 1.6)
+    goldfinger (2.0.0)
+      addressable (~> 2.5)
+      http (~> 2.2)
+      nokogiri (~> 1.8)
+      oj (~> 3.0)
     hamlit (2.8.4)
       temple (>= 0.8.0)
       thor
@@ -523,7 +524,7 @@ DEPENDENCIES
   fast_blank (~> 1.0)
   fuubar (~> 2.2)
   gemoji (~> 3.0)
-  goldfinger (~> 1.2)
+  goldfinger (~> 2.0)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)
   htmlentities (~> 4.3)
@@ -591,4 +592,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.15.1
+   1.15.2

From d4c6bf770d19d4fd9b1c05791679aa4e1ca15ea7 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Fri, 21 Jul 2017 21:22:05 +0900
Subject: [PATCH 307/382] Run `bundle` (regression from #4284) (#4290)

---
 Gemfile.lock | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8ed079753..e5fd3506a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,7 +163,6 @@ GEM
     fuubar (2.2.0)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
-    gemoji (3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
     goldfinger (2.0.0)
@@ -523,7 +522,6 @@ DEPENDENCIES
   faker (~> 1.7)
   fast_blank (~> 1.0)
   fuubar (~> 2.2)
-  gemoji (~> 3.0)
   goldfinger (~> 2.0)
   hamlit-rails (~> 0.2)
   hiredis (~> 0.6)

From 38177048068ec9448f53cf9cc531637de2248bb1 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Fri, 21 Jul 2017 14:22:29 +0200
Subject: [PATCH 308/382] feat(compose): Change media query for compact mode to
 max-height: 400px (#4291)

---
 app/javascript/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index b376f3a30..d9e5a9bad 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3729,7 +3729,7 @@ noscript {
   }
 }
 
-@media screen and (max-width: 1024px) and (max-height: 600px) {
+@media screen and (max-width: 1024px) and (max-height: 400px) {
   $duration: 400ms;
   $delay: 100ms;
 

From 8d6c3cd48ae4f96752ff6b698bc7244d97aa9a27 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 22 Jul 2017 01:09:10 +0200
Subject: [PATCH 309/382] Fix sessions being replaced needlessly (#4292)

---
 config/initializers/devise.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index bf61ea0ea..e6b0e90cb 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -1,8 +1,12 @@
 Warden::Manager.after_set_user except: :fetch do |user, warden|
-  SessionActivation.deactivate warden.cookies.signed['_session_id']
+  if user.session_active?(warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'])
+    session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
+  else
+    session_id = user.activate_session(warden.request)
+  end
 
   warden.cookies.signed['_session_id'] = {
-    value: user.activate_session(warden.request),
+    value: session_id,
     expires: 1.year.from_now,
     httponly: true,
   }

From cf51e07bde14bb21161f8bbe592207c2ef88ad16 Mon Sep 17 00:00:00 2001
From: Sylvhem <Sylvhem@users.noreply.github.com>
Date: Sat, 22 Jul 2017 14:11:46 +0200
Subject: [PATCH 310/382] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20la=20traduc?=
 =?UTF-8?q?tion=20de=20la=20page=20d=E2=80=99accueil=20(#4294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Mise à jour de la traduction de la page d’accueil

Met à jour les traductions et ajoute les chaînes manquantes suite à la refonte de la page d’accueil.

Update translations and add the strings introduced by the landing page's redesign.

* Correction d’erreurs

Corrige l’indentation de certaines clefs et supprime admin.settings.setting qui n’existe plus dans le projet original.

Fix some indentations and delete admin.settings.setting, which have been removed upstream.
---
 config/locales/fr.yml | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 65e681b20..606162c10 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,17 +1,30 @@
 ---
 fr:
   about:
-    about_mastodon: Mastodon est un serveur <em>libre</em> de réseautage social. Alternative <em>décentralisée</em> aux plateformes commerciales, la monopolisation de vos communications par une entreprise unique est évitée. Tout un chacun peut faire tourner Mastodon et participer au <em>réseau social</em> de manière transparente.
-    about_this: À propos de cette instance
+    about_mastodon_html: Mastodon est un réseau social utilisant des formats ouverts et des logiciels libres. Comme le courriel, il est décentralisé.
+    about_this: À propos
     business_email: Courriel professionnel
-    closed_registrations: Les inscriptions sont actuellement fermées sur cette instance.
+    closed_registrations: Les inscriptions sont actuellement fermées sur cette instance. Cependant, vous pouvez trouver une autre instance sur laquelle vous créer un compte et à partir de laquelle vous pourrez accéder au même réseau.
     contact: Contact
     description_headline: Qu’est-ce que %{domain} ?
     domain_count_after: autres instances
     domain_count_before: Connectés à
+    features:
+      humane_approach_body: Ayant appris des échecs d’autres réseaux, Mastodon à l’ambition de combattre l’abus des médias sociaux en effectuant des choix de conception éthiques.
+      humane_approach_title: Une approche plus humaine
+      not_a_product_body: Mastodon n’est pas un réseau commercial. Ici, pas de publicités, pas de prospection de données et pas d’environnement fermés. Il n’y existe aucune autorité centrale.
+      not_a_product_title: Vous êtes une personne, pas un produit
+      real_conversation_body: Avec 500 caractères à votre dispostion, une grande granularité en terme de diffusion et la possibilité de masquer vos messages derrières des avertissements, vous êtes libre de vous exprimer de la manière qui vous plaît.
+      real_conversation_title: Construit pour de vraies conversations
+      within_reach_body: Grâce à l’existence d’un environnement API accueillant pour les développeur·se·s, de multiples applications pour iOS, Android et d’autres plateformes vous permettent de rester en contact avec vos ami·e·s où que vous soyez.
+      within_reach_title: Toujours à portée de main
+    find_another_instance: Trouver une autre instance
+    generic_description: "%{domain} est seulement un serveur du réseau"
     get_started: Rejoindre le réseau
+    hosted_on: Instance Mastodon hébergée par %{domain}
+    learn_more: En savoir plus
     links: Liens
-    other_instances: Autres instances
+    other_instances: Liste des instances
     source_code: Code source
     status_count_after: posts
     status_count_before: Ayant publié
@@ -19,6 +32,7 @@ fr:
     user_count_after: utilisateur⋅ice⋅s
     user_count_before: Abrite
     version: Version
+    what_is_mastodon: Qu’est-ce que Mastodon ?
   accounts:
     follow: Suivre
     followers: Abonné⋅es
@@ -151,15 +165,25 @@ fr:
         closed_message:
           desc_html: Affiché sur la page d’accueil lorsque les inscriptions sont fermées<br>Vous pouvez utiliser des balises HTML
           title: Message de fermeture des inscriptions
+        deletion:
+          desc_html: Permettre à tou·te·s les utilisateur·rice·s de supprimer leur compte
+          title: Autoriser les suppressions de compte
         open:
-          title: Inscriptions
+          desc_html: Autoriser tout le monde à créer un compte
+          title: Ouvrir les inscriptions
       site_description:
         desc_html: Affichée sous la forme d’un paragraphe sur la page d’accueil et utilisée comme balise meta.<br>Vous pouvez utiliser des balises HTML, en particulier <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
         title: Description du site
       site_description_extended:
         desc_html: Affichée sur la page d’informations complémentaires du site<br>Vous pouvez utiliser des balises HTML
         title: Description étendue du site
+      site_terms:
+        desc_html: Affichée sur la page des conditions d’utilisation du site<br>Vous pouvez utiliser des balises HTML
+        title: Politique de confidentialité
       site_title: Titre du site
+      timeline_preview:
+        desc_html: Afficher le fil public sur la page d’accueil
+        title: Prévisualisation du fil global
       title: Paramètres du site
     subscriptions:
       callback_url: URL de rappel
@@ -180,6 +204,7 @@ fr:
   applications:
     invalid_url: L’URL fournie est invalide
   auth:
+    agreement_html: En vous inscrivant, vous souscrivez à <a href="%{rules_path}">nos conditions d’utilisation</a> ainsi qu’à <a href="%{terms_path}">notre politique de confidentialité</a>.
     change_password: Sécurité
     delete_account: Supprimer le compte
     delete_account_html: Si vous désirez supprimer votre compte, vous pouvez cliquer ici. Il vous sera demandé de confirmer cette action.

From a929f7e6ac92cf5dbb8458eb2975fa834e751e92 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 22 Jul 2017 16:36:36 +0200
Subject: [PATCH 311/382] Fix #4172 - Mutes now block notifications (#4300)

---
 app/services/notify_service.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index a44df5180..ca53c61c5 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -21,7 +21,7 @@ class NotifyService < BaseService
   end
 
   def blocked_favourite?
-    @recipient.muting?(@notification.from_account)
+    false
   end
 
   def blocked_follow?
@@ -41,6 +41,7 @@ class NotifyService < BaseService
     blocked ||= @recipient.id == @notification.from_account.id                                                                       # Skip for interactions with self
     blocked ||= @recipient.domain_blocking?(@notification.from_account.domain) && !@recipient.following?(@notification.from_account) # Skip for domain blocked accounts
     blocked ||= @recipient.blocking?(@notification.from_account)                                                                     # Skip for blocked accounts
+    blocked ||= @recipient.muting?(@notification.from_account)                                                                       # Skip for muted accounts
     blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))                         # Hellban
     blocked ||= (@recipient.user.settings.interactions['must_be_follower']  && !@notification.from_account.following?(@recipient))   # Options
     blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account))   # Options

From 311871eefcff5c90c87de406e29e1853f9621ab6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 22 Jul 2017 16:36:54 +0200
Subject: [PATCH 312/382] Turn clouds on landing page into SVGs, use SCSS
 variables to color them (#4299)

---
 app/javascript/images/cloud2.png | Bin 4973 -> 0 bytes
 app/javascript/images/cloud3.png | Bin 5860 -> 0 bytes
 app/javascript/images/cloud4.png | Bin 5273 -> 0 bytes
 app/javascript/styles/about.scss |   8 +++++++-
 app/views/about/show.html.haml   |   6 +++---
 5 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 app/javascript/images/cloud2.png
 delete mode 100644 app/javascript/images/cloud3.png
 delete mode 100644 app/javascript/images/cloud4.png

diff --git a/app/javascript/images/cloud2.png b/app/javascript/images/cloud2.png
deleted file mode 100644
index f325ca6de0967bec0b77f532cf7e961adb89b99a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4973
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
b)&0+1YW~Zts=5n4jG^Eo#}Ahu^t=3j6x<=*

diff --git a/app/javascript/images/cloud3.png b/app/javascript/images/cloud3.png
deleted file mode 100644
index ab194d0b857a946094418fdf4bd87caadb8d8122..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5860
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
N<0p^Z|J(P<{{Zxw-<SXZ

diff --git a/app/javascript/images/cloud4.png b/app/javascript/images/cloud4.png
deleted file mode 100644
index 98323f5a271555a8e5cc72a8a166ddbd8de7eddc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5273
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
CO5;fY

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index b9c018391..0aca5cc00 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -386,7 +386,7 @@
         top: 0;
         left: 0;
 
-        img {
+        div {
           position: absolute;
           transition: all 0.1s linear;
           animation-name: floating;
@@ -398,23 +398,29 @@
         }
 
         .float-1 {
+          width: 324px;
           height: 170px;
           right: -120px;
           bottom: 0;
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 447.1875 234.375" height="170" width="324"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M21.69 233.366c-6.45-1.268-13.347-5.63-16.704-10.564-10.705-15.734-1.513-37.724 18.632-44.57l4.8-1.632.173-17.753c.146-14.77.515-19.063 2.2-25.55 6.736-25.944 24.46-46.032 47.766-54.137 11.913-4.143 19.558-5.366 34.178-5.47l13.828-.096V71.12c0-4.755 2.853-17.457 5.238-23.327 8.588-21.137 26.735-35.957 52.153-42.593 23.248-6.07 50.153-6.415 71.863-.923 11.14 2.82 25.686 9.957 33.857 16.615 19.335 15.756 31.82 41.05 35.183 71.275.59 5.305.672 5.435 3.11 4.926 11.833-2.474 30.4-3.132 40.065-1.42 24.388 4.32 40.568 19.076 47.214 43.058 2.16 7.8 3.953 23.894 3.59 32.237l-.24 5.498 5.156 1.317c6.392 1.633 14.55 7.098 18.003 12.062 1.435 2.062 3.305 6.597 4.156 10.078 1.428 5.84 1.43 6.8.04 12.44-1.807 7.318-5.672 13.252-10.872 16.694-8.508 5.63 3.756 5.33-211.916 5.216-108.56-.056-199.22-.464-201.47-.906z"/></svg>');
         }
 
         .float-2 {
+          width: 241px;
           height: 100px;
           right: 210px;
           bottom: 0;
           animation-delay: 0.2s;
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 536.25 222.1875" height="100" width="241"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M42.626 221.23c-14.104-1.174-26.442-5.133-32.825-10.534-4.194-3.548-7.684-10.66-8.868-18.075-1.934-12.102.633-22.265 7.528-29.81 7.61-8.328 19.998-12.76 39.855-14.257l8.47-.638-2.08-6.223c-4.826-14.422-6.357-24.813-6.37-43.255-.012-14.923.28-18.513 2.1-25.724 2.283-9.048 8.483-23.034 13.345-30.1 14.76-21.45 43.505-38.425 70.535-41.65 30.628-3.655 64.47 12.073 89.668 41.673l5.955 6.995 2.765-4.174c1.52-2.296 5.74-6.93 9.376-10.295 18.382-17.02 43.436-20.676 73.352-10.705 12.158 4.052 21.315 9.53 29.64 17.733 12.752 12.562 18.16 25.718 18.19 44.26l.02 10.98 2.312-3.01c15.64-20.365 42.29-20.485 62.438-.28 3.644 3.653 7.558 8.593 8.697 10.976 4.895 10.24 5.932 25.688 2.486 37.046-.76 2.507-1.388 4.816-1.393 5.13-.006.316 6.845.87 15.224 1.234 53.06 2.297 76.356 12.98 81.817 37.526 3.554 15.973-3.71 28.604-19.566 34.02-4.554 1.555-17.922 1.655-234.517 1.757-126.327.06-233.497-.21-238.154-.597z"/></svg>');
         }
 
         .float-3 {
+          width: 267px;
           height: 140px;
           right: 110px;
           top: -30px;
           animation-delay: 0.1s;
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 388.125 202.5" height="140" width="267"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M181.37 201.458c-17.184-1.81-36.762-8.944-49.523-18.05l-5.774-4.12-8.074 2.63c-11.468 3.738-21.382 4.962-35.815 4.422-14.79-.554-24.577-2.845-36.716-8.594-15.483-7.332-28.498-19.98-35.985-34.968C2.44 128.675-.94 108.435.9 91.356c3.362-31.234 18.197-53.698 43.63-66.074 12.803-6.23 22.384-8.55 37.655-9.122 14.433-.54 24.347.684 35.814 4.42l8.073 2.633 5.635-4.01c24.81-17.656 60.007-23.332 92.914-14.985 10.11 2.565 25.498 9.62 33.102 15.178l5.068 3.704 7.632-2.564c10.89-3.66 21.086-4.916 35.516-4.376 45.816 1.716 76.422 30.03 81.285 75.196 1.84 17.08-1.54 37.32-8.585 51.422-7.487 14.99-20.502 27.636-35.984 34.968-12.14 5.75-21.926 8.04-36.716 8.593-14.43.54-24.626-.716-35.516-4.376l-7.632-2.564-5.068 3.704c-12.844 9.387-32.714 16.488-51.545 18.42-10.607 1.09-13.916 1.08-24.81-.066z"/></svg>');
         }
       }
 
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 0af47bde3..999d1e37b 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -38,9 +38,9 @@
 
       .container.hero
         .floats
-          = image_tag asset_pack_path('cloud2.png'), alt: '', role: 'presentation', class: 'float-1'
-          = image_tag asset_pack_path('cloud3.png'), alt: '', role: 'presentation', class: 'float-2'
-          = image_tag asset_pack_path('cloud4.png'), alt: '', role: 'presentation', class: 'float-3'
+          %div{ role: 'presentation', class: 'float-1' }
+          %div{ role: 'presentation', class: 'float-2' }
+          %div{ role: 'presentation', class: 'float-3' }
         .heading
           %h1
             = @instance_presenter.site_title

From 4cd82d442ea2040bc594a0e1b10c15df736d9ca5 Mon Sep 17 00:00:00 2001
From: Damien Erambert <damien.erambert@me.com>
Date: Sat, 22 Jul 2017 11:28:40 -0700
Subject: [PATCH 313/382] Update French locales (settings, ToS, & co) (#4261)

* add fr-FR locales to the landing page

* moar french locales

* terms of service/privacy policy

* remove un-used locales in the client (yarn manage:translations)

* update french locales in the client

* remove duplicate locales in fr.yml

* fix typos per PR comments in fr.yml

* put back default messages

* translate untranslated keys on the client

* add "push" after notifications

* correctly ident ToS in fr.yml
---
 app/javascript/mastodon/locales/fr.json |  22 ++---
 config/locales/fr.yml                   | 112 +++++++++++++++++++++++-
 2 files changed, 119 insertions(+), 15 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index c3e743259..fc33052b1 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -18,12 +18,12 @@
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.",
+  "bundle_column_error.retry": "Réessayer",
+  "bundle_column_error.title": "Erreur réseau",
+  "bundle_modal_error.close": "Fermer",
+  "bundle_modal_error.message": "Une erreur s'est produite lors du chargement de ce composant.",
+  "bundle_modal_error.retry": "Réessayer",
   "column.blocks": "Comptes bloqués",
   "column.community": "Fil public local",
   "column.favourites": "Favoris",
@@ -55,8 +55,8 @@
   "confirmations.domain_block.message": "Êtes-vous vraiment, vraiment sûr⋅e de vouloir bloquer {domain} en entier ? Dans la plupart des cas, quelques blocages ou masquages ciblés sont suffisants et préférables.",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.mute.message": "Confirmez vous le masquage de {name} ?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.confirm": "Ne plus suivre",
+  "confirmations.unfollow.message": "Vous voulez-vous arrêter de suivre {name} ?",
   "emoji_button.activity": "Activités",
   "emoji_button.flags": "Drapeaux",
   "emoji_button.food": "Boire et manger",
@@ -111,8 +111,8 @@
   "notifications.column_settings.favourite": "Favoris :",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonn⋅é⋅s :",
   "notifications.column_settings.mention": "Mentions :",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.push": "Notifications push",
+  "notifications.column_settings.push_meta": "Cet appareil",
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Émettre un son",
@@ -151,7 +151,7 @@
   "report.target": "Signalement",
   "search.placeholder": "Rechercher",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
-  "standalone.public_title": "A look inside...",
+  "standalone.public_title": "Coup d'oeil",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.delete": "Effacer",
   "status.favourite": "Ajouter aux favoris",
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 606162c10..7ba9e2525 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -185,6 +185,21 @@ fr:
         desc_html: Afficher le fil public sur la page d’accueil
         title: Prévisualisation du fil global
       title: Paramètres du site
+    statuses:
+      back_to_account: Retour à la page du compte
+      batch:
+        delete: Supprimer
+        nsfw_off: NSFW OFF
+        nsfw_on: NSFW ON
+      execute: Exécuter
+      failed_to_execute: Erreur d'exécution
+      media:
+        hide: Masquer les médias
+        show: Montrer les médias
+        title: Médias
+      no_media: Aucun média
+      title: État du compte
+      with_media: avec médias
     subscriptions:
       callback_url: URL de rappel
       confirmed: Confirmé
@@ -219,6 +234,12 @@ fr:
   authorize_follow:
     error: Malheureusement, il y a eu une erreur en cherchant les détails du compte distant
     follow: Suivre
+    follow_request: 'Vous avez demandé à suivre:'
+    following: 'Youpi! Vous suivez :'
+    post_follow:
+      close: Ou bien, vous pouvez fermer cette fenêtre.
+      return: Retour au profil de l'utilisateur⋅trice
+      web: Retour à l'interface web
     prompt_html: 'Vous (<strong>%{self}</strong>) avez demandé à suivre :'
     title: Suivre %{acct}
   datetime:
@@ -295,7 +316,7 @@ fr:
   landing_strip_signup_html: Si ce n’est pas le cas, vous pouvez <a href="%{sign_up_path}">en créer un ici</a>.
   media_attachments:
     validations:
-      images_and_video: Impossible de joindre une vidéo à un statut contenant déjà des images
+      images_and_video: Impossible de joindre une vidéo à un status contenant déjà des images
       too_many: Impossible de joindre plus de 4 fichiers
   notification_mailer:
     digest:
@@ -318,13 +339,28 @@ fr:
       subject: 'Abonné⋅es en attente : %{name}'
     mention:
       body: "%{name} vous a mentionné⋅e dans :"
-      subject: "%{name} vous a mentionné⋅e"
+      subject: "%{name} vous a mentionné"
     reblog:
-      body: "%{name} a partagé votre statut :"
-      subject: "%{name} a partagé votre statut"
+      body: "%{name} a partagé votre status :"
+      subject: "%{name} a partagé votre status"
   pagination:
     next: Suivant
     prev: Précédent
+  push_notifications:
+    favourite:
+      title: "%{name} à mis votre status en favori"
+    follow:
+      title: "%{name} vous suit"
+    mention:
+      action_boost: Partager
+      action_expand: Montrer plus
+      action_favourite: Ajouter aux favoris
+      title: "%{name} vous a mentionné"
+    reblog:
+      title: "%{name} a partagé⋅e votre status"
+    subscribed:
+      body: Vous pouvez désormais recevoir des notifications push.
+      title: Abonnements aux notifications push
   remote_follow:
     acct: Entrez votre pseudo@instance depuis lequel vous voulez suivre ce⋅tte utilisateur⋅trice
     missing_resource: L’URL de redirection n’a pas pu être trouvée
@@ -366,6 +402,8 @@ fr:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Révoquer
+    revoke_success: Session révoquée avec succès
     title: Sessions
   settings:
     authorized_apps: Applications autorisées
@@ -393,6 +431,72 @@ fr:
     click_to_show: Cliquer pour afficher
     reblogged: partagé
     sensitive_content: Contenu sensible
+  terms:
+    body_html: |
+      <h2>Politique de confidentialité</h2>
+
+      <h3 id="collect">Quelles données collectons-nous?</h3>
+
+      <p>Nous collectons des données lorsque vous vous enregistrez sur notre site et les récoltons lorsque vous participez dans le forum en lisant, écrivant, et évaluant le contenu partagé ici.</p>
+
+      <p>Lors de l'enregistrement sur notre site, il peut vous être demandé de renseigner votre nom et adresse e-mail. Vous pouvez, cependant, visiter notre site sans inscription. Votre adresse e-mail devra être vérifiée grâce à un e-mail contenant un lien unique. Si ce lien est visité, nous savons que vous contrôlez cette adresse e-mail.</p>
+
+      <p>Lors de l'inscription et de la publication de statuts, nous enregistrons l'adresse IP de laquelle le(s) status viennent. Nous pouvons également conserver des historiques serveurs qui contiendront l'adresse IP de chaque requête adressée à notre serveur.</p>
+
+      <h3 id="use">Que faisons-nous avec vos données?</h3>
+
+      <p>Toute information que nous collectons pourra être utilisée d'une des manières suivantes :</p>
+
+      <ul>
+        <li>Pour personnaliser votre expérience &mdash; vos données nous aident à mieux répondre à vos besoins individuels.</li>
+        <li>Pour améliorer notre site &mdash; nous faisons tout notre possible pour améliorer notre site en fonction des données, retours et suggestions que nous recevons.</li>
+        <li>Afin d'améliorer le support client &mdash; vos données nous aident à mieux répondre à vos requêtes et demandes de support.</li>
+        <li>Afin d'envoyer des e-mails à intervalles réguliers &mdash; l'adresse e-mail que vous renseignez peut être utilisée pour vous envoyer des données et notifications concernant des changements ou en réponse à votre nom d'utilisateur⋅trice, en réponse à vos demandes et/ou autres requêtes ou questions</li>
+      </ul>
+
+      <h3 id="protect">Comment protégeons-nous vos données?</h3>
+        
+      <p>Nous appliquons une multitude de mesures afin de maintenir la sécurité de vos données personnelles lorsque vous entrez, soumettez, ou accédez à ces dernières.</p>
+
+      <h3 id="data-retention">Quelle est notre politique de conservation des données?</h3>
+
+      <p>Nous nous efforçons de:</p>
+
+      <ul>
+        <li>Ne pas garder les historiques serveurs contenant l'adresse IP de chaque requête adressée à ce serveur plus de 90 jours.</li>
+        <li>Ne pas conserver les adresses IP associées aux utilisateur⋅trices et leur contenu plus de 5 ans.</li>
+      </ul>
+
+      <h3 id="cookies">Utilisons nous des "cookies"?</h3>
+
+      <p>Oui. Les cookies sont de petits fichiers qu'un site ou prestataires de services transfèrent sur le disque dur de votre ordinateur par le biais de votre navigateur Web (si ce dernier le permet). Ces cookies permettent au site de reconnaître votre navigateur et, si vous disposez d'un compte, l'associer à votre compte.</p>
+
+      <p>Nous utilisons les cookies pour enregistrer vos préférences pour de futures visites, compiler des données agrégées à propos du trafic et des interactions effectuées sur le site afin de proposer une meilleure expérience dans le futur. Nous pouvons contracter les services d'acteurs tiers afin de nous aider à mieux comprendre les visiteurs de notre site. Ces acteurs ont l'autorisation d'utiliser ces données seulement à des fins d'améliorations.</p>
+
+      <h3 id="disclose">Divulguons-nous des données à des acteurs tiers ?</h3>
+
+      <p>Nous n'échangeons pas, ne vendons pas ni effectuons de quelconques transferts avec des acteurs tiers d'informations permettant de vous identifier personnellement. Cela n'inclut pas les acteurs de confiance qui nous aident à gérer notre entreprise et à vous servir tant que ces acteurs s'accordent à garder lesdites informations confidentielles. Nous pouvons être amenés à délivrer vos informations lorsque jugé adéquat afin de respecter la loi, d'appliquer la politique de notre site, ou afin de protéger nos droits, ceux des autres, notre propriété ou sécurité. Cependant, aucune information permettant l'identification de nos visiteurs ne sera divulguée à des fins publicitaires, commerciales ou tout autre usage.</p>
+
+      <h3 id="third-party">Liens vers des acteurs tiers</h3>
+
+      <p>Nous pouvons être amenés à inclure ou offrir les services ou produits d'acteurs tiers sur notre site. Ces acteurs tiers possèdent leur propre politique de confidentialité. Nous ne sommes donc pas responsables du contenu ou activités desdits acteurs. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes ouverts à toute remarque concernant ces acteurs.</p>
+
+      <h3 id="coppa">Children's Online Privacy Protection Act</h3>
+
+      <p>Notre site, nos produits et services sont tous dirigés à l'usage de personnes étant âgés de 13 ans ou plus. Si ce serveur est hébergé aux États-Unis et que vous êtes âgé⋅e de moins de 13 ans, au vu du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) n'utilisez pas ce site.</p>
+
+      <h3 id="consent">Votre consentement</h3>
+
+      <p>En utilisant notre site, vous consentez à la politique de confiedentialité de notre site Web.</p>
+
+      <h3 id="changes">Changements de notre politique de confidentialité</h3>
+
+      <p>Si nous décidons d'apporter des changements à notre politique de confidentialité, nous les mettrons à disposition sur cette page.</p>
+
+      <p>Ce document est distribué sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 31 Mai 2013. Il a été traduit en français en Juillet 2017.</p>
+
+      <p>Originellement adapté à partir de la politique de confidentialité de <a href="https://github.com/discourse/discourse">Discourse</a></p>.
+    title: "%{instance} Conditions d'utilisations et Politique de confidentialité"
   time:
     formats:
       default: "%d %b %Y, %H:%M"

From db73ac92d7695606fdb59bcedd6caaf7c4fdf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 22 Jul 2017 22:27:06 +0200
Subject: [PATCH 314/382] Changed landing page cloud animation to be more
 relaxed and smoother (#4304)

---
 app/javascript/styles/about.scss | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 0aca5cc00..b94f61144 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -390,10 +390,9 @@
           position: absolute;
           transition: all 0.1s linear;
           animation-name: floating;
-          animation-duration: 1.7s;
           animation-iteration-count: infinite;
           animation-direction: alternate;
-          animation-timing-function: linear;
+          animation-timing-function: ease-in-out;
           z-index: 2;
         }
 
@@ -402,6 +401,7 @@
           height: 170px;
           right: -120px;
           bottom: 0;
+          animation-duration: 3s;
           background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 447.1875 234.375" height="170" width="324"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M21.69 233.366c-6.45-1.268-13.347-5.63-16.704-10.564-10.705-15.734-1.513-37.724 18.632-44.57l4.8-1.632.173-17.753c.146-14.77.515-19.063 2.2-25.55 6.736-25.944 24.46-46.032 47.766-54.137 11.913-4.143 19.558-5.366 34.178-5.47l13.828-.096V71.12c0-4.755 2.853-17.457 5.238-23.327 8.588-21.137 26.735-35.957 52.153-42.593 23.248-6.07 50.153-6.415 71.863-.923 11.14 2.82 25.686 9.957 33.857 16.615 19.335 15.756 31.82 41.05 35.183 71.275.59 5.305.672 5.435 3.11 4.926 11.833-2.474 30.4-3.132 40.065-1.42 24.388 4.32 40.568 19.076 47.214 43.058 2.16 7.8 3.953 23.894 3.59 32.237l-.24 5.498 5.156 1.317c6.392 1.633 14.55 7.098 18.003 12.062 1.435 2.062 3.305 6.597 4.156 10.078 1.428 5.84 1.43 6.8.04 12.44-1.807 7.318-5.672 13.252-10.872 16.694-8.508 5.63 3.756 5.33-211.916 5.216-108.56-.056-199.22-.464-201.47-.906z"/></svg>');
         }
 
@@ -410,6 +410,7 @@
           height: 100px;
           right: 210px;
           bottom: 0;
+          animation-duration: 3.5s;
           animation-delay: 0.2s;
           background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 536.25 222.1875" height="100" width="241"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M42.626 221.23c-14.104-1.174-26.442-5.133-32.825-10.534-4.194-3.548-7.684-10.66-8.868-18.075-1.934-12.102.633-22.265 7.528-29.81 7.61-8.328 19.998-12.76 39.855-14.257l8.47-.638-2.08-6.223c-4.826-14.422-6.357-24.813-6.37-43.255-.012-14.923.28-18.513 2.1-25.724 2.283-9.048 8.483-23.034 13.345-30.1 14.76-21.45 43.505-38.425 70.535-41.65 30.628-3.655 64.47 12.073 89.668 41.673l5.955 6.995 2.765-4.174c1.52-2.296 5.74-6.93 9.376-10.295 18.382-17.02 43.436-20.676 73.352-10.705 12.158 4.052 21.315 9.53 29.64 17.733 12.752 12.562 18.16 25.718 18.19 44.26l.02 10.98 2.312-3.01c15.64-20.365 42.29-20.485 62.438-.28 3.644 3.653 7.558 8.593 8.697 10.976 4.895 10.24 5.932 25.688 2.486 37.046-.76 2.507-1.388 4.816-1.393 5.13-.006.316 6.845.87 15.224 1.234 53.06 2.297 76.356 12.98 81.817 37.526 3.554 15.973-3.71 28.604-19.566 34.02-4.554 1.555-17.922 1.655-234.517 1.757-126.327.06-233.497-.21-238.154-.597z"/></svg>');
         }
@@ -419,7 +420,8 @@
           height: 140px;
           right: 110px;
           top: -30px;
-          animation-delay: 0.1s;
+          animation-duration: 4s;
+          animation-delay: 0.5s;
           background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 388.125 202.5" height="140" width="267"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M181.37 201.458c-17.184-1.81-36.762-8.944-49.523-18.05l-5.774-4.12-8.074 2.63c-11.468 3.738-21.382 4.962-35.815 4.422-14.79-.554-24.577-2.845-36.716-8.594-15.483-7.332-28.498-19.98-35.985-34.968C2.44 128.675-.94 108.435.9 91.356c3.362-31.234 18.197-53.698 43.63-66.074 12.803-6.23 22.384-8.55 37.655-9.122 14.433-.54 24.347.684 35.814 4.42l8.073 2.633 5.635-4.01c24.81-17.656 60.007-23.332 92.914-14.985 10.11 2.565 25.498 9.62 33.102 15.178l5.068 3.704 7.632-2.564c10.89-3.66 21.086-4.916 35.516-4.376 45.816 1.716 76.422 30.03 81.285 75.196 1.84 17.08-1.54 37.32-8.585 51.422-7.487 14.99-20.502 27.636-35.984 34.968-12.14 5.75-21.926 8.04-36.716 8.593-14.43.54-24.626-.716-35.516-4.376l-7.632-2.564-5.068 3.704c-12.844 9.387-32.714 16.488-51.545 18.42-10.607 1.09-13.916 1.08-24.81-.066z"/></svg>');
         }
       }

From 3c515f2cd2a636e06c2cdf67d3493671134b6839 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 01:14:57 +0200
Subject: [PATCH 315/382] Run yarn run manage:translations and i18n-tasks
 normalize (#4302)

---
 app/javascript/mastodon/locales/ar.json       |  1 +
 app/javascript/mastodon/locales/bg.json       |  1 +
 app/javascript/mastodon/locales/ca.json       |  1 +
 app/javascript/mastodon/locales/de.json       |  1 +
 .../mastodon/locales/defaultMessages.json     | 21 +++++++++++++++++++
 app/javascript/mastodon/locales/en.json       |  1 +
 app/javascript/mastodon/locales/eo.json       |  1 +
 app/javascript/mastodon/locales/es.json       |  1 +
 app/javascript/mastodon/locales/fa.json       |  1 +
 app/javascript/mastodon/locales/fi.json       |  1 +
 app/javascript/mastodon/locales/fr.json       |  1 +
 app/javascript/mastodon/locales/he.json       |  1 +
 app/javascript/mastodon/locales/hr.json       |  1 +
 app/javascript/mastodon/locales/hu.json       |  1 +
 app/javascript/mastodon/locales/id.json       |  1 +
 app/javascript/mastodon/locales/io.json       |  1 +
 app/javascript/mastodon/locales/it.json       |  1 +
 app/javascript/mastodon/locales/ja.json       |  1 +
 app/javascript/mastodon/locales/ko.json       |  1 +
 app/javascript/mastodon/locales/nl.json       |  1 +
 app/javascript/mastodon/locales/no.json       |  1 +
 app/javascript/mastodon/locales/oc.json       |  1 +
 app/javascript/mastodon/locales/pl.json       |  1 +
 app/javascript/mastodon/locales/pt-BR.json    |  1 +
 app/javascript/mastodon/locales/pt.json       |  1 +
 app/javascript/mastodon/locales/ru.json       |  1 +
 app/javascript/mastodon/locales/th.json       |  1 +
 app/javascript/mastodon/locales/tr.json       |  1 +
 app/javascript/mastodon/locales/uk.json       |  1 +
 app/javascript/mastodon/locales/zh-CN.json    |  1 +
 app/javascript/mastodon/locales/zh-HK.json    |  1 +
 app/javascript/mastodon/locales/zh-TW.json    |  1 +
 config/locales/en.yml                         | 12 +++++------
 config/locales/ja.yml                         |  6 +++---
 config/locales/pl.yml                         | 12 +++++------
 config/locales/simple_form.en.yml             |  2 +-
 config/locales/simple_form.ja.yml             |  3 +--
 config/locales/simple_form.pl.yml             |  3 +--
 38 files changed, 70 insertions(+), 20 deletions(-)

diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 89ddb2d15..0043e6667 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
   "privacy.unlisted.short": "غير مدرج",
   "reply_indicator.cancel": "إلغاء",
+  "report.heading": "New report",
   "report.placeholder": "تعليقات إضافية",
   "report.submit": "إرسال",
   "report.target": "إبلاغ",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 3dba91b82..6e6517733 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Отказ",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 54f2e5e22..bacb1c991 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "No publicar en línies de temps públiques",
   "privacy.unlisted.short": "No llistat",
   "reply_indicator.cancel": "Cancel·lar",
+  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Enviar",
   "report.target": "Informes",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a041e6655..0f192d4b6 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
   "privacy.unlisted.short": "Nicht gelistet",
   "reply_indicator.cancel": "Abbrechen",
+  "report.heading": "New report",
   "report.placeholder": "Zusätzliche Kommentare",
   "report.submit": "Absenden",
   "report.target": "Melden",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index bf462a537..707693612 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -965,6 +965,27 @@
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
+  {
+    "descriptors": [
+      {
+        "defaultMessage": "New report",
+        "id": "report.heading"
+      },
+      {
+        "defaultMessage": "Additional comments",
+        "id": "report.placeholder"
+      },
+      {
+        "defaultMessage": "Submit",
+        "id": "report.submit"
+      },
+      {
+        "defaultMessage": "Reporting",
+        "id": "report.target"
+      }
+    ],
+    "path": "app/javascript/mastodon/features/report/index.json"
+  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index fe2bd4cb4..14d5c7aa0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting {target}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 029cef883..cfc76517c 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Rezigni",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 36ad66ace..fb7186051 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "No mostrar en la historia federada",
   "privacy.unlisted.short": "Sin federar",
   "reply_indicator.cancel": "Cancelar",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 113daef77..f7a64d349 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
   "privacy.unlisted.short": "فهرست‌نشده",
   "reply_indicator.cancel": "لغو",
+  "report.heading": "New report",
   "report.placeholder": "توضیح اضافه",
   "report.submit": "بفرست",
   "report.target": "گزارش‌دادن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index da9e5d0f2..33691c671 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Peruuta",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index fc33052b1..436120860 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
   "privacy.unlisted.short": "Non-listé",
   "reply_indicator.cancel": "Annuler",
+  "report.heading": "New report",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",
   "report.target": "Signalement",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c8dc4fe8d..8e92668f6 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
   "privacy.unlisted.short": "לא לפיד הכללי",
   "reply_indicator.cancel": "ביטול",
+  "report.heading": "New report",
   "report.placeholder": "הערות נוספות",
   "report.submit": "שליחה",
   "report.target": "דיווח",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index fd669b2b2..78fe33dcc 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Ne prikazuj u javnim timelineovima",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Otkaži",
+  "report.heading": "New report",
   "report.placeholder": "Dodatni komentari",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index b3672cb7a..0b3ee085c 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Mégsem",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 8a17262fe..cff7ee261 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
   "privacy.unlisted.short": "Tak Terdaftar",
   "reply_indicator.cancel": "Batal",
+  "report.heading": "New report",
   "report.placeholder": "Komentar tambahan",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 154ca66ce..b9287081a 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Ne montrar en publika tempolinei",
   "privacy.unlisted.short": "Ne enlistigota",
   "reply_indicator.cancel": "Nihiligar",
+  "report.heading": "New report",
   "report.placeholder": "Plusa komenti",
   "report.submit": "Sendar",
   "report.target": "Denuncante",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 6cb274bae..e00df67fe 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
   "privacy.unlisted.short": "Non elencato",
   "reply_indicator.cancel": "Annulla",
+  "report.heading": "New report",
   "report.placeholder": "Commenti aggiuntivi",
   "report.submit": "Invia",
   "report.target": "Invio la segnalazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 7fe27a092..bba4b7e55 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
   "reply_indicator.cancel": "キャンセル",
+  "report.heading": "New report",
   "report.placeholder": "コメント",
   "report.submit": "通報する",
   "report.target": "問題のユーザー",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index fbd0098d7..b1bbbe4db 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "취소",
+  "report.heading": "New report",
   "report.placeholder": "코멘트",
   "report.submit": "신고하기",
   "report.target": "문제가 된 사용자",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index f7b0bbf68..70e134482 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
+  "report.heading": "New report",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 98f59f774..1ed213625 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
   "privacy.unlisted.short": "Uoppført",
   "reply_indicator.cancel": "Avbryt",
+  "report.heading": "New report",
   "report.placeholder": "Tilleggskommentarer",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index ca094c18a..b6a4bf134 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
   "reply_indicator.cancel": "Anullar",
+  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Mandar",
   "report.target": "Senhalar {target}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 348984648..8bc22f2df 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
+  "report.heading": "New report",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 3944e33e9..d46393cc0 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
+  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 3944e33e9..d46393cc0 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
+  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index cffc285f4..0d4f9a892 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Не показывать в лентах",
   "privacy.unlisted.short": "Скрытый",
   "reply_indicator.cancel": "Отмена",
+  "report.heading": "New report",
   "report.placeholder": "Комментарий",
   "report.submit": "Отправить",
   "report.target": "Жалуемся на",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 63bed6d8c..a59377c7d 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
+  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 5bd308e95..4820e017c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
   "privacy.unlisted.short": "Listelenmemiş",
   "reply_indicator.cancel": "İptal",
+  "report.heading": "New report",
   "report.placeholder": "Ek yorumlar",
   "report.submit": "Gönder",
   "report.target": "Raporlama",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index e1611505d..923332c62 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "Не показувати у публічних стрічках",
   "privacy.unlisted.short": "Прихований",
   "reply_indicator.cancel": "Відмінити",
+  "report.heading": "New report",
   "report.placeholder": "Додаткові коментарі",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 18bf872e5..4d8b0fb8e 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "公开，但不在公共时间轴显示",
   "privacy.unlisted.short": "公开",
   "reply_indicator.cancel": "取消",
+  "report.heading": "New report",
   "report.placeholder": "额外消息",
   "report.submit": "提交",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index a461085c7..69791293b 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "公開，但不在公共時間軸顯示",
   "privacy.unlisted.short": "公開",
   "reply_indicator.cancel": "取消",
+  "report.heading": "New report",
   "report.placeholder": "額外訊息",
   "report.submit": "提交",
   "report.target": "舉報",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d766fb394..af55663a3 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -146,6 +146,7 @@
   "privacy.unlisted.long": "不要貼到公開時間軸",
   "privacy.unlisted.short": "不列出來",
   "reply_indicator.cancel": "取消",
+  "report.heading": "New report",
   "report.placeholder": "更多訊息",
   "report.submit": "送出",
   "report.target": "通報中",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 47f276ca1..92d369b37 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -198,8 +198,8 @@ en:
         show: Show media
         title: Media
       no_media: No media
-      with_media: With media
       title: Account statuses
+      with_media: With media
     subscriptions:
       callback_url: Callback URL
       confirmed: Confirmed
@@ -347,15 +347,15 @@ en:
     follow:
       title: "%{name} is now following you"
     mention:
-      action_boost: 'Boost'
-      action_expand: 'Show more'
-      action_favourite: 'Favourite'
+      action_boost: Boost
+      action_expand: Show more
+      action_favourite: Favourite
       title: "%{name} mentioned you"
     reblog:
       title: "%{name} boosted your status"
     subscribed:
-      body: "You can now receive push notifications."
-      title: "Subscription registered!"
+      body: You can now receive push notifications.
+      title: Subscription registered!
   remote_follow:
     acct: Enter your username@domain you want to follow from
     missing_resource: Could not find the required redirect URL for your account
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 632f93ea3..ce20f37c5 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -198,8 +198,8 @@ ja:
         show: メディアを表示
         title: メディア
       no_media: メディアなし
-      with_media: メディアあり
       title: トゥート一覧
+      with_media: メディアあり
     subscriptions:
       callback_url: コールバックURL
       confirmed: 確認済み
@@ -345,12 +345,12 @@ ja:
     favourite:
       title: あなたのトゥートが %{name} さんにお気に入り登録されました
     follow:
-      title: '%{name} さんにフォローされました'
+      title: "%{name} さんにフォローされました"
     mention:
       action_boost: ブースト
       action_expand: もっと見る
       action_favourite: お気に入り
-      title: '%{name} さんから返信がありました'
+      title: "%{name} さんから返信がありました"
     reblog:
       title: あなたのトゥートが %{name} さんにブーストされました
     subscribed:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 325d52b45..3e5e3810d 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -198,8 +198,8 @@ pl:
         show: Pokaż zawartość multimedialną
         title: Media
       no_media: Bez zawartości multimedialnej
-      with_media: Z zawartością multimedialną
       title: Statusy konta
+      with_media: Z zawartością multimedialną
     subscriptions:
       callback_url: URL zwrotny
       confirmed: Potwierdzono
@@ -351,15 +351,15 @@ pl:
     follow:
       title: "%{name} zaczął Cię śledzić"
     mention:
-      action_boost: 'Podbij'
-      action_expand: 'Pokaż więcej'
-      action_favourite: 'Dodaj do ulubionych'
+      action_boost: Podbij
+      action_expand: Pokaż więcej
+      action_favourite: Dodaj do ulubionych
       title: "%{name} wspomniał o Tobie"
     reblog:
       title: "%{name} podbił Twój status"
     subscribed:
-      body: "Otrzymujesz teraz powiadomienia push."
-      title: "Zarejestrowano subskrypcję!"
+      body: Otrzymujesz teraz powiadomienia push.
+      title: Zarejestrowano subskrypcję!
   remote_follow:
     acct: Podaj swój adres (nazwa@domena), z którego chcesz śledzić
     missing_resource: Nie udało się znaleźć adresu przekierowania z Twojej domeny
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 536bb06e1..fb8524a24 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -41,9 +41,9 @@ en:
         setting_default_privacy: Post privacy
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a toot
+        setting_noindex: Opt-out of search engine indexing
         setting_system_font_ui: Use system's default font
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
-        setting_noindex: Opt-out of search engine indexing
         severity: Severity
         type: Import type
         username: Username
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 65845e1aa..70389e948 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -9,7 +9,6 @@ ja:
         locked: フォロワーを手動で承認する必要があります。
         note: あと<span class="note-counter">%{count}</span>文字入力できます。
         setting_noindex: 公開プロフィールおよび各投稿ページに影響します
-
       imports:
         data: 他の Mastodon インスタンスからエクスポートしたCSVファイルを選択して下さい
       sessions:
@@ -38,9 +37,9 @@ ja:
         setting_default_privacy: 投稿の公開範囲
         setting_default_sensitive: メディアを常に閲覧注意としてマークする
         setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
+        setting_noindex: 検索エンジンによるインデックスを拒否する
         setting_system_font_ui: システムのデフォルトフォントを使う
         setting_unfollow_modal: フォロー解除する前に確認ダイアログを表示する
-        setting_noindex: 検索エンジンによるインデックスを拒否する
         severity: 重大性
         type: インポートする項目
         username: ユーザー名
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index dc5492ea5..7e84472b9 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -40,14 +40,13 @@ pl:
         otp_attempt: Kod uwierzytelnienia dwustopniowego
         password: Hasło
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
-
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_privacy: Widoczność posta
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem postu
+        setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
         setting_system_font_ui: Używaj domyślnej czcionki systemu
         setting_unfollow_modal: Pytaj o potwierdzenie przed usunięciem śledzenia
-        setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
         severity: Priorytet
         type: Typ importu
         username: Nazwa użytkownika

From 7964bfccdb0bc30c4f15db092b66a6f8d57f1262 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 01:15:04 +0200
Subject: [PATCH 316/382] Add rake task mastodon:feeds:build to regenerate all
 active users' feeds (#4303)

---
 app/models/user.rb      | 1 +
 lib/tasks/mastodon.rake | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 25dc25864..96a2d09b7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -53,6 +53,7 @@ class User < ApplicationRecord
   scope :admins,    -> { where(admin: true) }
   scope :confirmed, -> { where.not(confirmed_at: nil) }
   scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) }
+  scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended: false }) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :with_recent_ip_address, ->(value) { where(arel_table[:current_sign_in_ip].eq(value).or(arel_table[:last_sign_in_ip].eq(value))) }
 
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index bceeeaf01..edfa3a4ac 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -143,6 +143,13 @@ namespace :mastodon do
     task clear_all: :environment do
       Redis.current.keys('feed:*').each { |key| Redis.current.del(key) }
     end
+
+    desc 'Generates home timelines for users who logged in in the past two weeks'
+    task build: :environment do
+      User.active.includes(:account).find_each do |u|
+        PrecomputeFeedService.new.call(u.account)
+      end
+    end
   end
 
   namespace :emails do

From 0e0f18ce7c9796b25efa415436fe662f3f65bd25 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 02:40:39 +0200
Subject: [PATCH 317/382] New logo (#4306)

* Add new logo

* Remove unused images
---
 app/javascript/images/background-photo.jpg    | Bin 264344 -> 0 bytes
 app/javascript/images/boost_sprite.png        | Bin 1326 -> 0 bytes
 .../images/fluffy-elephant-friend.png         | Bin 60667 -> 0 bytes
 app/javascript/images/logo.png                | Bin 7752 -> 0 bytes
 app/javascript/images/logo.svg                |   2 +-
 app/javascript/images/logo_alt.svg            |   1 +
 app/javascript/images/logo_full.svg           |   1 +
 app/javascript/images/mastodon.jpg            | Bin 133743 -> 0 bytes
 app/javascript/styles/about.scss              |   9 ++++++++-
 app/javascript/styles/containers.scss         |   3 +--
 app/views/about/show.html.haml                |   3 +--
 app/views/layouts/admin.html.haml             |   2 +-
 app/views/layouts/auth.html.haml              |   3 +--
 public/android-chrome-192x192.png             | Bin 14344 -> 6702 bytes
 public/apple-touch-icon.png                   | Bin 4217 -> 6977 bytes
 public/badge.png                              | Bin 31156 -> 5579 bytes
 public/browserconfig.xml                      |   2 +-
 public/favicon-dev.ico                        | Bin 9854 -> 1631 bytes
 public/favicon.ico                            | Bin 927 -> 1410 bytes
 public/mask-icon.svg                          |   2 +-
 public/mstile-150x150.png                     | Bin 6916 -> 5796 bytes
 21 files changed, 17 insertions(+), 11 deletions(-)
 delete mode 100644 app/javascript/images/background-photo.jpg
 delete mode 100644 app/javascript/images/boost_sprite.png
 delete mode 100644 app/javascript/images/fluffy-elephant-friend.png
 delete mode 100644 app/javascript/images/logo.png
 create mode 100644 app/javascript/images/logo_alt.svg
 create mode 100644 app/javascript/images/logo_full.svg
 delete mode 100644 app/javascript/images/mastodon.jpg

diff --git a/app/javascript/images/background-photo.jpg b/app/javascript/images/background-photo.jpg
deleted file mode 100644
index 03341b8ec5b9f682e5248e4782135d626b267302..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 264344
zcmaI73s@6Zw>Q3LGD9X4fg~hgk?IgYlW>&-iWhJa69`ab2m$d1@j}Z*FrxK-nPAWm
ziv|U&XmvtC0;1rpqV*Cjw$##=3RT|9ThSs#OQ|B>P}~3XJ?A~=d;ZUNzWoHA$z<=f
zFSBN^wSMcj|LXqh9vG`xm-{{d@$m|Pf&VFg4FaM1!=?G_0R#~Cc02%o-Qxu2tX^%L
z9vWJ>DrE7p6-%;1maZrWUANd6IyodP6wI8p&bWAKe)ei&N%jZ1h0)SKKEEO*a+gI*
z=SC)lB^hUD=j3WP6lJGwn4@31A%E$#WztzO#LRWm*A*BGvR5xA))g!-Ts3`NwDe!X
zr?c08-wu@$|EjV&KU%8%yH_G3i6UmND9R=xL;fRpY1rh+#FQx^lOrOhOqm=+gojNI
z4-I2KQ-UW)Oply0J$x$hUq#CHR<!K>={j}nfAz(Fi<bV^q}Hxo8?yF4LRJ)g5IT9<
zv}u3K2oDctYXq-aU$}bly5Pc9e*c!B&R(^&DA%|;cSRxbx5ULuR(!ZRTFQ>}Kc`S&
z{BN=U*R}dTDkdfUzpEA${JjAG61!@(F8hDR`+pU@O26Ki9jeP-wc^8~rP*wCzrPzB
zr_V0RUc7omk$%OB<^NtqDrd#&6{~Vq7>U`bQwZ7I+`?rm)~=HOtA0|_^!UP6s}~n8
z&5l<`OIZmaxw*@xt5nm%C#xo_C#xeSPoAuqs*2TwM}?_pYhq_ln=(0e%D>yHS1kRo
zAiHq&zuPYRpSGI+we8=kP+(+xR%aLGuE|~&TePBp_}7%D=l<_wVMp`7jpaYvF8kld
zGW&mR8_EtQ^zR4ze>~`a-(t1r@5}#ITlUL;D}Ht%tL;UsTK_c!-2SDkV40JBeW1VY
z05d>f80NqThl8LT4hMBX*y6%<`MYp=T#U<pcs!iX=i|IF|0?c(7vX;wh^^0c;kxp8
zt{!f#ZXV*lfBDzH|E}`?zWB=tgcz5`0S6KSSO{^1&|j@!2Y~*w{LkwT!R#2Z|NmWf
z9_)PqfFX7kC<lcA3`2kqAffMMSedeTrHJ#`RBk_c^#|#_C*dB5N{22f68jbJkzA|3
zdH+BBU4*Pewr}?D-(3kI-^rqXwf*ZSFowfQ6mo=M7I?FLPjtJtP^_?JqzogJQg<($
zs@tvOkw89!E;~NN`KAq~BdkG59kh*G;Jk6S)UJxCR{gg1sqe>AE`AZ)3}3b*k{{CV
z?HxdJUzLDlvv@ZZ;Pj{M=*}&M0u3CS8Q4GsXZ6T&U!f~rGf}PAWG=(kzoi3}%of6a
zUSLj(=rjp#;?)V{$&<)wcx0b27f3OnD@8Ch#?gk8_(Uk2p!3`DG_7DqN2Hk^V^+Nr
zdqv_b3=F-Q=N)-cI6pP#zJx&jtmP4^uIk1G!@dhT56qJmEQ9>f7qD92cJ{Lx;Ty4B
zXiu4YK21bsfZGnt!5xBqi@o|`8Q>0z#2pCpY1t)hX`Lv~#_2_%xdQ*D4unw5zwV?E
zUD{{h5u`Asu3SW(n6+d~-!WBj(pkcH!8OpC)(gvxLLyP>%ezog&?+t++vYvzAZ0o8
z6bG_(d-&s?$}Fbu_P8v$m;j`+C;>c`$k*+NhoeYLgYMqf>-WtwBG6Qu){3mBOMK`V
zPXK(SB?&$(LuIzvUS;QG<yW?ohU^9-B<Z7eJhZ!1Y#0-EU$CxAFiba&(AES7sUH&7
zJoJt2qWpr>ds;KTu)vL*tPw3aN*}^9bfb1Ay$@~<0QH0%eFB1B(wT=NWt|PZ%KbU^
z@qaFJrzhV$y0rV|(J0fE-ySSDneff^4W{uCigIr#J@WW|@0$_f-vo+}ggagg`%9ya
z<M<oA;iFSmK*9!4Ld^Ao8aR=cuj{^k7?5)8QCs*A>K%3aF(PWD1D!@c1WjL*#@<_9
z^~F26{~;?C$>U+iGg+yOs1;W8??G}R{o{SK`Wbv(hFEXWGxheke$txTk~DwLb^U{*
zt+9q%@;Mq$NT@hq!lP-a@9UBs+c^)5OfE@+F76<#5HRT*Hl2YaSZr0LnvSa%{G)PC
zIv85!Q(*Ml**r1f@^z6=CBTgUjvU6?^>Q_8?iPQOF~dY2@@l#IZEaWj`~r{ksy8LR
zqA?>UnDz{O*E(rU+($WZ6dri?yl~#Oc+nJ%uiGtR^{cB=^TPR%tdhFAul(rZr~OG^
zmJ+)qU=Hw|)#5IOG;O>=y7AMH2g~Zp5~OK8{1HOsr`oOJiDjDvvdd2J4Jo6b%e@=2
z>W|L7MqD9;uo$fF<81!G7;3d8tb9U-ydm|~n)Md1EMi^-ePIyZa%YrY(SdX|rwuPe
z&OGJBuYc(4QXD+9BRw;C11Mc-41y?^-;BaR&U^}epGn?A2+|The~evly6jm19qpAS
zJ5v9N`gK{Z$mH5SWi~huNlOMP)s9)=JDTyV0uX^FwiTNq`cia|g9lw(43SksB(0E&
zF+28*NIfE=d5h-&pI4xdylqU|9lqmMZ&pqhHuU@?bgn<`-D|ZNomMsHx@*oQt#u!*
zKh#zIctjcu!U8^IH21{^y10F>prDimp!#QLvN15f4JG%e)34befsA^O%Bw}%gvl+~
zQzF&^XFh|0O@P*b9kEc|R4A+2>nN>FCvGnE=j_U<o<@2f_ILfDXd67^DYV7MVxAS=
zaBEWzG|2~?Qm(9BEjyiLk$`@Z)t~byoZRg34{=mC-N(O7OX)~BZojL7s_QAfYZFC6
z<6aTLV3QfP=AfjeaHevbVP3tu*o8?u1&gH@>D4yX&I}rH1?gm%AZ4t3y)gHhX$~ZM
z1E0F(^bAx}kf;H=-^)!LhG+LdGI)eu!$?9~fHb|wa(bS^x*6p3aZ8~EnN#7UO<H_2
z)1b*OBJNLxBkFSSdcqt?Cw`L-k7u&KVub!_S+x7zE?DYa1O*-f)m`v*XIYbK+Z<n~
zPO{lqG2Dl&R+Rry#1mti;RY-{N)n%$EqProJpRWxH0q7X>pVxkqJUN^dthQ>jXe^s
z??vkNoJ8wv!eoa;(Pe)hIS*f`&_0)GCiQTgqKw)Jx4TSsPPZLH7h`U7ZKCk13Q<)a
z!l0yN1fIg6R%s8n%d+=;+6T{wy$(qtRCgZfLqd3Ug20ONX3b!loKeA_5}KuynM?@_
zEQ}(KnuSMA^@Az<ht-;-Rb_b1osQy?WTG?{Y6`PlTBf){Pa0?Peb`p5yEz$YkQk8H
z2ZZesN*YU#cWTX=cl$WCQ{ZHW3zRjK63`=^VGLH^F4fe6WSHxmpPr}m6{bhun0R@a
zyB;aS-8PeloY2FYN6%IsDdLOZ8eSJ)^2>Q-;|6j1Z)a@rnYAuxau-rDiyDK1W~gq6
zkkR<AEo6O+Cia*Ze%j<IjINQrA@~*$M1UA_k22xt!2!W@Tq#_dbWV2mlMY^IH$r+U
zl;dzlQeCM0@T@Zjpp8_Ay`Hn6A_Gd+A>#DUh}rZ`T|?q7Lz=-Ctz<;tI3oUs&C8*A
zT<qTEa`7zg>Y9V9Rkf)mPSLhZ=gcj%Z<{+NyZagAt>e`G*_yJT&-Y8v@T>#3Dtgsv
zg+Xw$@cIxmD@=f{Y~jfQi{K=1VOSavgjS)lH%>iF$j{O?dTs}|&GY0%D6mCySQ#g5
zXUJ82nz!n{bAoq;<h%_JEYnJ4Da}E%!r|&qfT|CoZ<3LNFeR+7{j=9cLnZ*n#TKyU
zC81t<KPAms-||wbI8f{$$$;W|^)l4MiR~?W1o!HD9z)MSOOb)F*9#tB`<UIehzL3t
zcn{0s4!|Wax{ROfQ2%N?R-Z7%GLi9JW!q^_lOsyS*ZQ|@o{%@#(N7yO5)t3LY?xGJ
zsq3;F*I4VHgS}levSw7Ak!12+MJQF{AW;jQa0GFwcuRwg;v{hFb}2Nk;@!2y+>5}j
zu8L*6FH)TQoPQ`lKB;&CM^uf1w3p!4cX)mLa$e2K4$hWd`BoCY_-C&GfQ0J+Y+)kB
zfipFM!5h)>wH_lx^RfF0{0=0q9=xMDaIc-02|Vr|vPHrxyE$c2=G|b@yNC$iX5*J~
zt}RrBoLr~a^Ximz){=TRt+zPbkd#A}8s2qQ5)_vZ456@U7omkbpUEKKQF@h_;W>n_
z#c}81Ji(rN2UkQ|>AC}mO&AaBnIZOlBP*NnZs0LzE+ll)R?+?E%XF93%2sIKvuyn*
zW9!pD#*Z_;&}$I?DhFx038J+DI1k*SW9wV(YGGizRsGhP-;Ujwc*q&uhOaA$B@5;-
zQW>)5KAe*>;Y1^6PC_Z8zBShKWGLkdD2>=D(pDc&aP!Ar0$Tu>u}AnQ{eFS1xKoEl
zY2AQdJ6}wQ6W&@vN@%$2yh=`a=yqH$g#sKuP(YE{E6x!*u(P9;S~6}u#Bd*T_PbtU
z_{O6q@4vvP>h!!(0GrcVUFi7($P2hceYYH)t*PfE&{cGgodF72#nCd;l7%#_I44Cn
zS-t5-fjms0I8H{WCw}f^_m*AmI_Ymt7g}tVNj{VcRX<j%H6?v%r0_&<##-=;&E?Xy
zTBpo{mtWHEtP{wSrhm}x8no%WSw7A-X#^UEWyrww%skGgV|!7p^!sqf0KKcnV!d>u
znwb6cA7E7A6W8sX2FYhSwY5IOhDE?eH$!yQQz+!1IFj)1uNs6w?nYpJi+iu?ved6X
zRUZM@zlSchN?pJBq)@WBO_<f~a!3f{c#RpCTs{OeTH)LP#QsOSX;BV!`x<eqvs}|p
zrW>LFc2;rp2#{Dj=4fzRBslJL>75zAZFdXIov@_j0DRiXk7xIFP;HAddemK=-D>lB
z+u@2!x-6SY#G@2fwBx)$vCCiyM8|5n6!H;hNy*YaQ~VJdf8%3_EWS<a{C!6hhw_v$
zCf8{t-i%y8J$AD1u>7hZqo$x<-S{=KTe@u@(m06Dp#xUElDdW+Eu|S@a(KzoLHNuF
zTswxl9qF|3S3*t>88^M7p-hjwbxxC6dn|5#rTR5>QsO9?-;PfE46V7T-B!462rhrF
zICZO;v!hJ})`Q(TM~j)82by~9Vq*3Y+jwVO-Xk()93gm%2TyPzSLn81p`=X%%5_j=
zFIDq3M`cw;m#YL)<?Q+E=m2nf46hz)-F!p*l*obN{1NEaC6*txK^v}wmmUWt!UloQ
zPuICaWbM4!bNmt5ENmWwh_y{l)gf#B+85vihjRY{PAKMF83(%Zsz~>7<sx56iaGg}
zVBQEWLIVFuTiamHr@bkY%2JS&cKf0rNUXI<o)YDQa2~P=%yA~<K?^yQM&r@K@9e2w
zWRt<0tp55Xlde)d$cdzicaRahhU-)$?=&sekD==Zkzt6~P|@ny+*swEZX$(!ZTuaK
z`}-+*bj3Lv*KGu9#rHfpsVXtK%_Nbt@G+Zcp(5=1j(oFz?=jqe-yt|M>-=oZ2)uOi
z80l*?7Pg)=dh5AiK|0oHz_u)oMdJ~H=fxH}4RpJ%eZZt7MRe0Agp8w6nFmq!OhX7@
zDk-lyB)AADWUd9~2f#!cW@h7`hMXRu7-*E5#e&<0+D*<g3!V8+PQq>I>n`L~m>a<(
z>lxjlHc7MQ<)|cG9NU+@<m6zAesqYOBk&?6x9BK3pY;3WL<$-Ej2>Sh6-oTQlgS!r
z4dS`B1?iz*k`qu8CzIB|Dk!iE)qMi$!HI)TH_~qry&Q_3@+sV97xni>J45wk<5T$9
zTOhkhPdwP{UVw#Mtf)vfj)C(J(Q9epJwc#ni=;MERvNQ(%%UiI$1fwkC4N*0Gm~^Z
z?DU6s*OPpZNOz&f{E>$n0aVuoI^&JN{-ss|*Y<(xto^)NGD$0f7wXFB)J1d{${U6<
zUJGJqn0KX_;*>%l3Vht|LWj1(TNuwOaj<iH)f3rzfhd!nFhRh2_Yf%ojg)<i^z#Z3
zd$~_oCzj<Vm_TY5X9T+O(-fGFH~9R<xR*HG3=2$h5#6+%j(h><K}|m7x~DFaIuw!G
z%o5jFG=@pYfi4xM@dO*%@bBHGL*xu0H}3)@eUMVu&Lh1w2h!vdjBbzH@VTPxp9AZ+
zbke#W-c|=L5RW3`PW&#3OJ*eBJY|FpkBO#NMY35PE}xrx2uYX8=-JGj+iGu|2N9eV
z?aZ(HxtpDpHb6iTH<?I6tkr>PX=!M?>35)ok|Q_=lp6&hbPn`ho^sqUcrGg|sJ-EB
zk~28%z-kuq8tGL&T0DjhCIvqZi1R)-?R$VE+->KFfKa1P@ev&gV*G^)Q*g4b;fodJ
z!VsPJCfHYb_Yv}vh#Qc2D<%bNg+6qQ*Jw$sR<fK|s{rsxl@AlUIKx+bcZuCNX}W3d
z@N+mlM>99%0vgy}EWY}iKc3ZxQM<iOtYz7rA7M2s&@(ql&E{)I4}lXCKSDPHjl7j7
zzS~}Hin!N`Qzm;WUWo<Y7(Y<lV9qjzlz4iD5b+D?-JO*Cc9Yr(t?NcYThOnbL6|Sd
zVz3<C;`J2LIckcpuP+4rqYfmL^ahP@oqA*gAf@FeHP$~6bTFl+g`V4o(-Q<T7Ljo=
zD;MJMCW1vu3~9q~gfz5^3)g?gi0Mumac0>>J1rUS9aZ{{LW@s1_6&DPYghwv+*yN$
zL7)Kah_I6`m0d0j8F~^LM6BhWhb!<(Xj~DfcIrEL&tN0mWy)K~9BCFVM^oCk7AT^H
z*Np334w^n-qxKt-vXio6un?SB5=x4WN%r^#r1qfB-6KSNlE+;5x2Z(KohgtwZHdbf
z%3r)F2ijn}8n2umM2-STE6X9%p=Zz+OG@Z<YW~l?lM2YtG0fpsK79eI*EmGYYC)>5
zH2#hWH6w6^z@0>(gpJ@;v%3S|K(n4t08)L>=1T-5C{`1!kvse$6myqS^ixNS0_BoD
zFcU8W1q14cIvd51O4xy9)(9)G06etKBhwH8&<-x)4Vs1DIul>F;f%Bt?(9&+_(2VW
zlz#h<&hiApueg5wDBUIfroWB9jaA8OVj?F^dwey7gEC;H%cd%h?jzHYD-3S~ZB|D1
z2^SWv=xMMuLWyN<JVxlWAMMlJ8&30`M8ubXh;IHoSc?&QyQDv?waKphnLON!h_OpH
zTo4GPwDc5o*XXNm1aqGd$ws$}-5wdTji7O(EdnCFwW8c{bT3&Jk`f5Hys;i-v<~1O
ze9e2as(eunN&1_Nj@}mk&=gUCpTYArlzvr(TzD)cQoen2&25)G?p#}n5nf&YDu_j1
zwqN`Vnzw@r@aNs5*W?@hL4o#1&2-xY;5YxLGqS1LF1j**2x{%JOP*q7g_DKH2B_R3
za?+5vQ2?6}YPSxfUV(kR8?=2%QF-Z>bSP$Q+I?i@3Zvjf5HfNSUA2|6q@_RNs7fVp
zQ$C%T|NCoGnzMnFE%P)<7UF^@s**_ljzdN`GE+&0(Ap0E?~gfi$2)zX<DYbU%vp?^
zmQ1wA&8I2yCcQ{2986h)Nj_m18nCM_XCVZ3PgTom)QZM%-k^Yyd_Mp+2t79uKny;|
z<Xhv3glx~|$hoaF5bPL#Rnr0jy!Nwd`{gY>ga9X-l^M80xEgMv-Gay?hJbhf0!FVs
z^gX7J+l<u_?tO46;ZHs=`hWEZh45RTmaYQOI0}9VI)JMKdQ1aAcGw5eBb3Jwe28v1
zM`}0G%)~?VDmaOp{iNA-YL7`P3)DFy%T@sWAr<T>T;8^G-e`$}8ZGB3EL>M-@CgeF
zb9B@%2A>eM7n5oeImJKZz?<nSl=$WY*QqWit`G^Ui2Qaog1!f~f~2*wS;Ywb$qm<n
zBIJ7+c1F>--qvL`kyS;qgnshDBPyL>FE<IKN63=3cpMNu0OLkjQ}AGjd`^d6Rn8{n
zA(MI<WCU|9FU3a?DZ2noYBM=RWYng^jL)MK={b0MHv$Uj;C{IL8T_yxKJ==XH)@i{
z_;Y6&1$|h5?_46`!W+7ziNNG;F^u$}IBu4KFF8sl#D!ZW(+1Rm51CHwTk^6q(h$eu
zF$d3{f-)X7^FQ_y7Q&djMRn0ypB0YWUSUvtxKpf|qec$>);{)_wKv6^&~s|Z6xnlG
zeL9mEa2`#0T>&a7va?)8t4d`Y$Y0X1nO_~cheOUI=(rQL_yF9zP;`V0po?TWvPub`
zCPeq)-}-o~(Wk^NoN%e2tzWC*ugXY0FN+AERc}c>T^Uou&3%f`8dDwl+8lf7GdM3L
z^+ccW`~7LRLdes@aCDpHw&2(ZG_OaIcf)6kir~SU;g71PNyS~&3(6yYcvF&)M<%RW
z4o|IyXT#_Fko<PXfneM}-R`~%VBT@fDJ4FwVC6Uft#)ORBDG+H;e=9RIPRZn-1Y=Y
zxYAYqTRQ^wQOk>GJchqNIr}<EdcD(u?@a)K%b|_U!S($@{RXH|_<jYP+p0*T*WilV
zhES()Dj7sm!nDuex{nD@&?}!w>Jbmk?k@PCEv?W1HddSG(Yq<seYJAwj{Rr=f;w2A
zr`c7z{UaAzLFStEhn_%rbk$0zNh+;OG*5j{k3LiE{i7M7)BRCU`WU)j;~O_xnR4MV
zaavVera*V=kXe-V$<KFD@2nZnWcal)z%>R;vw{xac)Q;Enc&J;9Kg{pZCPTXA`QM3
zLnmA|2qdAlNxu*ovZxV)2}FVL5%RnrI^jv2>5tG3!@qsdip;)aam_iw*^fU3N1Cyp
z=mi}}=K+BIo=Hy3p`iP;KiuN!V@jhh2(Fbokb2z?C)Ol_*$7;446ilE+Xb0d6H~kF
zi39K;{b?J+`XLeU!#23d=3)_!0$X6S@QHnPIi5yaGpeO75AestW}FvQ%!fQ$Q7SN7
zNcWSn2#a4DEqL{{@-eZg!p>Q+ve-N;4EKs4tLWMn@Q<BFF=SVE({HbNllW-m>N=_P
zb4kkQwiu8Ien;J1A<Tch*!u^8wo%iVl1AImv(A|PFW|tpjhq1#j@<(XxAG?Up(*Xi
z`Y-7u33<97{+!NHL=4{W(}Ua1T%$1QJmk-hl<hr_)@(HSnsOx$;agIsunR^@-cjeX
z@%V>u`Z*%E#dGh7ta7*+TTu>x=XGJ{9%#BCqL0eq6A9`CI)38s4&m}4XrbM%e%+0%
zXv3ZpVV+N+qy{q6Nw_d^TTd#*vChbWl&QVYYsia@n5*d3bg(m=(@BeJcvQ-}>*<wC
zO0&PAAPi3j(;i>*5ABdKrdCd=w0wRBqW?5Z7<CDElh#Q7ycd@z&}22cmzBsDobvT9
z@ib`ypUJ-64Eq#PWzNIzz}cn<8-5SN4}FO1qQLPssUC6zP(%p!wpjdGtw)E&(NIC0
z*@X&iS+&5bIuwJApQS6^!y9k=(tD#&`!*r8lwb3w(+l2y+OFPF@CZExC%;37UTYpR
zSAfqQKv_GDU4gXVSe9|8d%Lay9=JCCCp0h&_8LO^#gCoM4Eg~J4!<_fA9gu5@|5*i
zCJb?U<b?>I;(uif9aIX$=nY{!I00qaU<DLy#Yslbp+W_suXTqFW9_7n6sbL)!wp(j
zgBolOK@$hzXjNkl=K-kQLRJmK*Y1@2dK7mw$PjIh+>Xi`RG|rTF(%*<TJ|CM2jIM7
z@rz@!Dezi2(uv%}f*(4BS2|2<+xW-eSsFW3U<e(eNZ<9%te3x}7``3_`6{BxExi*P
zd3NF4>%~VXS6zf*91&{7?|iMCKBo`MsXjr(Z~DZB2a^}pokTQ9OV(<*{G1SJOyA2$
zCjR)SO(MH8pTa*O>!qysAaJgH0r5LHHgk!GEU?QmqcU|!`9U82o=YXff{Rc4Q`Wr_
z_&%cE<ABTL95dfM^=_XGz<Sw6ThcQ8l{kq!d&Gf|Hc6NLXe)xocURA@8nwv{{_Ds^
zImm9E6)EOZ{uDP%@)SBcXrIowwR+~TQA1o0V)h&@@#nS(@L%`Uie?qzR9TzrSHR6*
zisAuSaLfbI<t|d&1iYQ@^_=+~%&&TA6J4{Jwp|M1%sXuhX@&^#2=qZ8ytAEWbnA&w
zl;#$IvfmApEMphj^;Op`=3`I1^S;{89a8(|qk1baL?1|d*Rt(O2d_?4??mzq(u6+G
zsGjPglY%)}Unojjx;Z2F*|qf}g-dpN^&*W=h`{QSSt^v)#gvF<c4*fXJKko9PLVec
zGxBr$-H37B96P6vd4$Mz|4L3gTd&zf?(W6N<JTmg;`zf+2X6$+O~Ps@X_#w5U)sbH
z;cJNexLK4Zpm9~%&6}ikb8+vj-qx2cWjU|xmNHc@ts|ow=~+cNrSjfuW`qteiPlbR
zPV+v;s9*F`x4_;Oq}m*o9T|uSyZPV!RH8yQEJTd3#-Ee+8VY(u)e-*F{$ZXNTo@oK
zD}qhqFm%4nyEB<~^w{J+86X;u2s|ukt7WSnDQY;%Zq%}*Xy*(%(+QGD1w9Ha?czJp
zDOi1&heNXbEse+x4GzF<(H}96Cvc|>Zt5m#A9wJX*(Ke&DP&-~;>T6QMlI?rX1w3f
zEYz8Pg9nhgc{zZtUL!m91)FI@6Fayay2A>!Xw@h(O)#tI#~RSNU+nu;k&DUmuyW2)
zl?;6XAs;g-P;NMKq?;R~$CDqNx#D;ytJQP`H0)W6H4jnNmGJd7SUnN+sDUnfq@Jj1
zq_r?ajn^O!XanS{L}|?A=1gD%ly3OLYMaj*Z~|6P3D2a#{tb%=*JjD?4fK@(!I7})
z<TQUteIEjDeUkyrJN^#(N>(+;nI(cht^$|NfJ>n2PASKt&er8{sGv|PD8wMzuH1Z?
zyr4(@K2ZsMRW`y1Q6>JtGR~0$s?+VJ#tlHW`~cJ~NMNEs8U%Ui8a9)Hi8um6iGUae
zB;j6tvsahVDhKz=izH=_AZ8UfKZj)9u4JHC?vFv^%uyxc>v^dzN9^#RugXEvLKX?-
zShym<i!9z5vrIU}dDeyj)!HhQ5q$=K-wg0xf|K_^gt_XNPt#skkbe8Yo3IJQq%Lj;
zzl|qs=l@OtH9g}hTn;q%uS;ftczSI~61l5Z=LNz$t0dZ0mze-y{O5;Kck%80o)tvs
zo{~bO3t%VOuxBseNYdd{M9YL9Y&_L4sULn93({Q|u3LuGFAzu8Ltxb->K5ka%)+WC
z^|2$`^AfbU<{-Cl2^3$X9QPF0lJpPC)IRz-w!60>604qbP>i{cz_~3#;NaaQ$2-9!
zKQ#+oN5Wy=gDKLpjOPW47YXaG;<iZ}py(RK%_(>yBqqv&^HK<3BQN#HRdKRWLR7A5
z^K~upXAnqbdHx*Rh^i0SCVdBX^-egi-f~f^Tk;b+0Y-v1lliSK%zKT{Yw`PIxdMIs
zSdSLfX-W*LKQJ^L7~}H_jXRHY4sh$$+GR%sDUnCK;I8UTQ2qb~2MnSR#nX*|%i!3d
z>m923Z{daoxy_y@n^mXVaJpdxTqFbya0Kb=)Mpa>DLuZ=@FYJYpEWID5qY{<lnWva
z6TJj>^pZt@J~YS!oZ!<$u*Ks07f`Az5CVVM9VD%k)qH^&aK&<TT{)si&D=<r-iJyQ
z9TKKWZ^G|+(u90mhqN7C&>R4dk=JO2ois*Wt2<LZCtKq0JoXPHcR{c3Mw31?7$n-H
zyA1QYO<(AtZshl)*U_oxk*Xo#q8Cui0;V>`ITmX|lmP=M)VYY<)vJd)>os$C(yt)K
zb<JzRxDkW5EVZ2T2=?km)|(8-dXPjflyNEzaB>Ga$tVGT0fS!x=33Xz96mT|3cYI5
zy|O7XouYL3CF5!4ZKuezt>L_I!0qBcPVpQtjR0sNqlU|ZS3?xGWJ!}q5-B4>PZRqq
z<O1?Z8*`+`k|%x%ZUBF-nS?8n*0K@w_L@=J0dFhBg2b^5-2sHH+!l#=&N7Lb6w-UP
zoh5bJN#_V3puzEJMWAK6ZRV?r$)&~o@#IW8Y=`?ad`d5B1qzZ)>9?68ZNU3JlJ|a2
zN{F*;CA{$s=-~fGL>>fnL`XA|62W)|5{bdiN~>wXGk6mFv}1bXNY^L#B@^l!7shSY
z7GHrIzHuaE$C3@do`UYt=3|BaZU)~!OGK9qNr9Bx9*K9i{df>kWedyzcPwkcPu8m%
zSjsm_M{L%vfwVbc<dNuvKsfg#db?b`oA9P9`;nS!&|_+MCL%lv2M&?F*wlnBGy+g-
z@29X1-)i_W6NFsZFN%i6IK?z_%Aq%fNDlX1t$QmJF59JmzSdL?AtgZKoc_ub0WSH|
zXrqwyn=g*bsMT8TXIB>&%N^WLiD|>K!~R&qi#^H(c6I(W@Jv<~2DwNg`^Z(BPax3a
zw8VJ9P5Aiw%ZP}K8$?!76E(tD9mD{#DWSN60w>7h{_uG*9?6KZy0&#X!#7q;ILa)F
zzTrXoU49U`gq}th&^0D(=SQz9(=QA=JjYk#do6d3#q&)DX%`<~n&dp}&utT_juonE
zWG$Yc5<X6oUewM+u&Rb-@eGrVuPfEcG>Za?U|bF<mGmgcMlrsTw~%`tP3%DkpCCx7
z>Fj}XEE~%u(j8umkZOp1Aq9GPYKy0KC$Guiy&j!k!=~e${@5SMgddT3I3VZjKPUCN
zd>)qjZI2(-AF)`B1ezo88Ab5wrL+9Ko3U)+%U+a)_ZeO<)L}_qN7SoI<Uz$hcfrtV
zD89@&*M>8p;oGmU#v7^^ru8a_oy*=9A0ky<-1lhsF*r^{w-A!UWQHNKR~b_)c|z>|
z(&@XtLS4Toi1S-NG+%-#vKYy6r?IQL296Sl*c5Z6EQ&}1>u45k1<*|z_c=j=!%l+u
z1V2-F(ZXZg*eLnR`Pn82Y;x*>>w0LdtO8g>l+?R2y|Sw~mnts1QR9Fp#7!>~$ON5(
zaO6)VX>cw=Hf-s`hT+ZwY61z~TGWt%I35g=4WEG7CqAmaPFl4gCtF<PsWz|u+{bJ-
zw!tY>vvLRFna=Riw&F-tX*%=<5<MsCLv_W!7!{{R4F0^p?;oM(0-=CaL?sK6aOUT>
zNTSccx-~r<ctLx^fjOT+5wf_k1feh}{sPn_VkcHSZH?mCiV=7nDN7aJ>9Jb%d4km&
zCF*0(p(etYL%D7oLg)6UL|cMJS>JH_BRHDYMbT@1b+}l@%O6oiU36|}jVTf$NYSr0
zd0mGo;=F1Z1_QD0+(HoB0I*(OAn8VmLBbxFeRRP4PZ4(tXrIYI5n|Us$wUBI{(|A=
zK7;B`LbLnDH3jD-em~tCLm$x<*S^&T`|WpICTgsXJO-;bgA)yG5D&EW+25&rfb9}o
zRcQH?w!9rH-DFDh0*-SXCU=|5epj$-md<i5yaVrcX!0LXdkCu?S}xA=HLj{h8k?gP
ze=7Hq3V6LZ%@3;4i%~g2AZjyw_?{#~@m;T8sM|&6su7?>imc;*N24+n5amY7J_h(Q
zUk93(gF;R?t()H_|6oYDau+#kfIr4m^XSI-U*N5ja12wqxlQ<Gt!K1F!0;1+meUj_
z6TtV;1;~%Dup)R9GQR|Xn%^1E?+sXSC*`@@=(f~`J^vhT^LWyMbnvK}o3!sLWm;%5
zql%Wm5zw5=<RbquXI~YOS!+-;XD2km;*Rj2%XsR4iu~I6)AOCo;CsR=7@82Q^#^5Z
zpt=KSw&b`~K$prGH&Xs9s~|Gqfacl6g;d=j6zn{sU*`HjoBc5v9|v}hzpW@I((XZl
z{qUQ%@j~^j5a`>f9rSs+rn;CG(9NB%Z4=KxA3E9mP%{qYrA#660D_FG3-ioQc_JP6
z1ga?!Ig}+J0~MhC9MZ?hMgrx^IK~BdZ?gGy`}!o*9An)_L9f{Qny$TM^|rk$P*FNM
z^0_Si108b9IU%sZtC7AB2?(IN&?QIFdtj7aO^(HrXVANKaAuWQ^cM4KYH=?rKG$Vp
zd3%PN^fd8Iz3Gc??iZjbiA*k6Wp(jbT9K@D8m#BgxHGV=_*)!*)`fO^kgn;BcH?)9
z^kM^@vdOggtdo11OrTj%wtRkOug|dTAm}ACADG29DQIveGkC6X+!F@t#yUI(#7+D0
zJLxG?Y!l7{zM@ui2&Af97{86k{0)_fZ`*i~&)p^FD;+uu(o%K;-h<qja#F=;3x;5f
zqhIMz-`;PcJV7<sAdYM0HUq!XQ4{Mu3g;2FA2cg&FTpyz+KbbHo@<en4{}P?8=<9f
zhKY3SkLR$|{iz4wHSjTE%6FHU<UsMbDuFjGWrLR-qO5a(%HIr1H=2E%sXe9*)%Dk=
zA+rX&s}PYr?cGLlaZ2cvb6BLxV(}^5&wJi&O(n;;TqF-(jm^`)d(2R3XRR2>0OW#_
zMKQ&SS%zqzk8b7i%asm;uJ}m+*9-dMCRkv@USOM5m1G(QByvtXB{gRnrtSogFU6hy
zrzzztqU<lQ0Kf4b3MQi0Z*M@z+Bd~P7f?{63?TG}(5woW2^;|EGU+QcHf8ajX7}#u
zE{is0B222V*|rAZy4Rpah=cchy&qAI)IR<q`8TwCx8+>FSUiago(MkT#Dgw5NLmc^
zy=daswuR{rT;a&^RVEJ-4hrp%FIo?l`_3cgei5uYMJ@#8S-B?#n{uJVLC(i5*e2&G
zng{?5WZV!+!KZJ~kw;5}cZbN^1L%uh*w1S4xV_Od-@zTPW!Hr@{3vqfTn|T!m}-UN
zmIF(ws^Mvql$QjwqD?ov?jh*b@NLle7)&uAbl{cCIb$KA(Ob;!a(%Fel25oBT-p4X
zKam#MZQ0cP>3&&_DE|eE(r2-|d*Be-sl(_i=ham`G}Svqg8NgT8gq1?9L3kOdAx{w
z29FkZdK~TG)q)E{NM`R?w`{ywyo~<?Sg^3Vt2hsKMqAw<k+)_(g25^oc<c;N@yBNi
zlWiE0M{UB!_bRAm_(P+c-!@2R;v{rKs*i~rPSz63UE4bwX=nyGA|p;VeXYtKZUi+(
zHks24-8s_5B?2}VGW^<U6eqERH-=Nlyqi#;rP}^E<ed&>0)cKXF|FKd05L@DFbZG=
za;zW8)_;tklgHChFKy#{GoC|F>q+cVTkuS}3QCY(4_;3<?e~25O`9pr&muZ~&qVIq
zT4WA{rhzr!WfyNA^f#Wsn`?9L!BS$#Sw*EWWMCMysT*D9Qu%_&fiW+5TB9EO14s`g
zh-$E7i&R2;S}gBl0f8NHps$5`?3V+`hfihs3qYSu{=UY0p{4X8NcNKLyAn?PIMo)U
z>X8qpMf3`z$(i|1;k!3nLwkz-$HZP_I7xTfIlIFqG7*l{hee#--JAy6aq}&zer(;=
z{b~4dMz!gDg=ot{tYq3%y&cGX6W1>^jO3<HZ>yFqoSYxv$|m#|!l9p)q;&AU1gAr3
z?xj8;QLh9Sm#gy!Qquke^(jbN3lGi_e+Vb7dko(uJt!!ljZa(OAbGhh9^aYWU!8OC
z!y6p1Od3%^9Hr+D0+!GU|8}LLRx_0dc3x@m`i((bb2hS1TL#-b<*kbHip<^&2l|Lj
zc+OIBGM6wFVGRtj!94$~u$nxy@o5Lr0#BU-g1@(PtmsipN^0|xHH_RMPZcZZpsYvm
zw24p#3MM(wsatw|>FrQ3CV9}}Q4Z7cKA7NdjdrG!Ih<<{zYG5OI-xi?Jzi~AW=+sl
z&lAp_vxP~_K`VXev&8f#46BXh!t2&*{VyBn&iw+s=?r+?u`Th1OeaJ4aB^44c9GHh
zMFX6&8d!}`J;fbx0i6mKR0Myugd<Bmfa+zCXb)nVH=Fb`lCNYnC@LJK4H<MmIlK?c
zOM3^JJex+-#{ky#cm?I8yaUZ@;Xy<2T!$;jk0Ed*{|i|-e<($W8WNoDE%3JU=zZ8{
zJ?ju!arZ70>Y3ZZ!k03g(k$hV;gLCmoJ{cU`ELGaB?1eX`Ut*E&MfwcPN*TgiyZF7
z$QdZyysq1Yo|8t*qWuigvvxI+tJ~QW=Cz99y`>Lt0`<9uiHv-!P0)1>8i5CpIz<L2
z(;1f|%SDAxa8fkRAZlt(38-s!d6<hWClfQ+xJe|wW0Q2U4m^ZAZhn55(H_TA;s`KP
zTC8I;n>%)(l5aAdek1T^Y=WvJ0{j>yLPNu>k`5%dnVT~Lhnpc^iz`JMwBVPml*ls1
z(%4WHH;^*H-QcZrc5SUA0^YBx@coSfAga&8XDKz<Z@(DEJwh7vA$<I|McUHAG?jHw
z&5{touC2!LGo1lb&O<Mil&Q{j<_*{S`^fFXy<!h#tpNHdwra*3h_F<YIm4E`wCfWm
z=*CvPu9!(-j9sLRyh{n#_^|%Vd)x^|0g?`pM^Arin-#LfFlV(vdhwa;BflU=#BW5@
zKPx123EoDVRT9z70>qbQHD^aSJTD(1R95H4Q^k;H5ASnMO2!WhkuU)xtvSCO?X-AX
z>6h4rZZ4R3_-eui`iGK)Rb9TWCY3eV7&Ldk^61A-&qY6i()H;BV{^m~&(x<Z4;Txc
zv;%l#bR(3V0mWI(DNP2e*dewPiu!Q0hOQUfDRZWnBZ<=(y0(Snl=gGJz;&daf6pA;
z#&7DDJ2cJ0@55@|I*<-Ih~RH;)%59emr_9hUe(2KfFdC8a+kCiMn-n=T4}WK6l}X(
z!fzqUDR0yIS0Ekib7rK<>_g6&=^4m!SZsv0sL{=JhM+K<1XW$dS#8|l1g~LYq5U3R
zx6e7t5J5hd9qTF1Z?gy6BA?0*cR(2?)T_s2pFIb0Gh~285k$SzLKc_25@Z!yetK>5
z&a8E>$2XJf0c+EtR!hE9z5p<;a1c@dm^MO2w{dW1Cq-x&{Y{pwI|Z1I4puY#9&VU-
zg$#vb{FT2OkKK=eK{}-E=5qU~iW6i>8=`0KM=dnH1`r#(S45Px$q0l|mUwXuJPIH;
zeA>2~(kha)?j81a6Dgt?gtQ_Nc=RP_3|2io3I=OFSy#?W6{TsPfhHo8jIX6U8?F#)
zICm&z3A-2d!*U|_=OdKhu2Wb@?VezqbX7Tjp94GEJAL)yI01d=jT4Q&=6&lYf$wIs
zZ>Av%k|7OG@u}jD>fG;~k!0Xj73ae~Xf!NzMulcrxu8klk#H-)lg$_lXlGJ_nDv6U
z_a=Nj`ws1)+g?GiVE73`WKZ!ou!cO-kF4rTk)?Qj+vX?BgEra3^z9+)$$5?z4(B%!
z6IrJ)VLdcfqp0jcmtjB3na)%TaBsCml_Za6Vk?Ba#8Q<xb-#Np*wv@3w!B<OSAUR&
z;e+CjFIj~G`rGInh-Idkf-HgWDPo9Z!?u@jTpi)zr#}hNC2JXvNjI(wPb@I`bvUfc
z3`Ko<FSAmb5WMt}CUbln_Jd@=FHpB_1l(sK!E;|Lzq{&@q4s)|rax%VpMg3rz_q@f
zeikosC!s(tsd@*I1FykuqJd_2&`9i}1NMotdF^tB+}#DVsm<6gPKBec4V&Lp+@yl_
z4l!(j?5dy1cZ)+VM?=*wdU0S_bdJs6W*I%^kVJ8tDjLik!KRKUBc2jxGZ*vO0~VGK
zA%nFBfj&IG45YN&ht~{)JDFrcw<3SzO+YE?vxtlb{X$Cf9H!YLC$x^U%@Dt}*{hN~
z_%&MVJmgI6Fg1G)V4QaR?Q_V8hqicK1C=;W&pAg}CGR>zz3B=vlhJqMS{I~IPaiHp
zziNeMhAAw*B@YWVVz{CPFHI0r(m7yDpKF3I6k4=DN11v*?ApwiVE2-pIykKd9g9H=
z=+O$lLC!w}5n#VWU#+)9K?|0PX&>DC2_cS<x?R_4MRYnyghI=qIS=@9&}Y}7>&<ZQ
zL7P9pW2v#>JFB}nE84g=mT%;41d}W{-Nkt(lX4)&-RFkLVt!R3ZvnYt2XN~lk1Z)p
zCyhF{D<I}FJ1Q|Tw|w>i^d@QXeT~jqvg2#0)x`Q+y~Xu3j(ZCf*xdQmW*h0sa!cLR
z>W+pf41I4Q!=Tev!ru?UGi|;KXXLL&;og@}$j^+Zidixv)#hGCmqkZgg;apoj0$->
z+{0O6b1mo-qX~>;gjmTYuKtd|%B1z<Y3+{ZKsi(EdC_U@!4XZ_6`kWp1G~Qd33g$^
zrw!gYFXQ%$F4F1ZRYYSo$&Ki!&O@x?i2F)##zvR}1U}#yO92yqPyl9_e7?G>$|wBB
z5*4xww%`SMFb1?+7Ls9p7scaQ`j%M#$=@V3+7Rb<fdvKMqyKsBQ|bY5c!YMN<5QYD
zYIJWvq8(WoAr-tb$pi2W0-5#G=U|u-W|e)j-7Uzn<D_~N%{oz|Kl&MH$wTN;45nMa
z>(M<Wpz7r)_|WLG=*G4=1Jy{Rtm-Y<&?=UdSFU~D-T0{4FEIhwf-ff&FC@?6vkxw`
zyAN?lMJ6MnP)BTi0li?qrt$<0DsMfP?ma71KQSI(^B4GdEE_8sGw<<wB_|Thvvu1p
zzXnM?oaC=<liFND4aaK2ahRF-Ih$vj)5{_~xKnJNd+uvE8W$Tf>fC%2#qu_Oy`UfP
z=Y*;Kx;b|Y<}MeT7(?~&RZrDN+$+EXuK+h8{uX~x?q^puf1K10JCI|fVgZsXyMGQ_
z1hI(ge-MBW|4Lx2-|8#*mGLk^POM->Kb&ij^vmRDNfy6a4n2XahWTQN^H>30=sei$
zon{j!E9ee%ORML_-s(vdzaK1mOV8LupP;>VhlREv_3fxvhv{bZ$Fd6>ZSz5A>FfuB
zgn!UmTd;-QLPDY89qA~p|Fs3HWAmS4116S1BppG7;me2?)bk#Y;0?WTH%edtb`WC4
z;hUr_z#o~`ZIRXwqZ*iHo6Vpgmki?0XI<Vobsa8djfP_CUa<M}^ncQO2hijp_$*EO
zJ}}fqLUmw53kFzxrvva<b~6}fkd`2CEpF>+Xb?WEaa}j4G+=b%XoVMxX#s*1cJ7x0
zk3BmhYQbKWw60#i3>|=eItNMM72c3f!2tATVRg=#=ivAj^4(vG_&Dy@0G|u}<qN=i
ze$$}<8cM3cp3Cx(CXtz@-3WwmMdOl*@&0@rz{n&e?J<<*t6uK%0U7vdpE`-9r$i_h
zc?qO1I{59?iO-<pAlK-w;wHRjUrnwIK>2MZzOF>ngHg9P<RD$VLC$r+PEfG@kPKyG
zid{i)wAC+#^s7K}s-uR9bE{=5n^_+)4|-#ZcG{o?#(?$WKrKu;)+u9cxK=o7_9=PS
zBK*acVw%t<Y>$E%&5e60?V&m(8kDU+s@DGGRG|0Jlu=W-1>Pue8*fkz<Y*R6TEe4h
zGlV~1Fh{}^dRBUTJrvOo-Q6!rbM77x`V2?7>UogJ^Q^3MRG{#ZEGP<@;oldYWy6z$
zvA~ncyE{ZX&H%k3?b<!$;KJ1k>z_{6@e=#q$s4!PTmW9-yL#m<7)uMuK?_zG#Eko^
zUl~nZ7r)6H>?WnTmz*bpps8f_<v#9sa=sKu;vD?Pkdtw6RK>elO1B=diNmd(kVBHP
zQo&}I;S$0${v*rTK4=5I6#{~zOu9H7K*{@@Sq9u0(StBPYw^ko*dF(gkdTw8GL1@+
zdyGEP!B<3?j*R|H=V3cUrSqi6mm#z7Bk_XF80R=cz(Yo)QQUz2mFxGJH#Cc(cKmQH
z%D2Lfvn;~s|CYX>M4sm$p(<aof`z|ZpAd=f*_#Lnyb^wCn75rhiTD?&=6=ZpMs_fC
zzG51kI-Tz9wH%L6BTS9J5V~Y%E7}&gTV;l3t@rnh$!2rMj|ACiwQa&oQhtNn+rrx*
z#wPe8Bi(We1V&<8u2ZIV^s+PhJQ7>qCcm_<nsc1YOGzVF0ceyI7Lvz7c|RvJ2&X@8
z;mw7=eM<rdP9iT^(40WQMrc}(iw#XW3X`Dm4XAwB!b@WhE23mRh*<7IQ<Eyhdga7J
zbigQNkS5|t^gr0+9Y7k>3#uxl7nGb{lsrk|PLFO5y;uUz_*%Wy!Mz7Mud_*6aBPN6
z9^e*3D-iQP<t$GvjNgGdqxO_0ZWG=yix-{2%U%x%Zd-6CcdbC&_!gADqBjU8RG18$
zRecCO!5fnOQ+2e&<wtT~FG~z`)zejb%v*Z1Y{cYLmI1V7p(P-)2L-upux!d71@!C_
zOtPJ<p04OHC7&0LQ_z42N-akqhp4I|4vb~px0<&Ye#Gbpf7Q%;OBxBA4TEYb;=zpo
za?2j*yPrup%kiR9zZFPlUMs7|$};4FYkmhp<Pmpu_^(TNVh09m43;o=%0IHTp%Q${
z8&=P+AguXYNxn`IH4LYi6%sKrjyO%#Cln$_j2>ANNPnu@h*=yYzrw4{RU5oK_T<ma
z?=5>#T;kWqpZ{1!@|wE&Ta?(3m`sNY?siFQ=gcU{8n1NS!pwUM`&>Ij>*b7z@(;7_
zweil85tqo#H1mGBXE#3yK0^4|SW|hd)kK19S74OM?{jp%O;Y~xnZ+{7?vydiAbPF~
znOiF8k~U@fvw2N~&b*o)O>0!LR2H8e0ef!J+GD$v30hZG&9qOPxAqAAHsrYM$pr~;
z1g8%@YYQOj!zNJvaZ>ye9r&_eDfb~Syk&7#DA<$*CLRR)<Y~v>r~QUFS@o(3`->SL
znn{{w1D_e<&#+8^L(4eeJ}4bxitldgu_tXN<!=F_uYU$R!9+9u?OU7&rL}FRgRbrB
zSu2aoG)O-eBmlV9LCXI?ak@+!1V#SZjDyZWsG9|E*FrPsTP{^${`C%5r-MCl$L~h1
znCTgY#;rS#eA0;4sKHx$zB3BiGFp-Nn-LM^v9a~0LUK#Hy`QBx9SO<i9n7#Kp1HH6
z;ixR}CZnhN0Jqtd+~uHudTJ1aRX!-P0vHGsl|U_VuEN1wtod5)8~POBz|xYfMba-6
z*J!PSXGd6;_rgBTONCh?EpEmLv0sr3okYe2cw{y6Zuh!e%n((XKA^^MPeEdb@GBxn
ztld(BJf!?GHNy6n9SyNRfl(;nLMRcOGbqd_lGc@IKXGb8^93^pp^agJ%2`YBqXjc6
zv}>S3GU<aJ-j!YKJ}e-G#$v@@Fe%v}sRs;W`m)yxF7fCGrcY(_o{n82CU`ML0DJ2X
z0Dcy`=q;@rg(Bg|N7N`x2=AIyQ=|dwOXkTAwS_PQ=W&}fe-W8V39Nn=D5!c;i)ZE`
z=iZD=nl<L<M8M_ZwU6P*K4f2|3<7HO_ZF8+Z2<;ikKz#6b9X;}S5<mEL^!L+{7AV4
zOtd)O5Mnw21Z@V}#)#3VQ=Dhr)s*RvcHa0XkR6-(fV)m9`b6W^3ikIaSH7Bfd_$1l
zSAc^FgB<;5@OLKf-?vU`_Ru*hCk~_fUPz6k4V^$qzhR;DO^LPxVUr%KFcfIkK`VDh
z!=V?qrSH06PVSZ){q)2cMX4aGhz|njUeF?-J|wA0{IW>)T+LIsmYh8wWD3538;1Ws
ziq1W%iEC}+dnPk583dA$fJKBMfQBH#@qkJdoP<OIiVPuKMT{0(!5gC18`?<(4Olc<
zs7h5P2omrD^mxJhXtAc&b4nE}tyH5TrIb?dC|193_fHmU!AfS&-ur!@=lQ*8iC6}M
z3p9=HD59ScikmhACDWgkdz4ov(@XU7>g-`;Mk}LCKOQVoR^=^~bJc60#O%q*pyP8R
z%ZeGoyx}I7Ii*IV#G2_$5XZqzV&NusS9CXddl9>H179kEs+KAXWo7MdPbh<HIodC<
zx=}$7jGmoBzh3f7r^tIhubsLa8m|H-qcm)5zEu1$^9U2oc}O%t+rSYe8T_5-X0>uR
zyM*z-YmG)WgYn-XA5~rt=KP=0xf8{o%$GOE1-sKyLUIC~e~?#b<l%IEr(oqvWO{yG
z<6&oLk?=OVwimmejlJo_A~8?-b}DX5a>9%v-yxJA>w}?Zt+cGu%_u`!y|z~H>EE(Z
zeQ7#TMT;SoPO-X0a3U9WCjDDcc)lw%!yA}6>nP79?opYKTJaH3!`>Mbku$7bt$}u-
zLIo2#J@|gs3ZlDhSFLeu!jK?)_f{)1W0Z+v#7DrFCePy!Qp^^tu3@j&ZFWVM%ljK{
z(MSO2VWbOheS1|B^0gaC2}P&A=;r=>fyQ5Kz-Z+`7WK+%Cq5;2|J{xUbyL4}nt7oy
zVKMm0nb6WD^e`$O>C0_+`dpLGAtP+YyaKg7Ts?NF2|Z#`N9U9OjjfQ<A)9o#q_T<<
zGBx-I8t^0f1u!I~zIW<|!SzXh4x*%(9{(MBN|Dj;%9D9~R1<s}RKh%+2iQT9(44W2
z7NKE`{3lS=pbH~czY!&``++KlA2aLeGwGvYs?~gG^)a>7EL_2<&mWadXX>Wi->0tS
zM1dqvDd=GxrZkOdX?3x~lZSY6rRq`>)_4rWRI*yIE2l7Zv}W71I_~#ki-tU0n$VPE
z(ti=?9;~cC*#(o^Za5vi=Tqv)J(tlZenUL%veVP9wY!-LsPUcXD|FenY<d9-ZASl7
z*COO5)=nO}#ccn*L-3#p>ufHRZX07|FqzH`x>TBbY;JqWxR6^j(OqXCSE5jQ*hY?T
zW#naHA@LQ|k)pEvz~h(Il<cE!QgF@M`4DAAo>up#?80Pol`3_zOZC8j*svIhV7E7H
z0&V?h>^wI4qj~D_m~7J-0PfeK7<;Q6En(UD+f6||BwL<r#HaJz{MAeacw{6$=|^KC
zG1upekZsWk+tBk|-S0QBx26zqXBi*g!V!7K>=jTzM!V3|4mS^w%{KN>_Z}oF3?>eE
z!K0%_Dn_ONDYEvV*oRABEG#a|MmLcW7OLtQV4=o8+U5Q}^dOrsagU3v(jmL$sJm*!
zpjPb*QeJArmwp9D*_yW^zvoups<9#=l2ymKSjd-(f@>xiYFy7A1x`WA?($&ouLT;W
zViInI;`i$Ax*O{e6q%_CDMp6qa6~<iZ;nA0NPS>O%@u$z2E?n6kY|z6uHsg#!n51_
z+Def<fyW;hu=UbJDq#p+a)bL(98D&iOj4yUWsj5r#TlHzN~ZJEkg>ZoMe0VkD&2gj
zPe-?UQf_NBf;@%b6|!0D-PSG%eL}D35k5o5o%0zL)`wLWH_4pXtxd#)kx4ApM9q9B
za&>=7sq<*B&lWb#9nhq2rUKl-4N7)I*|8QTQ8!u>E*|9L&cae`y);H7V~gnd){ukF
z3D-%$pf9@x2cnxa_5Urz$^a|}(A3#ca%r!upxBl2M%OKJ!PxO#97haO1-Pf(ouJga
zMwy>ClRL)Ig`%1{WrhlAau6*={57snjrsA9cHzok_bK$`F2&6~b`dd*U?|)=8nAH#
z&Y9_<U@W`qaG6^XvEy^)xp!A6{o<t54TE%JlV)YF`<Q|utOOWB33G}S7n=MUXMv4j
z$Oowb<%)t34H!h{ALciF8~}BKjaKM?HK|Y2xgUdbubqgt+8i;KZ=1{!;C8H8UhGoE
zr%oBb7NmDuE}XmIY_|TR7|7a9X=vk+_>*hEzejz@7|o^4vxEatHu6n34t!8DU@mL-
zUgE%FD4mwmpR<y_2&3u%HnCw9>-IwFaTm`yx65NpHzrG;ArDNUjx_R`qh(`?1y1v<
z&SpI7p~kE12AVjjGVD)In>m8$Su%!Aak%bvQ-W@bp*dxrAc>_mvvkCE_Vv$5Xg`|v
z$S%d(kyO<UI{xRfF%0&+kKQ|<A%BAAZ6Uj-)w6+5>!;7C_n$E><V3CoC*a!r!$=Yn
zdIYtTws)BRF#xN{q@^yL0)Jo(36Ph*VG~uTGmcZj^X7{CmA7TFY+<Ty+$CB@q%;|t
z1Ufco)_}_2IsPS;{f=G?ZI`oHki`bGJ4X>P$Mb~#=>*a^mQJXo^UfhtktH^oJv6}V
z=~qE?0AvPG@_lqxE)Sixf`Qz~PO>Ik`P%LZ=H$D;Cl^Xp%wQtg;_ny9-l1V+gM`bu
zEZC*CqgLrbV|1V1>n*6NZ9_qcsZijo6aAytZD3y`U<_gx7b)U<kvujh!EMW&{CIWq
zjC{@5(FVJO3|`WQtZ0>Dj2oc1UzZG`wRW%VZD`o(N_y8fo#<1CFuM{mQ}&aG5?evA
z%Sm~_+@bWO<Ho3C=3Nc-mIzwbhd`U`<P%63ZYW0o`o!*;k1&GTdHj??fnN9<C1Y0^
zCx?2|RY=2Xj$HNB?)D)U{MQW*TP$cRNYlGL1T~031ZF+&5jM8ECk54kJ2s8pvZdB;
zc(9C}vCzzlPg165f?Bx?mm-Ch5^Fu=d1Q84CSN~9)0UPF<((Ju>Q3S|y=xO_aSHlW
zVFS`7JLS~tuDTD4!Oa&aBS>`+w-lS!BB4F<IUE)GlKhW))R}e{QGHfj7*djm6+SHv
zZBl=L9d&r=I*B(jm-}*yfesHQIui~LeXd}WKGO*1e~kCx89gYSx7L{cFNfUz6PNv&
zQK*#8{^HiGU6}c33k`J7$hIPRAvl})V`~6~Dl7i#aJ$w?wwoqz0Gm6A<mbwYi}|uC
z?LK;pt$<*f=Kz&~l1+4*PaAE%N(p8`AB+Ui5+SY719QDGFT`^P=Dt{z=gfZlW$E#J
z?<wtR*I9o))M1&NKHBiWCVHi;c-g6hZnVrV@eJamT-oh*#R*oTk)G=nZEeU>e%Eqp
zOp|!NsIi?q{UOL3EvCYZiF;ao_TuMFYZQfO?oUSpf7okq(tBWG$*2E&NvA2Zj~VG<
z|GI>3{ThahCLhIXiqQ|_^0oEVn)e;9m7jLYkH{8t=BMc2^70nBtJQro%>~zK3EyYn
zC;?srG&TO74k7OrHK+Pn!{C+yunS4j1CF31%B8IsV@BO~ko3_l32p;S$_9}PhMR1`
zF87B7!=T>v!$NE|`gLiO(*j5gyB{gOz<%yl4-RzkUh`lap5%jm1W4XSsexA*edHCt
z()%aUsKLyTLnuvqEW)hb^kl3yQn|bkiBUB7ti$GaE3q(p8Y`m$)nOf`#9?GeU=+hg
zU$K%jU?c3EeVT5Q|5aHBcnTDVDB^LuWHR{U7;C+$*uJwB|JNwDeDt6(wB1vLwqnIh
zq1}{-f|F6myl6#C5Alva=uj|SZV4moHadt7y`dP;$k>9(otCrJsjVTI{N=bZ!)m=M
z{mtT3&>ZuOs&4mgklgDP+GY37Rwaj6y?@+L6%8&}WD45lNUQj-Ce{72it#@HknmX(
zlKcv_%DLzsqNUwc$U4(fkAZ0DsN?5^xW|YIJMPudtQc1c@13d;@R_47H!w`ytiy(2
zC@F>YTLWtCkwveEJ~w~Xls@j9Tt54qxx%m<Njl6^p_vQiu~&jKt$6sIdFYN8U4qSJ
z(E+8YK|`XYZgb1Zqns##q?QIWX-<8C#p`_QvqB+3MIT3wkEK6ne{<MxTxyCh+HyvN
z{6@#-WVw!|=UPN=RC+sBlRFl)w{*+7=4$nXO=d8@3sbZ8>uE1~;t4V&=@~lfCeMfj
zOsT_rAmar3%~yKf3z=3HBFa{5)o#U+8#YlpyMu}YUo)KNR#iUw8vOaNS6Wwyzv>R8
zVl5Q{W?N+aigs^>Xy?o*!?7m-5~C8q3fit2Us#>cgw>Y?*EMv=8`@==I^z5$%LFWG
z=7UT<1OsGFT!edG>tUPQdvH0}@hNro334=x=tbY4w-|Z3S&&pRsp2sG^`jeg5mx1C
zY9jl|K78X4HXn#&3QC{km2{ik%<AZQAm;_8*w<ZmZ4kd>4Bq8E_JX-0^E*|F-CHTp
z15&D_EjDd|H5q)Js?Y?ML39sj{4cwW^1n=)){wQ7zLb;at8znm;3-9CvVK<D;|bd9
z0X-kUW>ZIWxNf)lt*=g47})qN7iE>1o8mNGKeh%>EEeSS<J%~pI8Y&06L(*t*TD-|
zm)Gck<l$MiaS}`39Y75_pT`5(Fg=d*rE-b8TT|y!wD6_kYekKz5X*%5)K>~SY7Dt(
zWX4B^(>uEYi|y@&n))>71Q=~DR=M^gS&Cm!lN7oJRs!T~mEq=VDy1KBXj(c$qk4q9
zn`qaqh~|fOVZJNR^~ukJSvQ^26V+=vg%09`88(IEiU4smHMCE*xlE$O6V-@Aun$dW
z1xiZi+72@eesMs%$*K51P;5C&Y-vrKTSX`&ZEdQAU7}fYB+_HYLWHS<^vXOcTZ<R=
zW5+q4OF(*w^MY5#m#Bf`3x=tPZt|AKtr%dd`bNclRh9T0X{M7w84NikcC)`5J)E&@
zT8Ec<AeOF?TONX>7ev(tnU40;mhiK7%k$F%|M#a=3Rbln7PwB5#juSBONG>?D9|9C
zLrbkev!q)8i^e%|d{~I4%QbT1(a;Y|cIj)+h<yv+FA^>ixm+q1Y_=_~rqw&ZSpIY3
zx9faTu`*~jmSGb%(Vp7rmI`V4;XOp6AstGR4ZgW#9k5g4`V(FF6&c$Azo}?&rG9ff
zp1U4L{ckAsaco`&Fh^8?=VaTU=)xO3RF9%}pzVeuWiAIrp2ZbxA)SHRpVMF_=hLcv
z@bGfdGvXYOO91xfDG|XaAK1OWXvOT(lPHpSp9xB=O#8KL>{2XayLH}jhB#7Gc&(Cc
zuGd0wfbFCX#68x7-895#)M8#8R*<uho&W7y@YBJic&FP+zzODF)}G=N0JyIMOIBp4
zq{sqm=oo2+?Z51f9mE91iMOW7zc@I)trZn0*3a%Se}nk58D`<S*3{)tD^S4OUA)QA
zCSWmi{1(MoQ&^4xL0<wkT{>>pNsIpj*}Xl=L&H=FfVM%p56wZCU~57E<Ie}pwZ?$m
zW&IXETKWO{B}fhHSJ7F5mxzXquPt(`T8eC-WLD{K093v~l6*zM#PQTM4-pkgO7|lE
ziJ%758a-%DoW>on^9lu5=|Z%@Bage8JEtBSNX>Z#(OaLS>^9p02p09?L~WY^nP8&i
zEUar$%7u*qP4Pb?g!C~3@)nUDg{tv`qKen;daqo5ChvRn0x7yc$WF1zNs{+BhzqYx
z1-=j@uwmf(_#Y$~TmSqpKcgsEe-#t-qb=p}-FOK!_z|kKeaJ@nwodciL3n@5%t7RB
z(2=`&QAWlc<J86UaW3qw=~Kn-lY8kv2Pul<CSLJ_7U1K~lu3dVeHp!DTr9;wGdNW+
zzbJ$T8Qti1QT9LW!8+J@?G|#b-Up2d{?33fKx987q5TwPytc9tuq3rny5(iq3+N7#
zoDa$ZzrwSsaUOkE6isF(>w+#^U*I2whSnC7rx&Ddb_RT~KzwNu%p=6SqoY#4Vz=FZ
zjZ@I;L*8FFS{s8zfgz@a3VBaQGf0YDUhqP>TjlLcih!-<kNWwj#(k-z?{}^?FTBeZ
zY3DbQ;&z`0rZu-LKK=`2nrDJ^LQ5~R$J0$zu;RccG?FyZO+5Oq>Enx+$%M#5M=tFp
z7vr2db8k8;WZ0wqNFK*Tl+ucvhoVj#=6n}!sae)WHevIO&3eNBGH9UN{LCW$#7nuX
zodm~Dqa4UOYKQd$;^}a0Rikwe5f~hNh}O|rdOrO*de!@~&vjOs_rSN)BoWLn3IO3v
z@p;CWZowHe%ppieQq(T{*`3=sAB%{*00A5+4$h9&(xmTOu+N~_M7UeC?BXmK7@E+9
zEo(wXl0o!eXJ~Vg;?x;5)CWCI1-|FA8hO>tp6iWWrVyc7P=`EY?D+Ioz>%7$dTkc$
zq)^cVqq$Wd3s?LjFg22#&POW5&+XoZszfSRut>PumG=t9mVZg<!NH(i_-{if7p*)r
z+tPAHQSsSA@*O)*e?D8)AqsG~u7|DK#cUyxvRC9baV@G<;C6`u?{fJ{ka%kuTkuL*
zEq8Nrk9Hw!8V{2(KXhX-N$}h*?7>=n9gvY1-Gdg=v+Qot&^~lYp~-MfY;wR{Xc{bF
z7XPaV;p^Tafr-$BjXkA(4Ym|Y;!ucOs+%;8HnF;ERg)?gE3k<gZ3bo^TG8M=oz47~
z8=H-i<Hv%uA;`Iz!b^t{Uv>@~g%)B+GCk$mUK}Jm9b|TPbDf@3;d%8b74^v3T(TS+
zX2U7=BAsURxVx0!vCbe=hW2Bt^DgU38N1i7ETb|Yemt4!w58|;YY{55xIE(w+k{#;
ztiBjjKt*<U*$Jxpg<{U_KK0IyFSJLOW5?MH?B>!`sxD-nMT8YLpqMo13gS&AS%4~N
z5G(6vK4k+_*L+n5?T|sIMeZ}Y<<mCNvrfLoXTGx>8S|dkwjtMQCENCZ@mKfZMY53D
zr88Atjcr=9aG~|kTC;P<WpRp4JAzD?D}Id;VOjgl<L*shRw9^yO`XYyKIRM$>53m5
zKl;BFq{x7{My29aGyZjCXVS?JM5_*$f#9WhllCU~4;^)qt*~m-lAz=o0~_;4k!TVg
z_NCOgbCHd$(7RFb0;yzAJX0lq)PqA?LaS;WXtcX0iD_S89LqPjiDilD6D$+C^wU;Q
zMsM!W0*86Ftu?)!&p7bUSpt(bpB4G0?A0#<%T1{_{^uO4ZU`9AWSywWf_<-H^qO5g
zzF)NfR>@K5vo2eh1Df~-u`W0NxuWSqSh5PQHDC|%*T^3{icD}DgGDKStV*8~OwbAZ
z;(0^BG@}*&Ux#q70$H>n9c0qu|I60AwtE_do2}Su>g2O_A1FF3S0#B<8DuEdhu<#>
zu9~2kAXS_dB@&^as#;B^#_mONu&e_Q?;E8Q3=^@PLQc;JA2Kyo5c>jM(t%)WAM&CE
zYMxODa(LAVX#+%7giS#YqyK?v>E*LIdMi=Og!}M#yL%k1_hYTWu!vPM)Q-E)(UU{W
zmx7#JmYw#b$L9aJaG_gvH@uzbT$fXzG6S5v$xWA+5gu2`_12(Aw9=vsPlAZfmB>@x
z_7c!eW?MkfgnktWGp*iTo+TGud?qVQ1sR0s3~STu#z}u?P>(6ks)Vqd3d~Ku<sA>x
z7m8<!Ron-;3Ord9aii|YHM>{N2>1!CcZlb1Wo6-m$omFy323xwH^s5K#N~nxJfI(|
zdBd)4q<k~=ZV9bkkY&)%)UT4IvV~`#!NhRb7+kVur+oW!n72RpC&+w*JZ=&UD^48X
zt#q%TAG&X?tETf-z&!+3#w<@`4v*+u!woK_qfT}Tw32+-)68*?_A7P?derWo&s|`X
z2}?V&08gM&H831@mc~-YGvZz(*LAG<-}I5pV!={<&8h_{61E)XXvdwqjE#V02{*v4
zA$nO{0H?as6}6+xrFzfgD?w(9I4St+#TiQuKU7ZEP|ee@q(%*D(^8iOIMd)5f4)=r
zW=5o>aR6KL9U=(Jny4%uCSKIPqc<%@;mKU3IQfolVuEyT{wi7ease$KM89}~Rc57r
z`yvPN8!@RHd7mBtqz4h7UejA-No2+0Qi2WF0mQpdpf_J?$8ZH}ut<&RA40*+{MIxE
z?l#BQ7Zag!<sAzF@K*PArZvYo*}6f+V$=y^m&#cS(((vvSqZOSUzk3Zg704^`Ccbt
z4@$rR0Na!yx5Ih2&mggg0;}M9-lX$oTeh2`UZK2KFIi94K&-{$c{*=&70e!p9B?Vj
z8BN^dr!)A%HOMy(x92=|tH{GC2XHT?W#L1rRBb6bnTl4M*HEjvM0dIYxtOt`S6$mg
zq(Tw)yc;KQl3`KrDutbJnryTs1FauI%<f%oi4Tzya3;RTT-+$3-jO$%>!LR-gvQhZ
z@;>7c^fC4nguLhHvK2XH;yJxCwipe)YKs2Kl-t8OKtPjfIlUC7R9Az0Tqp$+n$(2k
zf;RMjkm4tT=&=x&CR-E$Kk@$j#HNL1goIi9RuljurBw`Jn?UY$y}(LC2UJPp>fPl@
z<llr0vE$(KDbcOHj0-oBsX!!wuFLVrRw@25K{}&ZUjz5MUZ6;S=Lp&v8T9RWGGrN;
z@rM<^&gP|q)2-qkH?pgu5is_cL+JT~g>US!W!-1JviF&{YaIj%`6y?3w+uQP26^#9
ztC+TA%d!iQsLG1=jQ@jF!ETnJ681~eeZiWSY)FhX6#5<0mJ9-Xtx@s{{q_!;e%zSU
zVlEHylt8VVrrkl>4OeOu%N#N$jQ~X{>>F@S>}%`|`}Kh&KZgW6*M>Goz?bbV4;!RH
z#!S|LN}#TEga`G@LK3lu%vv<AnBFRA>@N4ZhBk4Mb5>vQXK`s(9YgUu@&(;W#R%Xu
z$4(-1rQ>^8>1%2e9c3=xXxek(XY`&iVc`~tZ@MA3n+wm)GSyUEj7@^Q9c;&r>JoOO
zkiS`5N8IM^fgOP_5UwB!O_q@3L3R<g@)+R4rkV5^oq;#;J3E}fOBK>9-P!I_dj_XP
zZk%Vg?SE{zag;4DAFW_dbS;+S@Sh)NI9Z}7lQ_}K7Xo=%AVN<Z13Q>2)r*m{24VCt
z8MBj8UrvvJWncO|8}`Mg@(CNN^wf|vWfQ#xd8+stTYw7Qp~u;%Gf=Mm%NP<fgx4ms
zik+O>dUoy-PL_Ft8x-hz1PC=JABu>L`veP1(++YU0Gr+C=}r##|6YiQNMX!Fe9lSa
zuU357&-m+h>|~G2QAitF%v3DZ1UCn3yi%DudddcNgl(d+uTer<C><${D`VJq6{F1R
z`Lz4J^YoNqBv@!yf8IRKDOg-yT9#r|pF|YqX{I%`u!HE?i^O-EjynT*0u7zdc>~6!
z3LvJb$R;)!Wbg`XJ6uWES&z?M|8@A_6wo(?mdrPb*eN=|R9MG>CA_P<UGOs)HijAm
z4k!&rgIla{1S<OU2}QYq{6#Tm1U%{19{sy4>Y+frbw3e?8eH3fdjwq*&Yx$$BsZ4E
zRy4$1#@j_4+^VjKkqbZ?MFsb|J;Tmu>Q{h-Zye@1_sYCz<!W%A3Tx~XwuB*zvEwg0
ziQRX)TwNCxdH=$RHLGy%^X#r9xN#c~abor;q~EF1@>QTyfKF<TL8G$}>B*$VQkCxp
z_RhjBmCGTR$~#qcce6373qNs2wCzT7^*L%?rwwudmZTJyb3)tV&jGoK->ov}#HWx5
zqkET2gR5Oq?;c)Qsw=#z&lc^r^P<2J_CkrpuyGKnN+^O<nI%`nuHWdJe9wWK=lLb=
zUUSw^ZGovj#In^VHkhLN(3ddSQI0fk(MP{lM8Bf;Pe8@-d#Iq@TMi6}j7j*+_EO)Y
z{nC{KqNhv{TZc^hLftkPo$wY3@U_MiVl~UL>hE{yt$k(U(_T<=`R>q<PYhvRMQ&`z
zl@XbC%4-xNneJWoO-9n*nI-tz10XW^_dYiAQ2Ilu-P10F@f>_TqL(XMBz0G(9y2#4
zPkqmY{A|rbbX373z1tI%vW-IGdr@R=q&dAuc@<m=A*e(o7rzo}(8*h9^BGj6)uFq|
zdTwuei`BJXEIY#<xKdN5oz6ml*NCW~=!{Bl^S;w6i@u?+gWXsuL;~367@=`Y?cy9?
zE)IO2Q<nV_&HMuSD_DCyraJKvBg>_WiKB{No-LBBMvuMM1uYMDZN(*c!PNmaq!2v4
zL8w;uG3h1E_yLFSTvL1*o7sg&qtBl*<eEN#+HF1~%<RT8H&bzC!hEuHtl5O2U%=*J
zqm{JgEfQP7#5mf2nDyLPm2<TqSo4#*MjH5GkENPaAsh*);4YFQ-qDf3tB9`k#>aQ!
z-qoG9sF2XP;js6SF&T-Qh)mitOeOT#KC~)%pcmZT>u%)!x>)Kp-=_W2Y5E@4lhxGO
zA!Oi%B4fP>OncJq>VUw@DG#djNIcvW(t}=6!SDujjqzz#l**=@08DE1&!$Bc5kS7;
zGg$rDGE{}kY=~mz?Lr>WCA1S75Kiy-WQzhkM6CL<VDmb5dlq@)2QZ<&9UwCSci4ys
zcFkNYSTm#wxUAXgVq3ov2_3+9(l8aPLykLRr?4{X#I=g=6A}NL%!8J0*9b<sq9^on
ztCUKG62k?Dd3nJN7pLNWCH;AG<zTvBI1#MU7&Gc#pi?VE5wwpJ;-})#{{wf<XcC{B
zU0Ru8@SC2hu)irCqdd$8{;n^7hW$jJwI=aWAl5%7kkg{zYfxK?Y#LUGNH0c8O>=nK
zuuIS)Hg(Cq_}YD%ia0EO4xY-cxXSN*=*(Wxk1a3t>R>Z}MMB<KHMP6aS3Bt%z>1gY
zf^>l}<A@b{DPW2G>j#=+v>t4v#yeEk;F%j&k0Xh>!HNqypI&TxAqo>8J2pQS-_Cd-
zzP~RmNlU+wZySQ&gyc>)HtpwJOY_s-^z`KmWJo4o2g3*Z+2dTC`cSKfG1^++G7l98
zrV!-b_+^%g^sI`=AaGopE<!}nrK)@zOh;di-=zvgdrs6b^q%i9rECFWm~EoW-<k-7
z4xb=a^5^;FwFfNbjmRfA>R_uU3RJZ=cyU6`<&PV}dahxioKE>4=iTAGOJ5mkAxe<+
zH|)-d`C??r^rQgBV;IT4K!c|kN=Y}i7{z&O&_eX$VmF6tK%`KuIQdl({JA7j*yN;t
zJ7J1R5ruzLB*C-a6eAb;pc?`RKA`a;h3i9l+z<l24%S#22D*mPKWJHKeIYQ_mr53B
zmtBX9cw{a}bzn`%ipcHHWYeiF^V`$UqEWRTi{$+(1>BbR;0oF*F9+|5!YRiu)1_>(
zj@;bgy6gnZeBEZNUZ89SbaMwxrb=Xbt7AI}TeSd*4A5`uWCaH*FanVwDYW}r7Regf
z1Gxhx<?usPtJKq{?U;ZrXwvjL6mEcZb4p?Q@fEOo8ohX|ghjr+>bV=|SGB3v7QZ&7
zbupc89UO3rek)C3)2>NeVdR#)E>EW#JgZazc6<^FlEGvVnHZl0+P!zHP(*Wq3~K+N
z({%Y#tM{JGk0r6EyWFOST{EHNC~PB)7|$s3tK$-k60SLlqppV-1$UUH#z;4(tFmA9
zG3WKfvh^U<oJ@p}LENa_D?Xl=k@FJL6~65Cp@W|wl)i?|DHQZ$Wti~PW1RMWM=#-t
zA>?w>4laojAuLf0jh#_w`@4#ePb`E@uvdJ)S3Y%j)8d!Zss-*PhGrF7aO12<HMZWg
zrh~g<72jTte3SlMQA=etpyO-zrgmd7$AZm-S}};#{9u(7oUg=xZ%<DY1uGsM?1)dQ
z(p9Pa-!BlSM9B*NRTMJed&A0h&B`luLU$c_&@S#~UQ?mZ6&Z!JF|jjr?j+LsLG?7S
zt=%hv@U4t!OC9@T>eRy2fr>$qDq#)u2fI;W{kVai%LLkeXHz)mTGTXzbi3VcH_Tz<
zI7)8sH66(&j)u;Bg@XL_5%%nJ>O^BFag^?=JIUa}76*|!(H8v?6vUtjqy(QY!7}BA
z_P4AG_j-cgWI2*2*|Y)iCo7CcblrjBtH=_zX6c}G?Fn8pJ9HMir!Riyg`^4D5k-X!
zzQx38B-lO1w27^qcO{|=ZA$myee#SUprr}MmyY#T%%w$wyblqtxg+4_DLS-Wt4d$^
z_jU3#<Y{n{d{c`Zsta@lfa37JbLb!KxIdR?oE|B;4aTAK_mb>W2YWFJsYg~gY<4Mo
zrVD#*%rT95VIT|&elb(fPs1cx>77Bm3hOd4(u3N-Ir(sGh@E^}C3!}HdXpbpe6ik(
zNz4Ax6wrp#2^T8D_8}iyMQFLM$IK#O|Kr17BH0JPD!bP~b}pMiWbQL;6onkmsS4|(
zU!ke5Un!d7>d9YtMK?La?)FBe4s0N$FQ`?>S%iw&2v&4*)e5>3>g&=8s)$*w6RP9~
z``Jf~-+7jWsLxBSF31TqlNtpPM^JfKochT!TE6{%T-d(`_)J>5z_X|!ye-}&7+^~2
zeMY9-q2R}f4%^aU@PVC*gsHZA{iZKl_>WP$sEZvGgeU!bMHpC}FIn3i81@aBUIZ@W
zIp<BSN^GPiL}3q+WBh+EMNaA)ZzLDR;V%23zP6nQUca~IR3hujw2Ls!b$RJbwq#QC
zv{lG8eRE{c8{}G#d6wer240-AhSCPx{={4t4=Y-+jWfn+{N@%n@uo?GqWg);YHP?H
z$=35nv8|$~fywJk3KW=#&x#sInc2-7l_pOG8ZVQIT^XREpR~hUEF1I&jRP6&I&sHJ
zMI|>O6ILy*bJ@LUJa}hm`uDf=p0`z@XT)(cE56*bApNXJA@gG^9p%TmH5*4v>540d
zMv%>9)4VIe4A;lcwD?nsD-?vpDT+x0d+!L$^$YFpF^KP?ne+1P)ryyLxeSJljBd}+
z040{QD&P0=EO^?jPiC8%a-#6VTo#PP&uW$2CHEf}FBGMUrFFkgGgzW3!rrMHs$kVI
zgogQ+rT-r6EfvvWRIwtVO-*C-Xwf`){)vBcDE=HqS-CgC1!lo&zfUv1_;!x2BQK*T
zbi;tio_g;lR>3Yvcx(3KgOAfo7S`Nc>PA=e-Cc@wuxsy|1P8`(LBq(x(m_FD7kfLV
z6y2?W``=#$l>Qg?RyTTpPjk394b9BacXaYaHbuh6<hyiYxB1yQqX|3o0yi(D&$D5S
zpwXLd8DMI_R=Tm%=DVy(P)#Z;b>4^v;G%(mp2*F~;}jxWW|W>*6lzct`Ge>X>)(^)
z3%c0DsHo4j!0uHIj^ZD&q(<tOh?VtfB=8I9tsx)7HdDGZu2eFR?>39w+~9Kh4B8;x
zTra!vw=|Zmxs0#4;W~(&9<BJ#09{MiI@muMpH}x^VKhD$yaM&3Q}%#>w)g`MToS7z
z+%hUWe$jb-@lcfs+^@cHfn5p<c{yJ1vKw2AJ}KdK!sC3*8@AI{-|7W|z8N<<n)lUV
zFuT#Blx90q^YOScazq57s-$`WO-}e%k)qyn+d_!w$LWot2#COJ4`uxLS*)dcskG59
z>k?SEY?TFEWv41Cfm!%{hm^wpn<X1DO{gau*g1K8(oBcz5OUYz^;;S5y=6_Ux!i!X
zr?4*Vcv3+x65_{y{cb6J{g1?UB6By|JW^+Q5dH#<PE_sy`@<>i*G>3iPNIK~yv6*U
zkr}+-Gem99Y4x>+FR6;<H}ZI2s_!$o`{u_6BhdTT<3;06c5yG+pjLcCY1jxz8>vnv
zf}VzWeu|y#MQe?|D-qv<HVkI&bS`@)Tf7xJg6{8i**|nWL@j-J{6U5S`wWD}eMZZd
z(^G`jkd(+tf6ViTkOQzROVNC)+su=Tweqic@s+03arJ5#)5;C|es3BRQnHJdM=^Ua
z$>`K)GM9>`oFaK}Cw8n5UE*^_wxH;rw2|FQ@7w`CmuFl}IDGu7=T^Z0lFZkM4byTh
z<4(L%ezn1rdmpArEtN$*@|*7$BsoOFnRLbP9nGQT=LCr$chi-KTm9mN+#Io8zw0dM
zQ%a9o)8B%YZu8fIOO(WEi-rn4-zv@(`M`-Rq|PH>ThYa7=5xRo>`Dqfz_$%*AgUqR
zh(+-`?&4l3KKEz#LZK)%fQhQR1CNf?#CY8cwCNy_+37FQgIpANU6piAqN%V;k&n?}
z%6#Yy3R+*F%Jl<~ywQVIWxqnAs1H~91~Y;@V=TL>-J6%Mb9jFR@{GZ#+-DVxuzcG=
z7C%I%f2B|&>977dW)oUO6Q}@MxZWC9Mo?!>01|8EPQK2XNROtKCIA~BqBsDp4hgWp
z>>(T0vx*Nz$za!XokxkoUxZ!vg_IB^rQ4LifU&2LZ-IU@y%Cn#hLrDAQwC65+KyhW
zBFp604n2OKB5$k08ulSN4_~$(9EHV=_9#G|XqnI`siOCvsY)ua;l}_Cf8AXdLmls-
zRkW#5<omwClaUDeIv|bnA(z-L#Uf(CI`fvKbyn#J>~W*pCme2G>=wEbHGp{L@QGJM
z0g_Odg|AV3D0Yz&N4k}I(p{918n+tIbn;YWjZ1Lo2$JO0M=$a+VXMYSLx;iR$PkEf
zf5&Sm>A?wZ|GpuNW2LmK2RA2Ukq;B7x^)9v=ah|og~o1TH_-|E5Kf7BXo4m__M$z)
z{j8~tc5zA<YN#zn&o672ojBjmoNcg_!iPHrHuK70fm<gyv6Sh?5bvulj?yXLCWnq0
zP(eOax%K0)^I&74=(X~Y6XpEhL$P>2J4M4o1BrxQg%by73kzrHv0F~TPG9S2@z-0b
zdsE|V!guDHVt7#<XOf)Vm6Qxxoyww%ToUvvFZ|926?zU6dho>`O`5~|9ozl2X?g*<
z12Vd_5_pQDDx@{&tL1Qxj|R{XeO50y)rXwGHZG%sUTUNLO6N>AAG*n`w2vyGWnk_g
zPKQOedrXlltF9m6w8p7A>^-eBY+xT7aKj6tDYVz6>i1R^+j7&ExM3O9u>(maD)xx%
zr>zsKD9-N(%8xFFX$J#|Y$#2aG3bM2`iMz0B1$io-|81t0K3XmD3iT2D`X{QGZ-qh
zLzKcwt<5z=sPd%Sl2Xad4)w(b@7%vlxe-lBNFVcDE|NN#qs3ID?^EReKqNa6#DP6I
zZ@l6iZmW?G*)EJtb6{_!Il$=%2|B<hOa!uZY$n8X41<;xba+Xp%j*s7+9ouKq$zh1
zoL{v}QTO8{%w*3{$ODI@R@}AN)dHAw4S<MxZjRQo2fFsCRl|_{4P)MCUnsvQ#;}mk
z9_2Xx#B+3=b;1A!;h=OtrNxUO2>ihd@Te0}S!o6Ezv^lXPFv^(M9>AUP)UkX=e_SB
z*&3Ghg}fOI{k{)c|Jgehv|Q^j-}&Bx?PrltVD;%kNw;2;<~Jw$4$$sv!CoPe{?1&5
z%m7JM^7D@HU<}khQ%p2oUK%-XJ(8xVJd#9Z{8AN+qK7#Q{&~a!fM+)*-$I>5rXE8*
zObIPx!Hx#uTWB+F?nwesmD!kr79U&p9ai-F+KxJi*l_(PpF_viyRh00@&H{hr3-^D
z*(adoSw-+ox>72KPtub!R4>H31n3W(q~!&8cM{c>OtN%_2Eq|3?&Jiq=U&A$*zJ?v
zyo&uzg{-E|SIF}{uTL#fK*ex+J6lr~`vS10WXqP}cJUM7wB1-ZeoR?tAG6{mnuu+v
z3V*~1;V>4_iq2+Qaw$!bc|(CzB~`(DL8DQG97drr<2jmlR+RgZF=QR?my8DEzDO2j
z552Zf*pRek#s1fw7Kis2L+R5UQW8Ofh81`$UwK@UOg3fm)P>->LOMNHcVy<DeOMKo
z(<T8sJCM*ZGV#5oOI#2CL>O?od8gHVZ7)9jP>{n`+^d1c)T>4cxB9LE_uCB|P^Jr#
z)?-pE+vpcIpAOm(*#PBeohA}}Yn`uT=>V8~65KCWLo=mFw&B0*oS)FY|1lKQaRUAE
zYPqtu3C@EcgIIT3UE8Yd3Y~BF`JEXb8%^qnjkz$uQI8m1!tT<Q6SC1T|CnmuwXL3<
z%P_2411Q}&W41!w3j|acyKO)ff_xlH0fNzJ&Q#B#)8iIkFUb>TGaF)&ftHJ<SgQUg
zyOx#xb`?oOn1bk+)Z|^N_Sf(D^#)TP(`biI=x-lK<+1bDvAwj8qZOGiQLF9+O@b?}
z^druFE%LAoe_)-86e6ZL6v?2g*iw#jLBhde%pQM*j8eti?=^{#ltE@MrIW~Bq1W$N
z0f<6u@w8VldWmvph}+;~FFb)}tOJ51se*on8r-s9D~hS;5%wu8*x=Gabv_T4WBYR1
zqXgcIE=D3Dk*gZeWUCiLI%D7)^z;>#4V+9q{*)uHwR@BR9lB*0QI_Ht`6xx&3$#&X
zienHqSJl|2UX40DR-<(m)kj0A(Q@)KEd?UGz6Kj@P^`B`+telOfBxXHGt`VZKu3gj
zHGhwWWE-IJv6;KIV;G%?d58Aqicjq&4s+>aAfCob2=-o}*)hkjdU(?EHHrvhlkUFN
zEshQvQZ1E5v!$JNGhcw)uh61)mjSKzL1|V~JRA>LTQo`;YK)>FilBtI@~3n88f5&u
z>%M?a;!(kpSLoEE?5*B9B;$RV7Zp^_O7~HfZ>0*s<}vIoD|V3|)5Z1*v(Uw=q<=?^
zmh>Hj9Ii3<h;3)mqkDwCxPjW)skp#KHJU`Lrd21Y&~+eR{JIzWamX<Cl<(P$O<YJo
zWF0l{xw1h$?kgCxn+4-UvxphRChRMu#QdKIOT?p>a1I;z{UsWe8v0p}{Q9ouKcx=~
zs$oYMPdWkWjVE8w@K%&TTv9h5KGaLea&>T)257>9Iu-2g@ILX!7lWyHtkt~JX?jSP
zbSs<Q5s+6phtAVd4F>G@naD`LsIxhu+iYJ_t~#5DX31iVInPmQ`vRLWe4eFr9CCpz
zL6%Y4DbLWWacbbxnmU4y9g^NGm7LAFDvRyf<sE~R{BG~M{S%v2-N)2Cp+b6d{CnLO
zGY^I!z<G9LbqH`@dYp!nI;`2C(SeIRi(phJ=D-2R_JD=<mh&e4XJ<4SyIn5A6}JlE
zWPmx(a#3hXCE!GOkrx$;VMoqrkIvmEU<ve=!v<&B7)-eP6zWu7uyE)UqBcPRRheX)
zJ#TWLeiJykyWD`DLVUeO0S&dStNAFQTF55S6eNcLp$`1zFmL8V?lOTm9feGTh<Z0j
zz*i(92HS_6j4DJK;%NuQxVFNoo%YV9OCm*1Y>;{5q^;h_C?Imf@g#86n$qF6h#4;m
zkK@OkfSXz;><}AqR}8D#Gb%dJf>%Z%$LQpfikYP%k}pJ>QExc);|9h)1l(RBY&fk4
zaP-8c>p<BL@f8uBgdJVdk2bgyxTj5!rxnuLzijA1C_5Q_pCM6SJ(o}DYTnsx{sxT<
zdRGzD?rHbxcKwDP+w1m(ow#pADtlk*%0uqd@fCxrvC~f~EZi?!k#81>?e9b+o*Z{M
zd2@$)(*yzIA1Iymjz6|+1v3e`YAy$<0S0jz3jKIZhC(7F4npsx+r_SD44Qa|WW5kf
z+{`_tV1W27fV&Y^LNj$BuYoAV3a#|PNNjD7V38*U!wM47@iP5%ho><pAGQ3kp~MuD
zs3lC99Z1+)1cnyp@kO^5VsFZ#k!*DK#31!r3RhFur;l1ms(cO{B*Ii#njXDWOql}`
zn1<C~qnp$r6p@QR6aB}Dq`na+6AjUw*lRiwnRKQqxuj4$KBZ{foU6$jqITE)coF7E
zXzkR+_(!1b+Xwi3F5Rxp6Qw=Ie2Zm)Z;+2>3Pj3>;xuE_Emm8@6b_9G%g2`&AbLXC
zg`gMNt2$eQ0#yRk@}NmwGhZzj*^^96c!R7*g$7X9FGA}A?W9giRo+>r*hGgr!pzOz
zyo3=clpS-&8OnJY7w>s|iq9UFPsj`7d^3p@kz8?F9uQ&}L2|*1Vmh%jIMgo5J4v;r
z*gYlKp5N_S_E4+jd)6CH98~|rg%`4%r#~GEqF*4%OYwT7pkMGK=tU2nXhMg$Fux=j
ziwWP6uyfUv*<&K=u5_Za*+(~Qbv>>XyIj|ilNqWY#N~XitCU_D4a}1CaUHIURj$zK
zWR<ZJs8NFGSHu$9&wR{EF0o7g7=m2u@3=IJxMh@Clj|DkcSa-yEp~M431pD&ausbg
zK`YCbeBdSk#}yX5Kz~}->dV5ES`;T->e?loKg+ZTzMt-3V^s|MY&V?Y+KH~P;)?;3
z1R+eWNdxqA#blKT(o>V^vvaNjX^mAWSic&E{5I3$pE;3hR+sAc^sIfzpCMjZt=?9;
z9zb6!lt<B0Wj_sT<U2*)PGp_d`?2t@-nE^C=Yc}Bx6ROm42VPD;@J(0uLK=jG;cb@
zMil|+W#A^k?3y>qLo0T75fGwH#}42vLoimE<ZJcWiZty*9Hxa^zI@LmtSBxoTwmp@
z((mUpRQRC9<8L~p)%#$XxF4I#5Z&&Z)w>~w@o%;7FZ|Tf(W%Ek38Jjt#D<c|pWHD0
zpsqkJ#R4n;rD6sX%;t5d3uU`29^DY~|IDaSXv6eE|1xopsqj+qmP+VY)NO4@g@f-z
zeslij4?auvt4c2lY6QODAWKYs>p0ir&cFfM>X&EIHGaqlVK1b{G=@ALOgJppy?(>g
zVpWmTiEY@G+7c-oO!d1xC>zr#s<MV8`CpdQ+DZJ1lCF|gj{(C}bc*rcA>xy?hoz}*
z`v%c9?xq{-Q|%DKz-ughR?#Qw6Fi$pepv~2MnQ@}WPQAR!W&ik1bmw}q!8S)dhd6-
z@`2F}ye|EKF3p5@!QshpVSd?Fr@#JKc7F)FQ-Q=egN%}2E#YuLVz;Z?E~tUMaXI*~
zA#++TwqXRc`Y@J3X^jc)W!qxW^7aw%X~SG{<7I56Lvev`>o?3Jl<%&DXKpv?N7yy+
zYA6I5&?K<Il+G)tDkS@GjWs7FQg#|nB8BV`p%SvCVZ^Ofmc}UHOsZ(;OJl;`+%>{a
z)67q>Z2z9NA5xe3ID~6oATQ;fcde<+;fOOxc#^USDhBKrWMQDpW}toZ)d7)>JigGZ
z!A0m*JQ#R!q&5oi=K$puZH0c&zuEL@?Bk+RT>cd_VoR1x14Sy|i?Csv@L7>i6eEoz
zB!XV5(VBJ@B<%$Z9gOeA=d-YkBiAES!B!ZO05&*b;olBS0o)V*YW3!HJ#H-^fQqef
zk5FSKaAZr9=BIjDH+m8Pc*&CN>Cx{R1{^eiwX=DTNw%J)<8<TQ>Ep3rIbXv5RKupe
z1#|Y(vBQY$j4q?seX>F+8uQ#-dXtDiw?AQ$->{pbki=uWG=h=PcPhZ~P;EzD9l=IN
z?2FF}CWx=9wF}+eR^24b-2&3uGJq`-;TMg<e_e%U`{?QPF?MGRnsAH<#xOc0&JOKD
zf1B&yN<)pZ9&8ho(~*1u6LS1|aJLCg)7n_1Jjw~{%^r9AQBH{gdd~o&GIW`u>%qB4
z9X5Z95DtFmU{@Ox1j&i<NV^lWseU>6P>}b}3{Hq~&5{J|!mR#_JU7FbNrwgwGb@9y
z6{y<nik8#zZqCNuVaXpr&?{t=B@Ris-jCs9hS3#6G`vWrNQ8%P5-JU+X>3FHwBx)2
zW^4_0kwNJ$hfYWO#a4uTyvgiofxv{qFKno>V)EZ?Whk1QH10n|<?vpsO|a$UTN={m
z)cfR^bft#6V}tH_HOrdRO6+zaerrdmP@fKWCY@IvWw<~$oq=~8opHWRKns8P39b3F
zRZ7+oQowM;F*=y3LfSzit!$U24bbnP2)b>e3XY`v6=fqj1a`Ib@3I)vYN9DT1|RK$
z75YCY`soCjL4PrSx68R=wEhiNu(4D^=lsGOP!Z8UD_)A-lbYO33qOFjEfqX+@ZSa_
zL)eji!5n(Dr&X4+**LC*U6M?fdhhSGje&B~7Z=#^4Qzx6uXx(+QcpVEe^$SEg}_^O
z-ZU#5|M6O(B}C!{Wi%cb4(Uupjmp49mC~6+L9v}4VbM<ETLi{o9in=-w^9)SK~Es7
zH0K9^dpXTB823wlumq5#BCe5w0qhRzt@AeeU5>v>_<<Tz7M>|WJ~S*She7L<BCiZV
z9!@-?*8ihOk6i@2Z?rN8kyd5C6-B>-diA$FCG=l)MoVo16@P=X?`WOKjd%UQ?%8AW
zbC9Ix4lZF?z4>>b{TNr)h~3w*6-(JdM&tD>vIruBP+F#wtZkLuMgrQjrSz@k{{X5P
zmaFR*=(j)6k=+1H03%hJu8pQt?A~%j>H~*1@Rn7*>4XRAr}O&*%);ho7n5oGpo1!U
zUd5!_uYrMDeCQPnLFmzMPtlUYe}mZ5w~^6=)n^S1C4gZ#5_A|%IitFF>L{+@6{q)!
zmfW^xt@P}vTP!L`YWk}!GNrhAy=f8jcyey-M6|43sK+jaiG8|{3Dem4xw!6dFND%6
zs{Zpe0-`^toBGnGnn6?ImQcm^D~NxGM`4mjuXor9soM2sQjim~^a9hgLgrS1TxPbn
zgBp=tGuFIMO1n7&M>Si49H02l+`JB=UEjP1Rp;ZfPOfpY#tremyn5#-i}hz+p+>A;
zhbJv_2)-J^3cofVK8J<=-Y!`nBj1ktSF|D%PFV$x1}bzq5mf%v?iKcYBJtOi2d>ZC
zW~M1)l{aT=nd|jeTh8Ej*qPOJPOle&L}{GK<$&6Xu;jQ4G$n8KFy`=Xk;;v%%DV$!
zcBLf}la4L~w(wZCptx-HNr$lNN))BJ+wCSo@>nLE7J~|U{zB*&ZqRLMOJBgwdV$tQ
z#*|KlxlL1fzVueUZ2ZSGTTy-ZJUf$3k9sZ0xo5P^(^Y8vjus>;4?zIO)ue`T)yVbF
zE$bE}rtzqTWM>nDu*Yj9Y0k&)YV-yJ80b;tIwIQCM+WgHZ016@l)2K_EELP!r!HAZ
zt+NJ%cy3}(RyvfA`;i&?vThG5i194PTPBqc#p~{IjO1s{Dk`K7>q69o>_=>TQT?6m
zoNKG3l?I0fQdff?wW!EY;dPixxlW8@$3y>tpqE8A*^#fyKI%b`RSL)|15)V+NTO=C
zX#6YWS~uJab?6(KC=yiiRcJqR%fUKPz-QiY*_i{N5xf&O?lqzp={T08ybtCJ;oAxT
zT8vidY*DxN?Dd{O`%0URo`w6LkJFS)Pew0tQX~MaIF&)_6`I7{%b6DP8RC%?Q0($`
zX`mGGtJm*J>}j8H2Cag_7bT78c8^{O7v%&th2@m8eixzKUL<`6HM~LKQby!Q&IMhz
zdQr4>)S>XDDnFI#7*R$ZF;4s%xm#QweeYBB!&MYSc+coG=?-7@nL1F}nUUL77vH9q
zylriCK}!ZSlPpdg$>4W<R7vl+4>XsSKvHs(KOgael8!4?o!eN*JU?LZo6e>s$r3;9
z5>jI!g%RBZLWbyv%uN=msX?<{!=zA)Rt1ozLP+cF!&ZJq2eqkjuOxsdWBK&D!1;8;
zO`~>(8amx;XI0HS4D)r18JZ&g`Y_TRiFRU~_xw<5)!_~g6$9aEr4fv;Xk3<oxjm#A
z8%+E<o!WZC=CASEt~^GJkC+4}zs<eD4PixCMX3m%2^0gCu$K?DGcTnQ-{*-{r3p_`
zYx4~ojyX{D=kHw3r5$skNr9$JPFo^Yn?U`1i#wzsJao?IJX!HPcE^uJ6Aw<*kmBTC
z<*DBm%Fh{^gU?uV5?bMO_KW;zPZ82IB1I!C%KdAou;t9QK9zprXr)zZS`ttkc&s1S
z&>Y@nNqxGzi7DrN=*CEe@D+;3fn9p#VdmgwjcWG0>l1g=x;pzo&CI6jpz^gbU4ngD
zJIXCY{L`Hg6P*!9SG{w<se$E!M@G**-7ZyV9rZ$4ZQh1r$?TG=Y%PJVHcH`2T#qc8
z*~2$~Vw4^~$7UccD55RcMAs@zWBw`%14kTnyWB%{<ouVgn0{?8|4ogtP4VBrJQ)ma
zY1FMq^_(2B3v39Gm|e0PZxxTj4T!Xd`>9k_cBGLCg0>K8S)fSQP>8@8RvgY)W`P4B
zzP8wMe^3RdN{^!_(@%KKjCNOw4ETSJ&OEM(YyJOcCNnS@1d@<|7g2_=g@DNQf`SW9
zV$cvohL8X%NNTkOw2Elmr6&<IVAZHl6}NyyLQuiFA#TxXn^Nz$sYazOZPB7drPO`5
z_jmgH-wj{M%sJ2V`MlqZ#7xqOtd);80t^WX@Z(>a+H92HQY;_)PFqcxIuJGw&v=R>
z2m6I&4E?b9uytFw5P*Vt)OAD1IglcodGZd6PVR&U0as!@4VT=k*5Ze@@90%<1RYJf
z#a>Xd$WA>+HIUg?B<hR0_Zkpo^i`T0#&6{-bYZEs>~3U1K{{mrZlAAvGr?JP`0<&n
zI8Ete1);28r<=d+NzZ}!)F;>@54kfCPV9Irn|j_E!7t(>2NcDgQsR@V3-P0YC`qKb
zM%xlky2!c23RPMWNP(HJ7hu>3XXZ)?(qXoT2^QN-4l0ut+;Ouxa~#pu$v<w*kn0E+
z!f;i8!v->oQPF?@NOW0N^JQCl34zo)!6nQx2-(n;4XQ_7;{Dr(TtRt|M%1oQ2*L+3
zK^hZswHv_^CbluLlIOA-gwpaj_D85nJdV*Mh;X%nDQBIVIQ*`&u|(-Ji=4oj5)TQ7
zzXr?qn*0ut_<;_u#+&kk4b*N2COXX4Xu>zPm2L24CtHNs;+H1k=6Rz^5mHo0hilkf
zQ|pmzv0$n#dqG#gZBRJPWPd`PI3_>TrFE!gjErFd@COnBIXw?q4JSaWc&(g#MQ^nS
zT9fc^L}ASdtxpnzz9ly~M;Stumf1snD)Z&FJ6d>!m*R@Wceq|ffid#6Py!T^tOWlq
zW&ANibHauWfF^XG{bRxXt)JLGM*M~sP~(v9IU#cxe5M?{Zcn>_h<b=u`THCnj!uOk
zpa5j_adi&}{GE`xb}_RUrM~RGANQD|r?dIsMGtif|7IAtUFO?`PwK{BVG`R)Y$fOO
z>@f)PGvwlXS@{om%mDtKku?gk)$;cYUJW<~<N@+EzOr0)i28Go#k8iqGWHc1%*nti
z)Y0wyXR_I!GAwn_8H|4IT99-(EWgK*WycY^NL_sxKQNsgkHU8K2r2YoFaBvezfEL!
zRX;5&y~gHcvbnTRkCF5qi*=oW2QQ0`c2Kz0k6nl_#oBtTf2)Jnz)G$KgO=dc38Hf>
zN9NNJJk~FQOllX9Ei2K&pd8(TldvJYRSVJemCf4e9he7dB*@f(MzGJpg|hHgyyKaj
z-)$XWD|!JevI?;xf$z0jc(Jo3#<a1mgPz}#=HZ>rj9h7v!PV29;f6SC<XWZQ#p%e}
z=S!h!W=sh->;aE6|4irYSyNj$h8YK1R2!Hn#L`(7X|kB}bJzGneCi-O>kRxO)4;Qf
z&a+{KXzE(@MQ_p_4hm<-8J9o75v1>a(P&4c2F!Q!M}2Wu_l29D;zYRoqr9~>v6hGn
zr}49JJixD{h}n>}a}h%D>q>ru;#*Z^0&?&K+e(QyMzs|2%oys{PC<jx{D<4LmYpOA
zYnB3Mj*{BTMxyo$l10#4dhO!}_0v^pHAectkH(#FWYMTOxJmxoMqE7gA(%RH2};n_
z%Qr&B6h-m_!Iv_N0~?hPGDvu+gQY{Jv@*kRq)u}2n}Kn%mW)r+kNF_Gk^fcJFj($k
zMKQwwyKK7e?_t8j2FECh-b!Y&Y$IIY&8HU%V5?F(YTHINFa6IMH!SJ~RaKv4o{*9|
zn6&wWB&#QcsBp%FUv2n?3x+lS#p8`>WgBl-&3w=90a3i_0G(v*CED&~4J!w`gvGp?
zIM6Dw1iyimlB5DPzvZ4j9o+w~CBMznX!HNEGXJ`YY~G|Cc|i%NPYwT`iTINVRe4TF
zxf_sQdEgG4GaY5QP7NqD5|8&arzmGUf|0()^SXLt3~|jb@GIv*fzOED;E%WPg$I!T
z@xSV|8y<Md978L(d4D;ny>fDz>AhEdJ>qA@M2b;%GyW>3a<CEJv7>o<S?5AU^wltI
z`Z#Qc%59up003&}n2dZohgVabgOU^^CVgX!Oz@p5M%g?RStyA>VWm9Fb+rev!M&LP
zX2i{4{-Ormp)x6map8@a&j5ixm01)k0jR(0I^I;#L@il~eDIcxaXmgDj%&f|3(yX2
z_F1-AaQH*cHn!bg#8o5S?jW{+J9H6`x!Rb#Whc`K{z%7;I5X*yAXgpjlw2qac@0t9
zsi$%5OXj!^D^jjIiao$weuhLDORz5>kmZX{Sug5Wg4tDp-y0;r6m(DAGWi8lZkN=i
zx8RT_@C{C+lJCV2@%bx>*cQFoXM>&o{NJNnF;Vu2pN+}D-Pr2!I(rgd4R#)O1p{QW
zzh$*eEsJQh?**Gb+*d^lCMcBZxSMQ=A^Hlah7J0V>DP!g4s4Ae2I&2(C$k{yV4vjr
zH>VXh_cK`~mf&~)rWEA0Dp56Tg&^o5^N~gC-vj(btcO&CB-wtzG)-+6O?0XntJ4_-
z<go$uW+Lbrjy#95eKNuFd-@ck90$`XGYVwR)}EU2jTB0PPUqnzS<-5GZz07eQ=#Ya
zQ6SCZ{3g_d&;Hd3swX9Ki<A@|Xq^g@evt^Be2^v+*RspE!0_tdOyIRxb4%-YKj*^*
zbwH8llH}uePS<j=t6Kj#C$EB*s^EL#jIZHL6nRNI#Y6@XSX-hA>L0P2=-{6Yb;)1S
z=ba#_Ri<5zX)7PjiIlJ?`rbkwTAcP3eMR|s*dzAvOWC9$J`u|7L^s3HG0$6s+7?#s
z^iGv0PI>neozU{xNNSz@P{vVVp2I_LmoXcUk~{7{AYl9+HWwu{vHuE#g1DAv9`AM#
z|CWgmB)-C5!EpS78$UG?Ag{~8UV+c~5XA7!$88UsnPc!@(s@6M#lQBb{Z5`%Qi6xa
zWXHblQ>-ENt7@}OlhZXrjHy>}vK!%t(F2|phX`al#Z)CTko`d>-ZV}K*7v4Vr5k3T
zKR5`lQKa7W7Vx@_S!1#*l9+m6$U-ULrC8_+CbC7*9{;5i!0`PZa+E>R$71b%!L>1j
zaQ-8*MLGW{zG(>>nTnslh(t2$GX_XCq5&50^0Buy*}sOHX&3#vHjz=It1yBW&H%T?
zp-u27N<?cbdMA|ya6`yjZmN;Jz>erq5YCFb-h=FxA&m<1uHE~ao(95Kj<bv1fNIfg
z;*0zt-_8e63v^yK+l)T^L$gE-e35Z_HTnkLcQs~KfN~}U3e&NV2a%0U5<}%NyWu9V
z20?DV+37cPQ=%n$+-URlQ`HFmm9>vauATV?OR+?qX^;Anygi7GpUQ-vgURyRn*5=g
zJ=dW4={zCWuPkv4-q`~)_P!QGzMeQkg^xL5372mkIpXr<bp1Vj<m>TRFjIbVw>SVz
zwTDww!=I;lS&&SqDPz!ThAz=zJs=>{6uc(Tkp^;hlEIcs5QK>>>(9c?bo5!H{Fb0H
zr(Y8CH7ZdStA_7)>31=;@14<X#C=;$h;yYeNiN<$hnJT9{f~r3o#Qggy}m$DO5)8z
zVMuplF58NV0x5zdX_dD~l@_xoETHSI4!mk%)o*LF=14o9(0l9>)NpGRYjj~l4x%CE
z!L!p$_rxpQ=rkyW;{6@NJ;UZ!^aXAsJw84&VS101%!hAa-d^Wi^6(%oP%LgTF6@BX
z2Z*fx6ifXeYa!5=0JF~~F0cvJWP!(eV?G;<I&I{dOB56;Ta>ZK&6By%VQ^Cf4WkED
z5#HnA0qm;ztfn=1E8cR4-TWz?OxMqH(|h>`kDRF^&apSqw4cG|4+DKX?RsnKrzYli
zkE2v2QX6G5#1sjdZkX`Exla&?D5FF_u?)+y2W{?^TJ=rP+-eV+&5D+R-_`?iTq(A?
zoo|~3Z};(rS@g<{3+E;x@<s%1LTVHIb7FNrAdoZd0Sma_Ph$$D#pQ2STzRILJ|5oM
z36Ruw5-Srmp!l&zMlNX7{ubfKW~DG@Z&#pIKxw%xEW%Sf$5KBxs!^U0n^rq~k41)e
z_7K-l`@j|pfdsouqG`OwCH8h(*>YZ$6Iu6;l6+)?^qUFGdCRR{*RUeAh28X|hksex
zqF@ntXg3NJs8A?9aQoH9?5EwPCpWDra4#suTem7FQW5~mWVuxEAlHgoLzr%=XdRQT
z`hu)^&u&8dYQ}Mez9P^5bk-35ORPv*W!~U+ln|32h?gIBBC{_+7P-lqAZb8zdroGJ
z7)xh>?ciNsN^A+qW8`>AC@JhThFruha%~>jpLcA+aqrC$P-E3$-@EylAa4*)zIj(y
zU%-F#4<4Wo){VtIJgZ1fY+)iKXzTn7D1C%2#F}S;B}o8IwMwRLB^+y%{Iz{Cuf;JD
z^sH{?p5tzzs0^ifPTr+f0YS_J__-?w8BwfLxMi~M1)-6AT!9<H7CGp(VA@Z8qJ4(p
zD{EPQ4}y-O18EQ&1&4|TfdcT5RCi0&+#xMJ_Nc(x8lgDxIJ5eqFvLT>hZQdB;aAEH
zPLxV=*7fl+k0>Tc*B#q3!X^sul|E#$#L_zKzE<|`HWuonpP~k?-*;b)>1zFcXJDs*
zt15B&F1e*$e>Mq|(6Nue3H&k^g^y|vo^^GQ_cxp4p;`y=&$xs8nL>5kEi>7H(^g(P
zAA2LFg#(Hy2RHXg#-J$h?B1gGAg|6n#>D-j?K?(GA6~|f3JyJ@@?Ov=S2Xe*JQ5N1
zjYsy^Gd7DkaEoia&Cws-VD-)IX=-WHpKpOJ>T<xF8wEzkYw(JtheDu`AIG-zE7oxQ
zZ=prhi!{Z^UvspxowE8HqMFifZN8!v3g<eGW2Z64bQ`&lmF~8rbV?yY^7i3vyU1I0
za0L<*T9fX8urQSEIh<@4J!8h4w@!4%P^7jx0^bm%Q$@sxE$i~`h;MTKWzi=<G7hyk
zn++{~cTqr^RQlnl1d;cGp`ccnW{nvjius`pc)bNNa^YyxT)bXQj+iSfXpk^RJBWJ_
zfRZR;FWdI(HM|Q|lElfY1mXV&(0&c+#4N9k`FuNhRGHU+!yvOP*22nvw-Vg%cJE*d
zL+Gr>nT5Pr-Cow@ax5zqs2|(KR<i&qlxNMspqSiA{J{=6SeXd<FryprThg)yc~@#i
zBE3+rOR|~G@6C=Of_4T}K~Rjp0x-8uRuVz6$+h9DU_EXzgQUB5FhT}+j~@^&FROZs
zv|4Nrx|~n_IdciP-$$5{%Xp$QVI<moVRbY1d#v@#u-Fx}7BK<lU-cOV%KOmgtd8D%
zwkEvfx2>e?3ss<nXhKP@WV<gOV9$Po=;LJDX+_)g2!gDZeepX3>V}HWc7-#g7*e$N
zYwOoMW_CQ4m0Y$dtNZPWkiW0^PRNHhX#dQu!24SQ5snSaWTpLw$wg2~9jEK_+*B|1
z?5$<S4d|d_7kbUq3Z-X2#TKoJvDajR@jBjIuk47*n1fdW>hP_rlc_ojAZKp9Jw#PT
zlt@S{<FL!dd9iF{8rYQ9+Ai?B_v5%y#b;%5O~rxi&hNXu$p%&JAnz;u30+?)DkEnP
z$nQT9&U)gOk9R4)w+MWK2PG>Kq&lXpn{FJ#>N}YVXVTpcx;9cxe|?wU8Z;XOpM$L)
z?}@Com~uEJPIOh9-jw!+7|P-7747{2LE~%djT>LAuTR-u#`wufn+i-#HMY6oniSwM
z-_S&UVwJqLXlBhZt=bw`tk?X4<t$FE3_zFO((@`xHu*WT`PZRAna;6nIBMj=&i9(g
z2xAcfMyY*2>?MvY>@AEZvkf5TzhJk37HU>OM=!f*%X+Q}q)&Nc{Ir3@p2<)I@-6Jf
zPhKIgPaa`#O^TEUFtzd}J>?2ce4?zp)MGr%0*|*Zn)ZXVQf`sUbTFF=1ox7S1{ByL
zd|9o5r{?>O9O7g5W0FuhhQX3-oG)0bridmEQMgwM^v8_>_^ULpUHF#IJ&k2ddlL`U
zY`#mEtu-4s+u@EJuKF2n3F!yk?Ou2%Tx^)L!XCJdc!7U+9*Rm9<LIg$1g;SQWPIyA
z?A1J9RL)NG197h4$LLes8;umtW{_wN*whvG))I+CDQMTNZ!}#PZbricnm;L1NaoE$
zSlRT+Ux9m0S|+Nbp2&oJT83S<s$$B5tEARsfN`kn4CoYq0xPfZv7zO>-#)KRZySxL
zkzK7^gz|UPkGI}g#;R~@P~#o)#Ts^V^jt|40`W<QBcS>Z4T9{oHO=1&XYEHew>RDV
z+HuB^)UX`ZZ`30!<~=(;J43dWf|ta{ZW&q=4_3*e8qfF6$T^0i)AWiv-1T*M3zk{{
zEWhuhPn3s!bJa1`s@i!+pNWoZ2mvvy(@p<o7k>Xmm57eKC5RrmkZn;2hTT1_fE)VR
zH^vZ!;DEg8j4?R(C3rZ;WQOr)*)4s1iQT&>LEK|>)mSsTM&E1@efhQ5b?wH1v_f@w
zt$0<MK)H<BcQ>bBHC%MK#@-v&mhhkE1V01yH#>foTS!->R8g(@Yd}r(F02Ei_y7zv
z{Vd(0q_<l(VNLI9Kro8&reI-jz>W#H19M6r^^)l+&6@$jq-D8f9Xk4eA?`Y&bLfiL
z5SM`TpwUdT$BK6rpr^elc#xEm`a4)Ywa-lB&cNNqiiN6w3H1*LxICu)9F1I6WCTA<
z-C7T=IkPcIR)k8IolUMOVWR5#u86+qK~a~{rt`hA3sFgUS^=!Jh*!a7huJ*T4m$K!
z7}(kEn4Bw=6uD%LC1v5&R{9Mr5D3>&BegAQFBy&OsFu%;M1^t`{c(CZ*T%D3qR2GL
zw!oFfaak^-4rTrd(Y(>S#*%-S-Fo+OLzWcBo`Jmx@aaDcEC)41Aa3)1YY})43Jvnu
z_h@fh|AhL|)D*=r$yDr`x-1L781GX|O=uO%wzpsxDBf;t#~j{EtO?`-o)VwcLmWw?
z7shC|36871V-3DohzpDo6X(DrE*8rKnJEDM&oaYUpjaxhqZp9cm+`VuMQpG|`Z!%s
z*~SLfQbHsyVnE2ZtnpAOz|X%y7uNQmmsk>Naf*jK*b95XmRoEbTGX+n*hF;jO6>8n
zMwZLwk3q2hiJ#(bL|0?;%L&UIr+^vI2WxREfTc6mgQ2)r15M_|U^x1ESh&&&Fh*@o
z9h;_G&TP8>0N=j4Hfr}md;kU7c7BZtY~k(1o@+f|`a=(W|1Bo9m^OddJ>=Xgam<A0
z@&jL=i6ZUfBlE^b&;nPq=ywE3{T3C=KR0e{5^Gp7?25=)M%v)k2dbIV@9JP&1`alS
zi{c2dvo>lE+`I=7URU5He{tcTZmTp7JBq<t{M1oZ8CGNoP_AP(zoY%10~F@gm-J;O
z#k70zrq31HQd4bS4t%YEYQwAZF)m;Rp6g6%AnDcLdd+`;c#?NUzkH6j!Glf8hAHP}
zV0pU?oBN2CXR^|?>AAA`n#b}eYldJ1oX&*&Tox{u{NY0T#acT0G(M`s>jfC_`p`UL
z$L*khsg8HbV)Ir|*Ggx}c7DnZbKG%858@^5{$&x@=i+OJ>N&yfBMmd>f5&YNxm6ba
z0~v%4zLg3c%%~Cs&LG_ojxs^=&+;lzaXTpe4yjj>Gb_cYT0zRM$nhj8spV@OyU%HY
z7c&`d^HKkm@;&THY!M@I7nhvDC(RYtKVfPu9gcSzd8bKw^=5y#=5sG=>>`b2>g~$B
zZ<LNm6sVeGCee;HKEhWme#`|-GDID<lR%swuHW_R-R!I;m}94!0~MkDypM=mbxzcW
zJq-%jqlcE@*H>c9@P5QhOn(Yaf)=a)r)6<Ex&tyLlR&6o!*xS5kl={q&*q-3oY-|>
zOOKJRxa(gI&>ht7&5|JC>&rllP{7F+Z8brTMgR;J{15CS0}D9wo=Y{i1Mli~6*$qh
zs0|3uTQ3)5*yS=7)UOdFfgLT%&&qk=Aj5w`F5fMdoUe4c0bk#Xy#;osB{<Vr)5-ZP
zg_|b=hb9{L$+CLk07<P@_T$Ggj8Xg8LQN2}1|s>IELBo$L_B(!5ZWH_343Dy5CUps
z*f`{a$XFk%CQ~e8WY~Ox>tE;lP-wP0249KI{=3SzR55J1xHTU`@&_3?>S)>zYRN<&
z<u*Yb3jAK8jg)-LO{(M(_Lp^XpF_svT=hBCge5^S^yR{^Jgxb}YetP%S$S;w8t0}9
z2@HSp0@L+pvQ4-4vfAY}U~w>X6tR&3w)OQTY+UMGuM^W6Q{Gx5qstw|KPd8LSoEiZ
zDwOo|OV0P&1NYt5zHAn)D{0pu0{w4C$)?&YiFD+OM#rRbpZP0mGXz8V&2H;o7ZOli
zo9Vo=vQi_NT5Op2{Z6k_&#BRlNj6jykJy7n(0z^Z5yEys{c&i}Jdv#eubAC$#Cc9r
z(mxDhaV9QQ+K&)-kctsY-whY9-maMa&Jy_P+}w{n)?U8kf>kk-ow8e~Sr_;P{ok<1
z;o;BSG3jkR{HgbNT=<sLlfRNjXpK`xPtF8&W;|z?5*^cG6*=7ymUQ?5$!X&+oswF2
zga1ReX1`h1p~9N}2g*ReOYD(&J&`?LEh$`xAfYetQ}_0R&!_){NsoKvtxu`wkZ1IT
z@mNmIRig|g{n=6*2-Q}7V)q3{GtHGTy}~>f7j_xVpBMscF$CPpo@=_g5>jbnu&=o0
zamL)ghk8F`<ccKuiJ$*2XbT_mQS7N6)0Ls*ZDV$}Zc1MghvV3=+6*REkB>5$miG9x
z5U-e2L!Qqw91W40Iplf0hua&Tke?Bv?ZqB``YgB%cfg`x0XpwX-hn@qfDGvh=s$%u
zVj>c6)~o^<Kf28^uyG#lqwc2aWP;{?ebPagh)EbQt?@@J>>{raWVMU=&W1Y>#ZK{@
zoq=e!ia4un5A>NUD8(Xz0$34?`1EJH`A@heOznf-YLr^nZ1FnlqI<z+23?9voWdm3
z?DOyzt~FM+9RG41`1PUNI5<;Ru9zoooMy}{M)8;?|50q*_do#noD4`zMg$FBON9(~
z7UR}oGR}CJSZxg!%O<C1){fGW?53MmZIxQk#Ajv}<Hs&H#_VG3#46CX4ZZ&JWoe~~
zrPysTh*AuP$BwH>ko?yZ-fSk0n?`Rt)&#ZLoN^*=ImhOL(HoFLHx=du;dxxu9HEY3
z{l)@k#&0ewTZF9bj0`)iDxC;7{WTwp%qtTiflKhCJM7Knuc=Q{5}Us3WicmjAw@6j
zirUxYEInBJ#uy_xgpCXq5A|EhBv7&!Zz`uc<;ge1(^b@Uv;ZC|!J<Ik%_n4Yg21_z
zi+zDl-O0~!ny&pU4sEA4!98k{?xwOMc<*JzhwUD3H~C2ih)x*dWfQ<`A%3>k`od#G
z8TucHO^e6?&M#Z_vl1zV51e2V52BE|4sW*jQcX^8l_Iz$JElzdN4q{f9p5GiYf=S2
z^J=>KNVdk3{_Z>sxfz!o4;oA5erVbxvJeZx!c_fi2fb1_Wg8aj;i0YRgY%hR=CLut
zoOqwAz0PZ;;hgxI3-2R5zJ`a-6<QB=i5=UAwXbWZNlBhlqI`p)8wrCZdZreP6YXNj
zs2$QcfPKGHxs>iCbhtKG%rSxcSrOVoow88uY$nSpNr3vtEZvJnr0SgM28}@8I*F5?
z8ycKGYn4PY?pyMyiGLVq>%o$%K7Y1MDf>I|kkM9dCXe+g1VNeV;CIGJWufho?6ppH
z&{|q_5Nx-4-xi=K=n>L(1ULAou{F!@knf#kPnf)2ijh=s?F1c!4vml7WR<v?uBM7U
zKJIBO1sK9qmhzCU1=eo{|5C&-v!2UPAM7mLz5+9d-3>*Ba3$vjgBVoJxyNJ0=x&?z
z&jHEP6dOSmz`Pg0BaU~lvNfQLwTr-%Ti`_p#q2qOHDKd-{5&tA?jIupKc=jYbfbqY
z&5k`^Npc{oY!s5Th5TPX@C(7iKc%w~n(`lQD0*B|oo=)h_UoflIpQ;bTI5+hUSDF1
zJLpohfYT5NCJYm2q8k4_OpY3j(?E;z%&l^7f!_`An-w?ztsa^37+W;jzDpQ(MB|L_
zqnlsIJ~W_nB!23Al`p%xHcTMTE+$lnwl@Pbd0C_C@LTT2+)^HzIKPO=7JBVqY!gBB
z183|bL`_ovC+Lna((Oo_Z$+SA;9t1Y>-K8wvvgVHxO}+1kGO6Sy$37az+U1PN%mKF
z1k3*@cf_*DSS^TLiQds`jG;btQyj$d7fii)Y`0HVBo`TV%4<Y~>7mlx#_uuOSeqzm
zsR^-;F;({bA|)YRZ&lywqq4!~pCO*EJZ}xlbX5ged^JrvqLk=E`aWFkr=sThQ_%T2
zyq5R=QuJS#dQ}c8@FX`{x7WNOLo10|?8h_UIMg%q@?J6v#N}VS(}Z6D>og0}Qege+
zDp`Q`yDg(B!L}O*D}}Y8r$BXni)z;gS%-_+<!_C{eH2W!K_WejH(=++_TtG<X9M4L
z`@PS)dL2JkW4n~Nm;HJ7DHkc}C-yqeTVr&RvR#|lY6vBL*i?(Ky=KRshGv&!+7irv
zrzG1_6ia7wrh{-H9y-9?y^3e-60SWC$QrmH?1+<V=LGhk%<YU^%#aI!cZb3ixF+G?
zy37~})%wXWI$;Pubyk&%b==yJ(0bW^K3<{C4zARv8g#A*03N=SjUn@X6bCQI5oC`Z
zUA*Omnto!)j3cv0DGiyvG-{x&8kva6=af2Y+7+T7m{=>BfJN*r#$skW^Y_E}H*oiR
zc2p0!ax2xV4{V}W)#~mmrAM$d!^j8{)PLXZpAZb%q?L=A$>7FZuQT8^wyO3j6>k#|
z$6ey1$}<+wVvKoP8#;^`VyeyB$Rbkk8%t^fEp2H4R<Qms9ql%b7|W+C8kCg~HPHF8
z-^ysGgw1pDtpOjg%fTO8d0O*M{lYU_g$v0S=raklme-Fl#5r>Lj$);+@e}O<na)E5
zI8esxDMmNZH=vKLi$v55DVyh^$XVUMn~6Z*5QvR1$hhgX%yc^s;oRS%J0H4E#7Hok
zLOb>v<buJqTG{*ocF9*)d1?Mbye=akU@fwI9A$!9WhZhQL2IVK9~l|#{2zc-c6d=k
z8ZHF3OTm(|dsyUJaEgKdQmg^XnLHQpW0DsTYn)4Bv;o*Ni;t;+cp*Dc1J@(W!2`Tx
zJ{DY#z1l{u)kL2ypzp2}YlevEsN=14@=;#5w-W@e`Imm=IJl)uwPX?(o-wG<L}(|f
zhkjXk>5mqkG3_3)VKrC+C?Ol-)NHHT(PNx?i557Orq9nn81aiS<db0IlzPkYr{FzU
z#N^{TJ`(O&rf{F4!A@GAx5rzApJKv$y!L?2p%3ukUE!<*ZqK~rd)*?e(!FPO@b9Hk
ztLleUlJu+^{Mw2}eukyyhO&8cq-s%l80DxhXGZsKe*0Lq!jQJ2x;xB@Hr#{UseZyr
zmXpytv&W8QlFQL)>i9yQZG0<stLndBI#P_fG~oDLdL&GrG~sV+w5ND2n^U&Y8S@s4
zHUvy(a(UBH@(Q-~lhp_9US}-&3PWCL0X)o(8V<!l34*qxf<L&pMP(xjP}$aW7Gb4j
zdfij(cSDtV)FgI&m4DembFt1WnTie|2moJSRfq?iCgx>Z8<E|bESLaK+<$CO%lKwz
zU=I~*7m$<K=!Ie5rfn$&hr4RT1ypp0*ff5MHTeNTkkmU9dhOVx%Z-oltV-<M{j0T!
z0AB|7!Pu{pF|9#H*76D|iLAys6Lp7~xD>oi#QUb2Nn?+_HHI5vR3^ghqpd!yuB=Oc
z<Qn<$E|nXeu8reqbnrwsQ7W*x^#$y<nh;9jX$T%*Z<kl0uI5r?7Yt=(!rv@`w3HDe
zrgRECa8zNO?NpK)zqM-NST}KjLq{Q@<1s)zp!`=@Ba_RPJi(8RU&uq%&@$o7ZZfsW
zkEwb%fLmj%0E8{Ukr=C}2l%uLnh~WIyYUp$poX%)X?-1&Wud|Rmsliqs|Wc03wNP4
zGD9N%@p!b02FhpX=fyJ6JX~9qgw~2`8oUvQSP)=gR0Mjp%uB4hfa;0(D~lNWD^lzY
zL^VTbXi;dQ-Q--;Bbnv*vQR>T$x&=tOkqr5Uv?s%I!>V0l8@(9ev3N!qHDdnCa-<H
zQ;)gP*v(1xnLGasl3U)vErnfCFx2+0rez-bBA}%C1uk6w3ZJCnj{K?;{W?!85H3^|
zHR$m118m#AyMb$-;n{-7wOs<#g-YyD9!r-WJYy_LLZj@VW^uVNNpAJGgme+23a8^B
z*!`|{mT`xY`B6XY1$N098$me78Ko;8V^=)J78P)d4mBh^AWGTl#O%BgpE92~Wk1%2
zN$nmTKfRZzDpaSrK~6PK+nCJMg1;_PU5uA5eMxXtxDq|{N=h13bN$OAVQE?j>vh&y
zyi@qyiD!l^%lHEe9H4FHkhIyxG@virIIBng)ib_m86yS_+O^JONm#nZ8Gxq3BR$|X
z-d67O@gwx#%`GZqWlylOO>uk5z5dfI7zHT$V1=fU5eDWxfQyg%>dDE-5FNbLM~v6Q
z9BUd3c_2p31^=~|n)d*Dls#yunQF1$Q57sjnO1(`0~}7==`5Ch^FS|6G@;mpQDDtR
z-1by!1j2Hl5B6sXq!)YUEmlg*vPud-dmq4kBE8G_(QhmPKdc_T!HobyxHay2A3Qt&
z8Vacqy-9~_d^~WUlZ*B+rfYQIYep<ROBFjgUJsBy_E3MhtVhr%0)>W<4#~_+f8K-W
z#!Kb3CtOM>gW#~U9JCE$S7CM^y6Z&z-rd-3imfb?$ZemMhbirM)S^q_3iXcX_{8WR
zwr7q-DLUih%RY8;)K+CbeTb-HLOZcSHJHlA>8$t|JZC_m1MPlHaI>g7wA`nN5t}ij
z_hc!>#|Qw3UNh7yj6tcv{Y=VRW9-{XuCW59tcDyO0-FcXUGWJHZyN;MUMiAx*vPRA
zkng*Qy09op7#RCZHqDa!0N3xzF23|R?Lf8TyIe35T4hF{s&J}WB8xHye{BV$dcq>L
zdt8#YaA7KBL!QOh?<~L;kbC2>MGFZEHA5e+um*I8eI(iQ+waWGe13Yj&xp_Q$5+v!
z&8Az7SB-4YM{f0M{fZso48G>nOj}bGGIezIl#U)F8U|Q{m&!^`<7gTGTDH**_n_?l
zY-eVP-Rpl~&N}mMOH4m^NI*-r*oD`whysR2qV`oEUeZt4fH<V0(yN6G$hgF8rhVUl
zYGi8&ene#$9U~E9xM{7EYn%@<QOV=hLN=>i@l%5q&ioepPNj`)_j(xH6CNMipwDZk
zE!6SX2(lc>ZeA+&yDPkW&W_JpEZaJPt;g0j8LznI^DzP6&(M%0-P!>7sb|4-=csXN
zO1#WG>v7_@&t=zaKpulR>5~*$vJggGD2v*SeFUfeX8=EM)gxO(g8UgK;icy+1mQiV
z$0%IU$WE3;Kx~1)Fm<i7GuMjhygL-RlMEv+2Ljm#K^El`-sP>hy&vnK)>KW<5qW*)
zvq$tg!QM-aFMGuv*+GDYBimt3W}4PPHe&jhOvVXkZjlSsP@?eU+6f84Tj^PB(}{a*
z%@fdg#u(xXVxp{tDCok8*?bhs#6~0mQVY1*+t^LZ0H=ys1?obT8)}X7z?S0}DlkuH
zwa6bryag?+aV6AmtJb1U*_+B4bS*Wi+-{a^LjhN80iGz^1J1gnbxx)Z%)ji&+KO@B
zm55k7dfmyh>iBkonxu3X#Zxy?qI=em+MXCjd}K9h$1ld1)PK;!IM{(5hB?=od=esb
z#;b_#TgP%f_JI3uK}Bz1pSJ-$eBt|RSUNTY@quGxXo7m&G7&}5itz&Qm`SvHCt%Y+
zntubD;A?!kVF%YRnl*q@3_aAJHiA9xAw$w*Ph(5$l!fl4h0_TdDHe~m2cbQ;?ASd(
z{-Ep)uLGyvvtU|-Mo2qzeuElv0_=1*W^Ki7{$-&d>Z+iAeJZOn2F<KY+Tg-Bs<Z#T
zD>}xGKCopg>9OwXO-8#s;|!2JYd!JFapIHnh9DpC`bUU{WXM>mK|<Lf|4!Ak9C51O
zzjx;K10E|qn+*5&IJTXBj4x(T;P*d8F*sIX3)rh3S+o<`rK1De11B_@;>RJ{xsUvN
zZS||y0vk}ZiZkFcq|G&C#G+FuO1GAh1#txCY8*8iiM?RxKV-mSw!-LNOs9b<hxinH
z4|mBWB8Xt+S^IjUKVfTn^RFujVJ2SFGnU$~T=xQ#pAn3;`l{`J-MOpk++-fnJACDv
zTFsFKUT11E=l2Wc<YR0~+Ekw!vBssmV2FV37@yL7V=jT{B8BR4-=5SwbeVrEoj0ie
z=z=vEyUZLR7s&0{p||k*&dEg<8=GP$Am=l}sWZ#5T$B`OP>!|I5dWzj=5^zn&}3VB
z=ASBpHToi%?n-+K{qp=i@TnY`%VUEPaKDiDxkR5mfyXc>D(2}>N2-aOt(u$(Ppqkl
zKYuwb9Yq>KDw>494U#Cl@lKqMpBm({L5d(F9^`M4k^reOjM1FDydTExagqISJkkOr
z&`4H}Kj=g)P7%Il0GoXZJ6K7-7RNpyN-)Iz5@<L2bNmWx$ZJ9LGa1<Hz$~$IObjo<
z({K_dBf@b|hcB)D;+Qmu&ZLXYp<%wboiE#X6Wy?L?X1bn_Hl1unJeG{KK68)%@xr^
zLX|bJmo*vi+CHuUkmu3VK6rUIqaS{XNtysR#cP>FIJ?gq(KYr(;5+fF1^h%D?f0(;
z;&|&J*fffXw<e-t%S-f@KtR(4^!qO19P$-J;f%J8$Y}ST9zvcTP5xyFIB4@*Wr@lY
z_yIM)n-rig&skU{Hnu1(jP|M$)fclhXmX}h51XhV{D<(Gt-iGULW1D$D;Et!0e(Rc
zyvXi_BjK%B1FnC=&}-TF2`>3*)qZ7I`rE1$agqtQjRdLmsMEse>)Mt=$`|}rW_}@W
z+@SSpE#GjxEMSB|!j?qvU&zKkHjKz93-7Qt<n~HV7o+{`wRi01no|IE+RxGUKP&;8
zoDrnCUGybyi)+XMts~_*v!7d6L~0Ar_g{dP7Du4&Z>O3$fu~Sp;R>;;=OR`+y82f(
z`uDPM*%F+kP^ZZ+f}f9GC$q3&+U$@~<6(_pN-fIMDknNYPM-o*zRV2Tp(Y;g3VshV
zHIXbFs_Z1iLY?t#)#c^{bIVIS#obVt#3TgvkqfAMl<HAUWE4<~dT4)bql`I=H+zgs
zRyR?rc`cY^uzgfP@z1O@h7R(4pUck87JAS2$ywldp-Sr&?`Tk9OS^sYLYCtm68F6|
zAg;tJgB7ag2e?eIw<SVMZ+}xIg)_^y5t9&7=Wm;D$L9%dOgYzBAw!B}KI523Q^wSP
zVRrn8jyit+A|D9qT(Unbv~%*#KoHX|k=Z%^VdYkaksTs4mq<$wzjFxL7M5R`I6WBq
z_*V6hl;2q4AlHXxhaWx1#=DL2Y*L{)`~`mIF{XZrPu-sopvJy-hP*eA5^ZGkDC9Xt
zv5?DHZ5?qL-%tb1OYUK(_iqcERi}AvNql3}enHm57R7(n$co8D!je8jzViM5xOg9r
z(LPygA5euP*bLH>hxFi!Cx~r?jaUOxu$com)JIZV5~R#A#E&!*bynXLp1&a!M1Fn6
z$3lylSmW&8qz2XRgOmLcE*X7@F?6~|tB7(hD?_=d7mRip@+C)iwj+=Y@Lp(`Xr`U1
zV6BGm9;j(P`BP=IlD8C1=+J0p^Us#NvdBn`Re$BT6mZ&CYTA<d3p^fQU;bpMNRtg0
zke`(ac=zqTG{1}iS~nuKAovO~h*jM6n=8Qg8H&oy4cZh~ppFxVWjQ6Pr&y%qZ%BvE
z6byT5^@ZRyBGMSUY?5z@U)fBA=jhd3OzZ4bM7zW6S{UkLWhnk<6GiMa+>>P^eMRVL
zRd%0Z-jX!miOy+l)_*cU@kG}RgLID_%lFCRMlsPRt<i4kd2jY`tE2u0SkW8D9s)XS
z{J5$q53+|9wFpPkiphI-`Y`dQ8i-pa@J^x3YayG&=|At{J$5&t4U120Obb3M7yY&G
z=pp>i81Zv_H0o&PBYrn(e#W13DyDqO=m3eJe)vSS&r5**wZOaF%)!x~C0Ksj7$U=E
z>X&?Y6^hG*v93n6vDzy)IF#G)+Sd;f{u^4!o6!+q7A3mTN@M>~uC|MC!xo=i%yzpm
zGW+|%e`UeOx!O-#nV4(N@Gda<2B`Hen7?F!qmyZQD^BV$w{F;_%jgMn$~#ytKB!lv
zxv#Apcg@Pk1_bx%V`<;$&@5UDepobzwg`=dUHm+Q=nsp3J8_Oh<TA%=h<A7(R?+7V
zHzL$<+Fqy5Yd4EXogd73+|C011txm$QtWcfUzg?4$SW_tT~_mIC1&4owvIS^5ORL|
z=AtfEQG38sn|b5~?fPwkSrQEqXKs0-m<K+y3g4&$6WjeQ(U<URy=f~?lRF!VQ#_{c
zzqsowQ_ML=`UbwE0yOYOEwVZ>WAC3<qJ5@cZ}MLqk^&;?-72^nfiM6WnXW8m5u^`=
zAnLm4&~|?VMYxgpMcx57(aQ6xgkHg&2V%E(=REYeK^Phk?QC?4CL&~!1j*NK5R#@C
zdyv-L&;H70iE3B`oox(b5ALb?AOYESuKJ9xWrrB8zCj*h0av_!>nJmY$F6k=&Velm
zDmBZ(;8@}x2JHm|3FxtQAn;+`O5^-VTmafL%keKI)W$Ar%qgoM2xytS$wmL1AVlw~
z;BqFK^Xc(+(x;ALlD*E+=KfcWw41mI<+v5>N1sa(j|H)4k-l00)*x!S@ojA?#aYRh
zGRFlr7-X;;+%Zfny1m0{P$QiAfZaR>Ye{>}RPmXT?>V1d9zYaPo3LAJ3)(8^)vFiy
zTyGaz5wc9O^Cw%ts7x@oTXf6n%N~9WVcf$92*W>uoqD-(%yW9rIgMbSHS(9$f+!f1
z=}hXYX~{6gtET8hv#rBl!KaU0LNq=YNryi&`=P3ji?@XpTZwZ&C{7ZK`|uzsqJ6PJ
z4-%$=kd?*|P>r=Qer_Bk;@1yp7-G`H!!qt1Ov*I>!<Aox#1f6`ty4}Ov3ZwOTeGj#
zTf{35n+|2UVe9;=ti5>n&KEIuENc=BIC()yq@jKF<{7@CBUgks7KjlWQjguSO)hI0
z*UdY8|1`1u9_I;8i13sKsyG>Y>mw+co+ll5r;hHrKeIO1?fvh|R@mC@wN3aBOFcgi
zWzfFpCBOXQIdx*^iPx625mh>LZ#;I7+~f*g>x!$e%6aP%{kV<s>BV=c$%$+`TDQm@
z=p-SKrdp|*vn)Z{S@s3S8gZL;Ebf%7evIaEd7j3_-Lh@FK1gqNCF!B#a@yC?)!85G
zKT`aQHGMpB!upLa{FNJN=pUifCkR61g*R~ZPinqP)H&Z8H~|4A+x=%VVaAY5XNxiS
ze@N%>#E`F|#ZfS}0pB!rmqLoa?+Qd9k;EEd0;ZKXPrSv}NC^#J{ewgae4sr{f{=(;
z>Fh*ig_YliFkbE$)>L_E&qQaLtX&bHpl6|G^P$=l%gC~j=du$_ZHGVdB4ZlXryEmN
z(&n_HNKp<WF0zW&>;xe|CG>LWXQC8q!1_wXNwKAp9NtyZb(xQ+wBywOfRZP_{ztXI
z?sX0-fisQGm`Ciwmt&cqVtE{hlHsD)vXs+UR-JPkY-1>|&FosRvCoGCp{Es=*e6`Q
zAe`mr>=aGXZfxPrtkV!w__Rg~sCX{R+jp6+4LZPNpzw%;!&L0`UCIcfprbbbEy8T2
zQ5Clh&fJwmoE`|0WK9BGCZsCGH*vr?ay&e*kU`dF^aa|nvKjyM#+V3}s=B~zxM|eR
zKJIQfT*5?thbM7#)DAp$z?o(1C+i=B-`&O?<HS=6gvU+IRzUiu_Mz7yuUQZ=s>iX}
zIsEh>fm=mZs^hI?<XRc0e^14qIz26|gAdqqYe7nJL#lPyPrXyPI;ELixJ5}_PxBjw
z22#gdz<B_F+99lscZL5WqS9_JU$@bc{HA?Gp9%a7MH*5FE#Y@y+0z!RIV?|0GSr_g
z>d$9rrgg=Hr9EuG-W6viF2j@GDDiRc!4!|&=*w<bt}`U!x$#698&CaRl@@iRfj;|^
z-rlE}Z-}@si~ZLc=d&x!=;TBRq-~@S&1vFLqR{xMG<b?FJ7JUN`5Q}K9sTbRHlg)k
z58G;b9vL$O?_%uUE*i*U3`yNSbBSrR@WZRJ(~xo$jV4|b(x0)C@xTs1xPgBQO0xQe
zpRKA&qULw#uI+0`>*sMzs{pF_sY)uYkb%^(Sr#3lAH$3%Prz0M8|XE(zFZorbeuLw
zzj(%MYI%ZR<aP6BpvezkM1lj~X}$mN3d!W3bVgP<^KI-36p_bL4by`y`TM2o056^4
ztOK}Akuy(z=`NGn<b`l7F30(Q5ddG~6en9GPUW`swQgwfFE{df!@{O;Ybb#!xGL;*
zZL*L&RHeV<WP>xnVG{T~1A{F0|663f;+d!{mT&TjYg94{L<*N2`59V3oZz}STbu-T
zQUxx*-t=c|<Vi)6wKBr1Nt9;^WI1cwoy+_qcc~Yci^z4RAjaqb+3nc&yg@kE>m7P|
z_%2{~Va=nBSOGtmL@M#!VhW%(ekqF`yi*q&0<8g_hD9D@KmKm0A5i_?OJj-nQU4yo
z8tn?|$KJpWKu@IQ(|ZMA<lKg5pi6>7Y(SCp3O}>9M%qE;oB`}(E=1!yQ5}#!519-E
zL1ygV<&|2Dw$Ow>tS^`E8qI4D$R+mnbB3uRv@=hLSP9pM1r@^if3UtWzuSdhI+Crz
zZ<Td4LB+KP-0cWpeNXi1KmJkZ?PJb)oEA{ddj<Zc30l{n_5N0|1S?#t9@5y-hyCmt
za&sB>BwL1ufF*APQy+1!j}o$+ELP&_EXFK};Pz;QnMk4}D49EI2>Hojryyjl7_+Ru
zo819@%VeAXhEoUZg4cAE;*<G8?OYz})Rsw?dGH!p6b!Uxlrxs>*m9q*FXmjX6+L!I
zSD=o_I(-XqsGQE7Cr)oph`JD|+`*)VWm1x7(sg)HLd4X5@A5AXX92%k_qc;@?lEV&
zqiE6xTJ=wmaRyg!oKqchL`P44NeS`~zt0GiKPG6j1#_F;Ed&jT*vM{UBnr{j>M;uc
z9)O}AvZ5)?L!NcAzHC;<<e$rImt-8h4Q?z-u)_krdiRimD7Ru_ll=bgJ@(c*_6NaJ
z{HykhD72iLs>gr2LPOmw6c&@pOpdNTc1Z%^rm=Ibz+Su-10z>qBe~(JH@EpTq%FEi
zA4jBhd_n^0dk0MEBWgnWkMJ%rXg(h3X|(sTX@T1>d+ol6&DMx;HK2pbW?4omH!3L$
z9|74ZZ%@OB%cRnj;etGE)p;is;uK3Oy&s~xV$n`z>VRXd8pPZawAI1fi|T@641Gfq
zv9<&emebF9$d3ouoO^=mKRV@yE_9pbUF!V-ZA&dftkvsB^rpADy_y2hQ>`1{Mm+5B
zH_&YPQAP6v=ZTxvM60Oqqu!+U>sb`+5||^n#w+T;J_7f6eaYoT4ITMHj>@((DqvwU
z>;#lv9A=3H@#ks3uQFpMs7Wtp3Ip>!1ek^L15gsg2wA!mmK+E32k{H16-`LU24nAK
zS3s}=4*j_wknERT;XoCGWn4fuo*31#6YyvpzZ^g3%-f2Ndx%Im8Gw+h&?1IaAO*H2
z;-JRUn9`{dPO%|v=2tkl^Bnu`>)x3KKF_=PPPsz0rJMTY6K#t!%<BEguP}MhQK2qU
zQ>qXCS>qJ3-~Dn8-`5)g7o!8D7XQ6Je+XLtwt4t@na-nsJ@eqJr!B-5IJddhJ^9I|
zt<R@kcQ>;9tqoFSLbQoG0h{<%O!-2t12DTw8kBHaBZ!|I;DfNn@{|UAC~^;7@v=6i
zys$*HV6$2EOpmF{67pVs0CYtnQLhHVs;Dv2%{}TsujcDz=DNSFGpjP<C(XIDDQzOC
zVeF}qqDt@oyg;)Fu*Kb&s_=b|4XJ5^y2YK0js&siz+Vmd(eovlA9KF7BI*Qe{Da-t
zmLNZuQWe`zG<Sy;o@3A7W=#tP`mC=o8{1k<?jZOJoio90G^dyGx_Qf~)m3_-(?0(w
zxm>ndpyQYm&nR%$5DeW!t{HEatmqYZ<ZXt^su(7$Dg%?J6&e~w?8a6SC30cV*YM*8
z)lFC$dzE0MJ&o2tX1sA&iJ<5cjahtazmsS-dtd6@rL2`7=?%Y%aG|5n?g38ov65iM
zb&gPuYUdi7`q`{s`>m{-;2IK67~<Hxdt@FGf3<!IwhHK@cS(Wq9#2_wL?P$y;1(4V
zGbHS}yzcr{IDqTQW!lS=E!v?}8lMGg+4i%psO^t<W*X%vX2>k8X~R)oCh`cjAR!Kr
zp?nT5%aF!ZseY{r%7T(@QeDgd6esnuH(~mFHmil$n+Q+`28Hj+>Fq;BFcWBPWDt@s
zgd2vl0vXo|en}RDfu>sYTb5zXVjPqV@(?cSCEkL^=EB0c4c}{dR(c`tD&nEpmN3WB
z8ZSoDPCdnAjq^cp_E9D0HwK-Mm}GGHGO<d`(Z#$uCj1*K4PGgzC$yRZc%lv^W0J6>
zzU+B|sR^9ND0J~mRb~Mu=kS7Lr~%@zsi$#P9b{B7TtkGir7BTPIkQt&W3ue9_dvPd
zWFBPiA8Hq&2Z?p~DUCD4satjd|NIgRE!5bSwg^h1oj$=r`U>3CXRon}3al-8tX6kX
zDY+!PYCN{B`Wa%GTSBYx@7~sCGDbFbb8+JWwshZJYVjyG;^Dn)>6iF?Lr5I48eWKG
zqc^jOl(Yp!yFiJnmJR4b=lu!>@xvs@6+*pb!g%Z2g(oELhViu;u&kFTbE|4}GQ})3
zcJDy@H3Sq$F-i^;Dia4Ybss3hxCoCGdvM(6efYvLcqT7QRri*>_<ak0JNx=BZm$yA
zfW1uHkMh=a5GWvy{g%~`A8>7<KBf)L&ghR<IfMF`L*xfjNA;`1Rr*49(ozENdX93t
zGSK!FJIV(k#ah>@MdYUUKnz&&6PNx#pAJPv^|{@~71DSc>7-GO1*jzbdd(Xmi9W`N
z3gG#R-YdGv2ziMU-q9Rv&@3SP28H@lme^M<f@WE;;4I8ti7nkb+r}^L4TCo<tlUKW
zHOFN8dT8zD@zjWGihOcHGFWCOM+3fNwzY5`R7qCV7O>eeWcL6;OAim=+jwT&>kHXx
z3qx~RHw42!W@{ekQv}fi<UFCV<OQ?a$Zq}_jUs*&DjQkGib2p?#GqK$bn65TQ!Yaw
zGq7!AgfRLAXaoo^=zW>~twVTHHIzeiRYBnAAQA7+PF0KDjGm%<x$vL=xjO>h7bo!X
zIun@dbxtGMg@I6~ZwjbrB9Cg2uf&Svs}~Hxme`hQ0Svgdbh!m2gAMoaVdzMXsW>9p
z1~9P;^$qSj$u7EwZ^~VUcayR0=)&*vvISgXP$yvm>N$|F5(2c9hfB?3gq@t$Ah8G9
z2-vA6?1%w%w`FoVb3*pHxs%n|{lH8t+)cDuy?VWlbx1C%vTbT`qwbH7=socytGXnf
z{lOFmT55ZLJ6RjtS*M+FiJ*xTa>hL2yLLwSjSQdfBwYMP6h&QzXSwMe2e<JG8=XUi
zSEpZb?2@(F1B|++0oC=c3!pF&2EW@XJh#Y6z3*z7z1)JbQ})UApb38B^iEI&Rm(S1
z!^BZ51QO&e90Lw;e%FXM;xM&p**$SF<y?%9IWUO*pHqh0C}zAR(3w8F6D>S`g=r6X
z-6XsFy*d<KsitJhi1~(fr}d#`JV~=P@EB*ibXe`nocX-tUV)<HO+wUeCv|v?#s9~Z
zf|!^1%qHK8i_}wEoMji@szkGcqgU56IWklZ>ZFpl991o2GQ_Etw9xf<bQeswO3u$R
z{(4mTWs=`r@_}yRfMmXlv`AiAV9qR7G7;#g>o5p!7s0H9w}aT$d?tIPQSXfXgpj1|
zM!t)Qm&7%oDpGs?qL@BAnmkR&6&hQ3x%7CwOlK~Xq+t?>Y8^_uFFVzW2G|<Zh<8-W
z?uozYGhf@)+>)kIZ<@1zX8^mAikamkD=<PooXvP+iJ8M(YGMNqHN=rF6i>`<9P>Y5
zh(Bv5Hry}sXX7~D^om|7)c>0k{%Me}y2=pbm?sUBzktbLNk1-U9r%UaVw5+}d^o_H
zPSUR}2sxbJD&K=L0=rR?Mukeib=l|QSqx<kYXZ@kUFl`v)<|451Z9*qW&n9LmEHi2
z`HhMHkD@aVYvS7f|Cz}QOa_4@Bw$ft2mwNH;rfLNb(_RQV=OWW3E)afwHMGLZgoNF
zNemjGYP8^j3ljuMPywwAT9s(&Ew$czQL)mNTTzixYQ63YYJb0T|Mq!Q@(h!6KA-pd
z^;+84qSX#sLLI`zL0bCXxZRF+pYjiXyi?RmngmY7093P_-zmTue{+je4w^vk595cJ
zik<n(Y!E+{lkWj!Mx$s7ThY(w@ctnT8~GKM_?K^r5qo$Fo70cd884Je6oICe0Qfj2
z5X`q_W2~&xzZ~>~lXV&<lLZYAF<%fvkAS5Q*x$He!t^BZycen+Ipgt`KswMBMoSY$
z=-6{llx>EN(BlZXz5&jG*2%4yp#Utb^ACiJsVCUj0=DV2(gIr%d;$U=AvTxzra&dT
z<ZAxmQZkX9@5^5R7{|Bos~}^WVja~RUMhZr&W+<@B%^$@Au@4PjmL+F&1RGOv9`n*
zu&w8cXV52&)sI<r9Gg5r`N8#G6oqSOx@63DFZ_t8{P8Z~Nch7mOKQ5!OkL6V$6ZGt
z!o|f5fqfmMHAD$71Z)lh+p+@<jJR^7YdQ`?j;;0!2bK7_r!C|XL=>;CobF@&M+<s6
z<_iqp@d95^DXBzfq+Z1GFFO2)WD1mZ8BX)HcX)KV$@z9A77ojpJnV!pU1MMJlF6oi
z8@#4n@{4Ix+eGwEE7u%Usz;TNL?|GHA#nJY<O$k9^fTA^TX#;WDxA-=YQ$euK2zp@
zP^HIzN2%J;0m2olsLbIRzw_j5X2ImsI5-1@T}TILRk>6Jy|UM$Ij%@k03Q_bE%7^A
z<vR}|)I<40672f5PJPLOj{nLe-^3NvS9eMcE2&ef)rNevO`$2Uptd9Z02c)=m5Kc9
zWuAR5%YxD7g<*2lJ9r99ZsNf<U*>O6V{I%@C*z0NtuT+%UW(wee}!qR*NbPC_~fAJ
zlij`8>{Gzohle!%KVYJ7S1TJoS`T)Tkv;C_L|KpjHYVX%HvLcN1$~%hN9d9ls(SF1
ziTaOxQ(B}bq1a3tQ(d7QQ5}t`dzrY|R**Ob?6Au0<;TJ?l{WdV-H9@1-ELGUjRVr1
z4$!B~(lna=y9C|NdUGAfs&|5@b(p!b{jN6IYo6^0iqM5N52}-J1On2d)|Qi1;U|GW
zuapxdzS&mB{<WD$9Yb;p09jo^ip=GsclD;b$xfN<k^>Cov3F5hBff*bfD&v2*mpaX
zyN{C@0|Is=sMyAv?2G(x-wXyc!BlAih(&j0@RoxDSKtI-4C%BZu_+t(kmQU79Kd^3
zFsZF*%xY!DR&e|`rp%4qM2k74Hc7R;lW?U1G#EwM2y4zdd;*#PPhr#0@0SZ~cIz9u
zYrUP$0$GxM58~L5`m1+_xI=if64?>wU><Q7<vV_gs+d@nRrL~|kZ$$-zT%5(rjxXE
zZlQJx73lfM{}b5(L+nx2!k;U1iZ)qu_SqEFU8;6ZFMj@Vz)N`O<<1I^82!t&hoUw)
zM2|I%#ZoqWh4KqK2MFLkj@Pu@m?6O$LYOp#pcM&(#azgMaYUE>O|wgGC-~S>5%bR4
z`2L@hKt7t{lUCu{?((|%Bkhb99ntVYA5uE{Cd_7LXh;i~d>ZjCC&6vL@WnUu&4|hQ
zy)3mWYGRe~Pmg5G`+zN;kIz1in$w_s_WuAnw|~2w5ch+U$j+IgRCcPq1_gXnAvxD4
zd5+B0<I1t5K5_m;@ywUX<y~~`DhHN6sIDIXwg+TeVyLos2aVu-z^h|49|gNf{0+SI
za6!^-PD-8g(S@iW1AN7UBDxskf_Z<&uoCo@C(jiKxm|8cEE@aO^5qxxk&3YYVB>}=
z=gt`KX!B@0{rW5=j8J-4ogY#}2D{{p*Jum-hcCKF1|!)qllFuxfagWz={nik#YA`L
zvDtj2gSGT?d|(NjTt~9!2h<^VI%;oqLHz5=Nkz<<Ca$y(OZAekDVauKMr{KXDls`_
zWi3j<UbWVBO?O3zDt#FveQ7L*m$1owxWq$0Kv<MBi~Y3GFKK;Pcb#E9I>@K#fdbIk
zZWH~`m>@k0ikuQ`@={S({84Gr5c>0Q;KepTDq%T2-3Q{|`4reIYZPL#>!=>ba4|0?
z#7GA{++V_a0@q5ZXcX2Ef@-}VAJ4@9z=Bb*xFr&>s*|XEV5NV(PhRHZz84wbUi6_V
z^Q87DRDT1?r``TNIF`eVu0}wEk6B<QtO-n1$$dZay1uM1N)PVsn6?9-|HLEHi^z4A
zQ+O%Z%Um3&o#DpT=K=gNh=IRdB^+ar6JB6)3`|Q)Ma+RN#-e}1POljtZdG^Udwcx%
zh)?4S&O;Q^i|+{Fkvj9AVM21osh_lk>tycrghlsAuNe)Cp<TG5cN@CUN2aQ(&DGVh
z+^5jQ?nXeJ`c$*+A}_(xX!@FmhFZiNIyOM1RM<v5QGW5!rj`&F2%MtzL)O1+ax~WN
z6LLw{FV029nDtV9lP~N{XMEjSH}1#3A~jL6ZmOp#CS=PFO)A1L3V$9deSiG`Ua=Ru
z_Gx?hxtUmJ<7D<<nSJ8$wwux^8rjz^@IRBUp#ob~+i}tL^Ow<0cbY5uOqZZVY||V<
zkhB>|ufPkdVJ6lN>%gr&G&)Pvq=5$)=_}tMHpD}txjT2<IIfnB^vJFw8%aO}@)9s%
z1LQ(J#g?)Btf05{JH&d|TQO`k)^WJXE+52kF~bEHV~gTHSO+rt$r3lU(&uNR&@yq(
zBG%35-?1m!xP*IraM7W?Jcy<<|8jI1C(0{0)#FFxnZ4q<k2aU7hUVM)jfJ=&9G(?8
z!ANuxH{p}vZVSM${G!O`Xpu8=0>+@+>6-tD%vS<Bi7tSy6Bu4Ew8kpgs;Gd(L$%$t
z*V%3R!Tb0*k$Hy>m39_$AoNa{%`yeSo&aaBoYmN6|FKk}qR#;ocQV=Y>~E#XyyWv-
zVp%o{YKeY4twJ>Qwcyz2EJ;1`6}!guao`$xq5=uh|2NewP%r5arYDl22#&X2?023Y
zjlxFx|LzR0!dCsI8QrZ)fL-!I86&XDd<x%Mmjoi$R-a_@r7fs0ZhI&gz#1-~2x`hs
z!PnqNUp!)*jO)Oejn9>4n<olHw)$JRprMv<l;lqa_hwZZE|L92A6azJmkbW_x=HX@
z0y-P}OUfeZLhEHRt=Qs=e|Kd})jHQK@S`EG1I$^dlb|J|co0sw$Clz>wrVu4z0*tt
z=p-^a0)8;<poZbw*@PnFsEhnaOj0+5W%StU4PrOQ{iG(wv@yjs2N|t9g&qmRzxtz9
zlG~faDue+?9L~rh$veGj?TJmO`_tY-?P?=4*-XPBo42;@63L5SRpO^^py+VvjP;e#
z-A>b5Y1%?ZC{v5r7@dvE?IN;a>Ix#0mS1cS!2aG<ThbngzRj*u4~$^BU-)BO1c0ix
zW!l^<XRuT`H4V)lzQ=TR<OUy$?x}C#&OeJv!<CgVWX@tlE_#730{K?O3A#x(&kF(;
zel+JZUh;)!TQk(o{L>@L76$!H)n3@xp}IFnAe>msYw3)QsIY{p#hE|DAJ2%59oklS
zeJf0|A3Df#xw`xn<NyemXuD-THEc}m;mY05>=hES4j};v>>R*Pd4l)pK_n`=<X;VV
z^S$WD`kNLL-HcQYU3SPO6x%YMDvQ<P)%`@~S#f4>PHx#F^(S!Dm4-{GX9I*!sfoS{
zWQYFI(KYg4-<oQQRIIsX5Gvk%My0pXk9l(?=5AET>U~U|{HMA42o>oilqde+sV6=1
zC083yK9R@X$r@mvV1_#E+=Xr-!T`l`xGB%?@IIYyyEXg)5OxGSU}vZ5W#h}MpEFC4
zan*|7n+a+awpL-?5L`Y{icnSk_{J0@&X8VkMlk*&6{42!)!k(uT@HGy+1c!7{T%-7
zZWM$|-B4*M1o|ktlJR#Ek#2<P@10`!DBTNi4zEvK*dF*9_S713qEE0#?)#gJ_m4~z
zYaDG{XurCEKv3qo&H$;>X-h^d@?$3`;BIOse*3~PlB7dg$=1LWkqWD%63(XSJ8iS(
z6^XF<giq{Q1mcdPzn(jAikZ-dpTL%4Y%q#e^CY^z#89O#nEVd+b3BjCKS3Y}+22ss
zuNZEp$aQM7J&Gsu@FLv%p+9c7U?ae+&$|OiSu+DtiMazZI{bUUvj+?!wkygPUksj8
z%U=R1(!F+qzvai6QDyo_uYIk18Yk<7*stuwZ2wNaX&UJX4eN9hAv<(0@nY0OpUH+l
zSMCU7s&-bd>n2AW@NsyfhX&nb_InvJ{ExGi53)mMk$Cv0AiN=w&IL;z5TB30l2!ZP
zmn+t-R2_W{j<Vt&_~K{Z+!+$*_0taWp|2^IpE+v}{ap`z;Yv&{n{k!;1BKte5W_=2
z9qS=lE2LqO%rIfFrgSxvY;t_<nr%h4T?N^3=(PthK|1ZNL97-j*Sd*MdDOM>1c>#|
zuy)ndH6HE3Jo#ipOzawErte5oJFeo03;NQ<rD<`fOhp(6ag}lG4#7-6DL(D=Ev%iA
z{rw+(+HFyWGqXA*2laxMi0viAjw;r5gdJ?tG+sV9)l}~Ji=X!zP!pffhFe@r$<J_U
zfCo?kuV58pDFEwTmStYji_M(&6MPI1xA~_Xa<4pmMZB!&Ig_86o%@8I2g#B}#NR?A
zAD}y;#!wGA=2okaH`PtwJz(LS*HPv#)z8^N><M?CVaA@noUl(cvY~B|t$m7EqFWqT
z##MKdkFhO))3Ar^s+Qn&9(rg1hq^HQ_tsDqQMR>J8qw}Q;tgbyILG<KF&kcjgJ-Nr
zRQo{@T1_!BA3DZr{HIEcQ`j?oNFRwlFrRx)FSfoV;XkgM&K6k~x`Wd<y=s@}8=#_G
zmdNo@4IM_6nOthjzn3eY(P~_YNjNlALbLL*K9+g|vJg(GGqi>HC3nkl{IA7?b5jl1
z;AB(ajfdEna@oZ?4LV<VKezkYLX+u(KFPMl)FPmi9G{>(QTrKF6RJEvhp3((fC}PD
z@_dJC;o^{9n;uPCxB9m7;YFSH_@AFMrt4fka9UJkTrV*mb!LP!)y)(!9=|{bee9w>
z_s~lgC~VeYym~VHO0%guzF96WKq&4dK*ipuGK4K6yf08Kxu*N0%&Y@^?VAqDCAHgk
z((mY)ak>8gydrebs%K0MNWz!}h8R#R5tSl_ymHnPtQlpLz^RVVjCGg~UHkBtpz9qS
zsR(?5!bq$Opj2KVvAsy~7)I;uC(1;P*j!qC2mFGPP9YiMiK66gx9o){WYD60j;~P0
z4>C+}DLCeF{a?5(TXMoObK3?`K<s&^59*D71J=CsYR;{|o-?V>l(GHo{%3WiO;B6^
zE1M_iq3(6@H()dj0yVr}cOdwJXw%rg>aw}jmwWLeSDm})s^54Z?bpqoV&xR^9yQ9g
znlVkuQsM;+dJDJi2+LNddy#A>@J6n1nY?x(Tlu)1FAvx%0T-zH=rU1VsRVnXmZt)x
z3-Es!z1}4GwsjATBO2s_w#2wjd=2>Zi}Gy;tyzCtutqTErfndjjsM8f8l8P)4H%7A
zs#JKV3OHMJyBaUozNSt-RU3xjQ~a1uWi!vd&LWHGT9+BV&yx%p>!HLY?lfG7sZt!A
zs!Q3VjkW1Bm0uC8`vV6Rsc|s8=3f`xnP0xdFS}%@<UjYVeObahztTjtQCIF*Fli%I
z5n<C!S)@7M5&zH_-$&m1M}2T1OT{r#rll67yMnEX3k7)f09mK=rHuh2P=&|?LfDvb
zPsmy}=AAFYFg{@3dg%goqUkD*>hj6%X>)a~sdti@j4kkG`eeX37Nm?9x^=IZHjI|l
zbE4`Zx%3(Mr86GHX|`O#3%Fw)cC+e^7kdL6Yn2mS(QN7E>enEPGLNmUq^!P)dP5#6
zRuX>r9JPJS=wUPS$f+9U@)xxO+F5}MqH|q*a1Z>woxz4mlQ$<`0z;swG;C0C)gJ2u
z&;hHfH2y6#_-z1dUygaFnFOxrlk@$0^dcC8O5Ty2!h2><(orz$8a%?wx&`xmG_0!k
zRo1iwd(d9&9Y}BWt8rs-lh}*_oFlk1jF=#P*c{1*L+t3d@uY~Zw8R%eRb`G#hIv_k
z#E0a>3l|4VNO_C~0$$->r3Ro&psdq&HD>I=>6#tdqary(S!XWR0VrYs0}F=-+R9o{
zOpv(a#+O{aPyYuzI*pArD7b((uIc2gEuN6=AlMp{tUR+pX8%fem-bwzOat+iN!sLo
zk+FUeVl*{uH#O!P^dPP?U~#+f!3zeg1~q%t>qT>)cKWxCcmCOd+yvt;Vevr0-+Ui0
z#_NUzGvC1jY}^%)`m9y>q>ELK+ew^7KjYUwO|+@7wa|Jqg*3c|S2j|cj%$mt5Z5@|
z`DZK5i)#7sHBWKnS8hDV#o3bX(mzmXja;U8`rM3&UNbz|FWr#LXqJ>Z=@Z0mMZi<K
zI*eWm%W~vpf{?JEHD$#+g$-R4v0*a4=M9liES@o&onE#3ePU(5|6xPNu6<$H80cMo
zH@o6FeHu+??f{-f`G}EMJPjRma|d0I%3_0LdXN3zJo%8F?@V~+3NdZ@p7pD&n-A@(
zUUKewh@KwDg2`7rfeWTk742>?i6v)a6p9sl>|>H&(9;k0W@$sj52V;LdYpA!D{)#d
z>xEo(G*P_3x#vSAtsUS{&}QbeZlNllRV|q%4zyQu_B3z~mJXtIKrhiE^dS(0kdNgp
z#qbDlkt+f|7%*C#;_2MiUQDXeCfqNOAtJc!E;)C+FdK^r$cFVNDl&i1B}cu+3Q)+Q
zn+N`z)r)|L@982um^(0G87#1g{7?ZW)n<q;prrlW_8yW7=!cim;0%N!ntW3ERj%+E
zwqD9q7u?vzPaohOIaN^pTA8UY-+k7iu+3%}!W_N=z4ANxqojvkDUX?qS7FaoF0BY`
z+UcFN$TlcC+NtyvtpR@}BOeo4j>%JD-6IBz0&T<b@Alvo0avLi1^sI;*eXhUzZ`OG
z9k7n_2yE&(j~Qt^T5dXz=j`;r{YRwOH+=!P7<hr6E)RD|p3-q-7?i-+lWxIG?Ei`a
z`taLk5PQr}SB#B%?LsRZWt6?Co-EM{Ki4?&Fi}Fp9sjkeV|uwO5)0lX7_?+o!Gj80
zI!`{q$F%c(_NhJLF`BZ7cHxF{*%9ynvw*utWXc_HU_YBxlSqTLo**zgLMLw3nO~z=
z2chgEa}*)n?tk>KSlmlh-RaYe)bO=v&Q0lzN9@Wbn4RIPML)%i1c-bw^Q5U9hFusi
zhBZ}TQ-&(TDVyetZ<xk!@H5IPMuRQF-<!70H@#c<l=&YK)l4;E*Fb|@s9Iadt>C&S
z<jSjCDwD%0b&`*6aN;{yDrftKjaHi2t-lZ8zb>Y~Vd9&P31kmD>XchyirF=C<GRwc
zwYBopA=!+}cO-_$R!#VsJ?0JiXtY>2s}%O|9R?c{5W%lm_8>D2csWm(sh;X2NASQ~
z$YujUnlGc1L@{$S%Snf9=69g6(Se>jW_ZwI++QD9!pA?OP6BZW#CPM@-uagJ%8t~n
z1IjstPR9j9!{%h!Nub=>ibsvV+?;U2F@g0a-QGhd9_f&Ksjr4aQn1u+JNV1;g^NQk
zTG7<X6`t`=P}_9Q7B6K^JbTJ)?;zH}JNMaetdKZy4>dxBMS}E};2Id+8k&rwGsag7
zx<gGHEO~+f^4NT^8D}T^bZDOy^S!!|J-q9#G3f=<G}#c`Nur}f*tdYAStLVcMfdhd
zYYPGV(?>3<qi8U1?=%hLKHFk~V)ciJ{10w`+bKW*N%TgK`mQJskeVuLDoiL*8<`+J
zz7L_1DDJw$|AC37q<y5-U{FqFWyrR$OI#@Jtj$x;^J@DL<*f+QBSccR)JOz8Qfe=1
z(RG$dU=jlHXeRj>a#Olg%Ld7UT}qC~>#Dq=iFzQ5vBmD6gHO%H`vs5Rv5XWPNU4l$
z;<><*O=)r%^;GFK3$GI39^o(IwliaZep-cUKP3@8W+n|-fP6T{x-J+(7!|6w9dnCz
zdXt&cez{3dIuB9jSug~LK-~%yJ@QT~BWGPvJ2}Qoizk<(;OADIKKkJL$|O7kr8%0D
zl^5TD+J55{exwMwOP+KJN=#VS^%J+<;z<uID6DbVp}T>+#Q*4%<Z)I1w+cU4Z@%Rc
zR@mjc)Uj2a?&l18h-~4~kgBh+tM)X5Qc{6VWPNOLw>yHLk-G_>4oAJVDX~|s@FLul
zDw|C?mp;ex*pW~0VpuMn!TX(eO3{cS+A0Hwy3ied|CI>eX#Cd|f|pDIx22<^>>0Hc
zb%n3}xF1yC=n^l;Gltel^HSacb9Lk4jrO|rJA~HhJ&!tTixXoGK-4`>6-(yPO&>o{
zPjQ>@U}VzR3YO#!*PMKe|KSrpZy9yvO5H!?m+yO#iMD`T_@2f}K~H=kNbX{4@$yqG
z!&qhvY99L<y)IEWBa->zND|1P;Unr1{F)_m%bPG4I8`+agfd?=9@lm$wPsivR^uYh
zUv>%ZyXLO94L@S|UcGQ#sku+y$duQPX1}VZK#WgziX^A-@{2msjMuOsEkWx=l03m#
zB8MIGQ1CCdhEt{SF_V2*Rx6Fgehmz$P98AlfS#1;sb&#<-S?FN?9m2O?m2G4tIOi)
zbz|7#F1&3r%;2Ou1@rWQpY>%B?_k<8v$_P%QOf-vh;HrS{7wR-k+>>qe!$5;!VD|%
zuMz7?(GfJoH|ipcq~S~D^mb|OhCJNiPZBq~h2WMK1?%zxMXajQAP*k{SEC3~$S-rT
zb(OPOL?#s_DbGE{GxfvVqiybK3kgjaZ{!2I{C@2<m5nhwIVB*>q%S{IiCEOc>Uqcj
z7=?fN1P9VN9>SLi&Q+!rsQnxpok5>-|Mv-+mCW$?oo)?H>c$NU`kJ=<0Uo{8>c`Jr
zS0K1u6wA*;Uvc2(rz{y%vWQ-9D@1(!F!M&=+}^O`8W5uah9&HwM=-U;?<W=$AVO~N
zcrsh_t<fcYjLp^)W)$1j5`VPF#+MypOt|d0`J`(!=MkaffpderF~Q~5r5DlTT7-3&
zjCUt71;lc3D3;w_ThvOYOB(Zie!IQ+-(l#ItPkLIUSE?~ex3f|X<p;DKF$7e&q;=r
zeb*y=NVZ7YtU-(T=7;LlN<$yq{+me?)Kuzsq+RIMurQJre+`aeA-t?DzRUl{RSJ1F
z5i;)P6kif}NR&TCC9w-XsWa!`1q9M<83D>TeRa~NdVoCwFT1Jk&{dt~+e@=VWkaPi
z3Zo>fng8XqLpJL*o%#1!*jmv@a;94Rt@F^_^-?zaonc@1FV8xK;SQ53rC&<zIEARr
z*6A-=Z^kPE0VlAo$%t9JT6x~CI$4bBSwED~TTyK{9u2$BV1Gsht}T^qfK}B@xxMjr
z2asjkJzcP-5;EtWDyRR9$$U3CvFZ_i<&7g@QDDx&Xi?otdMY{{7gZd^vc{>M={$`h
zLz7u|;01dXMmfEFT}HQX0o_n1QdulfvW$C99j9LX6nls+e=F;xbKF|=`e$eK5M9&`
ztdK0u&lMgWBxiL9)AZx^s;_~Xby(UeCTs3;<yO6H?x#M4Joe4qV5Z$qvGmS>r0t1f
z)C0trpynR<r)kqG>;ll{?7&fwE`I!`=U5>#8vD)@pn{#aoh~0+Cu~6}Q#=7wji|L@
zGx%w}suNE3HEu&y5;!|zI3cREP$5A&M775+<H}BVa~B~RXDX%8%4f!oz-*n!maH7_
z=OTMWD!0HkZ6A{-x}WPEs}J&x_9X@%xEya8tBv=Xo4p9|PDi#1pUZ=y_nK?9LS;-J
z`xQ3xrJEI;Dl<&O(|7e=26dX9mI+jz6!@^P?H(Kn?NRP<`nO<Q0%!^5sfE@QLX?5f
zbFx0a<|5%rj6>GvKHQg58OKR$R?zi5Lf(G~{B)x)p@`D#^eV^_klMqmSG~dL;BH7l
zgcPhTYqv=;50ENF3)bLkt(`o(*9@M|mChhSVu|IbnhNuQWq>FWxMaV$#6w{DJtU>a
zC-fOd@RCx~e;?p-U#e^FKf%I2%}%1Q)Y$&#S<494;4)z5?=ER;5>=~F>Zv#9^-;Os
zeq5|+oPh^qpJcV1r9QbeaG6yxU`!YR3eU3!YF9Bi1-@_9BR$9V9=N~K3$h^-(kpz9
zCA%n;{Gu?p@({CM%pE(UIw%U+6PQ9t)T%#5yE|+HgjM%Y7W3L6JO6;(Qr{k!&(^s{
z<DBs_o??$e9)+nQ@q6k-=Uq*6zzJ%Pafq1FAw*=Hpk!L^UoJD$MxQUpw9NNpbi{vi
z)x*c`gDs8ImRZL_Fo6xQ(i@&p6Pvj)3e_9PT|?gncn?Fr>j1Ru9W?nCtaZpVV>Y6q
zrlsi6DHN9@&3z)R?#>`b#d$2Z`UsO-s7|-iR{QTAei<EtJ2@^7N6(w(F#iQ^+L1zN
zlyA;c{3C1ff+miQa{(}%TtDA7r%yYYR}~1Hp$B;|5m+bO#g3hYEJ%w#1{D7-LIau$
zK99Y@ARYB;3AnbAqIY$<pM&4J$P%9tkP6}t^n2C?Kx8PRi`JB%EY}Blm?M3S>4REM
zVJ75zQu^4UD|8=)NtH*1dU>eoj_?uF^wtp95t!miB~r*K8ZmF$ATQNZG=5Mg{%!|A
zSVLEuhQ4GNz-j3=#)Ra7b<j}VVr=6g?gWgDvUJzRGiyD<TUQ0UxZ;Hl|8-r5$8^ND
z6{(Z31Z46KS{y86rfN+`@YtgQYrr$C!*(CY^NZ*numaa6j@f9CGO19CDGAW5IEwuf
zp}vcvInot+zepS-Yl*ER@T(-7!3x1){xYHl1KBIvYUQpsF0{J?U4Zfs_+;_40e1G<
zLHsn;xSRgcotE?yT*2OOf=%bEX50Z)3l%i@@s#qsGfoaE!0xM*M+~{f^cz=&qlWB&
zakB4+J<TfD$PanMaZ1*dqs9u>rtBdYNi92Nd?)_J87?xs%IM|T-QS<sgsRLvXh}V-
zAG;(T75yFVowC^6`>aR!NINsf+HhQlPEpkl$?7Z<-fv8}GM4NVE*MV3W);Atv(aLk
z+bQI~3FZkvq5A2q3cyxB#*5L0L71=;TQkgEoK3Wir+iJ%F8C^8^aZxk4#W0{q9%5$
z^516@K6Q#&#n2eNV*P^3QLqwI`Lf3A;`^|aH=>Ad14L;hzF53Ide?pJWAYon3$Xkx
z$YZVPJP2;bCh_jM8}$Kw<>mk?=!)~`v312^#L+>#r+i$b1kaaOgtQ0Lvn(MnWHWUE
zKz@pzX!0fhs;}^=j@Yt}BMzh=_H?Z95!v7&t*GWAE4d?Sx``ioQ~I8{3-SRLpL3k4
z7P9len*VID#dR|W^8RL~t5V>HXav$B$u^bb;U7O#Tdt@IR@vqJ7+86M_xl=lF+X?J
z{&H36o7YR8!k0f`ntEr9S1(z>N&fqppo2c2sCY<jpMq9rY|fAD+%x#Jr`R2R=vBO`
zpPXHVG%zAuP;p{QhXgdmtq`=y?cKKN+)lsB;~KU)gH!$dS8q7>516&?H5SxPM(AY8
z&3h%7ZWzzrc*q^?klK@g03obc@X{LD>UX3=phRdBCvbq5xP$hhK!Y$~fP?XbiwbzI
z+&A8jp9E9i83=Wc(x)>-yk+OO=IX`B^rESweSUu&SI_RlQ5=&*34`>92nlDMTU(ay
z#k6qcF*bFlV+;l4C(!;u1xUkZX4_1+dIFIMZtTIr-$Do^Z_vRUTofhtqrQA5*sBJ1
z5KNI%IS}rh)@K9pgB%*-1~6fF1sp)o9quK=rvbsE@<PtR!g%d^Q6|wPs$z1yT4%pj
zKHTEfZr6ZNUSktnR?c(L>qIjKjR!v2*ClxF3b<*@fDtOhJ(DbHsh8TOfY=M*!|%1$
zQJO=_{bOZWxZI2VZG@ygghQSGF9+s&Zhkf-GyT&w>PpbZi-@X8Y_oO5db4fLo8`)i
zJ{w}~7LfOOt*ZQUHs&+@g!6W*2+&0?MJnbY^RRvZi6Sg9WFRq}579WT4-Wtbp2e3c
zAg+()XTDG-N{mUE6#e)%ge_V77T#MSbeo6f+mpFXC!wPiT-TI|V*ceDsV2N;J6^yD
zRi7;uKQt>4a&{F{e#vC<V_qOaO}v8qBTC;a@gD<FJnp}5s=hS9tq;uE_cWf?K|mku
zP1*~~&tEQQ@H}VZyb7uLz_HniVLP<0K<@#OB`w>2?U9HYiy&Sb^<<!4D2-a@;1DK@
z8O<FI`g{fb(4xDuBXoWzso!B_@sCAx{2D6n1=D!n(uu1BHPBGvHhw2$&Y$dQ{3`9T
zYV`~G=uQ9}8-4i;b(U)I3da_&>tduF`;yrYng~fbj7KGR30~7mw}Ydwsvr9W(o}To
z|K^9bBxU1mPayiC=bVN~O;GM44p*aGMy)mK9K7bEUVtw#s}#~;suGhfp9A`-(vM`i
z2xu83KkL)PXbP%kGO0tA@8KKvP+oOLA3C0hM5J{rk5;H&ZCNj{<s^<?YK(sa4`~BS
zkll_3-f0?vC+wwP18Ts9VGT?jfzE>a4YDV4fTmtef`4~ncy>Ik!kW9?hf${C#$Ft!
zf2lHb(9_!~U7!*_=%69iE^zBInQ99($`BT-iB$;FoWbo7E2s=_IE%0DJRG#G4!1Ml
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
PPGpK*!mlf-{eAmCo-DMi

diff --git a/app/javascript/images/boost_sprite.png b/app/javascript/images/boost_sprite.png
deleted file mode 100644
index 564bf26463b0e458019647bc80892363a2a7ed27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1326
zcmeAS@N?(olHy`uVBq!ia0vp^VnF<agBeJ!Hc*iUQda|fLR{Soe6%OrBnBmBw-KWZ
zQw?0BQTKUFS%?T+4TJ$FfebVRSC1?X6ohag430H<&ww6uEeY}qX3*}pb}n;wFl+2?
z(Xe%p=D8X6+-JAEpzOnKCsb0zzHKm_|DH4c_t_N%nG+W`vQ*0$^<L5hYIwreI{jj*
zm*1+zv(84|_v8M~z`%Ui)5S5QBJSypw|Tcb7+N1PTilRfl3>;m=s9h!*tl(W&aIZR
z^4--n|EFI`wE1-7@z3k4oL*_Wa=D*ivG07-F#p>1@IBefZTH(aezo)5r*JaJ`pI|y
zn}3*Ys{dp-U*8#bwETS0U-gN#O>dGXZMp2c;@;y+i|3^3dw$|dIsZ>O^Q}tdk)@%F
znr7KMeT(1qZ*|&6`>ucOb)}Z8_tp8i+}wTU*B_mI3|qI~Upeo?(%#pr?;l||Kf7}K
zg02&iGeR4E^vb8^taCPdrfOlnNX^rIo%JcF6E&BPs;+9=ab?2hHGXCbKb^F@6tijK
zqQIqTVT!kdzAZ@GXzpU0qamd{`|_{Yt_k1RH}B%JY+6<PdZpHm@{irOauc$ht|f%5
zv}W{_pK24uR(#B|J#2YaXQx|paij;|gA9`cs((3mp1)w?d}f-PamgFwtQe8!tE}EF
zikcC**89YUACn8(c|*U-+!9G&_3l%K^ADBf+x@uR^maBZRp$S3@JHHw$tf3Nw!2^C
zV4HPHa#qGBNv;gvpYF$Q2MY2sSn4lid~j{m<<2$52QIx?>@DOV$Xna>$8BpvoAfJ_
zsO^52n%V?i`<_p|a7-mfw_|=_Yi-1*6XwFcPl7A6Ok{aXuC8iO>+(F;ud(Rl^f`|v
zqz4oWGe3J~>LyTXc-r{Qhhtm`3+4(0oMSa{5jn~mD7V)6QWM)GGZPjS|9K}Ie!GPw
ztURw+=PTtKe|c59wp6C8^5=|A%jTI%6$D)0n3R1=ru1Kvr*W;@`S~o;*S=)NDy)sR
zxXtXa_~p+F84?-AQ5Vl`Sv2?2!d=TWw`8AoIeqOdbL2k3j}14zNn77eTy{|=<&%1h
zl~~VL#^YDi>t|jLo9=tDVbjhz?!N?9X_%@-|ICi+Dsw9C&AH~w=pTQ%q&fHBtg^cq
z<@0#gvbKnsl*HV)aDrcBv958eM%T&ND^|-)aWYTedH$zuK-v7uJ5Tqh@7Qu{^2e;H
zlKQ7JR`X>#JF7Oa<}&l-W^7elw=r7SH}lp7r$_sG#3p<1P`l+bH@WuoeCxpKj&Hwp
zCEtIx62CqtHGi-2^4F#=wWr#S>Du4Zm^CxQmL(;|&AMSB?^?bCO<{*i%eE}kJti^b
z;<c2X3pI-atFC=xlS-9k)=imJm~YQJ?TH$Pf>gW8^TdQd>Ib%5aIg+aTQK)QfXK{@
z;vY|T^?Xxb#w~s8h1b~x=h>TYYcKXa$-8f625;B47orz!PSr5?u3FLYY$tosgH!B#
z?@fvM@~g~5D#Q5H9;I8hNnNwlZZRlY>Mp+9P%JIgaQ~<9#QXn+C%&(V?6_?b9wQ1Y
P9~eAc{an^LB{Ts5|CV-n

diff --git a/app/javascript/images/fluffy-elephant-friend.png b/app/javascript/images/fluffy-elephant-friend.png
deleted file mode 100644
index f0df29927885c3daa2b7cfc380c31c5ce463e559..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 60667
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
z0000000000000000000000000000000000000000005Zh2gh{Ze~|c<ivR!s07*qo
IM6N<$f;M=B=l}o!

diff --git a/app/javascript/images/logo.png b/app/javascript/images/logo.png
deleted file mode 100644
index f0c1c46c3908d368cee69aeeb5b2f1c88d8086ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7752
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
F{{hqrmSz9|

diff --git a/app/javascript/images/logo.svg b/app/javascript/images/logo.svg
index 16cb3a944..4b72b3ac8 100644
--- a/app/javascript/images/logo.svg
+++ b/app/javascript/images/logo.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000" height="1000" width="1000"><path d="M500 0a500 500 0 0 0-353.553 146.447 500 500 0 1 0 707.106 707.106A500 500 0 0 0 500 0zm-.059 280.05h107.12c-19.071 13.424-26.187 51.016-27.12 73.843V562.05c0 44.32-35.68 80-80 80s-80-35.68-80-80v-202c0-44.32 35.68-80 80-80zm-.441 52c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zm-279.059 7.9c44.32 0 80 35.68 80 80v206.157c.933 22.827 8.049 60.42 27.12 73.842H220.44c-44.32 0-80-35.68-80-80v-200c0-44.32 35.68-80 80-80zm559.12 0c44.32 0 80 35.68 80 80v200c0 44.32-35.68 80-80 80H672.44c19.071-13.424 26.187-51.016 27.12-73.843V419.95c0-44.32 35.68-80 80-80zM220 392c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm560 0c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zm-280.5 40.05c-15.464 0-28 12.537-28 28 0 15.465 12.536 28 28 28s28-12.535 28-28c0-15.463-12.536-28-28-28zM220 491.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zM499.5 532c-15.464 0-28 12.536-28 28s12.536 28 28 28 28-12.536 28-28-12.536-28-28-28zM220 591.95c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28zm560 0c-15.464 0-28 12.535-28 28 0 15.463 12.536 28 28 28s28-12.537 28-28c0-15.465-12.536-28-28-28z" fill="#fff"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="61.076954mm" height="65.47831mm" viewBox="0 0 216.4144 232.00976"><path d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" fill="#3088d4"/><path d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#fff"/></svg>
diff --git a/app/javascript/images/logo_alt.svg b/app/javascript/images/logo_alt.svg
new file mode 100644
index 000000000..e88ca7418
--- /dev/null
+++ b/app/javascript/images/logo_alt.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="61.077141mm" height="65.47831mm" viewBox="0 0 216.41507 232.00976"><path d="M211.80683 139.0875c-3.1825 16.36625-28.4925 34.2775-57.5625 37.74875-15.16 1.80875-30.0825 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.3925 27.9425 21.115.7225 39.91625-5.20625 39.91625-5.20625l.86875 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23183 213.82 1.40558 165.31125.20808 116.09125c-.36375-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67058 3.45375 78.20308.2425 107.86433 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.97625 14.7525 32.97625 65.0825 0 0 .4125 37.13375-4.6 62.915" fill="#3088d4"/><path d="M65.68743 96.45938c0 9.01375-7.3075 16.32125-16.3225 16.32125-9.01375 0-16.32-7.3075-16.32-16.32125 0-9.01375 7.30625-16.3225 16.32-16.3225 9.015 0 16.3225 7.30875 16.3225 16.3225M124.52893 96.45938c0 9.01375-7.30875 16.32125-16.3225 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.3225 7.30875 16.3225 16.3225M183.36933 96.45938c0 9.01375-7.3075 16.32125-16.32125 16.32125-9.01375 0-16.32125-7.3075-16.32125-16.32125 0-9.01375 7.3075-16.3225 16.32125-16.3225 9.01375 0 16.32125 7.30875 16.32125 16.3225" fill="#fff"/></svg>
diff --git a/app/javascript/images/logo_full.svg b/app/javascript/images/logo_full.svg
new file mode 100644
index 000000000..8b1328e8c
--- /dev/null
+++ b/app/javascript/images/logo_full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 713.35878 175.8678" height="49.633801mm" width="201.3257mm"><path d="M160.55476 105.43125c-2.4125 12.40625-21.5975 25.9825-43.63375 28.61375-11.49125 1.3725-22.80375 2.63125-34.8675 2.07875-19.73-.90375-35.2975-4.71-35.2975-4.71 0 1.92125.11875 3.75.355 5.46 2.565 19.47 19.3075 20.6375 35.16625 21.18125 16.00625.5475 30.2575-3.9475 30.2575-3.9475l.65875 14.4725s-11.19625 6.01125-31.14 7.11625c-10.99875.605-24.65375-.27625-40.56-4.485C6.99851 162.08 1.06601 125.31.15851 88-.11899 76.9225.05226 66.47625.05226 57.74125c0-38.1525 24.99625-49.335 24.99625-49.335C37.65226 2.6175 59.27976.18375 81.76351 0h.5525c22.48375.18375 44.125 2.6175 56.72875 8.40625 0 0 24.99625 11.1825 24.99625 49.335 0 0 .3125 28.1475-3.48625 47.69" fill="#3088d4"/><path d="M34.65751 48.494c0-5.55375 4.5025-10.055 10.055-10.055 5.55375 0 10.055 4.50125 10.055 10.055 0 5.5525-4.50125 10.055-10.055 10.055-5.5525 0-10.055-4.5025-10.055-10.055M178.86476 60.69975v46.195h-18.30125v-44.8375c0-9.4525-3.9775-14.24875-11.9325-14.24875-8.79375 0-13.2025 5.69125-13.2025 16.94375V89.2935h-18.19375V64.75225c0-11.2525-4.40875-16.94375-13.2025-16.94375-7.955 0-11.9325 4.79625-11.9325 14.24875v44.8375H73.79851v-46.195c0-9.44125 2.40375-16.94375 7.2325-22.495 4.98-5.55 11.50125-8.395 19.595-8.395 9.36625 0 16.45875 3.59875 21.14625 10.79875l4.56 7.6425 4.55875-7.6425c4.68875-7.2 11.78-10.79875 21.1475-10.79875 8.09375 0 14.61375 2.845 19.59375 8.395 4.82875 5.55125 7.2325 13.05375 7.2325 22.495M241.91276 83.663625c3.77625-3.99 5.595-9.015 5.595-15.075 0-6.06-1.81875-11.085-5.595-14.9275-3.63625-3.99125-8.25375-5.91125-13.84875-5.91125-5.59625 0-10.2125 1.92-13.84875 5.91125-3.6375 3.8425-5.45625 8.8675-5.45625 14.9275 0 6.06 1.81875 11.085 5.45625 15.075 3.63625 3.8425 8.2525 5.76375 13.84875 5.76375 5.595 0 10.2125-1.92125 13.84875-5.76375m5.595-52.025h18.04625v73.9h-18.04625v-8.72125c-5.455 7.2425-13.01 10.79-22.80125 10.79-9.3725 0-17.34625-3.695-24.06125-11.23375-6.57375-7.5375-9.93125-16.84875-9.93125-27.785 0-10.78875 3.3575-20.10125 9.93125-27.63875 6.715-7.5375 14.68875-11.38 24.06125-11.38 9.79125 0 17.34625 3.5475 22.80125 10.78875v-8.72zM326.26951 67.258625c5.315 3.99 7.97375 9.60625 7.83375 16.7 0 7.53875-2.65875 13.45-8.11375 17.58875-5.45625 3.99125-12.03 6.06-20.00375 6.06-14.40875 0-24.20125-5.9125-29.3775-17.58875l15.66875-9.31c2.0975 6.35375 6.71375 9.60625 13.70875 9.60625 6.43375 0 9.6525-2.07 9.6525-6.35625 0-3.10375-4.1975-5.91125-12.73-8.1275-3.21875-.8875-5.87625-1.77375-7.97375-2.51375-2.9375-1.18125-5.455-2.5125-7.55375-4.1375-5.17625-3.99-7.83375-9.3125-7.83375-16.11 0-7.2425 2.5175-13.00625 7.55375-17.145 5.17625-4.28625 11.47-6.355 19.025-6.355 12.03 0 20.84375 5.1725 26.5775 15.66625l-15.38625 8.8675c-2.23875-5.02375-6.015-7.53625-11.19125-7.53625-5.45625 0-8.11375 2.06875-8.11375 6.05875 0 3.10375 4.19625 5.91125 12.73 8.12875 6.575 1.4775 11.75 3.695 15.5275 6.50375M383.626635 49.966125h-15.8075v30.7425c0 3.695 1.4 5.91125 4.0575 6.945 1.95875.74 5.875.8875 11.75.59125v17.29375c-12.16875 1.4775-20.9825.295-26.15875-3.69625-5.175-3.8425-7.69375-10.93625-7.69375-21.13375v-30.7425h-12.17v-18.3275h12.17v-14.9275l18.045-5.76375v20.69125h15.8075v18.3275zM441.124885 83.2205c3.6375-3.84375 5.455-8.72125 5.455-14.6325 0-5.91125-1.8175-10.78875-5.455-14.63125-3.6375-3.84375-8.11375-5.76375-13.57-5.76375-5.455 0-9.93125 1.92-13.56875 5.76375-3.4975 3.99-5.31625 8.8675-5.31625 14.63125 0 5.765 1.81875 10.6425 5.31625 14.6325 3.6375 3.8425 8.11375 5.76375 13.56875 5.76375 5.45625 0 9.9325-1.92125 13.57-5.76375m-39.86875 13.15375c-7.13375-7.5375-10.63125-16.70125-10.63125-27.78625 0-10.9375 3.4975-20.1 10.63125-27.6375 7.13375-7.5375 15.9475-11.38 26.29875-11.38 10.3525 0 19.165 3.8425 26.3 11.38 7.135 7.5375 10.77125 16.84875 10.77125 27.6375 0 10.9375-3.63625 20.24875-10.77125 27.78625-7.135 7.53875-15.8075 11.2325-26.3 11.2325-10.49125 0-19.165-3.69375-26.29875-11.2325M524.92126 83.663625c3.6375-3.99 5.455-9.015 5.455-15.075 0-6.06-1.8175-11.085-5.455-14.9275-3.63625-3.99125-8.25375-5.91125-13.84875-5.91125-5.59625 0-10.2125 1.92-13.98875 5.91125-3.63625 3.8425-5.45625 8.8675-5.45625 14.9275 0 6.06 1.82 11.085 5.45625 15.075 3.77625 3.8425 8.5325 5.76375 13.98875 5.76375 5.595 0 10.2125-1.92125 13.84875-5.76375m5.455-81.585h18.04625v103.46h-18.04625v-8.72125c-5.315 7.2425-12.87 10.79-22.66125 10.79-9.3725 0-17.485-3.695-24.2-11.23375-6.575-7.5375-9.9325-16.84875-9.9325-27.785 0-10.78875 3.3575-20.10125 9.9325-27.63875 6.715-7.5375 14.8275-11.38 24.2-11.38 9.79125 0 17.34625 3.5475 22.66125 10.78875v-38.28zM611.79626 83.2205c3.63625-3.84375 5.455-8.72125 5.455-14.6325 0-5.91125-1.81875-10.78875-5.455-14.63125-3.6375-3.84375-8.11375-5.76375-13.57-5.76375-5.455 0-9.9325 1.92-13.56875 5.76375-3.49875 3.99-5.31625 8.8675-5.31625 14.63125 0 5.765 1.8175 10.6425 5.31625 14.6325 3.63625 3.8425 8.11375 5.76375 13.56875 5.76375 5.45625 0 9.9325-1.92125 13.57-5.76375m-39.86875 13.15375c-7.135-7.5375-10.63125-16.70125-10.63125-27.78625 0-10.9375 3.49625-20.1 10.63125-27.6375 7.135-7.5375 15.9475-11.38 26.29875-11.38 10.3525 0 19.165 3.8425 26.3 11.38 7.135 7.5375 10.77125 16.84875 10.77125 27.6375 0 10.9375-3.63625 20.24875-10.77125 27.78625-7.135 7.53875-15.8075 11.2325-26.3 11.2325-10.49125 0-19.16375-3.69375-26.29875-11.2325M713.35876 60.163875v45.37375h-18.04625v-43.00875c0-4.8775-1.25875-8.5725-3.77625-11.38-2.37875-2.5125-5.73625-3.84375-10.0725-3.84375-10.2125 0-15.3875 6.06-15.3875 18.3275v39.905h-18.04625v-73.89875h18.04625v8.27625c4.33625-6.94625 11.19-10.345 20.84375-10.345 7.69375 0 13.98875 2.66 18.885 8.12875 5.035 5.46875 7.55375 12.85875 7.55375 22.465" fill="#fff"/></svg>
diff --git a/app/javascript/images/mastodon.jpg b/app/javascript/images/mastodon.jpg
deleted file mode 100644
index 2dfeb879f97a3e7fc57722330082c5ce445c1ddd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 133743
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

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index b94f61144..a2642ee9f 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -505,12 +505,19 @@
         a {
           padding-left: 0;
           color: $white;
+
+          &:hover img {
+            opacity: 1;
+          }
         }
 
         img {
-          width: 32px;
           height: 32px;
           margin-right: 10px;
+          position: relative;
+          top: 4px;
+          left: -10px;
+          opacity: 0.8;
         }
       }
     }
diff --git a/app/javascript/styles/containers.scss b/app/javascript/styles/containers.scss
index 44d4c1118..7dcf2c006 100644
--- a/app/javascript/styles/containers.scss
+++ b/app/javascript/styles/containers.scss
@@ -23,8 +23,7 @@
     align-items: center;
 
     img {
-      width: 32px;
-      height: 32px;
+      height: 42px;
       margin-right: 10px;
     }
 
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index 999d1e37b..a3c8e4a84 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -24,8 +24,7 @@
       .container.links
         .brand
           = link_to root_url do
-            = image_tag asset_pack_path('logo.svg'), alt: '', role: 'presentation'
-            Mastodon
+            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
 
         %ul.nav
           %li
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 59d95a0c6..c98d85f7b 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -6,7 +6,7 @@
     .sidebar-wrapper
       .sidebar
         = link_to root_path do
-          = image_tag asset_pack_path('logo.png'), class: 'logo'
+          = image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'
 
         = render_navigation
     .content-wrapper
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index b4f1bd0f3..d8ac733f9 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,8 +6,7 @@
     .logo-container
       %h1
         = link_to root_path do
-          = image_tag asset_pack_path('logo.svg')
-          Mastodon
+          = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
 
     .form-container
       = render 'flashes'
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 3a475f61f31429846b94350e9ed81b47ba0e8fbe..0b4eb9fdf88613c1ae9e69359410ac29af6372cf 100644
GIT binary patch
literal 6702
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
Ef*Gx`(*OVf

literal 14344
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

diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b05996b374492abf54668d6563a9ccd0deafdb12..829263f83964188f93a80822db90a17e82693bad 100644
GIT binary patch
literal 6977
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
TBEdA=00000NkvXXu0mjf&zy3P

literal 4217
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

diff --git a/public/badge.png b/public/badge.png
index fc1f42dca135ab028fbf3194a74329eb7c5103ee..a1f2f8b0897b460a45486bed14c74b2a3f0dbd11 100644
GIT binary patch
literal 5579
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
bl04vp`*bIBD!#+9(yri~i50He$TR+b{mnhG

literal 31156
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
XmIvNiJ9t$G00000NkvXXu0mjfv<>6{

diff --git a/public/browserconfig.xml b/public/browserconfig.xml
index 29c6ff581..7fdab5058 100644
--- a/public/browserconfig.xml
+++ b/public/browserconfig.xml
@@ -3,7 +3,7 @@
   <msapplication>
     <tile>
       <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#2b5797</TileColor>
+      <TileColor>#282c37</TileColor>
     </tile>
   </msapplication>
 </browserconfig>
diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
index 5f725d587006713535077369269b4d74b5ef0d63..04c503c07fbd6b2dcc6385fb7d57cfeb2ba5bade 100644
GIT binary patch
literal 1631
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

literal 9854
zcmeHMO^g&p6n;ufki?i6<4M7Y8e(GPZak?82_6)VZ~**?o{cw9{E2!n9=HE?c82UO
z5CY-KpLj87A{XO7MmC1TgHbu41Q1!iuex7Pb#+%W)6+A%n^2p#)zek)z3;txRsE_;
z<PQ98+$i|}u)O}b$O9s>0fbkw1H|{^Er%Wznb|24hoF<7Uqqt6LDw?k^SQJw2}C+O
zL=LVWFQ!{bKkyJR?GXun1TCf%q9#Qi(su11`~aJFi%{02$}D^xc15QCD`Kw0?b@Su
zur{`EoH`=&kBrZXGk3#R??d0!4EK$CU%Qxnzl|-BMLVXhz>d8l)YWF0djhh*YZtd`
zk8MZrt;l{(;TB3~D{%jtVfVzfi)EDG8dFpMV4lA;ngPjcz<nKY(o(DpYF9oM&>g?p
z%m#y<xF?KVZOm<e{$XuMwk(a`6}#5C4H$<(W9cBifWf77Z6UwPTB<s?0dtV+NL}H&
z6?_i@?&W}8eMT(iJArknZf%V|Sbo@D8>08BM_~RjV8^$K^Hq74TTN`lSd}{ky?Wo9
zILzW|9I-Wse2t@UrZ@&i)}{H3>w8<Ki9e0Q7VS_SRq~^XSRh8`UWeB9ZHV74`(EXS
zzlkJoAwPZr^qk1PjOJ0tr$>l2;GmAqCw-ZePwHa*jz0ya%jI>1JhYX$ua@Aav>)3v
z<_-R@M9$u;y^8hc_k)LdBXB5>T^oML)7oy+XQK}~d}Z!Q@Lx=2C=YA$F>hz#-h=iS
zS*W$0<HT=)uXMJR`HYUtuf}&@qR%&=|5N$44%I{5$GPS5l;n-F9)llzoX6c=)$L(s
zpGT}j@09sC7G`XxM83GE&v_JjLfAsRwhfA-_jJFn`*h^NvL5BrJ)bR8{SuyWB^7^%
zA6Cna4ix+8FUDcGP>r84?<;55l=Ub^?nRSRMVZ<*EPnOL>{C7@(Di1jOZ}xhP4Sz(
z_WAPsqui$W7gqc6_cj-OISPLIIr<gEvjIL^Gz$L3yZrdOn_9;I7jSb8w6ODerQnZ|
zOH2~~bj$uH{utkfN%_BR{L!DlzOaJvWB$gUHCsPpXZ_c;q;CGU>3`~rPk?Y{$!9x;
z3>JJZ>q_)d^;$AX{QQ3T@`nI%Rac^3(e9D_zum9Nm!C0DVg69pKKo3y+++8__xNtu
z`-LX>b*+w$SL@;1WN+#xJ4RHO?!&zK^97N^8;Y_`9&_3+)6Uz9oEYopi!rD8>C5<I
zk;OZU96g@>VXxxm=mx))U)Jqk0-ULabCACqa*$UBf0VJ?IJm#@6`pAltL;lO@3Oo#
z#Q6g4h~GsYtShE3+Dsqt*?R2#3-@B&liBf*^MIfFT*})sxhgySTI7P~{CIH{<osUt
zXU;o-9%3X`_s-x}`}Zom?z`MZ*wA|xdpG31Zt3hvec|#B@|*I_n9R6Rad*(t`H9*<
zJypc^L9kZ!q3?Nq!aJ0zV(urhF|6Vr=AGK%*2BoK`%;eaJ?4h5@N6!>rx?Lcw%#_L
z6+7=W>h>43D?h)@=4~7LN0DL1k8v}=`K^x2ay&nueo@g4R!_eIn>hwcG!D7np`Tcq
z6l25n$=i@)hwkL%Cdm6dCYBI;X6{d5PU~Fd{oSxJ(??x=TFLjPY6;iYao=B?`v<J=
zb$2X^r)h1z)4enY(U>yvIz((~|2$Thdv*Qa)uveM_;_c)yfyr}KQ|PYZ@t&{Jg>mH
zH}gn07pv1djy8VtI#?&-7=*kxS^)7}jJZ3{m+%~)Pur3x-SZtrzID6Y_Q2A5;3oZU
BUY!5{

diff --git a/public/favicon.ico b/public/favicon.ico
index 3673ac0d5467a6d5f88ae0ec01827b1a2b539c06..70f2fec128e177d72b2c55297ae4c0a8cbef95d2 100644
GIT binary patch
delta 1404
zcmV-?1%vvZ2Z9R_000310RSy900031AOLIykq{YwEdT%jFbD<!004zj^WOjf1v5!R
zK~!jg)tXyu6jd02zcah-w!2W;0@4COO6UW03Ikp-#2X<7qe3tdK}<}H8bgeilsGX+
zd{GB4=z}CgO&~G)z{MzuKA<5&q8KA~3R9{9L@rw?hSJh*%kFk&e3)%v+1c5hr8?zH
zHrbqi`OleeX8z2%ji3Mvw02t6CID{R*e<1`_9CDexEYuR+yvAD)j$<64k*j~(wSdB
za0%!Ex`FdR95@T2ts<QI>F1UO7J#A|=&J1LBnnB-*NjI5tO6DTGYZ9D2XSCO@TIQG
zyS)N)q=&Cm(Tq2M*8%B2QS`<J-qKZhgWH{d&yrR&Lxdn^f`Rk+gXRp-1oZ2wY!4TX
zNGqBFPCj-4l@yUW{{uE~8JGg}4c~DIV8+H1!;heyu_FwQM+MNKt1|OH>=-EoK+%j3
zfR}=CD~gYFRek|LWYS_X&TD9_QzsBzQYJ0l589?k-fLBxMqX!62C7m#Yr#p6<-k{e
z0n7M6tdxMegVykeeUAiqcl2YACW*1p^ZB7c0_uXc@W~Vjrw6=|h)O`nD<W;#ES@!v
z74vGSuPP&L+Fs!#hb-j!N>(a0G}Tv<9I`y))22;*RT(Sh)v$QhxPt8iB8<m4V`41K
z*UvT*E59;2{o>aPyt(&p%0s!;EE{%zJw2PbbyptV(Q|{W-u@?&%UM#U&4vf2vig?V
zk+MY6V)-Y>xR4mir)5g{qzBU$TOXg9B@D3U)`{HLINnuw{gS#YVSu@Hm9#9W!*aQS
z_cvB$2?N9;5?fczWH6og38nH%*G9w4o)mGdwQO!R<~0@rDT{~XYS;LO<?0-N3DdG!
z)-=I2e)i-DHPLWB=|Kr+%$kE&ZdrEjF(JsgkgEm#lmiUqKbFWll}e;6+TsJQ$9C!6
zgsw@_Xqm*$){Cz3J6kUjEz3StND}PU-Q(Nh10<4p)1yZMTr)lr7OdNGiq772R{7?A
z=lJb(?!^cJTMl%w|9D?k`Tk>neQY_<g>Xs2L#GpL-q)2?7Vk;1ZpSGi;k@sMOG43%
z1Q5*^ae2r>nHHnEGQ{Ed0DUP7mlwwf$swDDi4ktDE$38sijx<TUILi5&G<-&c~hhG
z44UZi1QlV=x%3{PXht_s;}tc=*d_t)i92@blyFvlZY0i1KyT0%eh|=qA>pjA-7uJ8
z`=A8;6SRmA{y5yyoRWafpiO-63OFlFrvnx#maV!fe+!QEk$`22;bUEupKpHGQI#&I
z%MS)DREQ^ZReo;aJ4ZRPz8T02OBKzC15<-EbK%nvym&~Jb2`7_PW}fUjhUmO<W48B
z0hpkx@-wDz@2$hirXyf~vj<pHWW#54Rc=r;Lk1L_{g(wmBhGR}G0Vigz)9dZ&hm1b
zjs0Vr+I${B+0+hz{;K<u%+*W11!t5QOkI`pPAf8P#cZ4LLWl~mB_IhR0d~Kx%6TV$
z#d5XuF5uB3YfZO9p?F)%oa;S*Nk}mAIMkwR*}NQ-Fyw9&eFHpySY+J>U6ubDb)zB}
znIdF%1RnEI_jg4z?)7^@Wz*3s|23ney&boG#HGMqA8qKsXTW#5Dtq>>^EG3RfIEP@
zfZKIdR{Y2g<9elvW;_LKE2Y5<y*M)>6K8j-2AAbGU6o6^)2=f}U6r>3OG{}m!vvrn
zm<~*$z<Qxy@=kkWbyfZzhyb6D<_Sjw?|pBJl&;Ea5h4b>28_nw$_91<i%M;vq?}UT
zHWnhd6PN?c!WnE$!TEfmJQLQBGb@S%Cx8y%fUe5FKyjZ)<l|q^p`=lWwQuYI0000<
KMNUMnLSTaJd6Uxs

delta 917
zcmV;G18V$&3!euN000310RS*C00031AOML2kq{YwFaQ7mFbD<!00374`G)`i15ims
zK~!jg)!Ivo9Yque@ZWS4j2g%I0)?31orxm2O*SUr3tVdALU0rCfr1}E!AN3U_yNS7
zI-q3bN)UA8#(*(d>8PU^qas8X5(7>&lZkU(RJXae(^dD;J#+j1;lRCps?PaWS9SL}
zr)oxjGuVke*o_YE!YsC+i)Ea{PdJ4y@ELw+$p2W_j#u%$Kyn=U4hOMqBZ<#r0jo8L
zmt__2Vs1T&Z^jX<<WAQb96(`f1&4EAjpAN>y$-}<16jm9O_AS+^Xo`DCd+uNF8OD0
z$@<>))NEYB({;$NO^AH&Al7m&BVnJ(-TBymObor8cH*y=knbJDdEsS}#AcV@Hf@we
zT$38Wkrt2~B!^?<=Y<bRo0d-1Qd$xDVlOo4=p-J(wH1C2Hemmqve7$*c%<s?k2)hK
z#Y2HjI5URLGM`m>0C-hy_(0F^GA`l+A#%I}PvF)_TX-4&M0E4Gz2bToGr|kxBVn0;
z+>Zx)bOmN|t_Or?mYiJGXn%EOOfrj4Bkj9F4iLj5iGFV&E4AM*zA~1IMso?Hdm=<`
z!r6%7s}lowG~(xzM4v+mew_?^BOQMhvZgAW#fSQ*whrD)=-yB0_GZ`>QT{%_>2Cw{
zqafw$OhUIS6CSK8bO$&cq~8d1G9dwfpH_4-+&F0#H87jux=FLBfi30t?$jX@a?feS
zawb&Fn#86tb>rY%hSLojy*r_6tW=WYbSBg)o5V|z>$7;VVPB^*oQNp54(Pm6ajlCd
z@s|Feu7i)UBVsESy%OTC7)}rm=GKG+KZd6g{kr%YpW{pX8);j}Z3#awB>HuKibk<;
z`nWLlRk%gS73!v-#}nl5!=I6UOI%K3j;c<UcjGI(nRmEQ(jUVE2?8k;iOMlNT+-bj
zBs9;9XLm<?|7;ge940BT6n9lfgZr@10>Z<}6-hnQRaW``;Vt9!7LXhyuf@m{9++=h
zKr$wahS<F+io260TV6Ut6?Y4Kw6VPY_^{*)Jf}Sy9M6tQzIPCl-eMY?e1ZKYx5+p1
zvWa1;w^<8p#76f8p_JJ8Mt3jfgku3s9yPd#w{38ZYMZcGu~dWjw|GU3!yZi)XXo@E
rx7mT4aeb~|#vk}a|8bii>pK1qGTT)WtYa=e00000NkvXXu0mjfsGh9x

diff --git a/public/mask-icon.svg b/public/mask-icon.svg
index c35230117..f91ff5067 100644
--- a/public/mask-icon.svg
+++ b/public/mask-icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" height="16" width="16"><path d="M8 .1A7.9 7.9 0 0 0 .1 8 7.9 7.9 0 0 0 8 15.9 7.9 7.9 0 0 0 15.9 8 7.9 7.9 0 0 0 8 .1zm-.04 4.28h1.7c-.33.23-.44.9-.44 1.25v3.2c0 .7-.55 1.24-1.26 1.24-.7 0-1.26-.55-1.26-1.25v-3.2c0-.68.55-1.24 1.26-1.24zm-4.36.78c.7 0 1.26.55 1.26 1.24v3.2c0 .34.1 1.02.43 1.24H3.6c-.7 0-1.26-.55-1.26-1.24V6.4c0-.7.55-1.24 1.26-1.24zm8.7 0c.7 0 1.26.55 1.26 1.24v3.2c0 .7-.56 1.24-1.27 1.24h-1.7c.32-.22.43-.9.43-1.24V6.4c0-.7.56-1.24 1.26-1.24z" fill="#000"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 94.023018 100.80365" height="28.44903mm" width="26.535385mm"><path d="M72.57077 49.00625c-3.9125 0-7.085-3.1825-7.085-7.095 0-3.91125 3.1725-7.09375 7.085-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m-25.55875 0c-3.9225 0-7.095-3.1825-7.095-7.095 0-3.91125 3.1725-7.09375 7.095-7.09375 3.91125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1825 7.095-7.09375 7.095m-25.57 0c-3.91125 0-7.08375-3.1825-7.08375-7.095 0-3.91125 3.1725-7.09375 7.08375-7.09375 3.92125 0 7.09375 3.1825 7.09375 7.09375 0 3.9125-3.1725 7.095-7.09375 7.095m72.5775-15.905c0-21.86625-14.32375-28.27375-14.32375-28.27375-7.23-3.31875-19.63-4.7125-32.5175-4.8275h-.3125c-12.88875.115-25.28875 1.50875-32.5075 4.8275 0 0-14.32375 6.4075-14.32375 28.27375 0 5.00375-.105 10.995.05125 17.34C.60577 71.83 4.00702 92.905 23.78327 98.1375c9.1125 2.4125 16.945 2.9125 23.24875 2.56875 11.4225-.63375 17.84-4.07625 17.84-4.07625l-.37375-8.3025s-8.16625 2.58-17.34125 2.2675c-9.09125-.3125-18.6825-.9775-20.16-12.13875-.135-.97875-.1975-2.02875-.1975-3.13125 0 0 8.915 2.185 20.2325 2.69375 6.9075.3225 13.39875-.39375 19.98375-1.185 12.6275-1.50875 23.62375-9.29 25.0075-16.405 2.17375-11.1925 1.99625-27.3275 1.99625-27.3275" fill="#000"/></svg>
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index 57eae8355d0f091ad23bdac05cfe95584dec5430..e8e289eaac9fa597cac16f40bcbbf4ff786c4b35 100644
GIT binary patch
literal 5796
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

literal 6916
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


From dd28b557ae32d846ea2ef9f8e9ec208abeeca6af Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 02:46:10 +0200
Subject: [PATCH 318/382] Update README header with logo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8b902b7b4..dd7c519a8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Mastodon
+![Mastodon](https://i.imgur.com/NhZc40l.png)
 ========
 
 [![Build Status](http://img.shields.io/travis/tootsuite/mastodon.svg)][travis]

From 4d661e11837c12a3381a08cb686fc5451e8d7deb Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 23 Jul 2017 18:09:42 +0900
Subject: [PATCH 319/382] Change logo.png to logo.svg for web UI (#4307)

---
 app/views/home/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 13ca9ea79..a2ea0d948 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,6 +6,6 @@
 
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
-    = image_tag asset_pack_path('logo.png')
+    = image_tag asset_pack_path('logo.svg')
     %div
       = t('errors.noscript')

From bdbfb10cff0cee5158252caf2d6def3424a1d96d Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Sun, 23 Jul 2017 19:46:10 +0900
Subject: [PATCH 320/382] Fix logo URL (#4309)

---
 app.json      | 2 +-
 scalingo.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app.json b/app.json
index 049f63a9e..a935b8232 100644
--- a/app.json
+++ b/app.json
@@ -2,7 +2,7 @@
   "name": "Mastodon",
   "description": "A GNU Social-compatible microblogging server",
   "repository": "https://github.com/tootsuite/mastodon",
-  "logo": "https://github.com/tootsuite/mastodon/raw/master/app/assets/images/logo.png",
+  "logo": "https://github.com/tootsuite/mastodon/raw/master/app/javascript/images/logo.svg",
   "env": {
     "HEROKU": {
       "description": "Leave this as true",
diff --git a/scalingo.json b/scalingo.json
index 4afaa6b4e..8df2caba1 100644
--- a/scalingo.json
+++ b/scalingo.json
@@ -2,7 +2,7 @@
   "name": "Mastodon",
   "description": "A GNU Social-compatible microblogging server",
   "repository": "https://github.com/tootsuite/mastodon",
-  "logo": "https://github.com/tootsuite/mastodon/raw/master/app/assets/images/logo.png",
+  "logo": "https://github.com/tootsuite/mastodon/raw/master/app/javascript/images/logo.svg",
   "env": {
     "LOCAL_DOMAIN": {
       "description": "The domain that your Mastodon instance will run on (this can be appname.scalingo.io or a custom domain)",

From a677ac83845d00b22019a14bd1011f539644665f Mon Sep 17 00:00:00 2001
From: Quent-in <pages_quentin@hotmail.com>
Date: Sun, 23 Jul 2017 12:46:40 +0200
Subject: [PATCH 321/382] i10n Update for Occitan (#4301)

* Update to translate new strings

* Update

* Update

* Indend added

* Update oc.yml
---
 app/javascript/mastodon/locales/oc.json |  32 ++---
 config/locales/oc.yml                   | 162 ++++++++++++++++++++++--
 config/locales/simple_form.oc.yml       |   5 +
 3 files changed, 169 insertions(+), 30 deletions(-)

diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index b6a4bf134..6b42f4d4f 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -18,18 +18,18 @@
   "account.unfollow": "Quitar de sègre",
   "account.unmute": "Quitar de rescondre @{name}",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.body": "Quicòm a fach meuca pendent lo cargament d’aqueste compausant.",
+  "bundle_column_error.retry": "Tornar ensejar",
+  "bundle_column_error.title": "Error de ret",
+  "bundle_modal_error.close": "Tampar",
+  "bundle_modal_error.message": "Quicòm a fach meuca pendent lo cargament d’aqueste compausant.",
+  "bundle_modal_error.retry": "Tornar ensejar",
   "column.blocks": "Personas blocadas",
-  "column.community": "Flux d’actualitat public local",
+  "column.community": "Flux public local",
   "column.favourites": "Favorits",
   "column.follow_requests": "Demandas d’abonament",
   "column.home": "Acuèlh",
-  "column.mutes": "Personas mesas en silenci",
+  "column.mutes": "Personas en silenci",
   "column.notifications": "Notificacions",
   "column.public": "Flux public global",
   "column_back_button.label": "Tornar",
@@ -55,8 +55,8 @@
   "confirmations.domain_block.message": "Sètz segur segur de voler blocar complètament {domain} ? De còps cal pas que blocar o rescondre unas personas solament.",
   "confirmations.mute.confirm": "Metre en silenci",
   "confirmations.mute.message": "Sètz segur de voler metre en silenci {name} ?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.unfollow.confirm": "Quitar de sègre",
+  "confirmations.unfollow.message": "Volètz vertadièrament quitar de sègre {name} ?",
   "emoji_button.activity": "Activitat",
   "emoji_button.flags": "Drapèus",
   "emoji_button.food": "Beure e manjar",
@@ -69,7 +69,7 @@
   "emoji_button.travel": "Viatges & lòcs",
   "empty_column.community": "Lo flux public local es void. Escribètz quicòm per lo garnir !",
   "empty_column.hashtag": "I a pas encara de contengut ligat a aqueste hashtag",
-  "empty_column.home": "Pel moment segètz pas segun. Visitatz {public} o utilizatz la recèrca per vos connectar a d’autras personas.",
+  "empty_column.home": "Pel moment segètz pas degun. Visitatz {public} o utilizatz la recèrca per vos connectar a d’autras personas.",
   "empty_column.home.inactivity": "Vòstra pagina d’acuèlh es voida. Se sètz estat inactiu per un moment, serà tornada generar per vos dins una estona.",
   "empty_column.home.public_timeline": "lo flux public",
   "empty_column.notifications": "Avètz pas encara de notificacions. Respondètz a qualqu’un per començar una conversacion.",
@@ -111,8 +111,8 @@
   "notifications.column_settings.favourite": "Favorits :",
   "notifications.column_settings.follow": "Nòus seguidors :",
   "notifications.column_settings.mention": "Mencions :",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.push": "Notificacions",
+  "notifications.column_settings.push_meta": "Aqueste periferic",
   "notifications.column_settings.reblog": "Partatges :",
   "notifications.column_settings.show": "Mostrar dins la colomna",
   "notifications.column_settings.sound": "Emetre un son",
@@ -125,7 +125,7 @@
   "onboarding.page_one.handle": "Sètz sus {domain}, doncas vòstre identificant complet es {handle}",
   "onboarding.page_one.welcome": "Benvengut a Mastodon !",
   "onboarding.page_six.admin": "Vòstre administrator d’instància es {admin}.",
-  "onboarding.page_six.almost_done": "Gaireben acabat...",
+  "onboarding.page_six.almost_done": "Gaireben acabat…",
   "onboarding.page_six.appetoot": "Bon Appetoot!",
   "onboarding.page_six.apps_available": "I a d’aplicacions per mobil per iOS, Android e mai.",
   "onboarding.page_six.github": "Mastodon es un logicial liure e open-source.  Podètz senhalar de bugs, demandar de foncionalitats e contribuir al còdi sus {github}.",
@@ -152,14 +152,14 @@
   "report.target": "Senhalar {target}",
   "search.placeholder": "Recercar",
   "search_results.total": "{count, number} {count, plural, one {resultat} other {resultats}}",
-  "standalone.public_title": "A look inside...",
+  "standalone.public_title": "Una ulhada dedins…",
   "status.cannot_reblog": "Aqueste estatut pòt pas èsser partejat",
   "status.delete": "Escafar",
   "status.favourite": "Apondre als favorits",
   "status.load_more": "Cargar mai",
   "status.media_hidden": "Mèdia rescondut",
   "status.mention": "Mencionar",
-  "status.mute_conversation": "Mute conversation",
+  "status.mute_conversation": "Rescondre la conversacion",
   "status.open": "Desplegar aqueste estatut",
   "status.reblog": "Partejar",
   "status.reblogged_by": "{name} a partejat :",
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 2eb85be58..6fec85555 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -1,7 +1,7 @@
 ---
 oc:
   about:
-    about_mastodon: Mastodon es un malhum social <em>liure e open-source</em>. Una alternativa <em>decentralizada</em> a las platformas comercialas, aquò evita qu’una sola companiá monopolize vòstra comunicacion. Causissètz une servidor que vos fisatz, quina que siague vòstra causida, podètz interagir amb tot lo mond. Qual que siague pòt aver son instància Mastodon e participar al <em>malhum social</em> sens cap de problèmas.
+    about_mastodon_html: Mastodon es un malhum social <em>liure e open-source</em>. Una alternativa <em>descentralizada</em> a las plat-formas comercialas, aquò evita qu’una sola companhiá monopolize vòstra comunicacion. Causissètz un servidor que vos fisatz, quina que siasque vòstra causida, podètz interagir amb tot lo mond. Qual que siasque pòt aver son instància Mastodon e participar al <em>malhum social</em> sens cap de problèmas.
     about_this: A prepaus d’aquesta instància
     business_email: 'Corrièl professional :'
     closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància.
@@ -25,7 +25,7 @@ oc:
     following: Abonaments
     nothing_here: I a pas res aquí !
     people_followed_by: Lo mond que %{name} sèc
-    people_who_follow: Lo mond que ségon %{name}
+    people_who_follow: Lo mond que sègon %{name}
     posts: Estatuts
     remote_follow: Sègre a distància
     unfollow: Quitar de sègre
@@ -60,7 +60,7 @@ oc:
       order:
         alphabetic: Alfabetic
         most_recent: Mai recent
-        title: Order
+        title: Ordre
       perform_full_suspension: Botar en tren la suspension complèta
       profile_url: URL del perfil
       public: Public
@@ -94,7 +94,7 @@ oc:
           suspend: Suspendre
         title: Nòu blocatge domeni
       reject_media: Regetar los fichièrs mèdias
-      reject_media_hint: Lèva los fichièrs gardats localament e regeta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions
+      reject_media_hint: Lèva los fichièrs gardats localament e regèta las demandas de telecargament dins lo futur. Servís pas a res per las suspensions
       severities:
         silence: Silenci
         suspend: Suspendre
@@ -108,7 +108,7 @@ oc:
           suspend: Levar la suspension de totes los comptes d’aqueste domeni
         title: Restablir lo blocatge de domeni de %{domain}
         undo: Restablir
-      title: Bloc de domeni
+      title: Blòc de domeni
       undo: Restablir
     instances:
       account_count: Comptes coneguts
@@ -125,7 +125,7 @@ oc:
       nsfw:
         'false': Sens contengut sensible
         'true': Contengut sensible activat
-      report: 'enhalament #%{id}'
+      report: 'senhalament #%{id}'
       report_contents: Contenguts
       reported_account: Compte senhalat
       reported_by: Senhalat per
@@ -145,16 +145,41 @@ oc:
         closed_message:
           desc_html: Afichat sus las pagina d’acuèlh quand las inscripcions son tampadas.<br>Podètz utilizar de balisas HTML
           title: Messatge de barradura de las inscripcions
+        deletion:
+          desc_html: Autorizar al monde a suprimir lor compte
+          title: Possibilitat de suprimir lo compte
         open:
+          desc_html: Autorizar lo monde a se marcar
           title: Inscripcions
       site_description:
-        desc_html: Afichada jos la forma de paragrafe sus la pagina d’acuèlh e utilizada coma balisa meta.<br> Podètz utilizar de balisas HTML, coma <code>&lt;a&gt;</code> et <code>&lt;em&gt;</code>.
+        desc_html: Afichada jos la forma de paragrafe sus la pagina d’acuèlh e utilizada coma balisa meta.<br> Podètz utilizar de balisas HTML, coma <code>&lt;a&gt;</code> e <code>&lt;em&gt;</code>.
         title: Descripcion del site
       site_description_extended:
         desc_html: Afichada sus la pagina d’informacion complementària del site<br>Podètz utilizar de balisas HTML
         title: Descripcion espandida del site
+      site_terms:
+        desc_html: Afichada sus la pagina de las condicions d’utilizacion<br>Podètz utilizar de balisas HTML
+        title: Politica de confidencialitat del site
       site_title: Títol del site
+      timeline_preview:
+        desc_html: Mostrar lo flux public sus la pagina d’acuèlh
+        title: Apercebut flux public
       title: Paramètres del site
+    statuses:
+      back_to_account: Tornar a la pagina Compte
+      batch:
+        delete: Suprimir
+        nsfw_off: NSFW OFF
+        nsfw_on: NSFW ON
+      execute: Lançar
+      failed_to_execute: Fracàs
+      media:
+        hide: Amagar mèdia
+        show: Mostrar mèdia
+        title: Mèdia
+      no_media: Cap mèdia
+      with_media: Amb mèdia
+      title: Estatuts del compteAccount statuses
     subscriptions:
       callback_url: URL de rapèl
       confirmed: Confirmat
@@ -261,11 +286,11 @@ oc:
       x_seconds: Fa %{count} segondas
   deletes:
     bad_password_msg: Ben ensajat pirata ! Senhal incorrècte
-    confirm_password: Picatz vòstre senhal acutal per verificar vòstra identitat
+    confirm_password: Picatz vòstre senhal actual per verificar vòstra identitat
     description_html: Aquò suprimirà <strong>definitivament e sens possibilitat de retorn</strong> lo contengut de vòstre compte e lo desactivarà. Lo nom d’utilizaire serà gardat per evitar una futura impostura.
-    proceed: Delete account
-    success_msg: Your account was successfully deleted
-    warning_html: La supression del contengut d’aquesta instància es sola assegurada. Lo contengut fòrça partejat daissarà problablament de traças. Los servidors fòra-linha e los que vos sègon pas mai auràn pas la mesa a jorn de lor basa de donada.
+    proceed: Suprimir lo compte
+    success_msg: Compte ben suprimit
+    warning_html: La supression del contengut d’aquesta instància es sola assegurada. Lo contengut fòrça partejat daissarà probablament de traças. Los servidors fòra-linha e los que vos sègon pas mai auràn pas la mesa a jorn de lor basa de donada.
     warning_title: Disponibilitat del contengut difusat
   errors:
     '404': La pagina que recercatz existís pas.
@@ -282,7 +307,7 @@ oc:
     storage: Mèdias gardats
   followers:
     domain: Domeni
-    explanation_html: Se volètz vos assegurar de la confidencialitat de vòstres estatuts, vos cal saber qual sèc vòstre compte. <strong>Vòstres estatuts privats son enviats a totas las instàncias qu’an de mond que vos sègon.</strong>. Benlèu que volètz repassar vòstra lista e tirar los seguidors s’avètz de dubtes tocant las politica de confidencialitat de lor instàncias.
+    explanation_html: Se volètz vos assegurar de la confidencialitat de vòstres estatuts, vos cal saber qual sèc vòstre compte. <strong>Vòstres estatuts privats son enviats a totas las instàncias qu’an de mond que vos sègon.</strong>. Benlèu que volètz repassar vòstra lista e tirar los seguidors s’avètz de dobtes tocant las politica de confidencialitat de lor instàncias.
     followers_count: Nombre de seguidors
     lock_link: Clavar vòstre compte
     purge: Tirar dels seguidors
@@ -307,7 +332,7 @@ oc:
       following: Lista de mond que seguètz
       muting: Lista de mond que volètz pas legir
     upload: Importar
-  landing_strip_html: "<strong>%{name}</strong> es un utilizaire de %{link_to_root_path}. Podètz lo/la sègre o interagir amb el o ela s’avètz un compte ont que siasgue sul fediverse."
+  landing_strip_html: "<strong>%{name}</strong> es un utilizaire de %{link_to_root_path}. Podètz lo/la sègre o interagir amb el o ela s’avètz un compte ont que siasque sul fediverse."
   landing_strip_signup_html: S’es pas lo cas, podètz <a href="%{sign_up_path}">vos marcar aquí</a>.
   media_attachments:
     validations:
@@ -347,6 +372,45 @@ oc:
     missing_resource: URL de redireccion pas trobada
     proceed: Contunhatz per sègre
     prompt: 'Sètz per sègre :'
+  sessions:
+    activity: Darrièra activitat
+    browser: Navigator
+    browsers:
+      alipay: Alipay
+      blackberry: Blackberry
+      chrome: Chrome
+      edge: Microsoft Edge
+      firefox: Firefox
+      generic: Navigator desconegut
+      ie: Internet Explorer
+      micro_messenger: MicroMessenger
+      nokia: Nokia S40 Ovi Browser
+      opera: Opera
+      phantom_js: PhantomJS
+      qq: QQ Browser
+      safari: Safari
+      uc_browser: UCBrowser
+      weibo: Weibo
+    current_session: Session en cors
+    description: "%{browser} sus %{platform}"
+    explanation: Aquí los navigators connectats a vòstre compte Mastodon.
+    ip: IP
+    platforms:
+      adobe_air: Adobe Air
+      android: Android
+      blackberry: Blackberry
+      chrome_os: ChromeOS
+      firefox_os: Firefox OS
+      ios: iOS
+      linux: Linux
+      mac: Mac
+      other: plataforma desconeguda
+      windows: Windows
+      windows_mobile: Windows Mobile
+      windows_phone: Windows Phone
+    revoke: Revocar
+    revoke_success: Session ben revocada
+    title: Sessions
   settings:
     authorized_apps: Aplicacions autorizadas
     back: Tornar a Mastodon
@@ -354,7 +418,7 @@ oc:
     edit_profile: Modificar lo perfil
     export: Export donadas
     followers: Seguidors autorizats
-    import: Import
+    import: Importar
     preferences: Preferéncias
     settings: Paramètres
     two_factor_authentication: Autentificacion en dos temps
@@ -373,6 +437,76 @@ oc:
     click_to_show: Clicatz per afichar
     reblogged: a partejat
     sensitive_content: Contengut sensible
+  terms:
+    body_html: |
+      <h2>Politica de confidencialitat</h2>
+
+      <h3 id="collect">Quinas informacions collectem ?</h3>
+
+      <p>Collectem informacions sus vos quand vos marcatz sus nòstre site e juntem las donadas quand participatz a nòstre forum ne legissent, escrivent e notant lo contengut partejat aquí.</p>
+
+      <p>Pendent l’inscripcion podèm vos demandar vòstre nom e adreça de corrièl. Podètz çaquelà visitar nòstre site sens vos marcar. Verificarem vòstra adreça amb un messatge donant un ligam unic. Se clicatz sul ligam sauprem qu’avètz lo contraròtle de l’adreça.</p>
+
+      <p>Quand sètz marcat e que publicatz quicòm, enregistrem l’adreça IP d’origina. Podèm tanben salvagardar los jornals del servidor que tenon l’adreça IP de totas las demandas fachas al nòstre servidor.</p>
+
+      <h3 id="use">Qué fasèm de vòstras informacions ?</h3>
+
+      <p>Totas las informacions que collectem de vos pòdon servir dins los cases seguents :</p>
+
+      <ul>
+        <li>Per personalizar vòstre experiéncia &mdash; vòstras informacions nos ajudaràn a respondre melhor a vòstres besonhs individuals.</li>
+        <li>Per melhorar nòstre site &mdash; s’eforcem de longa a melhorar çò que nòstre site ofrís segon las informacions e los comentaris que recebèm de vòstra part.</li>
+        <li>Per melhorar nòstre servici client &mdash; vòstras informacions nos ajudan per respondre amb mai eficacitat a vòstras demandas d’assisténcia.</li>
+        <li>Per enviar periodicament de corrièls &mdash; Podèm utilizar l’adreça qu’avètz donada per vos enviar d’informacions e de notificacions que demandatz tocant de cambiaments dins los subjèctes del forum o en responsa a vòstre nom d’utilizaire, en responsa a una demanda, e/o tota autra question.</li>
+      </ul>
+
+      <h3 id="protect">Cossí protegèm vòstras informacions ?</h3>
+
+      <p>Apliquem tota una mena de mesuras de seguretat per manténer la fisança de vòstras informacions personalas quand las picatz, mandatz, o i accedètz.</p>
+
+      <h3 id="data-retention">Quala es vòstra politica de conservacion de donadas ?</h3>
+
+      <p>Farem esfòrces per :</p>
+
+      <ul>
+        <li>Gardar los jornals del servidor que contenon las adreças IP de totas las demandas al servidor pas mai de 90 jorns.</li>
+        <li>Gardar las adreças IP ligadas als utilizaires e lors publicacions pas mai de 5 ans.</li>
+      </ul>
+
+      <h3 id="cookies">Empleguem de cookies ?</h3>
+
+      <p>Òc-ben. Los cookies son de pichons fichièrs qu’un site o sos forneires de servicis plaçan dins lo disc dur de vòstre ordenador via lo navigator Web (Se los acceptatz). Aqueles cookies permeton al site de reconéisser vòstre navigator e se tenètz un compte enregistrat de l’associar a vòstre compte.</p>
+
+      <p>Empleguem de cookies per comprendre e enregistrar vòstras preferéncias per vòstras visitas venentas, per recampar de donadas sul trafic del site e las interaccions per fin que posquem ofrir una melhora experiéncia del site e de las aisinas pel futur. Pòt arribar que contractèssem amb de forneires de servicis tèrces per nos ajudar a comprendre melhor nòstres visitors.  Aqueles forneires an pas lo drech que d’utilizar las donadas collectadas per nos ajudar a menar e melhorar nòstre afar.</p>
+
+      <h3 id="disclose">Divulguem d’informacions a de partits exteriors ?</h3>
+
+      <p>Vendèm pas, comercem o qualque transferiment que siasque a de partits exteriors vòstras informacions personalas identificablas. Aquò inclutz pas los tèrces partits de confisança que nos assiston a menar nòstre site, menar nòstre afar o vos servir, baste que son d’acòrd per gardar aquelas informacions confidencialas. Pòt tanben arribar que liberèssem vòstras informacions quand cresèm qu’es apropriat d’o far per se sometre a la lei, per refortir nòstras politicas, o per protegir los dreches, proprietats o seguritat de qualqu’un o de nosautres. Pasmens es possible que mandèssem d’informacions non-personalas e identificablas de nòstres visitors a d’autres partits per d’utilizacion en marketing, publicitat o un emplec mai.</p>
+
+      <h3 id="third-party">Ligams de tèrces partits</h3>
+
+      <p>Pòt arribar, a nòstra discrecion, qu’incluguèssem o ofriguèssem  de produches o servicis de tèrces partits sus nòstre site. Aqueles sites tèrces an de politicas de confidencialitats separadas e independentas. En consequéncia avèm pas cap de responsabilitat pel contengut e las activitats d’aqueles sites ligats. Pasmens cerquem de protegir l’integritat de nòstre site e aculhèm los comentaris tocant aqueles sites.</p>
+
+      <h3 id="coppa">Conformitat amb la lei de proteccion de la confidencialitat dels mainatges</h3>
+
+      <p>Nòstre site, nòstres produches e servicis son totes destinats a de monde d’almens 13 ans. S’aqueste servidor se tròba en los Estats Units per acontentar las exigéncias del COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) utilizetz pas aqueste site.</p>
+
+      <h3 id="online">Politica de confidencialitat en linha solament</h3>
+
+      <p>Aquesta politica de confidencialitat s’aplica pas qu’a las informacions collectadas via nòstre site e non pas a las informacions collectadas fòra linha.</p>
+
+      <h3 id="consent">Vòstre consentiment</h3>
+
+      <p>N’utilizant nòstre site, consentètz a nòstra politica de confidencialitat.</p>
+
+      <h3 id="changes">Cambiament dins nòstra politica de confidencialitat</h3>
+
+      <p>Se decidèm de cambiar nòstra politica de confidencialitat, publicarem los cambiaments sus aquesta pagina.</p>
+
+      <p>Aqueste document es jos licéncia CC-BY-SA. Darrièra mesa a jorn lo 31 de mai de 2013</p>
+
+      <p>Prima adaptacion de la <a href="https://github.com/discourse/discourse">politica de confidencialitat de Discourse</a>.</p>
+    title: "Condicions d’utilizacion e politica de confidencialitat de %{instance}"
   time:
     formats:
       default: Lo %d %b de %Y a %Ho%M
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index a8f259057..fe8ed7484 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -27,6 +27,7 @@ oc:
         data: Data
         display_name: Escais
         email: Corrièl
+        filtered_languages: Lengas filtradas
         header: Bandièra
         locale: Lenga
         locked: Far venir lo compte privat
@@ -37,7 +38,11 @@ oc:
         setting_auto_play_gif: Lectura automatica dels GIFS animats
         setting_boost_modal: Afichar una fenèstra de confirmacion abans de partejar un estatut
         setting_default_privacy: Confidencialitat de las publicacions
+        setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
         setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut
+        setting_system_font_ui: Utilizar la policia Font del sisèma
+        setting_unfollow_modal: Afichar una confirmacion abans de quitar de sègre qualqu’un
+        setting_noindex: Èsser pas indexat pels motors de recèrca
         severity: Severitat
         type: Tip d’impòrt
         username: Nom d’utilizaire

From 3757546f1bd06737af7899d55f4686678e8ff03e Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 23 Jul 2017 14:03:35 +0200
Subject: [PATCH 322/382] fix(columns_area): Show correct title for preview
 columns (#4310)

---
 .../mastodon/features/ui/components/columns_area.js  |  7 +++++--
 .../mastodon/features/ui/components/tabs_bar.js      | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 515c377b9..7de66ce3f 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { injectIntl } from 'react-intl';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
@@ -21,6 +22,7 @@ const componentMap = {
   'FAVOURITES': FavouritedStatuses,
 };
 
+@injectIntl
 export default class ColumnsArea extends ImmutablePureComponent {
 
   static contextTypes = {
@@ -28,6 +30,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
   };
 
   static propTypes = {
+    intl: PropTypes.object.isRequired,
     columns: ImmutablePropTypes.list.isRequired,
     singleColumn: PropTypes.bool,
     children: PropTypes.node,
@@ -64,8 +67,8 @@ export default class ColumnsArea extends ImmutablePureComponent {
 
   renderView = (link, index) => {
     const columnIndex = getIndex(this.context.router.history.location.pathname);
-    const title = link.props.children[1] && React.cloneElement(link.props.children[1]);
-    const icon = (link.props.children[0] || link.props.children).props.className.split(' ')[2].split('-')[1];
+    const title = this.props.intl.formatMessage({ id: link.props['data-preview-title-id'] });
+    const icon = link.props['data-preview-icon'];
 
     const view = (index === columnIndex) ?
       React.cloneElement(this.props.children) :
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index b4153ff45..baec86d0d 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -3,14 +3,14 @@ import NavLink from 'react-router-dom/NavLink';
 import { FormattedMessage } from 'react-intl';
 
 export const links = [
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
 
-  <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
-  <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
+  <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
+  <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
 
-  <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='tabs_bar.federated_timeline' data-preview-icon='asterisk' ><i className='fa fa-fw fa-asterisk' /></NavLink>,
 ];
 
 export function getIndex (path) {

From 6803935c4d97e3003552a116f186c14d28f453f5 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Sun, 23 Jul 2017 14:50:10 +0200
Subject: [PATCH 323/382] i18n: Update Polish translation (#4311)

---
 app/javascript/mastodon/locales/pl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 8bc22f2df..a6611e343 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -146,7 +146,7 @@
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
-  "report.heading": "New report",
+  "report.heading": "Nowe zgłoszenie",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",

From ff26b7233363b6d5b01d7b95cd6c6ba26fb36876 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 23 Jul 2017 14:50:26 +0200
Subject: [PATCH 324/382] fix(getting_started): Scroll on mobile (#4312)

---
 app/javascript/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index d9e5a9bad..1f70c6563 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1856,7 +1856,7 @@
 
 .getting-started__wrapper {
   position: relative;
-  flex: 0 0 auto;
+  overflow-y: scroll;
 }
 
 .getting-started__footer {

From 9244f6b6280ccc6645478216b1b2fdd1416572df Mon Sep 17 00:00:00 2001
From: Sylvhem <Sylvhem@users.noreply.github.com>
Date: Sun, 23 Jul 2017 16:57:32 +0200
Subject: [PATCH 325/382] Change "Content Warning" to "Write your warning here"
 (#4313)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change the placeholder used in the content warning field from "Content Warning" to "Write your warning here". This change should made it easier to understand what the field is about.

Change le message de substitution utilisé dans le champ d’avertissement de « Avertissement » à « Écrivez ici votre avertissement ». Ce changement devrait rendre plus évidente la fonction du champ.
---
 app/javascript/mastodon/locales/en.json | 2 +-
 app/javascript/mastodon/locales/fr.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 14d5c7aa0..0a318f6fa 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -45,7 +45,7 @@
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Mark media as sensitive",
   "compose_form.spoiler": "Hide text behind warning",
-  "compose_form.spoiler_placeholder": "Content warning",
+  "compose_form.spoiler_placeholder": "Write your warning here",
   "confirmation_modal.cancel": "Cancel",
   "confirmations.block.confirm": "Block",
   "confirmations.block.message": "Are you sure you want to block {name}?",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 436120860..b7e9b3390 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -45,7 +45,7 @@
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Marquer le média comme délicat",
   "compose_form.spoiler": "Masquer le texte derrière un avertissement",
-  "compose_form.spoiler_placeholder": "Avertissement",
+  "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
   "confirmation_modal.cancel": "Annuler",
   "confirmations.block.confirm": "Bloquer",
   "confirmations.block.message": "Confirmez vous le blocage de {name} ?",

From 3a3b556065d34a52843b427fb211d8649f01fe89 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 20:28:06 +0200
Subject: [PATCH 326/382] Improve noscript message and style (#4315)

---
 app/javascript/styles/components.scss | 20 +++++++++++++++++---
 app/views/home/index.html.haml        |  3 ++-
 config/locales/en.yml                 |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 1f70c6563..e6ccace9c 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3723,10 +3723,24 @@ button.icon-button.active i.fa-retweet {
 noscript {
   text-align: center;
 
-  div {
-    font-size: 20px;
-    margin: 20px 0;
+  img {
+    width: 200px;
+    opacity: 0.5;
+    animation: flicker 4s infinite;
   }
+
+  div {
+    font-size: 14px;
+    margin: 30px auto;
+    color: $ui-secondary-color;
+    max-width: 400px;
+  }
+}
+
+@keyframes flicker {
+  0% { opacity: 1; }
+  30% { opacity: 0.75; }
+  100% { opacity: 1; }
 }
 
 @media screen and (max-width: 1024px) and (max-height: 400px) {
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index a2ea0d948..75fe59f00 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,6 +6,7 @@
 
 .app-holder#mastodon{ data: { props: Oj.dump(default_props) } }
   %noscript
-    = image_tag asset_pack_path('logo.svg')
+    = image_tag asset_pack_path('logo.svg'), alt: 'Mastodon'
+
     %div
       = t('errors.noscript')
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 92d369b37..cc2ea0542 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -272,7 +272,7 @@ en:
       content: Security verification failed. Are you blocking cookies?
       title: Security verification failed
     '429': Throttled
-    noscript: To use Mastodon, please enable JavaScript.
+    noscript: To use the Mastodon web application, please enable JavaScript. Alternatively, find a native app for Mastodon for your platform.
   exports:
     blocks: You block
     csv: CSV

From 1e0c7a0afc0f3635c9b5f43f53c386aea9e1f650 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 20:28:18 +0200
Subject: [PATCH 327/382] Add loading indicator animation (#4316)

---
 .../mastodon/components/loading_indicator.js  |  1 +
 app/javascript/styles/components.scss         | 71 +++++++++++++++++--
 2 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/components/loading_indicator.js b/app/javascript/mastodon/components/loading_indicator.js
index c09244834..d6a5adb6f 100644
--- a/app/javascript/mastodon/components/loading_indicator.js
+++ b/app/javascript/mastodon/components/loading_indicator.js
@@ -3,6 +3,7 @@ import { FormattedMessage } from 'react-intl';
 
 const LoadingIndicator = () => (
   <div className='loading-indicator'>
+    <div className='loading-indicator__figure' />
     <FormattedMessage id='loading_indicator.label' defaultMessage='Loading...' />
   </div>
 );
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index e6ccace9c..e95be3f19 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -2213,11 +2213,72 @@ button.icon-button.active i.fa-retweet {
 }
 
 .loading-indicator {
-  color: $ui-secondary-color;
-  font-size: 16px;
-  font-weight: 500;
-  padding-top: 120px;
-  text-align: center;
+  color: lighten($ui-base-color, 26%);
+  font-size: 12px;
+  font-weight: 400;
+  text-transform: uppercase;
+  overflow: visible;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+
+  span {
+    display: block;
+    float: left;
+    margin-left: 50%;
+    transform: translateX(-50%);
+    margin: 82px 0 0 50%;
+    white-space: nowrap;
+    animation: loader-label 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
+  }
+}
+
+.loading-indicator__figure {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 0;
+  height: 0;
+  box-sizing: border-box;
+  border: 0 solid lighten($ui-base-color, 26%);
+  border-radius: 50%;
+  animation: loader-figure 1.15s infinite cubic-bezier(0.215, 0.610, 0.355, 1.000);
+}
+
+@keyframes loader-figure {
+  0% {
+    width: 0;
+    height: 0;
+    background-color: lighten($ui-base-color, 26%);
+  }
+
+  29% {
+    background-color: lighten($ui-base-color, 26%);
+  }
+
+  30% {
+    width: 42px;
+    height: 42px;
+    background-color: transparent;
+    border-width: 21px;
+    opacity: 1;
+  }
+
+  100% {
+    width: 42px;
+    height: 42px;
+    border-width: 0;
+    opacity: 0;
+    background-color: transparent;
+  }
+}
+
+@keyframes loader-label {
+  0% { opacity: 0.25; }
+  30% { opacity: 1; }
+  100% { opacity: 0.25; }
 }
 
 .video-error-cover {

From ed4c754fff8aa77bfe311742bfd58c97521d15e0 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Jul 2017 20:28:31 +0200
Subject: [PATCH 328/382] Add background to media modal (#4317)

---
 app/javascript/styles/components.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index e95be3f19..4523c9156 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -3057,6 +3057,10 @@ button.icon-button.active i.fa-retweet {
   }
 }
 
+.media-modal__content {
+  background: $base-overlay-background;
+}
+
 .media-modal__close {
   position: absolute;
   right: 4px;

From 43cad817e8d7d2fb1dd9369f4c4603185dc79fe3 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 06:04:25 +0900
Subject: [PATCH 329/382] Update Japanese translations for #4313 and #4315
 (#4323)

* Update Japanese translations for #4313

* Update Japanese translations for #4315
---
 app/javascript/mastodon/locales/ja.json | 2 +-
 config/locales/ja.yml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index bba4b7e55..bd2455d81 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -45,7 +45,7 @@
   "compose_form.publish_loud": "{publish}！",
   "compose_form.sensitive": "メディアを閲覧注意としてマークする",
   "compose_form.spoiler": "テキストを隠す",
-  "compose_form.spoiler_placeholder": "警告",
+  "compose_form.spoiler_placeholder": "ここに警告を書いてください",
   "confirmation_modal.cancel": "キャンセル",
   "confirmations.block.confirm": "ブロック",
   "confirmations.block.message": "本当に{name}をブロックしますか？",
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index ce20f37c5..98ecd37f8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -272,7 +272,7 @@ ja:
       content: セキュリティ認証に失敗しました。Cookieをブロックしていませんか？
       title: セキュリティ認証に失敗
     '429': リクエストの制限に達しました。
-    noscript: Mastodonを利用する場合はJavaScriptを有効にしてください。
+    noscript: Mastodonのウェブアプリケーションを利用する場合はJavaScriptを有効にしてください。またはあなたのプラットフォーム向けのMastodonネイティブアプリを探すことができます。
   exports:
     blocks: ブロック
     csv: CSV

From 63a2566007351bc5f8772518b0664343c9095bb6 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 06:04:44 +0900
Subject: [PATCH 330/382] Fix manifest description (regression from #4122)
 (#4324)

---
 app/views/manifests/show.json.rabl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/manifests/show.json.rabl b/app/views/manifests/show.json.rabl
index 0aa1728e7..ee0a70324 100644
--- a/app/views/manifests/show.json.rabl
+++ b/app/views/manifests/show.json.rabl
@@ -2,7 +2,7 @@ object false
 
 node(:name)             { Setting.site_title }
 node(:short_name)       { Setting.site_title }
-node(:description)      { strip_tags(Setting.site_description.presence || I18n.t('about.about_mastodon')) }
+node(:description)      { strip_tags(Setting.site_description.presence || I18n.t('about.about_mastodon_html')) }
 node(:icons)            { [{ src: '/android-chrome-192x192.png', sizes: '192x192', type: 'image/png' }] }
 node(:theme_color)      { '#282c37' }
 node(:background_color) { '#d9e1e8' }

From 9075c90c463d02b789d8dcee69115d11ca203ce3 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sun, 23 Jul 2017 23:27:23 +0200
Subject: [PATCH 331/382] feat: Enable push subscription for mobile devices by
 default (#4321)

---
 .../api/web/push_subscriptions_controller.rb  | 23 ++++++++++++----
 .../mastodon/web_push_subscription.js         |  2 +-
 .../web/push_subscriptions_controller_spec.rb | 26 +++++++------------
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index 8425db7b4..d66237feb 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -6,8 +6,8 @@ class Api::Web::PushSubscriptionsController < Api::BaseController
   before_action :require_user!
 
   def create
-    params.require(:data).require(:endpoint)
-    params.require(:data).require(:keys).require([:auth, :p256dh])
+    params.require(:subscription).require(:endpoint)
+    params.require(:subscription).require(:keys).require([:auth, :p256dh])
 
     active_session = current_session
 
@@ -16,10 +16,23 @@ class Api::Web::PushSubscriptionsController < Api::BaseController
       active_session.update!(web_push_subscription: nil)
     end
 
+    # Mobile devices do not support regular notifications, so we enable push notifications by default
+    alerts_enabled = active_session.detection.device.mobile? || active_session.detection.device.tablet?
+
+    data = {
+      alerts: {
+        follow: alerts_enabled,
+        favourite: alerts_enabled,
+        reblog: alerts_enabled,
+        mention: alerts_enabled,
+      },
+    }
+
     web_subscription = ::Web::PushSubscription.create!(
-      endpoint: params[:data][:endpoint],
-      key_p256dh: params[:data][:keys][:p256dh],
-      key_auth: params[:data][:keys][:auth]
+      endpoint: params[:subscription][:endpoint],
+      key_p256dh: params[:subscription][:keys][:p256dh],
+      key_auth: params[:subscription][:keys][:auth],
+      data: data
     )
 
     active_session.update!(web_push_subscription: web_subscription)
diff --git a/app/javascript/mastodon/web_push_subscription.js b/app/javascript/mastodon/web_push_subscription.js
index 391d3bcec..96ac63b52 100644
--- a/app/javascript/mastodon/web_push_subscription.js
+++ b/app/javascript/mastodon/web_push_subscription.js
@@ -37,7 +37,7 @@ const unsubscribe = ({ registration, subscription }) =>
 
 const sendSubscriptionToBackend = (subscription) =>
   axios.post('/api/web/push_subscriptions', {
-    data: subscription,
+    subscription,
   }).then(response => response.data);
 
 // Last one checks for payload support: https://web-push-book.gauntface.com/chapter-06/01-non-standards-browsers/#no-payload
diff --git a/spec/controllers/api/web/push_subscriptions_controller_spec.rb b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
index 871176a07..7e83b801d 100644
--- a/spec/controllers/api/web/push_subscriptions_controller_spec.rb
+++ b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
@@ -9,7 +9,7 @@ describe Api::Web::PushSubscriptionsController do
 
   let(:create_payload) do
     {
-      data: {
+      subscription: {
         endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
         keys: {
           p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
@@ -36,25 +36,17 @@ describe Api::Web::PushSubscriptionsController do
     it 'saves push subscriptions' do
       sign_in(user)
 
-      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
+      stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
 
       post :create, format: :json, params: create_payload
 
       user.reload
 
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint])
+      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
 
-      expect(push_subscription['endpoint']).to eq(create_payload[:data][:endpoint])
-      expect(push_subscription['key_p256dh']).to eq(create_payload[:data][:keys][:p256dh])
-      expect(push_subscription['key_auth']).to eq(create_payload[:data][:keys][:auth])
-    end
-
-    it 'sends welcome notification' do
-      sign_in(user)
-
-      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
-
-      post :create, format: :json, params: create_payload
+      expect(push_subscription['endpoint']).to eq(create_payload[:subscription][:endpoint])
+      expect(push_subscription['key_p256dh']).to eq(create_payload[:subscription][:keys][:p256dh])
+      expect(push_subscription['key_auth']).to eq(create_payload[:subscription][:keys][:auth])
     end
   end
 
@@ -62,15 +54,15 @@ describe Api::Web::PushSubscriptionsController do
     it 'changes alert settings' do
       sign_in(user)
 
-      stub_request(:post, create_payload[:data][:endpoint]).to_return(status: 200)
+      stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
 
       post :create, format: :json, params: create_payload
 
-      alerts_payload[:id] = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint]).id
+      alerts_payload[:id] = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint]).id
 
       put :update, format: :json, params: alerts_payload
 
-      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:data][:endpoint])
+      push_subscription = Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
 
       expect(push_subscription.data['follow']).to eq(alerts_payload[:data][:follow])
       expect(push_subscription.data['favourite']).to eq(alerts_payload[:data][:favourite])

From 45af29912f1f1817598ee4be471b75c7b7e08ccd Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 06:32:53 +0900
Subject: [PATCH 332/382] Change about_mastodon to about_mastodon_html for all
 locales (#4326)

---
 config/locales/ar.yml    | 2 +-
 config/locales/bg.yml    | 2 +-
 config/locales/ca.yml    | 2 +-
 config/locales/de.yml    | 2 +-
 config/locales/eo.yml    | 2 +-
 config/locales/es.yml    | 2 +-
 config/locales/fa.yml    | 2 +-
 config/locales/fi.yml    | 2 +-
 config/locales/he.yml    | 2 +-
 config/locales/hr.yml    | 2 +-
 config/locales/hu.yml    | 2 +-
 config/locales/id.yml    | 2 +-
 config/locales/io.yml    | 2 +-
 config/locales/it.yml    | 2 +-
 config/locales/ko.yml    | 2 +-
 config/locales/nl.yml    | 2 +-
 config/locales/no.yml    | 2 +-
 config/locales/pt-BR.yml | 2 +-
 config/locales/pt.yml    | 2 +-
 config/locales/ru.yml    | 2 +-
 config/locales/th.yml    | 2 +-
 config/locales/tr.yml    | 2 +-
 config/locales/uk.yml    | 2 +-
 config/locales/zh-CN.yml | 2 +-
 config/locales/zh-HK.yml | 2 +-
 config/locales/zh-TW.yml | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index d395dc9c3..81e685bf6 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1,7 +1,7 @@
 ---
 ar:
   about:
-    about_mastodon: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
+    about_mastodon_html: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
     about_this: عن مثيل الخادوم هذا
     business_email: 'البريد الإلكتروني المهني :'
     closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا.
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 042d609b0..ab024c741 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1,7 +1,7 @@
 ---
 bg:
   about:
-    about_mastodon: Mastodon е <em>безплатен</em> сървър с <em>отворен код</em> за социални мрежи. Като <em>децентрализирана</em> алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в <em>социалната мрежа</em>.
+    about_mastodon_html: Mastodon е <em>безплатен</em> сървър с <em>отворен код</em> за социални мрежи. Като <em>децентрализирана</em> алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в <em>социалната мрежа</em>.
     about_this: За тази инстанция
     business_email: 'Служебен e-mail:'
     closed_registrations: В момента регистрациите за тази инстанция са затворени.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0ba893a12..4109ed5ce 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1,7 +1,7 @@
 ---
 ca:
   about:
-    about_mastodon: Mastodon és un servidor de xarxa social <em>lliure i de codi obert</em>. Una alternativa <em>descentralitzada</em> a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la <em>xarxa social</em>.
+    about_mastodon_html: Mastodon és un servidor de xarxa social <em>lliure i de codi obert</em>. Una alternativa <em>descentralitzada</em> a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la <em>xarxa social</em>.
     about_this: Sobre aquesta instància
     business_email: 'Adreça de contacte:'
     closed_registrations: Els registres estan actualment tancats en aquesta instància.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index b084aca31..4e081eb27 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,7 +1,7 @@
 ---
 de:
   about:
-    about_mastodon: Mastodon ist ein <em>freier, quelloffener</em> sozialer Netzwerkserver. Als <em>dezentralisierte</em> Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am <em>sozialen Netzwerk</em> teilnehmen.
+    about_mastodon_html: Mastodon ist ein <em>freier, quelloffener</em> sozialer Netzwerkserver. Als <em>dezentralisierte</em> Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am <em>sozialen Netzwerk</em> teilnehmen.
     about_this: Über diese Instanz
     business_email: 'Geschäftliche E-Mail:'
     closed_registrations: Die Registrierung ist auf dieser Instanz momentan geschlossen.
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index d47a5db0e..2b95d4565 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -1,7 +1,7 @@
 ---
 eo:
   about:
-    about_mastodon: Mastodon estas <em>senpaga, malfermitkoda</em> socia reto. Ĝi estas <em>sencentra</em> alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la <em>socia reto</em> tute glate.
+    about_mastodon_html: Mastodon estas <em>senpaga, malfermitkoda</em> socia reto. Ĝi estas <em>sencentra</em> alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la <em>socia reto</em> tute glate.
     about_this: Pri tiu aperaĵo
     business_email: 'Profesia retpoŝt-adreso:'
     contact: Kontakti
diff --git a/config/locales/es.yml b/config/locales/es.yml
index c051c9a08..d845a18c2 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,7 +1,7 @@
 ---
 es:
   about:
-    about_mastodon: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
+    about_mastodon_html: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
     about_this: Acerca de esta instancia
     business_email: 'Correo de negocios:'
     closed_registrations: Los registros están actualmente cerrados en esta instancia.
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 218d859bb..5fb215262 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1,7 +1,7 @@
 ---
 fa:
   about:
-    about_mastodon: ماستدون (Mastodon) یک شبکهٔ اجتماعی <em>آزاد و کدباز</em> است. یک جایگزین <em>غیرمتمرکز</em> برای شبکه‌های تجاری، که نمی‌گذارد ارتباط‌های شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید &mdash; هر سروری که باشد، همچنان می‌توانید با سرورهای دیگر ارتباط داشته باشید. هر کسی می‌تواند سرور ماستدون خود را راه بیندازد و در <em>شبکهٔ اجتماعی</em> سهیم شود.
+    about_mastodon_html: ماستدون (Mastodon) یک شبکهٔ اجتماعی <em>آزاد و کدباز</em> است. یک جایگزین <em>غیرمتمرکز</em> برای شبکه‌های تجاری، که نمی‌گذارد ارتباط‌های شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید &mdash; هر سروری که باشد، همچنان می‌توانید با سرورهای دیگر ارتباط داشته باشید. هر کسی می‌تواند سرور ماستدون خود را راه بیندازد و در <em>شبکهٔ اجتماعی</em> سهیم شود.
     about_this: دربارهٔ این سرور
     business_email: 'ایمیل کاری:'
     closed_registrations: امکان ثبت نام روی این سرور هم‌اینک فعال نیست.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a2488530f..382c60cc2 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1,7 +1,7 @@
 ---
 fi:
   about:
-    about_mastodon: Mastodon on <em>ilmainen, avoimeen lähdekoodiin perustuva</em> sosiaalinen verkosto. <em>Hajautettu</em> vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat &mdash; minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa <em>sosiaaliseen verkkoon</em> saumattomasti.
+    about_mastodon_html: Mastodon on <em>ilmainen, avoimeen lähdekoodiin perustuva</em> sosiaalinen verkosto. <em>Hajautettu</em> vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat &mdash; minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa <em>sosiaaliseen verkkoon</em> saumattomasti.
     about_this: Tietoja tästä palvelimesta
     business_email: 'Business e-mail:'
     contact: Ota yhteyttä
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 251b6914e..798265e9f 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1,7 +1,7 @@
 ---
 he:
   about:
-    about_mastodon: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
+    about_mastodon_html: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
     about_this: אודות שרת זה
     business_email: 'דוא"ל עסקי:'
     closed_registrations: הרשמות סגורות לשרת זה לעת עתה.
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 8297ca629..e1d92b9b4 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1,7 +1,7 @@
 ---
 hr:
   about:
-    about_mastodon: Mastodon je <em>besplatna, open-source</em> socijalna mreža. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati &mdash; koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreži</em> bez problema.
+    about_mastodon_html: Mastodon je <em>besplatna, open-source</em> socijalna mreža. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati &mdash; koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreži</em> bez problema.
     about_this: O ovoj instanci
     business_email: 'Poslovni e-mail:'
     closed_registrations: Registracije na ovoj instanci su trenutno zatvorene.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 24996e39d..5b52b256b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1,7 +1,7 @@
 ---
 hu:
   about:
-    about_mastodon: Mastodon egy <em>szabad, nyílt forráskódú</em> szociális hálózati kiszolgálo. Egy <em>központosítatlan</em> alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a <em>szociális hálózatban</em>.
+    about_mastodon_html: Mastodon egy <em>szabad, nyílt forráskódú</em> szociális hálózati kiszolgálo. Egy <em>központosítatlan</em> alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a <em>szociális hálózatban</em>.
     get_started: Első lépések
     source_code: Forráskód
     terms: Feltételek
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 7bda52c78..d0e708749 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1,7 +1,7 @@
 ---
 id:
   about:
-    about_mastodon: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
+    about_mastodon_html: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
     about_this: Tentang server ini
     business_email: 'E-mail bisnis:'
     closed_registrations: Pendaftaran untuk server ini sedang ditutup.
diff --git a/config/locales/io.yml b/config/locales/io.yml
index b587d4bc6..7c074e349 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1,7 +1,7 @@
 ---
 io:
   about:
-    about_mastodon: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate.
+    about_mastodon_html: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate.
     about_this: Pri ta instaluro
     business_email: 'Profesionala retpost-adreso:'
     closed_registrations: Membresko ne nun esas posible en ta instaluro.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5c014c61d..ab15726c4 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1,7 +1,7 @@
 ---
 it:
   about:
-    about_mastodon: Mastodon è un social network <em>gratuito e open-source</em>. Un'alternativa <em>decentralizzata</em> alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi &mdash; qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del <em>social network</em>.
+    about_mastodon_html: Mastodon è un social network <em>gratuito e open-source</em>. Un'alternativa <em>decentralizzata</em> alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi &mdash; qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del <em>social network</em>.
     about_this: A proposito di questo server
     business_email: 'Email di lavoro:'
     closed_registrations: Al momento le iscrizioni a questo server sono chiuse.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c7c310cfe..6e73c7697 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1,7 +1,7 @@
 ---
 ko:
   about:
-    about_mastodon: Mastodon 은<em>자유로운 오픈 소스</em>소셜 네트워크입니다. 상용 플랫폼의 대체로써 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
+    about_mastodon_html: Mastodon 은<em>자유로운 오픈 소스</em>소셜 네트워크입니다. 상용 플랫폼의 대체로써 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
     about_this: 이 인스턴스에 대해서
     business_email: '비즈니스 메일 주소:'
     closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index dfc58f6b3..301b0296f 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1,7 +1,7 @@
 ---
 nl:
   about:
-    about_mastodon: Mastodon is een <em>vrij, gratis en open-source</em> sociaal netwerk. Een <em>gedecentraliseerd</em> alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt &mdash; welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het <em>sociale netwerk</em>.
+    about_mastodon_html: Mastodon is een <em>vrij, gratis en open-source</em> sociaal netwerk. Een <em>gedecentraliseerd</em> alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt &mdash; welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het <em>sociale netwerk</em>.
     about_this: Over deze server
     business_email: 'E-mailadres:'
     closed_registrations: Registreren op deze server is momenteel uitgeschakeld.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index cf94524d2..11bf4eef0 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1,7 +1,7 @@
 ---
 'no':
   about:
-    about_mastodon: Mastodon er et sosialt nettverk laget med <em>fri programvare</em>. Et <em>desentralisert</em> alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på &mdash; uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
+    about_mastodon_html: Mastodon er et sosialt nettverk laget med <em>fri programvare</em>. Et <em>desentralisert</em> alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på &mdash; uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
     about_this: Om denne instansen
     business_email: 'Bedriftsepost:'
     closed_registrations: Registreringer er for øyeblikket lukket på denne instansen.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 5ba763ae4..1881c6f66 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1,7 +1,7 @@
 ---
 pt-BR:
   about:
-    about_mastodon: Mastodon é um servidor de rede social <em>grátis, e open-source</em>. Uma alternativa <em>descentralizada</em> ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie &mdash; qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na <em>rede social federada</em> sem problemas.
+    about_mastodon_html: Mastodon é um servidor de rede social <em>grátis, e open-source</em>. Uma alternativa <em>descentralizada</em> ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie &mdash; qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na <em>rede social federada</em> sem problemas.
     about_this: Sobre essa instância
     business_email: 'Email comercial:'
     closed_registrations: Registros estão fechadas para essa instância.
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 346fcdda8..de6428d42 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1,7 +1,7 @@
 ---
 pt:
   about:
-    about_mastodon: Mastodon é uma rede social <em>grátis e em código aberto</em>. Uma alternativa <em>descentralizada</em> às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta <em>rede social</em>.
+    about_mastodon_html: Mastodon é uma rede social <em>grátis e em código aberto</em>. Uma alternativa <em>descentralizada</em> às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta <em>rede social</em>.
     about_this: Sobre esta instância
     business_email: 'Email comercial:'
     closed_registrations: Novos registos estão fechados nesta instância.
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5cfc2b1ca..5d307f444 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,7 +1,7 @@
 ---
 ru:
   about:
-    about_mastodon: Mastodon - это <em>свободная</em> социальная сеть с <em>открытым исходным кодом</em>. Как <em>децентрализованная</em> альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете &mdash; что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в <em>социальной сети</em> совершенно бесшовно.
+    about_mastodon_html: Mastodon - это <em>свободная</em> социальная сеть с <em>открытым исходным кодом</em>. Как <em>децентрализованная</em> альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете &mdash; что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в <em>социальной сети</em> совершенно бесшовно.
     about_this: Об этом узле
     business_email: 'Деловой e-mail:'
     closed_registrations: В данный момент регистрация на этом узле закрыта.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 17eb96110..4b929cb77 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1,7 +1,7 @@
 ---
 th:
   about:
-    about_mastodon: แมสโทดอน เป็น  <em>ดีเซ็นทรัลไลซ์</em><em>ฟรีโอเพ่นซอร์ส</em> โซเชี่ยวเน็ตเวริ์ค.  เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ &mdash; ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับ<em>โซเชี่ยวเน็ตเวิร์ค</em> โดยไม่มีอะไรมาขวางกั้น.
+    about_mastodon_html: แมสโทดอน เป็น  <em>ดีเซ็นทรัลไลซ์</em><em>ฟรีโอเพ่นซอร์ส</em> โซเชี่ยวเน็ตเวริ์ค.  เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ &mdash; ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับ<em>โซเชี่ยวเน็ตเวิร์ค</em> โดยไม่มีอะไรมาขวางกั้น.
     about_this: เกี่ยวกับอินซะแตนซ์นี้
     business_email: 'อีเมล์ธุรกิจ:'
     closed_registrations: อินซะแตนซ์นี้ปิดรับลงทะเบียนแล้ว.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index bb83991cd..9c03890c6 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1,7 +1,7 @@
 ---
 tr:
   about:
-    about_mastodon: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
+    about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
     about_this: Bu sunucu hakkında
     business_email: 'İş e-postası:'
     closed_registrations: Bu sunucu şu anda yeni kayıt almamaktadır.
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 129fc5bb7..48a4046df 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1,7 +1,7 @@
 ---
 uk:
   about:
-    about_mastodon: Mastodon - це <em>вільна</em> соціальна мережа з <em>відкритим вихідним кодом</em>. Вона є <em>децентралізованою</em> альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте &mdash; що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в <em>соціальній мережі</em>.
+    about_mastodon_html: Mastodon - це <em>вільна</em> соціальна мережа з <em>відкритим вихідним кодом</em>. Вона є <em>децентралізованою</em> альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте &mdash; що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в <em>соціальній мережі</em>.
     about_this: Про цю інстанцію
     business_email: 'Діловий email:'
     closed_registrations: На даний момент реєстрація на цій інстанції закрита.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 0526ec1ba..3dffc1db0 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,7 +1,7 @@
 ---
 zh-CN:
   about:
-    about_mastodon: Mastodon（长毛象）是一个<em>自由、开放源码</em>的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的<em>社交</em>交流。
+    about_mastodon_html: Mastodon（长毛象）是一个<em>自由、开放源码</em>的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的<em>社交</em>交流。
     about_this: 关于本实例
     business_email: 商业电邮︰
     closed_registrations: 这个实例目前不开放注册 _(:3」∠)_
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 06f9ab63d..916678b71 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1,7 +1,7 @@
 ---
 zh-HK:
   about:
-    about_mastodon: Mastodon（萬象）是<em>自由、開源</em>的社交網絡。服務站<em>各自獨立而互連</em>，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的<em>網絡交流</em>。
+    about_mastodon_html: Mastodon（萬象）是<em>自由、開源</em>的社交網絡。服務站<em>各自獨立而互連</em>，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的<em>網絡交流</em>。
     about_this: 關於本服務站
     business_email: 聯絡網站管理者︰
     closed_registrations: 本服務站暫時停止接受登記。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 67aa2830f..31846dac3 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1,7 +1,7 @@
 ---
 zh-TW:
   about:
-    about_mastodon: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的<em>社群網路</em>交流。
+    about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的<em>社群網路</em>交流。
     about_this: 關於本服務站
     business_email: 商務信箱︰
     closed_registrations: 本服務站暫時停止接受註冊。

From 4b4ea1f92935ee8b32ed50dc2f4f1d091f6276f2 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Sun, 23 Jul 2017 23:57:13 +0200
Subject: [PATCH 333/382] i18n: Update Polish translation (#4327)

* i18n: Update Polish translation

* i18n: Update Polish translation
---
 app/javascript/mastodon/locales/pl.json | 2 +-
 config/locales/pl.yml                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index a6611e343..109a004a6 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -45,7 +45,7 @@
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Oznacz treści jako wrażliwe",
   "compose_form.spoiler": "Ukryj tekst za ostrzeżeniem",
-  "compose_form.spoiler_placeholder": "Ostrzeżenie o zawartości",
+  "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości",
   "confirmation_modal.cancel": "Anuluj",
   "confirmations.block.confirm": "Zablokuj",
   "confirmations.block.message": "Czy na pewno chcesz zablokować {name}?",
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3e5e3810d..766eb9887 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -272,7 +272,7 @@ pl:
       content: Sprawdzanie bezpieczeństwa nie powiodło się. Czy blokujesz pliki cookie?
       title: Sprawdzanie bezpieczeństwa nie powiodło się
     '429': Uduszono
-    noscript: Aby korzystać z Mastodona, włącz JavaScript.
+    noscript: Aby korzystać z aplikacji Mastodon, włącz JavaScript. Możesz też skorzystać z natywnej aplikacji obsługującej Twoje urządzenie.
   exports:
     blocks: Blokujesz
     csv: CSV

From ef16089c6d32d8d6619fea28838b83136fe3b0fd Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 15:46:29 +0900
Subject: [PATCH 334/382] Redirect user profile page to short URL when HTML
 format (#4328)

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 072ef7984..ddb4a5b9e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -26,7 +26,7 @@ Rails.application.routes.draw do
     confirmations:      'auth/confirmations',
   }
 
-  get '/users/:username', to: redirect('/@%{username}'), constraints: lambda { |req| req.format.nil? }
+  get '/users/:username', to: redirect('/@%{username}'), constraints: lambda { |req| req.format.nil? || req.format.html? }
 
   resources :accounts, path: 'users', only: [:show], param: :username do
     resources :stream_entries, path: 'updates', only: [:show] do

From 1e665a0bf4c4ffa4ea062ee8181db507c42caa2f Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 17:43:59 +0900
Subject: [PATCH 335/382] Add space to toot paragraph in landing page (#4331)

---
 app/javascript/styles/about.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index a2642ee9f..90ad9bea9 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -595,6 +595,11 @@
       line-height: inherit;
       font-weight: inherit;
       color: $primary-text-color;
+      margin-bottom: 20px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
 
       a {
         color: $ui-secondary-color;

From d6f5dbff3ef0194ae50863d466d9a6136c85e499 Mon Sep 17 00:00:00 2001
From: masarakki <masaki182@gmail.com>
Date: Mon, 24 Jul 2017 17:51:38 +0900
Subject: [PATCH 336/382] add-dependent-package (#4330)

---
 Aptfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Aptfile b/Aptfile
index 3af0956e3..f89f74bd4 100644
--- a/Aptfile
+++ b/Aptfile
@@ -4,3 +4,4 @@ ffmpeg
 libxdamage1
 libxfixes3
 libicu-dev
+libidn11-dev

From 0ad41be0f314a9ee16cd167620e0636859349cc8 Mon Sep 17 00:00:00 2001
From: Andrew Zyabin <schas002@users.noreply.github.com>
Date: Mon, 24 Jul 2017 15:37:05 +0400
Subject: [PATCH 337/382] Update Russian translation for #4313 (#4334)

---
 app/javascript/mastodon/locales/ru.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 0d4f9a892..3075efa94 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -45,7 +45,7 @@
   "compose_form.publish_loud": "{publish}!",
   "compose_form.sensitive": "Отметить как чувствительный контент",
   "compose_form.spoiler": "Скрыть текст за предупреждением",
-  "compose_form.spoiler_placeholder": "Предупреждение о скрытом тексте",
+  "compose_form.spoiler_placeholder": "Напишите свое предупреждение здесь",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.confirm": "Заблокировать",
   "confirmations.block.message": "Вы уверены, что хотите заблокировать {name}?",

From 06d905f415f38ed8e13f6390a93a0db928dee6a7 Mon Sep 17 00:00:00 2001
From: sdukhovni <dukhovni@mit.edu>
Date: Mon, 24 Jul 2017 22:26:55 +1000
Subject: [PATCH 338/382] Allow domain blocks that only reject media without
 silencing or suspending (#4325)

* Allow domain blocks to reject media without silencing or suspending

* Fix typo

* Hide 'Reject media' button when superfluous, instead of disabling it

* Properly hide 'reject media' checkbox on page load if needed

This may happen when resubmitting the domain block form after an error.

* Don't ask whether undoing a media-only block should be retroactive

* Rename :media_only block to :noop

* Display :noop block as None in frontend, allow blocks that do nothing

* Remove 'coding' line auto-added by emacs
---
 app/models/domain_block.rb                   |  2 +-
 app/services/block_domain_service.rb         |  4 ++--
 app/services/unblock_domain_service.rb       |  2 +-
 app/views/admin/domain_blocks/show.html.haml | 19 ++++++++++++-------
 config/locales/en.yml                        |  4 +++-
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index f26e8183f..aea8919af 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -12,7 +12,7 @@
 #
 
 class DomainBlock < ApplicationRecord
-  enum severity: [:silence, :suspend]
+  enum severity: [:silence, :suspend, :noop]
 
   attr_accessor :retroactive
 
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index e8b3a870d..a6b3c4cdb 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -11,16 +11,16 @@ class BlockDomainService < BaseService
   private
 
   def process_domain_block
+    clear_media! if domain_block.reject_media?
     if domain_block.silence?
       silence_accounts!
-    else
+    elsif domain_block.suspend?
       suspend_accounts!
     end
   end
 
   def silence_accounts!
     blocked_domain_accounts.in_batches.update_all(silenced: true)
-    clear_media! if domain_block.reject_media?
   end
 
   def clear_media!
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb
index 169d2f781..946b6d465 100644
--- a/app/services/unblock_domain_service.rb
+++ b/app/services/unblock_domain_service.rb
@@ -10,7 +10,7 @@ class UnblockDomainService < BaseService
   end
 
   def process_retroactive_updates
-    blocked_accounts.in_batches.update_all(update_options)
+    blocked_accounts.in_batches.update_all(update_options) unless domain_block.noop?
   end
 
   def blocked_accounts
diff --git a/app/views/admin/domain_blocks/show.html.haml b/app/views/admin/domain_blocks/show.html.haml
index 70dfef9b2..ea1929d44 100644
--- a/app/views/admin/domain_blocks/show.html.haml
+++ b/app/views/admin/domain_blocks/show.html.haml
@@ -3,13 +3,18 @@
 
 = simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :delete do |f|
 
-  = f.input :retroactive,
-    as: :boolean,
-    wrapper: :with_label,
-    label: t(".retroactive.#{@domain_block.severity}"),
-    hint: t(:affected_accounts,
-      scope: [:admin, :domain_blocks, :show],
-      count: @domain_block.accounts_count)
+  - if (@domain_block.noop?)
+    = f.input :retroactive,
+      as: :hidden,
+      input_html: { :value => "0" }
+  - else
+    = f.input :retroactive,
+      as: :boolean,
+      wrapper: :with_label,
+      label: t(".retroactive.#{@domain_block.severity}"),
+      hint: t(:affected_accounts,
+        scope: [:admin, :domain_blocks, :show],
+        count: @domain_block.accounts_count)
 
   .actions
     = f.button :button, t('.undo'), type: :submit
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cc2ea0542..1ec727ca7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -108,13 +108,15 @@ en:
         create: Create block
         hint: The domain block will not prevent creation of account entries in the database, but will retroactively and automatically apply specific moderation methods on those accounts.
         severity:
-          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data."
+          desc_html: "<strong>Silence</strong> will make the account's posts invisible to anyone who isn't following them. <strong>Suspend</strong> will remove all of the account's content, media, and profile data. Use <strong>None</strong> if you just want to reject media files."
+          noop: None
           silence: Silence
           suspend: Suspend
         title: New domain block
       reject_media: Reject media files
       reject_media_hint: Removes locally stored media files and refuses to download any in the future. Irrelevant for suspensions
       severities:
+        noop: None
         silence: Silence
         suspend: Suspend
       severity: Severity

From de985a30bce875906baa419b4a595513e452c046 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 14:30:10 +0200
Subject: [PATCH 339/382] Run i18n-tasks normalize (#4335)

---
 config/locales/oc.yml             | 4 ++--
 config/locales/simple_form.oc.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 6fec85555..dbdd6eacf 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -178,8 +178,8 @@ oc:
         show: Mostrar mèdia
         title: Mèdia
       no_media: Cap mèdia
-      with_media: Amb mèdia
       title: Estatuts del compteAccount statuses
+      with_media: Amb mèdia
     subscriptions:
       callback_url: URL de rapèl
       confirmed: Confirmat
@@ -506,7 +506,7 @@ oc:
       <p>Aqueste document es jos licéncia CC-BY-SA. Darrièra mesa a jorn lo 31 de mai de 2013</p>
 
       <p>Prima adaptacion de la <a href="https://github.com/discourse/discourse">politica de confidencialitat de Discourse</a>.</p>
-    title: "Condicions d’utilizacion e politica de confidencialitat de %{instance}"
+    title: Condicions d’utilizacion e politica de confidencialitat de %{instance}
   time:
     formats:
       default: Lo %d %b de %Y a %Ho%M
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index fe8ed7484..43cb52201 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -40,9 +40,9 @@ oc:
         setting_default_privacy: Confidencialitat de las publicacions
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
         setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut
+        setting_noindex: Èsser pas indexat pels motors de recèrca
         setting_system_font_ui: Utilizar la policia Font del sisèma
         setting_unfollow_modal: Afichar una confirmacion abans de quitar de sègre qualqu’un
-        setting_noindex: Èsser pas indexat pels motors de recèrca
         severity: Severitat
         type: Tip d’impòrt
         username: Nom d’utilizaire

From 117eb3b2bc9253bed6c8df245a1df65404cedeb6 Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Mon, 24 Jul 2017 21:49:06 +0900
Subject: [PATCH 340/382] Change defaultMessage for spoiler placeholder (#4329)

---
 .../compose/components/compose_form.js        |  2 +-
 app/javascript/mastodon/locales/ar.json       |  1 -
 app/javascript/mastodon/locales/bg.json       |  1 -
 app/javascript/mastodon/locales/ca.json       |  1 -
 app/javascript/mastodon/locales/de.json       |  1 -
 .../mastodon/locales/defaultMessages.json     | 23 +------------------
 app/javascript/mastodon/locales/en.json       |  1 -
 app/javascript/mastodon/locales/eo.json       |  1 -
 app/javascript/mastodon/locales/es.json       |  1 -
 app/javascript/mastodon/locales/fa.json       |  1 -
 app/javascript/mastodon/locales/fi.json       |  1 -
 app/javascript/mastodon/locales/fr.json       |  1 -
 app/javascript/mastodon/locales/he.json       |  1 -
 app/javascript/mastodon/locales/hr.json       |  1 -
 app/javascript/mastodon/locales/hu.json       |  1 -
 app/javascript/mastodon/locales/id.json       |  1 -
 app/javascript/mastodon/locales/io.json       |  1 -
 app/javascript/mastodon/locales/it.json       |  1 -
 app/javascript/mastodon/locales/ja.json       |  1 -
 app/javascript/mastodon/locales/ko.json       |  1 -
 app/javascript/mastodon/locales/nl.json       |  1 -
 app/javascript/mastodon/locales/no.json       |  1 -
 app/javascript/mastodon/locales/oc.json       |  1 -
 app/javascript/mastodon/locales/pl.json       |  1 -
 app/javascript/mastodon/locales/pt-BR.json    |  1 -
 app/javascript/mastodon/locales/pt.json       |  1 -
 app/javascript/mastodon/locales/ru.json       |  1 -
 app/javascript/mastodon/locales/th.json       |  1 -
 app/javascript/mastodon/locales/tr.json       |  1 -
 app/javascript/mastodon/locales/uk.json       |  1 -
 app/javascript/mastodon/locales/zh-CN.json    |  1 -
 app/javascript/mastodon/locales/zh-HK.json    |  1 -
 app/javascript/mastodon/locales/zh-TW.json    |  1 -
 33 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 98e823555..4400c89c8 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -20,7 +20,7 @@ import { length } from 'stringz';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
-  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Write your warning here' },
   publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },
   publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' },
 });
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 0043e6667..89ddb2d15 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "لا تقم بإدراجه على الخيوط العامة",
   "privacy.unlisted.short": "غير مدرج",
   "reply_indicator.cancel": "إلغاء",
-  "report.heading": "New report",
   "report.placeholder": "تعليقات إضافية",
   "report.submit": "إرسال",
   "report.target": "إبلاغ",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 6e6517733..3dba91b82 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Отказ",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index bacb1c991..54f2e5e22 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "No publicar en línies de temps públiques",
   "privacy.unlisted.short": "No llistat",
   "reply_indicator.cancel": "Cancel·lar",
-  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Enviar",
   "report.target": "Informes",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 0f192d4b6..a041e6655 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Nicht in öffentlichen Zeitleisten anzeigen",
   "privacy.unlisted.short": "Nicht gelistet",
   "reply_indicator.cancel": "Abbrechen",
-  "report.heading": "New report",
   "report.placeholder": "Zusätzliche Kommentare",
   "report.submit": "Absenden",
   "report.target": "Melden",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 707693612..a50c8b338 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -452,7 +452,7 @@
         "id": "compose_form.placeholder"
       },
       {
-        "defaultMessage": "Content warning",
+        "defaultMessage": "Write your warning here",
         "id": "compose_form.spoiler_placeholder"
       },
       {
@@ -965,27 +965,6 @@
     ],
     "path": "app/javascript/mastodon/features/public_timeline/index.json"
   },
-  {
-    "descriptors": [
-      {
-        "defaultMessage": "New report",
-        "id": "report.heading"
-      },
-      {
-        "defaultMessage": "Additional comments",
-        "id": "report.placeholder"
-      },
-      {
-        "defaultMessage": "Submit",
-        "id": "report.submit"
-      },
-      {
-        "defaultMessage": "Reporting",
-        "id": "report.target"
-      }
-    ],
-    "path": "app/javascript/mastodon/features/report/index.json"
-  },
   {
     "descriptors": [
       {
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 0a318f6fa..b6e92dda0 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting {target}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index cfc76517c..029cef883 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Rezigni",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index fb7186051..36ad66ace 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "No mostrar en la historia federada",
   "privacy.unlisted.short": "Sin federar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index f7a64d349..113daef77 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "عمومی، ولی فهرست نکن",
   "privacy.unlisted.short": "فهرست‌نشده",
   "reply_indicator.cancel": "لغو",
-  "report.heading": "New report",
   "report.placeholder": "توضیح اضافه",
   "report.submit": "بفرست",
   "report.target": "گزارش‌دادن",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 33691c671..da9e5d0f2 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Peruuta",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index b7e9b3390..5b734a253 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Ne pas afficher dans les fils publics",
   "privacy.unlisted.short": "Non-listé",
   "reply_indicator.cancel": "Annuler",
-  "report.heading": "New report",
   "report.placeholder": "Commentaires additionnels",
   "report.submit": "Envoyer",
   "report.target": "Signalement",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 8e92668f6..c8dc4fe8d 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "לא יופיע בפידים הציבוריים המשותפים",
   "privacy.unlisted.short": "לא לפיד הכללי",
   "reply_indicator.cancel": "ביטול",
-  "report.heading": "New report",
   "report.placeholder": "הערות נוספות",
   "report.submit": "שליחה",
   "report.target": "דיווח",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 78fe33dcc..fd669b2b2 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Ne prikazuj u javnim timelineovima",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Otkaži",
-  "report.heading": "New report",
   "report.placeholder": "Dodatni komentari",
   "report.submit": "Pošalji",
   "report.target": "Prijavljivanje",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 0b3ee085c..b3672cb7a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not show in public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Mégsem",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index cff7ee261..8a17262fe 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Tidak ditampilkan di linimasa publik",
   "privacy.unlisted.short": "Tak Terdaftar",
   "reply_indicator.cancel": "Batal",
-  "report.heading": "New report",
   "report.placeholder": "Komentar tambahan",
   "report.submit": "Kirim",
   "report.target": "Melaporkan",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index b9287081a..154ca66ce 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Ne montrar en publika tempolinei",
   "privacy.unlisted.short": "Ne enlistigota",
   "reply_indicator.cancel": "Nihiligar",
-  "report.heading": "New report",
   "report.placeholder": "Plusa komenti",
   "report.submit": "Sendar",
   "report.target": "Denuncante",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index e00df67fe..6cb274bae 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Non mostrare sulla timeline pubblica",
   "privacy.unlisted.short": "Non elencato",
   "reply_indicator.cancel": "Annulla",
-  "report.heading": "New report",
   "report.placeholder": "Commenti aggiuntivi",
   "report.submit": "Invia",
   "report.target": "Invio la segnalazione",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index bd2455d81..c52f8c2bb 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "公開TLで表示しない",
   "privacy.unlisted.short": "未収載",
   "reply_indicator.cancel": "キャンセル",
-  "report.heading": "New report",
   "report.placeholder": "コメント",
   "report.submit": "通報する",
   "report.target": "問題のユーザー",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index b1bbbe4db..fbd0098d7 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "공개 타임라인에 표시하지 않음",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "취소",
-  "report.heading": "New report",
   "report.placeholder": "코멘트",
   "report.submit": "신고하기",
   "report.target": "문제가 된 사용자",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 70e134482..f7b0bbf68 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
-  "report.heading": "New report",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 1ed213625..98f59f774 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Ikke vis i offentlige tidslinjer",
   "privacy.unlisted.short": "Uoppført",
   "reply_indicator.cancel": "Avbryt",
-  "report.heading": "New report",
   "report.placeholder": "Tilleggskommentarer",
   "report.submit": "Send inn",
   "report.target": "Rapporterer",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 6b42f4d4f..34469deac 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Mostrar pas dins los fluxes publics",
   "privacy.unlisted.short": "Pas-listat",
   "reply_indicator.cancel": "Anullar",
-  "report.heading": "New report",
   "report.placeholder": "Comentaris addicionals",
   "report.submit": "Mandar",
   "report.target": "Senhalar {target}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 109a004a6..92782ec2a 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Niewidoczne na publicznych osiach czasu",
   "privacy.unlisted.short": "Niewidoczne",
   "reply_indicator.cancel": "Anuluj",
-  "report.heading": "Nowe zgłoszenie",
   "report.placeholder": "Dodatkowe komentarze",
   "report.submit": "Wyślij",
   "report.target": "Zgłaszanie {target}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index d46393cc0..3944e33e9 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index d46393cc0..3944e33e9 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Não publicar nos feeds públicos",
   "privacy.unlisted.short": "Não listar",
   "reply_indicator.cancel": "Cancelar",
-  "report.heading": "New report",
   "report.placeholder": "Comentários adicionais",
   "report.submit": "Enviar",
   "report.target": "Denunciar",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 3075efa94..9e8573efa 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Не показывать в лентах",
   "privacy.unlisted.short": "Скрытый",
   "reply_indicator.cancel": "Отмена",
-  "report.heading": "New report",
   "report.placeholder": "Комментарий",
   "report.submit": "Отправить",
   "report.target": "Жалуемся на",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a59377c7d..63bed6d8c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Do not post to public timelines",
   "privacy.unlisted.short": "Unlisted",
   "reply_indicator.cancel": "Cancel",
-  "report.heading": "New report",
   "report.placeholder": "Additional comments",
   "report.submit": "Submit",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 4820e017c..5bd308e95 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Herkese açık zaman tüneline gönderme",
   "privacy.unlisted.short": "Listelenmemiş",
   "reply_indicator.cancel": "İptal",
-  "report.heading": "New report",
   "report.placeholder": "Ek yorumlar",
   "report.submit": "Gönder",
   "report.target": "Raporlama",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 923332c62..e1611505d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "Не показувати у публічних стрічках",
   "privacy.unlisted.short": "Прихований",
   "reply_indicator.cancel": "Відмінити",
-  "report.heading": "New report",
   "report.placeholder": "Додаткові коментарі",
   "report.submit": "Відправити",
   "report.target": "Скаржимося на",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 4d8b0fb8e..18bf872e5 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "公开，但不在公共时间轴显示",
   "privacy.unlisted.short": "公开",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "额外消息",
   "report.submit": "提交",
   "report.target": "Reporting",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 69791293b..a461085c7 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "公開，但不在公共時間軸顯示",
   "privacy.unlisted.short": "公開",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "額外訊息",
   "report.submit": "提交",
   "report.target": "舉報",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index af55663a3..d766fb394 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -146,7 +146,6 @@
   "privacy.unlisted.long": "不要貼到公開時間軸",
   "privacy.unlisted.short": "不列出來",
   "reply_indicator.cancel": "取消",
-  "report.heading": "New report",
   "report.placeholder": "更多訊息",
   "report.submit": "送出",
   "report.target": "通報中",

From 2374d63536fd9459243a235763c87f8e9fdfc581 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 15:09:08 +0200
Subject: [PATCH 341/382] Redesign extended information page (#4322)

* Redesign extended information page

* Remove unused keys

* Add $ui-base-lighter-color variable to SCSS
---
 app/javascript/styles/about.scss      | 241 ++++++++++++++------------
 app/javascript/styles/boost.scss      |   2 +-
 app/javascript/styles/components.scss |  48 ++---
 app/javascript/styles/forms.scss      |   4 +-
 app/javascript/styles/variables.scss  |   9 +-
 app/views/about/_contact.html.haml    |  16 +-
 app/views/about/more.html.haml        |  61 +++++--
 config/locales/ar.yml                 |   1 -
 config/locales/bg.yml                 |   1 -
 config/locales/ca.yml                 |   1 -
 config/locales/de.yml                 |   1 -
 config/locales/en.yml                 |   6 +-
 config/locales/eo.yml                 |   1 -
 config/locales/es.yml                 |   1 -
 config/locales/fa.yml                 |   1 -
 config/locales/fi.yml                 |   1 -
 config/locales/fr.yml                 |  66 +------
 config/locales/he.yml                 |   1 -
 config/locales/hr.yml                 |   1 -
 config/locales/id.yml                 |   1 -
 config/locales/io.yml                 |   1 -
 config/locales/it.yml                 |   1 -
 config/locales/ja.yml                 |   1 -
 config/locales/ko.yml                 |   1 -
 config/locales/nl.yml                 |   1 -
 config/locales/no.yml                 |   1 -
 config/locales/oc.yml                 |   1 -
 config/locales/pl.yml                 |   1 -
 config/locales/pt-BR.yml              |   1 -
 config/locales/pt.yml                 |   1 -
 config/locales/ru.yml                 |   1 -
 config/locales/th.yml                 |   1 -
 config/locales/tr.yml                 |   1 -
 config/locales/uk.yml                 |   1 -
 config/locales/zh-CN.yml              |   1 -
 config/locales/zh-HK.yml              |   1 -
 config/locales/zh-TW.yml              |   1 -
 37 files changed, 220 insertions(+), 261 deletions(-)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 90ad9bea9..01a341538 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -120,18 +120,55 @@
 }
 
 .information-board {
-  margin: 20px 0;
-  display: flex;
-  justify-content: space-between;
-  border-top: 1px solid lighten($ui-base-color, 10%);
-  border-bottom: 1px solid lighten($ui-base-color, 10%);
-  padding-right: 14px;
+  background: darken($ui-base-color, 4%);
+  padding: 40px 0;
+
+  .panel {
+    position: absolute;
+    width: 280px;
+    box-sizing: border-box;
+    background: darken($ui-base-color, 8%);
+    padding: 20px;
+    padding-top: 10px;
+    border-radius: 4px 4px 0 0;
+    right: 0;
+    bottom: -40px;
+
+    .panel-header {
+      font-family: 'mastodon-font-display', sans-serif;
+      font-size: 14px;
+      line-height: 24px;
+      font-weight: 500;
+      color: $ui-base-lighter-color;
+      padding-bottom: 5px;
+      margin-bottom: 15px;
+      border-bottom: 1px solid lighten($ui-base-color, 4%);
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+
+      span {
+        font-weight: 400;
+        color: lighten($ui-base-color, 34%);
+      }
+    }
+  }
+
+  .container {
+    position: relative;
+    padding-right: 280px + 15px;
+  }
+
+  .information-board-sections {
+    display: flex;
+    justify-content: space-between;
+  }
 
   .section {
     flex: 1 0 0;
-    padding: 14px;
-    text-align: right;
     font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
+    text-align: right;
+    padding: 0 15px;
 
     span,
     strong {
@@ -143,7 +180,6 @@
 
       &:last-child {
         color: $ui-secondary-color;
-        font-size: 14px;
       }
     }
 
@@ -203,100 +239,6 @@
   }
 }
 
-.contact-email {
-  text-align: center;
-  margin: 40px 0;
-
-  strong {
-    display: block;
-    color: $primary-text-color;
-    word-break: break-word;
-  }
-}
-
-.sidebar-layout {
-  display: flex;
-
-  .main {
-    flex: 1 1 auto;
-    padding: 14px 0;
-
-    .panel {
-      padding-right: 14px;
-    }
-  }
-
-  .sidebar {
-    border-left: 1px solid lighten($ui-base-color, 10%);
-    width: 200px;
-    flex: 0 0 auto;
-  }
-
-  .panel {
-    .panel-header {
-      background: lighten($ui-base-color, 10%);
-      padding: 7px 14px;
-      text-transform: uppercase;
-      font-size: 12px;
-      font-weight: 500;
-    }
-
-    .panel-body {
-      padding: 14px;
-    }
-
-    .panel-list {
-      ul {
-        list-style: none;
-        margin: 0;
-
-        li {
-          margin: 0;
-          font-family: inherit;
-          font-size: 13px;
-          line-height: 18px;
-
-          a {
-            display: block;
-            padding: 7px 14px;
-            color: rgba($primary-text-color, 0.7);
-            text-decoration: none;
-            transition: all 200ms linear;
-
-            i.fa {
-              margin-right: 5px;
-            }
-
-            &:hover {
-              color: $primary-text-color;
-              background-color: darken($ui-base-color, 5%);
-              transition: all 100ms linear;
-            }
-
-            &.selected {
-              color: $primary-text-color;
-              background-color: $ui-highlight-color;
-
-              &:hover {
-                background-color: lighten($ui-highlight-color, 5%);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  @media screen and (max-width: 625px) {
-    flex-direction: column;
-
-    .sidebar {
-      border: 1px solid lighten($ui-base-color, 10%);
-      width: auto;
-    }
-  }
-}
-
 .features-list__row {
   display: flex;
   padding: 10px 0;
@@ -322,7 +264,7 @@
   .text {
     font-size: 16px;
     line-height: 30px;
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
 
     h6 {
       font-weight: 500;
@@ -338,6 +280,15 @@
     background: linear-gradient(150deg, lighten($ui-base-color, 8%), $ui-base-color);
     position: relative;
 
+    &.compact {
+      background: $ui-base-color;
+      padding-bottom: 15px;
+
+      .hero .heading {
+        padding-bottom: 30px;
+      }
+    }
+
     .mascot-container {
       max-width: 800px;
       margin: 0 auto;
@@ -402,7 +353,7 @@
           right: -120px;
           bottom: 0;
           animation-duration: 3s;
-          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 447.1875 234.375" height="170" width="324"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M21.69 233.366c-6.45-1.268-13.347-5.63-16.704-10.564-10.705-15.734-1.513-37.724 18.632-44.57l4.8-1.632.173-17.753c.146-14.77.515-19.063 2.2-25.55 6.736-25.944 24.46-46.032 47.766-54.137 11.913-4.143 19.558-5.366 34.178-5.47l13.828-.096V71.12c0-4.755 2.853-17.457 5.238-23.327 8.588-21.137 26.735-35.957 52.153-42.593 23.248-6.07 50.153-6.415 71.863-.923 11.14 2.82 25.686 9.957 33.857 16.615 19.335 15.756 31.82 41.05 35.183 71.275.59 5.305.672 5.435 3.11 4.926 11.833-2.474 30.4-3.132 40.065-1.42 24.388 4.32 40.568 19.076 47.214 43.058 2.16 7.8 3.953 23.894 3.59 32.237l-.24 5.498 5.156 1.317c6.392 1.633 14.55 7.098 18.003 12.062 1.435 2.062 3.305 6.597 4.156 10.078 1.428 5.84 1.43 6.8.04 12.44-1.807 7.318-5.672 13.252-10.872 16.694-8.508 5.63 3.756 5.33-211.916 5.216-108.56-.056-199.22-.464-201.47-.906z"/></svg>');
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 447.1875 234.375" height="170" width="324"><path fill="#{hex-color($ui-base-lighter-color)}" d="M21.69 233.366c-6.45-1.268-13.347-5.63-16.704-10.564-10.705-15.734-1.513-37.724 18.632-44.57l4.8-1.632.173-17.753c.146-14.77.515-19.063 2.2-25.55 6.736-25.944 24.46-46.032 47.766-54.137 11.913-4.143 19.558-5.366 34.178-5.47l13.828-.096V71.12c0-4.755 2.853-17.457 5.238-23.327 8.588-21.137 26.735-35.957 52.153-42.593 23.248-6.07 50.153-6.415 71.863-.923 11.14 2.82 25.686 9.957 33.857 16.615 19.335 15.756 31.82 41.05 35.183 71.275.59 5.305.672 5.435 3.11 4.926 11.833-2.474 30.4-3.132 40.065-1.42 24.388 4.32 40.568 19.076 47.214 43.058 2.16 7.8 3.953 23.894 3.59 32.237l-.24 5.498 5.156 1.317c6.392 1.633 14.55 7.098 18.003 12.062 1.435 2.062 3.305 6.597 4.156 10.078 1.428 5.84 1.43 6.8.04 12.44-1.807 7.318-5.672 13.252-10.872 16.694-8.508 5.63 3.756 5.33-211.916 5.216-108.56-.056-199.22-.464-201.47-.906z"/></svg>');
         }
 
         .float-2 {
@@ -412,7 +363,7 @@
           bottom: 0;
           animation-duration: 3.5s;
           animation-delay: 0.2s;
-          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 536.25 222.1875" height="100" width="241"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M42.626 221.23c-14.104-1.174-26.442-5.133-32.825-10.534-4.194-3.548-7.684-10.66-8.868-18.075-1.934-12.102.633-22.265 7.528-29.81 7.61-8.328 19.998-12.76 39.855-14.257l8.47-.638-2.08-6.223c-4.826-14.422-6.357-24.813-6.37-43.255-.012-14.923.28-18.513 2.1-25.724 2.283-9.048 8.483-23.034 13.345-30.1 14.76-21.45 43.505-38.425 70.535-41.65 30.628-3.655 64.47 12.073 89.668 41.673l5.955 6.995 2.765-4.174c1.52-2.296 5.74-6.93 9.376-10.295 18.382-17.02 43.436-20.676 73.352-10.705 12.158 4.052 21.315 9.53 29.64 17.733 12.752 12.562 18.16 25.718 18.19 44.26l.02 10.98 2.312-3.01c15.64-20.365 42.29-20.485 62.438-.28 3.644 3.653 7.558 8.593 8.697 10.976 4.895 10.24 5.932 25.688 2.486 37.046-.76 2.507-1.388 4.816-1.393 5.13-.006.316 6.845.87 15.224 1.234 53.06 2.297 76.356 12.98 81.817 37.526 3.554 15.973-3.71 28.604-19.566 34.02-4.554 1.555-17.922 1.655-234.517 1.757-126.327.06-233.497-.21-238.154-.597z"/></svg>');
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 536.25 222.1875" height="100" width="241"><path fill="#{hex-color($ui-base-lighter-color)}" d="M42.626 221.23c-14.104-1.174-26.442-5.133-32.825-10.534-4.194-3.548-7.684-10.66-8.868-18.075-1.934-12.102.633-22.265 7.528-29.81 7.61-8.328 19.998-12.76 39.855-14.257l8.47-.638-2.08-6.223c-4.826-14.422-6.357-24.813-6.37-43.255-.012-14.923.28-18.513 2.1-25.724 2.283-9.048 8.483-23.034 13.345-30.1 14.76-21.45 43.505-38.425 70.535-41.65 30.628-3.655 64.47 12.073 89.668 41.673l5.955 6.995 2.765-4.174c1.52-2.296 5.74-6.93 9.376-10.295 18.382-17.02 43.436-20.676 73.352-10.705 12.158 4.052 21.315 9.53 29.64 17.733 12.752 12.562 18.16 25.718 18.19 44.26l.02 10.98 2.312-3.01c15.64-20.365 42.29-20.485 62.438-.28 3.644 3.653 7.558 8.593 8.697 10.976 4.895 10.24 5.932 25.688 2.486 37.046-.76 2.507-1.388 4.816-1.393 5.13-.006.316 6.845.87 15.224 1.234 53.06 2.297 76.356 12.98 81.817 37.526 3.554 15.973-3.71 28.604-19.566 34.02-4.554 1.555-17.922 1.655-234.517 1.757-126.327.06-233.497-.21-238.154-.597z"/></svg>');
         }
 
         .float-3 {
@@ -422,7 +373,7 @@
           top: -30px;
           animation-duration: 4s;
           animation-delay: 0.5s;
-          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 388.125 202.5" height="140" width="267"><path fill="#{hex-color(lighten($ui-base-color, 26%))}" d="M181.37 201.458c-17.184-1.81-36.762-8.944-49.523-18.05l-5.774-4.12-8.074 2.63c-11.468 3.738-21.382 4.962-35.815 4.422-14.79-.554-24.577-2.845-36.716-8.594-15.483-7.332-28.498-19.98-35.985-34.968C2.44 128.675-.94 108.435.9 91.356c3.362-31.234 18.197-53.698 43.63-66.074 12.803-6.23 22.384-8.55 37.655-9.122 14.433-.54 24.347.684 35.814 4.42l8.073 2.633 5.635-4.01c24.81-17.656 60.007-23.332 92.914-14.985 10.11 2.565 25.498 9.62 33.102 15.178l5.068 3.704 7.632-2.564c10.89-3.66 21.086-4.916 35.516-4.376 45.816 1.716 76.422 30.03 81.285 75.196 1.84 17.08-1.54 37.32-8.585 51.422-7.487 14.99-20.502 27.636-35.984 34.968-12.14 5.75-21.926 8.04-36.716 8.593-14.43.54-24.626-.716-35.516-4.376l-7.632-2.564-5.068 3.704c-12.844 9.387-32.714 16.488-51.545 18.42-10.607 1.09-13.916 1.08-24.81-.066z"/></svg>');
+          background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 388.125 202.5" height="140" width="267"><path fill="#{hex-color($ui-base-lighter-color)}" d="M181.37 201.458c-17.184-1.81-36.762-8.944-49.523-18.05l-5.774-4.12-8.074 2.63c-11.468 3.738-21.382 4.962-35.815 4.422-14.79-.554-24.577-2.845-36.716-8.594-15.483-7.332-28.498-19.98-35.985-34.968C2.44 128.675-.94 108.435.9 91.356c3.362-31.234 18.197-53.698 43.63-66.074 12.803-6.23 22.384-8.55 37.655-9.122 14.433-.54 24.347.684 35.814 4.42l8.073 2.633 5.635-4.01c24.81-17.656 60.007-23.332 92.914-14.985 10.11 2.565 25.498 9.62 33.102 15.178l5.068 3.704 7.632-2.564c10.89-3.66 21.086-4.916 35.516-4.376 45.816 1.716 76.422 30.03 81.285 75.196 1.84 17.08-1.54 37.32-8.585 51.422-7.487 14.99-20.502 27.636-35.984 34.968-12.14 5.75-21.926 8.04-36.716 8.593-14.43.54-24.626-.716-35.516-4.376l-7.632-2.564-5.068 3.704c-12.844 9.387-32.714 16.488-51.545 18.42-10.607 1.09-13.916 1.08-24.81-.066z"/></svg>');
         }
       }
 
@@ -505,10 +456,6 @@
         a {
           padding-left: 0;
           color: $white;
-
-          &:hover img {
-            opacity: 1;
-          }
         }
 
         img {
@@ -517,7 +464,6 @@
           position: relative;
           top: 4px;
           left: -10px;
-          opacity: 0.8;
         }
       }
     }
@@ -541,6 +487,42 @@
     padding: 50px 0;
   }
 
+  .extended-description {
+    padding: 50px 0;
+
+    ul,
+    ol {
+      list-style: inherit;
+      margin-left: 20px;
+
+      &[type='a'] {
+        list-style-type: lower-alpha;
+      }
+
+      &[type='i'] {
+        list-style-type: lower-roman;
+      }
+    }
+
+    li > ol,
+    li > ul {
+      margin-top: 20px;
+    }
+
+    p,
+    li {
+      font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
+      font-weight: 400;
+      margin-bottom: 12px;
+      color: $ui-base-lighter-color;
+
+      a {
+        color: $ui-highlight-color;
+        text-decoration: underline;
+      }
+    }
+  }
+
   h3 {
     font-family: 'mastodon-font-display', sans-serif;
     font-size: 16px;
@@ -553,7 +535,7 @@
   p {
     font-size: 16px;
     line-height: 30px;
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 
   .features {
@@ -645,14 +627,14 @@
       display: block;
       font-size: 18px;
       font-weight: 400;
-      color: lighten($ui-base-color, 26%);
+      color: $ui-base-lighter-color;
     }
   }
 
   .footer-links {
     padding-bottom: 50px;
     text-align: right;
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
 
     p {
       font-size: 14px;
@@ -669,6 +651,29 @@
       padding: 0 20px;
     }
 
+    .information-board {
+      padding-bottom: 20px;
+    }
+
+    .information-board .container {
+      padding-right: 20px;
+
+      .panel {
+        position: static;
+        margin-top: 30px;
+        width: 100%;
+        border-radius: 4px;
+
+        .panel-header {
+          text-align: center;
+        }
+      }
+    }
+
+    .information-board .section {
+      text-align: center;
+    }
+
     .header-wrapper .mascot {
       left: 20px;
     }
@@ -720,6 +725,12 @@
         padding: 30px 0;
       }
 
+      .links .brand img {
+        left: 0;
+        top: 0;
+        margin-right: 0;
+      }
+
       .hero {
         .simple_form,
         .closed-registrations-message {
diff --git a/app/javascript/styles/boost.scss b/app/javascript/styles/boost.scss
index 5eb3149ef..31053decc 100644
--- a/app/javascript/styles/boost.scss
+++ b/app/javascript/styles/boost.scss
@@ -6,7 +6,7 @@
 }
 
 button.icon-button i.fa-retweet {
-  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 26%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
+  background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-base-lighter-color)}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
 
   &:hover {
     background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' width='22' height='209'><path d='M4.97 3.16c-.1.03-.17.1-.22.18L.8 8.24c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77L5.5 3.35c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.02-2.4.02H7.1l2.32 2.85.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color(lighten($ui-base-color, 33%))}' stroke-width='0'/><path d='M7.78 19.66c-.24.02-.44.25-.44.5v2.46h-.06c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v4.47c0 4.26-.56 3.62 3.65 3.62H8.5l-1.3-1.06c-.1-.08-.18-.2-.2-.3-.02-.17.06-.35.2-.45l1.33-1.1H7.28c-.44 0-.72-.3-.72-.7v-4.48c0-.44.28-.72.72-.72h.06v2.5c0 .38.54.63.82.38l4.9-3.93c.25-.18.25-.6 0-.78l-4.9-3.92c-.1-.1-.24-.14-.38-.12zm9.34 2.93c-.54-.02-1.3.02-2.4.02h-1.25l1.3 1.07c.1.07.18.2.2.33.02.16-.06.3-.2.4l-1.33 1.1h1.28c.42 0 .72.28.72.72v4.47c0 .42-.3.72-.72.72h-.1v-2.47c0-.3-.3-.53-.6-.47-.07 0-.14.05-.2.1l-4.9 3.93c-.26.18-.26.6 0 .78l4.9 3.92c.27.25.82 0 .8-.38v-2.5h.1c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.15.4-3.62-1.25-3.66zM10.34 38.66c-.24.02-.44.25-.43.5v2.47H7.3c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.47c0 3.66-.23 3.7 2.34 3.66l-1.34-1.1c-.1-.08-.18-.2-.2-.3 0-.17.07-.35.2-.45l1.96-1.6c-.03-.06-.04-.13-.04-.2v-4.48c0-.44.28-.72.72-.72H9.9v2.5c0 .36.5.6.8.38l4.93-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.08-.23-.13-.36-.12zm5.63 2.93l1.34 1.1c.1.07.18.2.2.33.02.16-.03.3-.16.4l-1.96 1.6c.02.07.06.13.06.22v4.47c0 .42-.3.72-.72.72h-2.66v-2.47c0-.3-.3-.53-.6-.47-.06.02-.12.05-.18.1l-4.94 3.93c-.24.18-.24.6 0 .78l4.94 3.92c.28.22.78-.02.78-.38v-2.5h2.66c4.27 0 3.65.67 3.65-3.62v-4.47c0-3.66.34-3.7-2.4-3.66zM13.06 57.66c-.23.03-.4.26-.4.5v2.47H7.28c-1.08 0-1.86-.04-2.4-.04-1.64 0-1.25.43-1.25 3.65v4.87l2.93-2.37v-2.5c0-.44.28-.72.72-.72h5.38v2.5c0 .36.5.6.78.38l4.94-3.93c.24-.18.24-.6 0-.78l-4.94-3.92c-.1-.1-.24-.14-.38-.12zm5.3 6.15l-2.92 2.4v2.52c0 .42-.3.72-.72.72h-5.4v-2.47c0-.3-.32-.53-.6-.47-.07.02-.13.05-.2.1L3.6 70.52c-.25.18-.25.6 0 .78l4.93 3.92c.28.22.78-.02.78-.38v-2.5h5.42c4.27 0 3.65.67 3.65-3.62v-4.47-.44zM19.25 78.8c-.1.03-.2.1-.28.17l-.9.9c-.44-.3-1.36-.25-3.35-.25H7.28c-1.08 0-1.86-.03-2.4-.03-1.64 0-1.25.43-1.25 3.65v.7l2.93.3v-1c0-.44.28-.72.72-.72h7.44c.2 0 .37.08.5.2l-1.8 1.8c-.25.26-.08.76.27.8l6.27.7c.28.03.56-.25.53-.53l-.7-6.25c0-.27-.3-.48-.55-.44zm-17.2 6.1c-.2.07-.36.3-.33.54l.7 6.25c.02.36.58.55.83.27l.8-.8c.02 0 .04-.02.04 0 .46.24 1.37.17 3.18.17h7.44c4.27 0 3.65.67 3.65-3.62v-.75l-2.93-.3v1.05c0 .42-.3.72-.72.72H7.28c-.15 0-.3-.03-.4-.1L8.8 86.4c.3-.24.1-.8-.27-.84l-6.28-.65h-.2zM4.88 98.6c-1.33 0-1.34.48-1.3 2.3l1.14-1.37c.08-.1.22-.17.34-.2.16 0 .34.08.44.2l1.66 2.03c.04 0 .07-.03.12-.03h7.44c.34 0 .57.2.65.5h-2.43c-.34.05-.53.52-.3.78l3.92 4.95c.18.24.6.24.78 0l3.94-4.94c.22-.27-.02-.76-.37-.77H18.4c.02-3.9.6-3.4-3.66-3.4H7.28c-1.08 0-1.86-.04-2.4-.04zm.15 2.46c-.1.03-.2.1-.28.2l-3.94 4.9c-.2.28.03.77.4.78H3.6c-.02 3.94-.45 3.4 3.66 3.4h7.44c3.65 0 3.74.3 3.7-2.25l-1.1 1.34c-.1.1-.2.17-.32.2-.16 0-.34-.08-.44-.2l-1.65-2.03c-.06.02-.1.04-.18.04H7.28c-.35 0-.57-.2-.66-.5h2.44c.37 0 .63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.23-.47-.2zM4.88 117.6c-1.16 0-1.3.3-1.3 1.56l1.14-1.38c.08-.1.22-.14.34-.16.16 0 .34.04.44.16l2.22 2.75h7c.42 0 .72.28.72.72v.53h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-.53c0-4.2.72-3.63-3.66-3.63H7.28c-1.08 0-1.86-.03-2.4-.03zm.1 1.74c-.1.03-.17.1-.23.16L.8 124.44c-.2.28.03.77.4.78H3.6v.5c0 4.26-.55 3.62 3.66 3.62h7.44c1.03 0 1.74.02 2.28 0-.16.02-.34-.03-.44-.15l-2.22-2.76H7.28c-.44 0-.72-.3-.72-.72v-.5h2.5c.37.02.63-.5.4-.78L5.5 119.5c-.12-.15-.34-.22-.53-.16zm12.02 10c1.2-.02 1.4-.25 1.4-1.53l-1.1 1.36c-.07.1-.17.17-.3.18zM5.94 136.6l2.37 2.93h6.42c.42 0 .72.28.72.72v1.25h-2.6c-.3.1-.43.54-.2.78l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.25c0-4.2.72-3.63-3.66-3.63H7.28c-.6 0-.92-.02-1.34-.03zm-1.72.06c-.4.08-.54.3-.6.75l.6-.74zm.84.93c-.12 0-.24.08-.3.18l-3.95 4.9c-.24.3 0 .83.4.82H3.6v1.22c0 4.26-.55 3.62 3.66 3.62h7.44c.63 0 .97.02 1.4.03l-2.37-2.93H7.28c-.44 0-.72-.3-.72-.72v-1.22h2.5c.4.04.67-.53.4-.8l-3.96-4.92c-.1-.13-.27-.2-.44-.2zm13.28 10.03l-.56.7c.36-.07.5-.3.56-.7zM17.13 155.6c-.55-.02-1.32.03-2.4.03h-8.2l2.38 2.9h5.82c.42 0 .72.28.72.72v1.97H12.9c-.32.06-.48.52-.28.78l3.94 4.94c.2.23.6.22.78-.03l3.94-4.9c.22-.28-.02-.77-.37-.78H18.4v-1.97c0-3.15.4-3.62-1.25-3.66zm-12.1.28c-.1.02-.2.1-.28.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v1.96c0 4.26-.55 3.62 3.66 3.62h8.24l-2.36-2.9H7.28c-.44 0-.72-.3-.72-.72v-1.97h2.5c.37.02.63-.5.4-.78l-3.96-4.9c-.1-.15-.3-.22-.47-.2zM5.13 174.5c-.15 0-.3.07-.38.2L.8 179.6c-.24.27 0 .82.4.8H3.6v2.32c0 4.26-.55 3.62 3.66 3.62h7.94l-2.35-2.9h-5.6c-.43 0-.7-.3-.7-.72v-2.3h2.5c.38.03.66-.54.4-.83l-3.97-4.9c-.1-.13-.23-.2-.38-.2zm12 .1c-.55-.02-1.32.03-2.4.03H6.83l2.35 2.9h5.52c.42 0 .72.28.72.72v2.34h-2.6c-.3.1-.43.53-.2.78l3.92 4.9c.18.24.6.24.78 0l3.94-4.9c.22-.3-.02-.78-.37-.8H18.4v-2.33c0-3.15.4-3.62-1.25-3.66zM4.97 193.16c-.1.03-.17.1-.22.18l-3.94 4.9c-.2.3.03.78.4.8H3.6v2.68c0 4.26-.55 3.62 3.66 3.62h7.66l-2.3-2.84c-.03-.02-.03-.04-.05-.06H7.27c-.44 0-.72-.3-.72-.72v-2.7h2.5c.37.03.63-.48.4-.77l-3.96-4.9c-.12-.17-.34-.25-.53-.2zm12.16.43c-.55-.02-1.32.03-2.4.03H7.1l2.32 2.84.03.06h5.25c.42 0 .72.28.72.72v2.7h-2.5c-.36.02-.56.54-.3.8l3.92 4.9c.18.25.6.25.78 0l3.94-4.9c.26-.28 0-.83-.37-.8H18.4v-2.7c0-3.15.4-3.62-1.25-3.66z' fill='#{hex-color($ui-highlight-color)}' stroke-width='0'/></svg>");
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 4523c9156..c4c4420eb 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -107,7 +107,7 @@
 .icon-button {
   display: inline-block;
   padding: 0;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   border: none;
   background: transparent;
   cursor: pointer;
@@ -145,7 +145,7 @@
     &:hover,
     &:active,
     &:focus {
-      color: lighten($ui-base-color, 26%);
+      color: $ui-base-lighter-color;
     }
 
     &.active {
@@ -185,7 +185,7 @@
   &:hover,
   &:active,
   &:focus {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
     transition: color 200ms ease-out;
   }
 
@@ -610,13 +610,13 @@
 }
 
 .status__relative-time {
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   float: right;
   font-size: 14px;
 }
 
 .status__display-name {
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
 }
 
 .status__info .status__display-name {
@@ -652,14 +652,14 @@
 
 .status__prepend {
   margin-left: 68px;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   padding: 8px 0;
   padding-bottom: 2px;
   font-size: 14px;
   position: relative;
 
   .status__display-name strong {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 }
 
@@ -725,7 +725,7 @@
 
 .detailed-status__meta {
   margin-top: 15px;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   font-size: 14px;
   line-height: 18px;
 }
@@ -944,7 +944,7 @@
   }
 
   abbr {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 }
 
@@ -1046,11 +1046,11 @@
 .muted {
   .status__content p,
   .status__content a {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 
   .status__display-name strong {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 
   .status__avatar {
@@ -1058,7 +1058,7 @@
   }
 
   a.status__content__spoiler-link {
-    background: lighten($ui-base-color, 26%);
+    background: $ui-base-lighter-color;
     color: lighten($ui-base-color, 4%);
 
     &:hover {
@@ -1273,7 +1273,7 @@
 .static-content {
   padding: 10px;
   padding-top: 20px;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
 
   h1 {
     font-size: 16px;
@@ -1736,7 +1736,7 @@
 
 .column-subheading {
   background: $ui-base-color;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   padding: 8px 20px;
   font-size: 12px;
   font-weight: 500;
@@ -1875,7 +1875,7 @@
   }
 
   a {
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
   }
 }
 
@@ -1939,7 +1939,7 @@ button.icon-button.active i.fa-retweet {
   font-size: 14px;
   border: 1px solid lighten($ui-base-color, 8%);
   border-radius: 4px;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   margin-top: 14px;
   text-decoration: none;
   overflow: hidden;
@@ -2034,7 +2034,7 @@ button.icon-button.active i.fa-retweet {
 
 .load-more {
   display: block;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   background-color: transparent;
   border: 0;
   font-size: inherit;
@@ -2723,13 +2723,13 @@ button.icon-button.active i.fa-retweet {
   color: $ui-secondary-color;
   font-size: 18px;
   font-weight: 500;
-  border: 2px dashed lighten($ui-base-color, 26%);
+  border: 2px dashed $ui-base-lighter-color;
   border-radius: 4px;
 }
 
 .upload-progress {
   padding: 10px;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   overflow: hidden;
   display: flex;
 
@@ -2754,7 +2754,7 @@ button.icon-button.active i.fa-retweet {
   width: 100%;
   height: 6px;
   border-radius: 6px;
-  background: lighten($ui-base-color, 26%);
+  background: $ui-base-lighter-color;
   position: relative;
   margin-top: 5px;
 }
@@ -2965,7 +2965,7 @@ button.icon-button.active i.fa-retweet {
 }
 
 .search-results__header {
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   background: lighten($ui-base-color, 2%);
   border-bottom: 1px solid darken($ui-base-color, 4%);
   padding: 15px 10px;
@@ -3559,7 +3559,7 @@ button.icon-button.active i.fa-retweet {
 
 .attachment-list__icon {
   flex: 0 0 auto;
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   padding: 8px 18px;
   cursor: default;
   border-right: 1px solid lighten($ui-base-color, 8%);
@@ -3589,7 +3589,7 @@ button.icon-button.active i.fa-retweet {
 
   a {
     text-decoration: none;
-    color: lighten($ui-base-color, 26%);
+    color: $ui-base-lighter-color;
     font-weight: 500;
 
     &:hover {
@@ -3752,7 +3752,7 @@ button.icon-button.active i.fa-retweet {
 }
 
 .account-section-headline {
-  color: lighten($ui-base-color, 26%);
+  color: $ui-base-lighter-color;
   background: lighten($ui-base-color, 2%);
   border-bottom: 1px solid lighten($ui-base-color, 4%);
   padding: 15px 10px;
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index c467aa7db..cffb6f197 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -32,7 +32,7 @@ code {
       line-height: 18px;
       margin-top: 15px;
       margin-bottom: 0;
-      color: lighten($ui-base-color, 26%);
+      color: $ui-base-lighter-color;
 
       a {
         color: $ui-primary-color;
@@ -308,7 +308,7 @@ code {
       padding: 7px 4px;
       padding-bottom: 9px;
       font-size: 16px;
-      color: lighten($ui-base-color, 26%);
+      color: $ui-base-lighter-color;
       font-family: inherit;
       pointer-events: none;
       cursor: default;
diff --git a/app/javascript/styles/variables.scss b/app/javascript/styles/variables.scss
index 8362096e1..52c8cd1cf 100644
--- a/app/javascript/styles/variables.scss
+++ b/app/javascript/styles/variables.scss
@@ -22,7 +22,8 @@ $valid-value-color: $success-green !default;
 $error-value-color: $error-red !default;
 
 // Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default;             // Darkest
-$ui-primary-color: $classic-primary-color !default;       // Lighter
-$ui-secondary-color: $classic-secondary-color !default;   // Lightest
-$ui-highlight-color: $classic-highlight-color !default;   // Vibrant
+$ui-base-color: $classic-base-color !default;                  // Darkest
+$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest
+$ui-primary-color: $classic-primary-color !default;            // Lighter
+$ui-secondary-color: $classic-secondary-color !default;        // Lightest
+$ui-highlight-color: $classic-highlight-color !default;        // Vibrant
diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml
index 292a58575..4394aebdd 100644
--- a/app/views/about/_contact.html.haml
+++ b/app/views/about/_contact.html.haml
@@ -1,5 +1,8 @@
 .panel
-  .panel-header= t 'about.contact'
+  .panel-header
+    = succeed ':' do
+      = t 'about.contact'
+    %span{ title: contact.site_contact_email.presence }= contact.site_contact_email.presence
   .panel-body
     - if contact.contact_account
       .owner
@@ -8,8 +11,9 @@
           = link_to TagManager.instance.url_for(contact.contact_account) do
             %span.display_name.emojify= display_name(contact.contact_account)
             %span.username @#{contact.contact_account.acct}
-
-    - unless contact.site_contact_email.blank?
-      .contact-email
-        = t 'about.business_email'
-        %strong= contact.site_contact_email
+    - else
+      .owner
+        .avatar= image_tag full_asset_url('avatars/original/missing.png')
+        .name
+          %span.display_name= t 'about.contact_missing'
+          %span.username= t 'about.contact_unavailable'
diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index cce749561..11315fefa 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -1,16 +1,44 @@
 - content_for :page_title do
   = site_hostname
 
-.wrapper.thicc
-  .sidebar-layout
-    .main
-      .panel
-        %h2= site_hostname
+- content_for :header_tags do
+  = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
 
-        - unless @instance_presenter.site_description.blank?
-          %p!= @instance_presenter.site_description
+  %meta{ property: 'og:site_name', content: site_title }/
+  %meta{ property: 'og:url', content: about_url }/
+  %meta{ property: 'og:type', content: 'website' }/
+  %meta{ property: 'og:title', content: site_hostname }/
+  %meta{ property: 'og:description', content: strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html')) }/
+  %meta{ property: 'og:image', content: asset_pack_path('mastodon_small.jpg', protocol: :request) }/
+  %meta{ property: 'og:image:width', content: '400' }/
+  %meta{ property: 'og:image:height', content: '400' }/
+  %meta{ property: 'twitter:card', content: 'summary' }/
 
-      .information-board
+.landing-page
+  .header-wrapper.compact
+    .header
+      .container.links
+        .brand
+          = link_to root_url do
+            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+
+        %ul.nav
+          %li
+            - if user_signed_in?
+              = link_to t('settings.back'), root_url, class: 'webapp-btn'
+            - else
+              = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
+          %li= link_to t('about.about_this'), about_more_path
+          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
+
+      .container.hero
+        .heading
+          %h3= t('about.description_headline', domain: site_hostname)
+          %p= @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
+
+  .information-board
+    .container
+      .information-board-sections
         .section
           %span= t 'about.user_count_before'
           %strong= number_with_delimiter @instance_presenter.user_count
@@ -23,11 +51,14 @@
           %span= t 'about.domain_count_before'
           %strong= number_with_delimiter @instance_presenter.domain_count
           %span= t 'about.domain_count_after'
-
-      - unless @instance_presenter.site_extended_description.blank?
-        .panel!= @instance_presenter.site_extended_description
-
-    .sidebar
       = render 'contact', contact: @instance_presenter
-      = render 'links', instance: @instance_presenter
-      = render 'version', version: @instance_presenter
+
+  .extended-description
+    .container
+      = @instance_presenter.site_extended_description.html_safe.presence || t('about.extended_description_html')
+
+  .footer-links
+    .container
+      %p
+        = link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
+        = " (#{@instance_presenter.version_number})"
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 81e685bf6..2df8b01aa 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -3,7 +3,6 @@ ar:
   about:
     about_mastodon_html: ماستدون شبكة إجتماعية <em>حرة و مفتوحة المصدر</em>. هو بديل <em>لامركزي</em> لمنصات تجارية ، يمكنك من تجنب احتكار شركة واحدة للإتصالات الخاصة بك. يمكنك اختيار أي خادم تثق فيه. أيهما تختار، يمكنك التفاعل مع أي شخص آخر على الشبكة. يمكن لأي شخص تنصيب و تشغيل خادم ماستدون خاص به والمشاركة في <em>الشبكات الاجتماعية</em> بكل شفافية.
     about_this: عن مثيل الخادوم هذا
-    business_email: 'البريد الإلكتروني المهني :'
     closed_registrations: التسجيلات في مثيل الخادوم هذا مُغلقة حاليًا.
     contact: للتواصل معنا
     description_headline: ما هو %{domain}?
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ab024c741..c23a7907c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -3,7 +3,6 @@ bg:
   about:
     about_mastodon_html: Mastodon е <em>безплатен</em> сървър с <em>отворен код</em> за социални мрежи. Като <em>децентрализирана</em> алтернатива на комерсиалните платформи, той позволява избягването на риска от монополизация на твоята комуникация от единични компании. Изберете си сървър, на който се доверявате, и ще можете да контактувате с всички останали. Всеки може да пусне Mastodon и лесно да вземе участие в <em>социалната мрежа</em>.
     about_this: За тази инстанция
-    business_email: 'Служебен e-mail:'
     closed_registrations: В момента регистрациите за тази инстанция са затворени.
     contact: За контакти
     description_headline: Какво е %{domain}?
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4109ed5ce..9c58214d5 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -3,7 +3,6 @@ ca:
   about:
     about_mastodon_html: Mastodon és un servidor de xarxa social <em>lliure i de codi obert</em>. Una alternativa <em>descentralitzada</em> a plataformes comercials, que evita el risc que una única companyia monopolitzi la teva comunicació. Qualsevol pot executar Mastodon i participar sense problemes en la <em>xarxa social</em>.
     about_this: Sobre aquesta instància
-    business_email: 'Adreça de contacte:'
     closed_registrations: Els registres estan actualment tancats en aquesta instància.
     contact: Contacte
     description_headline: Què es %{domain}?
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 4e081eb27..6ac8c1bf4 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -3,7 +3,6 @@ de:
   about:
     about_mastodon_html: Mastodon ist ein <em>freier, quelloffener</em> sozialer Netzwerkserver. Als <em>dezentralisierte</em> Alternative zu kommerziellen Plattformen verhindert es die Risiken, die entstehen, wenn eine einzelne Firma deine Kommunikation monopolisiert. Jeder kann Mastodon verwenden und ganz einfach am <em>sozialen Netzwerk</em> teilnehmen.
     about_this: Über diese Instanz
-    business_email: 'Geschäftliche E-Mail:'
     closed_registrations: Die Registrierung ist auf dieser Instanz momentan geschlossen.
     contact: Kontakt
     description_headline: Was ist %{domain}?
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1ec727ca7..664a26348 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,12 +3,16 @@ en:
   about:
     about_mastodon_html: Mastodon is a social network based on open web protocols and free, open-source software. It is decentralized like e-mail.
     about_this: About
-    business_email: 'Business e-mail:'
     closed_registrations: Registrations are currently closed on this instance. However! You can find a different instance to make an account on and get access to the very same network from there.
     contact: Contact
+    contact_missing: Not set
+    contact_unavailable: N/A
     description_headline: What is %{domain}?
     domain_count_after: other instances
     domain_count_before: Connected to
+    extended_description_html: |
+      <h3>A good place for rules</h3>
+      <p>The extended description has not been set up yet.</p>
     features:
       humane_approach_body: Learning from failures of other networks, Mastodon aims to make ethical design choices to combat the misuse of social media.
       humane_approach_title: A more humane approach
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 2b95d4565..c79342e2c 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -3,7 +3,6 @@ eo:
   about:
     about_mastodon_html: Mastodon estas <em>senpaga, malfermitkoda</em> socia reto. Ĝi estas <em>sencentra</em> alia eblo al komercaj servoj. Ĝi evitigas, ke unusola firmao regu vian tutan komunikadon. Elektu servilon, kiun vi fidas. Kiu ajn estas via elekto, vi povas interagi kun ĉiuj aliaj uzantoj. Iu ajn povas krei sian propran aperaĵon de Mastodon en sia servilo, kaj partopreni en la <em>socia reto</em> tute glate.
     about_this: Pri tiu aperaĵo
-    business_email: 'Profesia retpoŝt-adreso:'
     contact: Kontakti
     description_headline: Kio estas %{domain}?
     domain_count_after: aliaj aperaĵoj
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d845a18c2..70774c73a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -3,7 +3,6 @@ es:
   about:
     about_mastodon_html: Mastodon es un servidor de red social <em>libre y de código abierto</em>. Una alternativa <em>descentralizada</em> a plataformas comerciales, que evita el riesgo de que una única compañía monopolice tu comunicación. Cualquiera puede ejecutar Mastodon y participar sin problemas en la <em>red social</em>.
     about_this: Acerca de esta instancia
-    business_email: 'Correo de negocios:'
     closed_registrations: Los registros están actualmente cerrados en esta instancia.
     contact: Contacto
     description_headline: "¿Qué es %{domain}?"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 5fb215262..0febff307 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -3,7 +3,6 @@ fa:
   about:
     about_mastodon_html: ماستدون (Mastodon) یک شبکهٔ اجتماعی <em>آزاد و کدباز</em> است. یک جایگزین <em>غیرمتمرکز</em> برای شبکه‌های تجاری، که نمی‌گذارد ارتباط‌های شما را یک شرکت در انحصار خود بگیرد. یک سرور مورد اعتماد را انتخاب کنید &mdash; هر سروری که باشد، همچنان می‌توانید با سرورهای دیگر ارتباط داشته باشید. هر کسی می‌تواند سرور ماستدون خود را راه بیندازد و در <em>شبکهٔ اجتماعی</em> سهیم شود.
     about_this: دربارهٔ این سرور
-    business_email: 'ایمیل کاری:'
     closed_registrations: امکان ثبت نام روی این سرور هم‌اینک فعال نیست.
     contact: تماس
     description_headline: "%{domain} چیست؟"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 382c60cc2..6bf2092b9 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -3,7 +3,6 @@ fi:
   about:
     about_mastodon_html: Mastodon on <em>ilmainen, avoimeen lähdekoodiin perustuva</em> sosiaalinen verkosto. <em>Hajautettu</em> vaihtoehto kaupallisille alustoille, se välttää eiskit yhden yrityksen monopolisoinnin sinun viestinnässäsi. Valitse palvelin mihin luotat &mdash; minkä tahansa valitset, voit vuorovaikuttaa muiden kanssa. Kuka tahansa voi luoda Mastodon palvelimen ja ottaa osaa <em>sosiaaliseen verkkoon</em> saumattomasti.
     about_this: Tietoja tästä palvelimesta
-    business_email: 'Business e-mail:'
     contact: Ota yhteyttä
     description_headline: Mikä on %{domain}?
     domain_count_after: muuhun palvelimeen
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 7ba9e2525..c8e55460c 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -3,7 +3,6 @@ fr:
   about:
     about_mastodon_html: Mastodon est un réseau social utilisant des formats ouverts et des logiciels libres. Comme le courriel, il est décentralisé.
     about_this: À propos
-    business_email: Courriel professionnel
     closed_registrations: Les inscriptions sont actuellement fermées sur cette instance. Cependant, vous pouvez trouver une autre instance sur laquelle vous créer un compte et à partir de laquelle vous pourrez accéder au même réseau.
     contact: Contact
     description_headline: Qu’est-ce que %{domain} ?
@@ -432,70 +431,7 @@ fr:
     reblogged: partagé
     sensitive_content: Contenu sensible
   terms:
-    body_html: |
-      <h2>Politique de confidentialité</h2>
-
-      <h3 id="collect">Quelles données collectons-nous?</h3>
-
-      <p>Nous collectons des données lorsque vous vous enregistrez sur notre site et les récoltons lorsque vous participez dans le forum en lisant, écrivant, et évaluant le contenu partagé ici.</p>
-
-      <p>Lors de l'enregistrement sur notre site, il peut vous être demandé de renseigner votre nom et adresse e-mail. Vous pouvez, cependant, visiter notre site sans inscription. Votre adresse e-mail devra être vérifiée grâce à un e-mail contenant un lien unique. Si ce lien est visité, nous savons que vous contrôlez cette adresse e-mail.</p>
-
-      <p>Lors de l'inscription et de la publication de statuts, nous enregistrons l'adresse IP de laquelle le(s) status viennent. Nous pouvons également conserver des historiques serveurs qui contiendront l'adresse IP de chaque requête adressée à notre serveur.</p>
-
-      <h3 id="use">Que faisons-nous avec vos données?</h3>
-
-      <p>Toute information que nous collectons pourra être utilisée d'une des manières suivantes :</p>
-
-      <ul>
-        <li>Pour personnaliser votre expérience &mdash; vos données nous aident à mieux répondre à vos besoins individuels.</li>
-        <li>Pour améliorer notre site &mdash; nous faisons tout notre possible pour améliorer notre site en fonction des données, retours et suggestions que nous recevons.</li>
-        <li>Afin d'améliorer le support client &mdash; vos données nous aident à mieux répondre à vos requêtes et demandes de support.</li>
-        <li>Afin d'envoyer des e-mails à intervalles réguliers &mdash; l'adresse e-mail que vous renseignez peut être utilisée pour vous envoyer des données et notifications concernant des changements ou en réponse à votre nom d'utilisateur⋅trice, en réponse à vos demandes et/ou autres requêtes ou questions</li>
-      </ul>
-
-      <h3 id="protect">Comment protégeons-nous vos données?</h3>
-        
-      <p>Nous appliquons une multitude de mesures afin de maintenir la sécurité de vos données personnelles lorsque vous entrez, soumettez, ou accédez à ces dernières.</p>
-
-      <h3 id="data-retention">Quelle est notre politique de conservation des données?</h3>
-
-      <p>Nous nous efforçons de:</p>
-
-      <ul>
-        <li>Ne pas garder les historiques serveurs contenant l'adresse IP de chaque requête adressée à ce serveur plus de 90 jours.</li>
-        <li>Ne pas conserver les adresses IP associées aux utilisateur⋅trices et leur contenu plus de 5 ans.</li>
-      </ul>
-
-      <h3 id="cookies">Utilisons nous des "cookies"?</h3>
-
-      <p>Oui. Les cookies sont de petits fichiers qu'un site ou prestataires de services transfèrent sur le disque dur de votre ordinateur par le biais de votre navigateur Web (si ce dernier le permet). Ces cookies permettent au site de reconnaître votre navigateur et, si vous disposez d'un compte, l'associer à votre compte.</p>
-
-      <p>Nous utilisons les cookies pour enregistrer vos préférences pour de futures visites, compiler des données agrégées à propos du trafic et des interactions effectuées sur le site afin de proposer une meilleure expérience dans le futur. Nous pouvons contracter les services d'acteurs tiers afin de nous aider à mieux comprendre les visiteurs de notre site. Ces acteurs ont l'autorisation d'utiliser ces données seulement à des fins d'améliorations.</p>
-
-      <h3 id="disclose">Divulguons-nous des données à des acteurs tiers ?</h3>
-
-      <p>Nous n'échangeons pas, ne vendons pas ni effectuons de quelconques transferts avec des acteurs tiers d'informations permettant de vous identifier personnellement. Cela n'inclut pas les acteurs de confiance qui nous aident à gérer notre entreprise et à vous servir tant que ces acteurs s'accordent à garder lesdites informations confidentielles. Nous pouvons être amenés à délivrer vos informations lorsque jugé adéquat afin de respecter la loi, d'appliquer la politique de notre site, ou afin de protéger nos droits, ceux des autres, notre propriété ou sécurité. Cependant, aucune information permettant l'identification de nos visiteurs ne sera divulguée à des fins publicitaires, commerciales ou tout autre usage.</p>
-
-      <h3 id="third-party">Liens vers des acteurs tiers</h3>
-
-      <p>Nous pouvons être amenés à inclure ou offrir les services ou produits d'acteurs tiers sur notre site. Ces acteurs tiers possèdent leur propre politique de confidentialité. Nous ne sommes donc pas responsables du contenu ou activités desdits acteurs. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes ouverts à toute remarque concernant ces acteurs.</p>
-
-      <h3 id="coppa">Children's Online Privacy Protection Act</h3>
-
-      <p>Notre site, nos produits et services sont tous dirigés à l'usage de personnes étant âgés de 13 ans ou plus. Si ce serveur est hébergé aux États-Unis et que vous êtes âgé⋅e de moins de 13 ans, au vu du COPPA (<a href="https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) n'utilisez pas ce site.</p>
-
-      <h3 id="consent">Votre consentement</h3>
-
-      <p>En utilisant notre site, vous consentez à la politique de confiedentialité de notre site Web.</p>
-
-      <h3 id="changes">Changements de notre politique de confidentialité</h3>
-
-      <p>Si nous décidons d'apporter des changements à notre politique de confidentialité, nous les mettrons à disposition sur cette page.</p>
-
-      <p>Ce document est distribué sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 31 Mai 2013. Il a été traduit en français en Juillet 2017.</p>
-
-      <p>Originellement adapté à partir de la politique de confidentialité de <a href="https://github.com/discourse/discourse">Discourse</a></p>.
+    body_html: "<h2>Politique de confidentialité</h2>\n\n<h3 id=\"collect\">Quelles données collectons-nous?</h3>\n\n<p>Nous collectons des données lorsque vous vous enregistrez sur notre site et les récoltons lorsque vous participez dans le forum en lisant, écrivant, et évaluant le contenu partagé ici.</p>\n\n<p>Lors de l'enregistrement sur notre site, il peut vous être demandé de renseigner votre nom et adresse e-mail. Vous pouvez, cependant, visiter notre site sans inscription. Votre adresse e-mail devra être vérifiée grâce à un e-mail contenant un lien unique. Si ce lien est visité, nous savons que vous contrôlez cette adresse e-mail.</p>\n\n<p>Lors de l'inscription et de la publication de statuts, nous enregistrons l'adresse IP de laquelle le(s) status viennent. Nous pouvons également conserver des historiques serveurs qui contiendront l'adresse IP de chaque requête adressée à notre serveur.</p>\n\n<h3 id=\"use\">Que faisons-nous avec vos données?</h3>\n\n<p>Toute information que nous collectons pourra être utilisée d'une des manières suivantes :</p>\n\n<ul>\n  <li>Pour personnaliser votre expérience &mdash; vos données nous aident à mieux répondre à vos besoins individuels.</li>\n  <li>Pour améliorer notre site &mdash; nous faisons tout notre possible pour améliorer notre site en fonction des données, retours et suggestions que nous recevons.</li>\n  <li>Afin d'améliorer le support client &mdash; vos données nous aident à mieux répondre à vos requêtes et demandes de support.</li>\n  <li>Afin d'envoyer des e-mails à intervalles réguliers &mdash; l'adresse e-mail que vous renseignez peut être utilisée pour vous envoyer des données et notifications concernant des changements ou en réponse à votre nom d'utilisateur⋅trice, en réponse à vos demandes et/ou autres requêtes ou questions</li>\n</ul>\n\n<h3 id=\"protect\">Comment protégeons-nous vos données?</h3>\n  \n<p>Nous appliquons une multitude de mesures afin de maintenir la sécurité de vos données personnelles lorsque vous entrez, soumettez, ou accédez à ces dernières.</p>\n\n<h3 id=\"data-retention\">Quelle est notre politique de conservation des données?</h3>\n\n<p>Nous nous efforçons de:</p>\n\n<ul>\n  <li>Ne pas garder les historiques serveurs contenant l'adresse IP de chaque requête adressée à ce serveur plus de 90 jours.</li>\n  <li>Ne pas conserver les adresses IP associées aux utilisateur⋅trices et leur contenu plus de 5 ans.</li>\n</ul>\n\n<h3 id=\"cookies\">Utilisons nous des \"cookies\"?</h3>\n\n<p>Oui. Les cookies sont de petits fichiers qu'un site ou prestataires de services transfèrent sur le disque dur de votre ordinateur par le biais de votre navigateur Web (si ce dernier le permet). Ces cookies permettent au site de reconnaître votre navigateur et, si vous disposez d'un compte, l'associer à votre compte.</p>\n\n<p>Nous utilisons les cookies pour enregistrer vos préférences pour de futures visites, compiler des données agrégées à propos du trafic et des interactions effectuées sur le site afin de proposer une meilleure expérience dans le futur. Nous pouvons contracter les services d'acteurs tiers afin de nous aider à mieux comprendre les visiteurs de notre site. Ces acteurs ont l'autorisation d'utiliser ces données seulement à des fins d'améliorations.</p>\n\n<h3 id=\"disclose\">Divulguons-nous des données à des acteurs tiers ?</h3>\n\n<p>Nous n'échangeons pas, ne vendons pas ni effectuons de quelconques transferts avec des acteurs tiers d'informations permettant de vous identifier personnellement. Cela n'inclut pas les acteurs de confiance qui nous aident à gérer notre entreprise et à vous servir tant que ces acteurs s'accordent à garder lesdites informations confidentielles. Nous pouvons être amenés à délivrer vos informations lorsque jugé adéquat afin de respecter la loi, d'appliquer la politique de notre site, ou afin de protéger nos droits, ceux des autres, notre propriété ou sécurité. Cependant, aucune information permettant l'identification de nos visiteurs ne sera divulguée à des fins publicitaires, commerciales ou tout autre usage.</p>\n\n<h3 id=\"third-party\">Liens vers des acteurs tiers</h3>\n\n<p>Nous pouvons être amenés à inclure ou offrir les services ou produits d'acteurs tiers sur notre site. Ces acteurs tiers possèdent leur propre politique de confidentialité. Nous ne sommes donc pas responsables du contenu ou activités desdits acteurs. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes ouverts à toute remarque concernant ces acteurs.</p>\n\n<h3 id=\"coppa\">Children's Online Privacy Protection Act</h3>\n\n<p>Notre site, nos produits et services sont tous dirigés à l'usage de personnes étant âgés de 13 ans ou plus. Si ce serveur est hébergé aux États-Unis et que vous êtes âgé⋅e de moins de 13 ans, au vu du COPPA (<a href=\"https://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) n'utilisez pas ce site.</p>\n\n<h3 id=\"consent\">Votre consentement</h3>\n\n<p>En utilisant notre site, vous consentez à la politique de confiedentialité de notre site Web.</p>\n\n<h3 id=\"changes\">Changements de notre politique de confidentialité</h3>\n\n<p>Si nous décidons d'apporter des changements à notre politique de confidentialité, nous les mettrons à disposition sur cette page.</p>\n\n<p>Ce document est distribué sous licence CC-BY-SA. Il a été mis à jour pour la dernière fois le 31 Mai 2013. Il a été traduit en français en Juillet 2017.</p>\n\n<p>Originellement adapté à partir de la politique de confidentialité de <a href=\"https://github.com/discourse/discourse\">Discourse</a></p>.\n"
     title: "%{instance} Conditions d'utilisations et Politique de confidentialité"
   time:
     formats:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 798265e9f..0dce40e2b 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3,7 +3,6 @@ he:
   about:
     about_mastodon_html: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
     about_this: אודות שרת זה
-    business_email: 'דוא"ל עסקי:'
     closed_registrations: הרשמות סגורות לשרת זה לעת עתה.
     contact: צור קשר
     description_headline: מהו %{domain}?
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index e1d92b9b4..328230e17 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -3,7 +3,6 @@ hr:
   about:
     about_mastodon_html: Mastodon je <em>besplatna, open-source</em> socijalna mreža. <em>Decentralizirana</em> alternativa komercijalnim platformama, izbjegava rizik toga da jedna tvrtka monopolizira vašu komunikaciju. Izaberite server kojem ćete vjerovati &mdash; koji god odabrali, moći ćete komunicirati sa svima ostalima. Bilo tko može imati svoju vlastitu Mastodon instancu i sudjelovati u <em>socijalnoj mreži</em> bez problema.
     about_this: O ovoj instanci
-    business_email: 'Poslovni e-mail:'
     closed_registrations: Registracije na ovoj instanci su trenutno zatvorene.
     contact: Kontakt
     description_headline: Što je %{domain}?
diff --git a/config/locales/id.yml b/config/locales/id.yml
index d0e708749..f49516268 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -3,7 +3,6 @@ id:
   about:
     about_mastodon_html: Mastodon adalah sebuah jejaring sosial <em>terbuka, open-source</em. Sebuah alternatif <em>desentralisasi</em> dari platform komersial, menjauhkan anda resiko dari sebuah perusahaan yang memonopoli komunikasi anda. Pilih server yang anda percayai &mdash; apapun yang anda pilih, anda tetap dapat berinteraksi dengan semua orang. Semua orang dapat menjalankan server Mastodon sendiri dan berpartisipasi dalam <em>jejaring sosial</em> dengan mudah.
     about_this: Tentang server ini
-    business_email: 'E-mail bisnis:'
     closed_registrations: Pendaftaran untuk server ini sedang ditutup.
     contact: Kontak
     description_headline: Apa itu %{domain}?
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 7c074e349..cfde5b333 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -3,7 +3,6 @@ io:
   about:
     about_mastodon_html: Mastodon esas <em>gratuita, apertitkodexa</em> sociala reto. Ol esas <em>sencentra</em> altra alternativo a komercala servadi. Ol evitigas, ke sola firmo guvernez tua tota komunikadol. Selektez servero, quan tu fidas. Irge qua esas tua selekto, tu povas komunikar kun omna altra uzeri. Irgu povas krear sua propra instaluro di Mastodon en sua servero, e partoprenar en la <em>sociala reto</em> tote glate.
     about_this: Pri ta instaluro
-    business_email: 'Profesionala retpost-adreso:'
     closed_registrations: Membresko ne nun esas posible en ta instaluro.
     contact: Kontaktar
     description_headline: Quo esas %{domain}?
diff --git a/config/locales/it.yml b/config/locales/it.yml
index ab15726c4..5aa0e1da6 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,7 +3,6 @@ it:
   about:
     about_mastodon_html: Mastodon è un social network <em>gratuito e open-source</em>. Un'alternativa <em>decentralizzata</em> alle piattaforme commerciali che evita che una singola compagnia monopolizzi il tuo modo di comunicare. Scegli un server di cui ti fidi &mdash; qualunque sia la tua scelta, potrai interagire con chiunque altro. Chiunque può sviluppare un suo server Mastodon e partecipare alla vita del <em>social network</em>.
     about_this: A proposito di questo server
-    business_email: 'Email di lavoro:'
     closed_registrations: Al momento le iscrizioni a questo server sono chiuse.
     contact: Contatti
     description_headline: Cos'è %{domain}?
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 98ecd37f8..5bd4c38a3 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -3,7 +3,6 @@ ja:
   about:
     about_mastodon_html: Mastodon は、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。
     about_this: このインスタンスについて
-    business_email: 'ビジネスメールアドレス:'
     closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。しかし、他のインスタンスにアカウントを作成しても全く同じネットワークに参加することができます。
     contact: 連絡先
     description_headline: "%{domain} とは？"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 6e73c7697..fbd250c95 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -3,7 +3,6 @@ ko:
   about:
     about_mastodon_html: Mastodon 은<em>자유로운 오픈 소스</em>소셜 네트워크입니다. 상용 플랫폼의 대체로써 <em>분산형 구조</em>를 채택해, 여러분의 대화가 한 회사에 독점되는 것을 방지합니다. 신뢰할 수 있는 인스턴스를 선택하세요 &mdash; 어떤 인스턴스를 고르더라도, 누구와도 대화할 수 있습니다. 누구나 자신만의 Mastodon 인스턴스를 만들 수 있으며, Seamless하게 <em>소셜 네트워크</em>에 참가할 수 있습니다.
     about_this: 이 인스턴스에 대해서
-    business_email: '비즈니스 메일 주소:'
     closed_registrations: 현재 이 인스턴스에서는 신규 등록을 받고 있지 않습니다.
     contact: 연락처
     description_headline: "%{domain} 는 무엇인가요?"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 301b0296f..482eeaf82 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -3,7 +3,6 @@ nl:
   about:
     about_mastodon_html: Mastodon is een <em>vrij, gratis en open-source</em> sociaal netwerk. Een <em>gedecentraliseerd</em> alternatief voor commerciële platforms. Het voorkomt de risico's van een enkel bedrijf dat jouw communicatie monopoliseert. Kies een server die je vertrouwt &mdash; welke je ook kiest, je kunt met elke andere server communiceren. Iedereen kan een eigen Mastodon-server draaien en naadloos deelnemen in het <em>sociale netwerk</em>.
     about_this: Over deze server
-    business_email: 'E-mailadres:'
     closed_registrations: Registreren op deze server is momenteel uitgeschakeld.
     contact: Contact
     description_headline: Wat is %{domain}?
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 11bf4eef0..f75e2a031 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -3,7 +3,6 @@
   about:
     about_mastodon_html: Mastodon er et sosialt nettverk laget med <em>fri programvare</em>. Et <em>desentralisert</em> alternativ til kommersielle plattformer. Slik kan det unngå risikoene ved å ha et enkelt selskap som monopoliserer din kommunikasjon. Velg en tjener du stoler på &mdash; uansett hvilken du velger så kan du kommunisere med alle andre. Alle kan kjøre sin egen Mastodon og delta sømløst i det sosiale nettverket.
     about_this: Om denne instansen
-    business_email: 'Bedriftsepost:'
     closed_registrations: Registreringer er for øyeblikket lukket på denne instansen.
     contact: Kontakt
     description_headline: Hva er %{domain}?
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index dbdd6eacf..ed9ff99c1 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -3,7 +3,6 @@ oc:
   about:
     about_mastodon_html: Mastodon es un malhum social <em>liure e open-source</em>. Una alternativa <em>descentralizada</em> a las plat-formas comercialas, aquò evita qu’una sola companhiá monopolize vòstra comunicacion. Causissètz un servidor que vos fisatz, quina que siasque vòstra causida, podètz interagir amb tot lo mond. Qual que siasque pòt aver son instància Mastodon e participar al <em>malhum social</em> sens cap de problèmas.
     about_this: A prepaus d’aquesta instància
-    business_email: 'Corrièl professional :'
     closed_registrations: Las inscripcions son clavadas pel moment sus aquesta instància.
     contact: Contacte
     description_headline: Qué es %{domain} ?
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 766eb9887..77412be78 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -3,7 +3,6 @@ pl:
   about:
     about_mastodon_html: Mastodon jest wolną i otwartą siecią społecznościową, zdecentralizowaną alternatywą dla zamkniętych, komercyjnych platform.
     about_this: O tej instancji
-    business_email: 'Służbowy adres e-mail:'
     closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta. Możesz jednak zarejestrować się na innej instancji, uzyskując dostęp do tej samej sieci.
     contact: Kontakt
     description_headline: Czym jest %{domain}?
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1881c6f66..9d08c2010 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -3,7 +3,6 @@ pt-BR:
   about:
     about_mastodon_html: Mastodon é um servidor de rede social <em>grátis, e open-source</em>. Uma alternativa <em>descentralizada</em> ás plataformas comerciais, que evita o risco de uma única empresa monopolizar a sua comunicação. Escolha um servidor que você confie &mdash; qualquer um que escolher, você poderá interagir com todo o resto. Qualquer um pode ter uma instância Mastodon e assim participar na <em>rede social federada</em> sem problemas.
     about_this: Sobre essa instância
-    business_email: 'Email comercial:'
     closed_registrations: Registros estão fechadas para essa instância.
     contact: Contato
     description_headline: O que é %{domain}?
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index de6428d42..7a31f4bbe 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -3,7 +3,6 @@ pt:
   about:
     about_mastodon_html: Mastodon é uma rede social <em>grátis e em código aberto</em>. Uma alternativa <em>descentralizada</em> às plataformas comerciais, que evita o risco de uma única empresa monopolizar a tua comunicação. Escolhe um servidor que confies, não importa qual, pois vais poder comunicar com todos os outros. Qualquer um pode criar uma instância Mastodon e participar nesta <em>rede social</em>.
     about_this: Sobre esta instância
-    business_email: 'Email comercial:'
     closed_registrations: Novos registos estão fechados nesta instância.
     contact: Contacto
     description_headline: O que é o %{domain}?
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5d307f444..2854c6c7c 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -3,7 +3,6 @@ ru:
   about:
     about_mastodon_html: Mastodon - это <em>свободная</em> социальная сеть с <em>открытым исходным кодом</em>. Как <em>децентрализованная</em> альтернатива коммерческим платформам, Mastodon предотвращает риск монополизации Вашего общения одной компанией. Выберите сервер, которому Вы доверяете &mdash; что бы Вы ни выбрали, Вы сможете общаться со всеми остальными. Любой может запустить свой собственный узел Mastodon и участвовать в <em>социальной сети</em> совершенно бесшовно.
     about_this: Об этом узле
-    business_email: 'Деловой e-mail:'
     closed_registrations: В данный момент регистрация на этом узле закрыта.
     contact: Связаться
     description_headline: Что такое %{domain}?
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 4b929cb77..a4a9c0647 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -3,7 +3,6 @@ th:
   about:
     about_mastodon_html: แมสโทดอน เป็น  <em>ดีเซ็นทรัลไลซ์</em><em>ฟรีโอเพ่นซอร์ส</em> โซเชี่ยวเน็ตเวริ์ค.  เป็นทางเลือกทดแทนโซเชี่ยวเน็ตเวิร์คที่ทำเป็นธุรกิจการค้า, ป้องกันการผูกขาดช่องทางการสื่อสารของคุณ. เลือกเซร์ฟเวอร์ที่คุณไว้ใจ &mdash; ที่คุณเลือกได้เอง, สื่อสารกับคนที่คุณต้องการได้เสมอ. ใครๆก็รันแมสโทดอนอินซะแตนซ์ได้ และ เชื่อมต่อกับ<em>โซเชี่ยวเน็ตเวิร์ค</em> โดยไม่มีอะไรมาขวางกั้น.
     about_this: เกี่ยวกับอินซะแตนซ์นี้
-    business_email: 'อีเมล์ธุรกิจ:'
     closed_registrations: อินซะแตนซ์นี้ปิดรับลงทะเบียนแล้ว.
     contact: ติดต่อ
     description_headline: โดเมนคือ %{domain} ?
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 9c03890c6..16d374627 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -3,7 +3,6 @@ tr:
   about:
     about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
     about_this: Bu sunucu hakkında
-    business_email: 'İş e-postası:'
     closed_registrations: Bu sunucu şu anda yeni kayıt almamaktadır.
     contact: İletişim
     description_headline: Peki %{domain} nedir?
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 48a4046df..437113711 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -3,7 +3,6 @@ uk:
   about:
     about_mastodon_html: Mastodon - це <em>вільна</em> соціальна мережа з <em>відкритим вихідним кодом</em>. Вона є <em>децентралізованою</em> альтернативою комерційним платформам, що дозволяє уникнути ризиків монополізації вашого спілкування однією компанією. Виберіть сервер, якому ви довіряєте &mdash; що б ви не вибрали, Ви зможете спілкуватись з усіма іншими. Будь-який користувач може запустити власну інстанцію Mastodon та без проблем брати участь в <em>соціальній мережі</em>.
     about_this: Про цю інстанцію
-    business_email: 'Діловий email:'
     closed_registrations: На даний момент реєстрація на цій інстанції закрита.
     contact: Зв'язатися
     description_headline: Що таке %{domain}?
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 3dffc1db0..3df5d1483 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -3,7 +3,6 @@ zh-CN:
   about:
     about_mastodon_html: Mastodon（长毛象）是一个<em>自由、开放源码</em>的社交网站。它是一个分布式的服务，避免你的通信被单一商业机构垄断操控。请你选择一家你信任的 Mastodon 实例，在上面创建帐号，然后你就可以和任一 Mastodon 实例上的用户互通，享受无缝的<em>社交</em>交流。
     about_this: 关于本实例
-    business_email: 商业电邮︰
     closed_registrations: 这个实例目前不开放注册 _(:3」∠)_
     contact: 联络
     description_headline: 关于 %{domain}
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 916678b71..396d084c5 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -3,7 +3,6 @@ zh-HK:
   about:
     about_mastodon_html: Mastodon（萬象）是<em>自由、開源</em>的社交網絡。服務站<em>各自獨立而互連</em>，避免單一商業機構壟斷。找你所信任的服務站，建立帳號，你即可與任何服務站上的用戶溝通，享受無縫的<em>網絡交流</em>。
     about_this: 關於本服務站
-    business_email: 聯絡網站管理者︰
     closed_registrations: 本服務站暫時停止接受登記。
     contact: 聯絡
     description_headline: 關於 %{domain}
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 31846dac3..6726d6779 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -3,7 +3,6 @@ zh-TW:
   about:
     about_mastodon_html: Mastodon （長毛象）是一個<em>自由、開放原始碼</em>的社群網站。它是一個分散式的服務，避免您的通訊被單一商業機構壟斷操控。請您選擇一家您信任的 Mastodon 服務站，在上面建立帳號，然後您就可以和任一 Mastodon 服務站上的使用者互通，享受無縫的<em>社群網路</em>交流。
     about_this: 關於本服務站
-    business_email: 商務信箱︰
     closed_registrations: 本服務站暫時停止接受註冊。
     contact: 聯絡我們
     description_headline: 關於 %{domain}

From 467456f7a19371fe4d50f25751a1d32a63e9f75c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 16:17:55 +0200
Subject: [PATCH 342/382] Move clean up of unconfirmed users to
 sidekiq-scheduler (#4336)

* Move clean up of unconfirmed users to sidekiq-scheduler

* mastodon:daily is now deprecated
---
 .../scheduler/user_cleanup_scheduler.rb       | 13 ++++++++++
 config/sidekiq.yml                            |  3 +++
 lib/tasks/mastodon.rake                       | 24 +++++--------------
 3 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 app/workers/scheduler/user_cleanup_scheduler.rb

diff --git a/app/workers/scheduler/user_cleanup_scheduler.rb b/app/workers/scheduler/user_cleanup_scheduler.rb
new file mode 100644
index 000000000..a8f8fbd83
--- /dev/null
+++ b/app/workers/scheduler/user_cleanup_scheduler.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+require 'sidekiq-scheduler'
+
+class Scheduler::UserCleanupScheduler
+  include Sidekiq::Worker
+
+  def perform
+    User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).find_in_batches do |batch|
+      Account.where(id: batch.map(&:account_id)).delete_all
+      User.where(id: batch.map(&:id)).delete_all
+    end
+  end
+end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 78aaa311c..8273c1201 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -18,3 +18,6 @@
   doorkeeper_cleanup_scheduler:
     cron: '1 1 * * 0'
     class: Scheduler::DoorkeeperCleanupScheduler
+  user_cleanup_scheduler:
+    cron: '4 5 * * *'
+    class: Scheduler::UserCleanupScheduler
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index edfa3a4ac..226523554 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -1,18 +1,10 @@
 # frozen_string_literal: true
 
 namespace :mastodon do
-  desc 'Execute daily tasks'
+  desc 'Execute daily tasks (deprecated)'
   task :daily do
-    %w(
-      mastodon:feeds:clear
-      mastodon:media:clear
-      mastodon:users:clear
-      mastodon:push:refresh
-    ).each do |task|
-      puts "Starting #{task} at #{Time.now.utc}"
-      Rake::Task[task].invoke
-    end
-    puts "Completed daily tasks at #{Time.now.utc}"
+    # No-op
+    # All of these tasks are now executed via sidekiq-scheduler
   end
 
   desc 'Turn a user into an admin, identified by the USERNAME environment variable'
@@ -162,14 +154,10 @@ namespace :mastodon do
   end
 
   namespace :users do
-    desc 'Clear out unconfirmed users'
+    desc 'Clear out unconfirmed users (deprecated)'
     task clear: :environment do
-      # Users that never confirmed e-mail never signed in, means they
-      # only have a user record and an avatar record, with no files uploaded
-      User.where('confirmed_at is NULL AND confirmation_sent_at <= ?', 2.days.ago).find_in_batches do |batch|
-        Account.where(id: batch.map(&:account_id)).delete_all
-        User.where(id: batch.map(&:id)).delete_all
-      end
+      # No-op
+      # This task is now executed via sidekiq-scheduler
     end
 
     desc 'List e-mails of all admin users'

From a549d1ae6b33d93743a0c0c3fb1575f07a58492a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 16:21:08 +0200
Subject: [PATCH 343/382] Bump to 1.5.0rc1 (#4318)

---
 lib/mastodon/version.rb                               | 10 +++++++---
 spec/workers/pubsubhubbub/confirmation_worker_spec.rb |  2 +-
 spec/workers/pubsubhubbub/delivery_worker_spec.rb     |  1 -
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 3c92ce417..07969aff4 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,23 +9,27 @@ module Mastodon
     end
 
     def minor
-      4
+      5
     end
 
     def patch
-      7
+      0
     end
 
     def pre
       nil
     end
 
+    def flags
+      'rc1'
+    end
+
     def to_a
       [major, minor, patch, pre].compact
     end
 
     def to_s
-      to_a.join('.')
+      [to_a.join('.'), flags].join
     end
   end
 end
diff --git a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
index 8f66b4520..1eecdd2b5 100644
--- a/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
+++ b/spec/workers/pubsubhubbub/confirmation_worker_spec.rb
@@ -83,6 +83,6 @@ describe Pubsubhubbub::ConfirmationWorker do
   end
 
   def http_headers
-    { 'Connection' => 'close', 'Host' => 'example.com', 'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)' }
+    { 'Connection' => 'close', 'Host' => 'example.com' }
   end
 end
diff --git a/spec/workers/pubsubhubbub/delivery_worker_spec.rb b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
index b72001568..c0e0d5186 100644
--- a/spec/workers/pubsubhubbub/delivery_worker_spec.rb
+++ b/spec/workers/pubsubhubbub/delivery_worker_spec.rb
@@ -59,7 +59,6 @@ describe Pubsubhubbub::DeliveryWorker do
         'Content-Type' => 'application/atom+xml',
         'Host' => 'example.com',
         'Link' => "<https://#{Rails.configuration.x.local_domain}/api/push>; rel=\"hub\", <https://#{Rails.configuration.x.local_domain}/users/#{subscription.account.username}.atom>; rel=\"self\"",
-        'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)',
       }.tap do |basic|
         known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload)
         basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret?

From b3e7beb7c561ca54e8eb43613535ff1350968a99 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Mon, 24 Jul 2017 23:52:47 +0900
Subject: [PATCH 344/382] Perfectly center mastodon logo on mobile landing page
 (#4339)

Setting only padding-left made the logo left-shifted on mobile page. Margin-right was old setting for adjusting clearance between old logo and letter "Mastodon".
---
 app/javascript/styles/about.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 01a341538..daf0e4ac5 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -455,12 +455,12 @@
       .brand {
         a {
           padding-left: 0;
+          padding-right: 0;
           color: $white;
         }
 
         img {
           height: 32px;
-          margin-right: 10px;
           position: relative;
           top: 4px;
           left: -10px;
@@ -728,7 +728,6 @@
       .links .brand img {
         left: 0;
         top: 0;
-        margin-right: 0;
       }
 
       .hero {

From 029f2c4545de617f82c1dfaea3543a9bd75ebcab Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 17:15:15 +0200
Subject: [PATCH 345/382] Redesign /terms page (#4338)

* Redesign /terms page

* Fix tests

* Remove unused keys
---
 app/views/about/_contact.html.haml          |  2 +-
 app/views/about/_links.html.haml            | 12 -------
 app/views/about/_version.html.haml          |  4 ---
 app/views/about/terms.html.haml             | 25 +++++++++++---
 config/locales/ar.yml                       |  3 --
 config/locales/bg.yml                       |  3 --
 config/locales/ca.yml                       |  4 ---
 config/locales/de.yml                       |  4 ---
 config/locales/en.yml                       |  4 ---
 config/locales/eo.yml                       |  3 --
 config/locales/es.yml                       |  3 --
 config/locales/fa.yml                       |  4 ---
 config/locales/fi.yml                       |  3 --
 config/locales/fr.yml                       |  4 ---
 config/locales/he.yml                       |  4 ---
 config/locales/hr.yml                       |  3 --
 config/locales/hu.yml                       |  4 +--
 config/locales/id.yml                       |  4 ---
 config/locales/io.yml                       |  3 --
 config/locales/it.yml                       |  3 --
 config/locales/ja.yml                       |  4 ---
 config/locales/ko.yml                       |  4 ---
 config/locales/nl.yml                       |  3 --
 config/locales/no.yml                       |  4 ---
 config/locales/oc.yml                       |  4 ---
 config/locales/pl.yml                       |  4 ---
 config/locales/pt-BR.yml                    |  4 ---
 config/locales/pt.yml                       |  4 ---
 config/locales/ru.yml                       |  4 ---
 config/locales/th.yml                       |  4 ---
 config/locales/tr.yml                       |  4 ---
 config/locales/uk.yml                       |  4 ---
 config/locales/zh-CN.yml                    |  4 ---
 config/locales/zh-HK.yml                    |  4 ---
 config/locales/zh-TW.yml                    |  3 --
 spec/views/about/_contact.html.haml_spec.rb |  7 ----
 spec/views/about/_links.html.haml_spec.rb   | 38 ---------------------
 37 files changed, 22 insertions(+), 180 deletions(-)
 delete mode 100644 app/views/about/_links.html.haml
 delete mode 100644 app/views/about/_version.html.haml
 delete mode 100644 spec/views/about/_links.html.haml_spec.rb

diff --git a/app/views/about/_contact.html.haml b/app/views/about/_contact.html.haml
index 4394aebdd..822639962 100644
--- a/app/views/about/_contact.html.haml
+++ b/app/views/about/_contact.html.haml
@@ -13,7 +13,7 @@
             %span.username @#{contact.contact_account.acct}
     - else
       .owner
-        .avatar= image_tag full_asset_url('avatars/original/missing.png')
+        .avatar= image_tag full_asset_url('avatars/original/missing.png', skip_pipeline: true)
         .name
           %span.display_name= t 'about.contact_missing'
           %span.username= t 'about.contact_unavailable'
diff --git a/app/views/about/_links.html.haml b/app/views/about/_links.html.haml
deleted file mode 100644
index fb3350539..000000000
--- a/app/views/about/_links.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-.panel
-  .panel-header= t 'about.links'
-  .panel-list
-    %ul
-      - if user_signed_in?
-        %li= link_to t('about.get_started'), root_path
-      - else
-        - if instance.open_registrations
-          %li= link_to t('about.get_started'), new_user_registration_path
-        %li= link_to t('auth.login'), new_user_session_path
-      %li= link_to t('about.terms'), terms_path
-      %li= link_to t('about.source_code'), 'https://github.com/tootsuite/mastodon'
diff --git a/app/views/about/_version.html.haml b/app/views/about/_version.html.haml
deleted file mode 100644
index f8ebc4c6d..000000000
--- a/app/views/about/_version.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.panel
-  .panel-header= t 'about.version'
-  .panel-body
-    %strong= version.version_number
diff --git a/app/views/about/terms.html.haml b/app/views/about/terms.html.haml
index 58064f0be..7004cb0b1 100644
--- a/app/views/about/terms.html.haml
+++ b/app/views/about/terms.html.haml
@@ -1,8 +1,23 @@
 - content_for :page_title do
   = t('terms.title', instance: site_hostname)
 
-.wrapper
-  - if @instance_presenter.site_terms.present?
-    = raw @instance_presenter.site_terms
-  - else
-    = t('terms.body_html')
+.landing-page
+  .header-wrapper.compact
+    .header
+      .container.links
+        .brand
+          = link_to root_url do
+            = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+
+        %ul.nav
+          %li
+            - if user_signed_in?
+              = link_to t('settings.back'), root_url, class: 'webapp-btn'
+            - else
+              = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
+          %li= link_to t('about.about_this'), about_more_path
+          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
+
+  .extended-description
+    .container
+      = @instance_presenter.site_terms.html_safe.presence || t('terms.body_html')
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2df8b01aa..ec051591a 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -8,13 +8,10 @@ ar:
     description_headline: ما هو %{domain}?
     domain_count_after: خوادم أخرى
     domain_count_before: متصل بـ
-    get_started: إبدأ الآن
-    links: الروابط
     other_instances: خوادم أخرى
     source_code: الشفرة المصدرية
     status_count_after: منشورا
     status_count_before: نشروا
-    terms: شروط الاستعمال
     user_count_after: مستخدم
     user_count_before: يستضيف
   accounts:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index c23a7907c..65ff5c025 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -8,13 +8,10 @@ bg:
     description_headline: Какво е %{domain}?
     domain_count_after: други инстанции
     domain_count_before: Свързани към
-    get_started: Първи стъпки
-    links: Връзки
     other_instances: Други инстанции
     source_code: Програмен код
     status_count_after: публикации
     status_count_before: Написали
-    terms: Условия
     user_count_after: потребители
     user_count_before: Дом на
   accounts:
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 9c58214d5..ce4831ac2 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -8,16 +8,12 @@ ca:
     description_headline: Què es %{domain}?
     domain_count_after: altres instàncies
     domain_count_before: Connectat a
-    get_started: Començar
-    links: Vincles
     other_instances: Altres instàncies
     source_code: Codi font
     status_count_after: estats
     status_count_before: Que han escrit
-    terms: Termes
     user_count_after: usuaris registrats
     user_count_before: Tenim
-    version: Versió
   accounts:
     follow: Seguir
     followers: Seguidors
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6ac8c1bf4..04d3fd0b8 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -8,16 +8,12 @@ de:
     description_headline: Was ist %{domain}?
     domain_count_after: andere Instanzen
     domain_count_before: Verbunden mit
-    get_started: Erste Schritte
-    links: Links
     other_instances: Andere Instanzen
     source_code: Quellcode
     status_count_after: Beiträge verfassten
     status_count_before: die
-    terms: AGB
     user_count_after: Benutzer
     user_count_before: Heimat für
-    version: Version
   accounts:
     follow: Folgen
     followers: Folgende
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 664a26348..8fa1ac0e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -24,18 +24,14 @@ en:
       within_reach_title: Always within reach
     find_another_instance: Find another instance
     generic_description: "%{domain} is one server in the network"
-    get_started: Get started
     hosted_on: Mastodon hosted on %{domain}
     learn_more: Learn more
-    links: Links
     other_instances: Instance list
     source_code: Source code
     status_count_after: statuses
     status_count_before: Who authored
-    terms: Terms
     user_count_after: users
     user_count_before: Home to
-    version: Version
     what_is_mastodon: What is Mastodon?
   accounts:
     follow: Follow
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index c79342e2c..6673b6516 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -7,13 +7,10 @@ eo:
     description_headline: Kio estas %{domain}?
     domain_count_after: aliaj aperaĵoj
     domain_count_before: Konektita al
-    get_started: Komenci
-    links: Ligiloj
     other_instances: Aliaj aperaĵoj
     source_code: Fontkodo
     status_count_after: mesaĝoj
     status_count_before: Kiu publikigis
-    terms: Terms
     user_count_after: uzantoj
     user_count_before: Hejmo de
   accounts:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 70774c73a..89e2828d0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -8,13 +8,10 @@ es:
     description_headline: "¿Qué es %{domain}?"
     domain_count_after: otras instancias
     domain_count_before: Conectado a
-    get_started: Comenzar
-    links: Enlaces
     other_instances: Otras instancias
     source_code: Código fuente
     status_count_after: estados
     status_count_before: Que han escrito
-    terms: Términos
     user_count_after: usuarios registrados
     user_count_before: Tenemos
   accounts:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 0febff307..c42016eb3 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -8,16 +8,12 @@ fa:
     description_headline: "%{domain} چیست؟"
     domain_count_after: سرور دیگر
     domain_count_before: متصل به
-    get_started: آغاز کنید
-    links: پیوندها
     other_instances: سرورهای دیگر
     source_code: کدهای منبع
     status_count_after: چیز نوشته‌اند
     status_count_before: که جمعاً
-    terms: شرایط استفاده
     user_count_after: کاربر
     user_count_before: دارای
-    version: نسخه
   accounts:
     follow: پی بگیرید
     followers: پیگیران
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 6bf2092b9..23c844741 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -7,13 +7,10 @@ fi:
     description_headline: Mikä on %{domain}?
     domain_count_after: muuhun palvelimeen
     domain_count_before: Yhdistyneenä
-    get_started: Aloita käyttö
-    links: Linkit
     other_instances: Muut palvelimet
     source_code: Lähdekoodi
     status_count_after: statusta
     status_count_before: Ovat luoneet
-    terms: Ehdot
     user_count_after: käyttäjälle
     user_count_before: Koti
   accounts:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c8e55460c..13514bfc3 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -19,18 +19,14 @@ fr:
       within_reach_title: Toujours à portée de main
     find_another_instance: Trouver une autre instance
     generic_description: "%{domain} est seulement un serveur du réseau"
-    get_started: Rejoindre le réseau
     hosted_on: Instance Mastodon hébergée par %{domain}
     learn_more: En savoir plus
-    links: Liens
     other_instances: Liste des instances
     source_code: Code source
     status_count_after: posts
     status_count_before: Ayant publié
-    terms: Conditions d’utilisation
     user_count_after: utilisateur⋅ice⋅s
     user_count_before: Abrite
-    version: Version
     what_is_mastodon: Qu’est-ce que Mastodon ?
   accounts:
     follow: Suivre
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 0dce40e2b..dc6caf87a 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -8,16 +8,12 @@ he:
     description_headline: מהו %{domain}?
     domain_count_after: שרתים אחרים
     domain_count_before: מחובר אל
-    get_started: בואו נתחיל
-    links: קישורים
     other_instances: שרתים אחרים
     source_code: קוד מקור
     status_count_after: הודעות
     status_count_before: שכתבו
-    terms: תנאים
     user_count_after: משתמשים
     user_count_before: ביתם של
-    version: גרסה
   accounts:
     follow: לעקוב
     followers: עוקבים
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 328230e17..2d43fcad8 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -8,13 +8,10 @@ hr:
     description_headline: Što je %{domain}?
     domain_count_after: druge instance
     domain_count_before: Spojen na
-    get_started: Započni
-    links: Linkovi
     other_instances: Druge instance
     source_code: Izvorni kod
     status_count_after: statusi
     status_count_before: Tko je autor
-    terms: Uvjeti
     user_count_after: korisnici
     user_count_before: Home to
   accounts:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5b52b256b..53319a673 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -2,9 +2,7 @@
 hu:
   about:
     about_mastodon_html: Mastodon egy <em>szabad, nyílt forráskódú</em> szociális hálózati kiszolgálo. Egy <em>központosítatlan</em> alternatíva a kereskedelmi platformokra, elkerüli a kommunikációd monopolizációját veszélyét. Bárki futtathatja a Mastodon-t és részt vehet a <em>szociális hálózatban</em>.
-    get_started: Első lépések
     source_code: Forráskód
-    terms: Feltételek
   accounts:
     follow: Követés
     followers: Követők
@@ -32,7 +30,7 @@ hu:
     validation_errors:
       one: Valami nincs rendjén! Kérlek tekintsd meg a hibát alant
       other: Valami nincs rendjén! Kérlek tekintsd meg a %{count} darab hibát alant.
-  landing_strip_html: <strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse.
+  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   notification_mailer:
     favourite:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f49516268..e0e82d378 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -8,16 +8,12 @@ id:
     description_headline: Apa itu %{domain}?
     domain_count_after: server lain
     domain_count_before: Terhubung dengan
-    get_started: Mulai
-    links: Link
     other_instances: Server lain
     source_code: Kode sumber
     status_count_after: status
     status_count_before: Yang telah menulis
-    terms: Ketentuan
     user_count_after: pengguna
     user_count_before: Tempat bernaung bagi
-    version: Versi
   accounts:
     follow: Ikuti
     followers: Pengikut
diff --git a/config/locales/io.yml b/config/locales/io.yml
index cfde5b333..4f7323a6f 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -8,13 +8,10 @@ io:
     description_headline: Quo esas %{domain}?
     domain_count_after: altra instaluri
     domain_count_before: Konektita ad
-    get_started: Komencar
-    links: Ligili
     other_instances: Altra instaluri
     source_code: Fontkodexo
     status_count_after: mesaji
     status_count_before: Qua publikigis
-    terms: Terms
     user_count_after: uzeri
     user_count_before: Hemo di
   accounts:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 5aa0e1da6..de9682589 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -8,13 +8,10 @@ it:
     description_headline: Cos'è %{domain}?
     domain_count_after: altri server
     domain_count_before: Connesso a
-    get_started: Inizia
-    links: Links
     other_instances: Altri server
     source_code: Codice sorgente
     status_count_after: status
     status_count_before: Che hanno pubblicato
-    terms: Termini di Utilizzo
     user_count_after: utenti
     user_count_before: Casa di
   accounts:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5bd4c38a3..74448ff42 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -19,18 +19,14 @@ ja:
       within_reach_title: いつでも身近に
     find_another_instance: 他のインスタンスを探す
     generic_description: "%{domain} は、Mastodon インスタンスの一つです。"
-    get_started: 参加する
     hosted_on: Mastodon hosted on %{domain}
     learn_more: もっと詳しく
-    links: リンク
     other_instances: 他のインスタンス
     source_code: ソースコード
     status_count_after: トゥート
     status_count_before: トゥート数
-    terms: プライバシーポリシー
     user_count_after: 人
     user_count_before: ユーザー数
-    version: バージョン
     what_is_mastodon: Mastodon とは？
   accounts:
     follow: フォロー
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index fbd250c95..a081de38d 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -8,16 +8,12 @@ ko:
     description_headline: "%{domain} 는 무엇인가요?"
     domain_count_after: 개의 인스턴스
     domain_count_before: 연결됨
-    get_started: 참가하기
-    links: 링크
     other_instances: 다른 인스턴스
     source_code: 소스 코드
     status_count_after: Toot
     status_count_before: Toot 수
-    terms: 개인 정보 보호 정책
     user_count_after: 명
     user_count_before: 사용자 수
-    version: 버전
   accounts:
     follow: 팔로우
     followers: 팔로워
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 482eeaf82..016cddc22 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -8,13 +8,10 @@ nl:
     description_headline: Wat is %{domain}?
     domain_count_after: andere servers
     domain_count_before: Verbonden met
-    get_started: Beginnen
-    links: Links
     other_instances: Andere servers
     source_code: Broncode
     status_count_after: toots
     status_count_before: Zij schreven
-    terms: Voorwaarden
     user_count_after: gebruikers
     user_count_before: Thuisbasis van
   accounts:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f75e2a031..122ad5675 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -8,16 +8,12 @@
     description_headline: Hva er %{domain}?
     domain_count_after: andre instanser
     domain_count_before: Koblet til
-    get_started: Kom i gang
-    links: Lenker
     other_instances: Andre instanser
     source_code: Kildekode
     status_count_after: statuser
     status_count_before: Som skrev
-    terms: Betingelser
     user_count_after: brukere
     user_count_before: Her bor
-    version: Versjon
   accounts:
     follow: Følg
     followers: Følgere
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index ed9ff99c1..6d9996dbc 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -8,16 +8,12 @@ oc:
     description_headline: Qué es %{domain} ?
     domain_count_after: autras instàncias
     domain_count_before: Connectat a
-    get_started: Venètz al malhum
-    links: Ligams
     other_instances: Autras instàncias
     source_code: Còdi font
     status_count_after: estatuts
     status_count_before: qu’an escrich
-    terms: Tèrmes
     user_count_after: personas
     user_count_before: Ostal de
-    version: Version
   accounts:
     follow: Sègre
     followers: Seguidors
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 77412be78..c0cb126fa 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -19,18 +19,14 @@ pl:
       within_reach_title: Zawsze w Twoim zasięgu
     find_another_instance: Znajdź inną instancję
     generic_description: "%{domain} jest jednym z serwerów sieci"
-    get_started: Rozpocznijmy!
     hosted_on: Mastodon uruchomiony na %{domain}
     learn_more: Dowiedz się więcej
-    links: Odnośniki
     other_instances: Lista instancji
     source_code: Kod źródłowy
     status_count_after: wpisów
     status_count_before: Są autorami
-    terms: Regulamin
     user_count_after: użytkowników
     user_count_before: Z serwera korzysta
-    version: Wersja
     what_is_mastodon: Czym jest Mastodon?
   accounts:
     follow: Śledź
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9d08c2010..9bd1b0d28 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -8,16 +8,12 @@ pt-BR:
     description_headline: O que é %{domain}?
     domain_count_after: outras instâncias
     domain_count_before: Conectado a
-    get_started: Comece aqui
-    links: Links
     other_instances: Outras instâncias
     source_code: Source code
     status_count_after: status
     status_count_before: Quem autorizou
-    terms: Termos
     user_count_after: usuários
     user_count_before: Lugar de
-    version: Versão
   accounts:
     follow: Seguir
     followers: Seguidores
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 7a31f4bbe..6bf592d1c 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -8,16 +8,12 @@ pt:
     description_headline: O que é o %{domain}?
     domain_count_after: outras instâncias
     domain_count_before: Ligado a
-    get_started: Começar
-    links: Links
     other_instances: Outras instâncias
     source_code: Código fonte
     status_count_after: publicações
     status_count_before: Que fizeram
-    terms: Termos
     user_count_after: utilizadores
     user_count_before: Casa para
-    version: Versão
   accounts:
     follow: Seguir
     followers: Seguidores
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2854c6c7c..141017f40 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -8,16 +8,12 @@ ru:
     description_headline: Что такое %{domain}?
     domain_count_after: другими узлами
     domain_count_before: Связан с
-    get_started: Начать
-    links: Ссылки
     other_instances: Другие узлы
     source_code: Исходный код
     status_count_after: статусов
     status_count_before: Опубликовано
-    terms: Условия
     user_count_after: пользователей
     user_count_before: Здесь живет
-    version: Версия
   accounts:
     follow: Подписаться
     followers: Подписчики
diff --git a/config/locales/th.yml b/config/locales/th.yml
index a4a9c0647..89782209e 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -8,16 +8,12 @@ th:
     description_headline: โดเมนคือ %{domain} ?
     domain_count_after: อินซะแตนซ์อื่นๆ
     domain_count_before: เชื่อมต่อกับ
-    get_started: เริ่มกันเลย
-    links: ลิงก์
     other_instances: อินซะแตนซ์อื่นๆ
     source_code: ซอร์สโค๊ด
     status_count_after: สถานะ
     status_count_before: Who authored
-    terms: เงื่อนไข
     user_count_after: ผู้ใช้
     user_count_before: Home to
-    version: เวอร์ชั่น
   accounts:
     follow: ติดตาม
     followers: ผู้ติดตาม
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 16d374627..a1f2d2078 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -8,16 +8,12 @@ tr:
     description_headline: Peki %{domain} nedir?
     domain_count_after: sunucu var.
     domain_count_before: Bağlı olduğu
-    get_started: Kayıt ol
-    links: Bağlantılar
     other_instances: Diğer sunucular
     source_code: Kaynak kodu
     status_count_after: adet gönderi yazıldı.
     status_count_before: Şu ana kadar
-    terms: Kullanım koşulları
     user_count_after: kullanıcı var.
     user_count_before: Kayıtlı
-    version: Sürüm
   accounts:
     follow: Takip et
     followers: Takipçiler
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 437113711..3237ea1db 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -8,16 +8,12 @@ uk:
     description_headline: Що таке %{domain}?
     domain_count_after: іншими інстанціями
     domain_count_before: Зв'язаний з
-    get_started: Почати
-    links: Посилання
     other_instances: Інші інстанції
     source_code: Вихідний код
     status_count_after: статусів
     status_count_before: Опубліковано
-    terms: Умови
     user_count_after: користувачів
     user_count_before: Тут живе
-    version: Версія
   accounts:
     follow: Підписатися
     followers: Підписники
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 3df5d1483..0b0263294 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -8,16 +8,12 @@ zh-CN:
     description_headline: 关于 %{domain}
     domain_count_after: 个其它实例
     domain_count_before: 现已接入
-    get_started: 上手使用
-    links: 链接
     other_instances: 其它实例
     source_code: 源码
     status_count_after: 条嘟文
     status_count_before: 他们共嘟出了
-    terms: 条款
     user_count_after: 位用户
     user_count_before: 这里共注册有
-    version: 版本
   accounts:
     follow: 关注
     followers: 粉丝
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 396d084c5..40087ed53 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -8,16 +8,12 @@ zh-HK:
     description_headline: 關於 %{domain}
     domain_count_after: 個其他服務站
     domain_count_before: 已連接至
-    get_started: 立即登記
-    links: 連結
     other_instances: 其他服務站
     source_code: 源代碼
     status_count_after: 篇文章
     status_count_before: 他們共發佈了
-    terms: 使用條款
     user_count_after: 位使用者
     user_count_before: 這裏共註冊有
-    version: 版本
   accounts:
     follow: 關注
     followers: 關注者
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 6726d6779..e25edc890 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -8,13 +8,10 @@ zh-TW:
     description_headline: 關於 %{domain}
     domain_count_after: 個服務站相連
     domain_count_before: 與其他
-    get_started: 立即註冊
-    links: 連結
     other_instances: 其他服務站
     source_code: 原始碼
     status_count_after: 篇文章
     status_count_before: 他們共發佈了
-    terms: 使用條款
     user_count_after: 位註冊使用者
     user_count_before: 這裡共有
   accounts:
diff --git a/spec/views/about/_contact.html.haml_spec.rb b/spec/views/about/_contact.html.haml_spec.rb
index d2e7a4598..25ba15794 100644
--- a/spec/views/about/_contact.html.haml_spec.rb
+++ b/spec/views/about/_contact.html.haml_spec.rb
@@ -31,12 +31,5 @@ describe 'about/_contact.html.haml' do
 
       expect(rendered).to have_content('admin@example.com')
     end
-
-    it 'does not show info when email is missing' do
-      contact = double(site_contact_email: nil, contact_account: nil)
-      render 'about/contact', contact: contact
-
-      expect(rendered).not_to have_content(I18n.t('about.business_email'))
-    end
   end
 end
diff --git a/spec/views/about/_links.html.haml_spec.rb b/spec/views/about/_links.html.haml_spec.rb
deleted file mode 100644
index 2d7f7467a..000000000
--- a/spec/views/about/_links.html.haml_spec.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe 'about/_links.html.haml' do
-  context 'when signed in' do
-    before do
-      allow(view).to receive(:user_signed_in?).and_return(true)
-    end
-
-    it 'does not show sign in link' do
-      render 'about/links', instance: InstancePresenter.new
-
-      expect(rendered).to have_content(I18n.t('about.get_started'))
-      expect(rendered).not_to have_content(I18n.t('auth.login'))
-    end
-  end
-
-  context 'when signed out' do
-    before do
-      allow(view).to receive(:user_signed_in?).and_return(false)
-    end
-
-    it 'shows get started link when registrations are allowed' do
-      render 'about/links', instance: double(open_registrations: true)
-
-      expect(rendered).to have_content(I18n.t('about.get_started'))
-      expect(rendered).to have_content(I18n.t('auth.login'))
-    end
-
-    it 'hides get started link when registrations are closed' do
-      render 'about/links', instance: double(open_registrations: false)
-
-      expect(rendered).not_to have_content(I18n.t('about.get_started'))
-      expect(rendered).to have_content(I18n.t('auth.login'))
-    end
-  end
-end

From 462b3752e48c2cad8d61bd1c35ad94d6b660c8e7 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Mon, 24 Jul 2017 17:15:35 +0200
Subject: [PATCH 346/382] i18n: @2374d63 (pl) (#4340)

* i18n: @2374d63 (pl)

* i18n: fixed typo on Polish translation
---
 config/locales/pl.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index c0cb126fa..02c97e955 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -5,9 +5,14 @@ pl:
     about_this: O tej instancji
     closed_registrations: Rejestracja na tej instancji jest obecnie zamknięta. Możesz jednak zarejestrować się na innej instancji, uzyskując dostęp do tej samej sieci.
     contact: Kontakt
+    contact_missing: Nie ustawiono
+    contact_unavailable: Nie dotyczy
     description_headline: Czym jest %{domain}?
     domain_count_after: instancji
     domain_count_before: Serwer połączony z
+    extended_description_html: |
+      <h3>Dobre miejsce na zasady użytkowania</h3>
+      <p>Nie ustawiono jeszcze szczegółowego opisu</p>
     features:
       humane_approach_body: Nauczeni na błędach innych sieci społecznościowych, zaprojektowaliśmy Mastodona tak, aby uniknąć częstych nadużyć.
       humane_approach_title: Bardziej ludzkie podejście
@@ -481,7 +486,7 @@ pl:
 
       <h3 id="online">Polityka prywatności dotyczy tylko Internetu</h3>
 
-      <p>Ta polityka prywatności dotyczy jedynie danych zbieranych w Internecie, nie tych, które przechowywane są na Twoim kompurerze, np. pliki cookies.</p>
+      <p>Ta polityka prywatności dotyczy jedynie danych zbieranych w Internecie, nie tych, które przechowywane są na Twoim komputerze, np. pliki cookies.</p>
 
       <h3 id="consent">Wyrażenie zgody</h3>
 

From 1306d637a209393826cc5bf830864a281db71066 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 17:56:50 +0200
Subject: [PATCH 347/382] Fix oddities with public profile CSS (#4341)

* Fix oddities with public profile CSS

* Remove trailing whitespace
---
 app/javascript/styles/stream_entries.scss | 12 ++++++++++++
 app/views/accounts/show.html.haml         |  6 +++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/stream_entries.scss
index e89cc3f09..3856942e1 100644
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/stream_entries.scss
@@ -36,6 +36,18 @@
     }
   }
 
+  &.with-header {
+    .entry {
+      &:first-child {
+        &,
+        .detailed-status.light,
+        .status.light {
+          border-radius: 0;
+        }
+      }
+    }
+  }
+
   .status.light {
     padding: 14px 14px 14px (48px + 14px * 2);
     position: relative;
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index 7ed634e5d..150c14791 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -23,9 +23,9 @@
     .accounts-grid
       = render 'nothing_here'
   - else
-    .activity-stream
+    .activity-stream.with-header
       = render partial: 'stream_entries/status', collection: @statuses, as: :status
 
-  .pagination
-    - if @statuses.size == 20
+  - if @statuses.size == 20
+    .pagination
       = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), short_account_url(@account, max_id: @statuses.last.id), class: 'next', rel: 'next'

From 32fa312b2acd80775ee254712003e020e3397f25 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Mon, 24 Jul 2017 19:54:39 +0200
Subject: [PATCH 348/382] fix(compose_from): Do not autofocus on mobile (#4344)

---
 .../mastodon/features/compose/components/compose_form.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 4400c89c8..7a7a20bb8 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -15,6 +15,7 @@ import SensitiveButtonContainer from '../containers/sensitive_button_container';
 import EmojiPickerDropdown from './emoji_picker_dropdown';
 import UploadFormContainer from '../containers/upload_form_container';
 import WarningContainer from '../containers/warning_container';
+import { isMobile } from '../../../is_mobile';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { length } from 'stringz';
 
@@ -179,7 +180,7 @@ export default class ComposeForm extends ImmutablePureComponent {
             onSuggestionsClearRequested={this.onSuggestionsClearRequested}
             onSuggestionSelected={this.onSuggestionSelected}
             onPaste={onPaste}
-            autoFocus={!showSearch}
+            autoFocus={!showSearch && !isMobile(window.innerWidth)}
           />
 
           <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />

From 88b5e0b70340138cfb2495abb5384f62908b82a6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 19:54:59 +0200
Subject: [PATCH 349/382] Use the "m" version of the logo for favicons (#4345)

---
 public/favicon-dev.ico | Bin 1631 -> 9086 bytes
 public/favicon.ico     | Bin 1410 -> 9086 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/favicon-dev.ico b/public/favicon-dev.ico
index 04c503c07fbd6b2dcc6385fb7d57cfeb2ba5bade..3836044068bad645ea04b01041f4712d52d8f32e 100644
GIT binary patch
literal 9086
zcmdT~TWl3Y7@k@#1(8Y#cPK60La}l&NK}Z%TT~R|1ByII0wgBrlP{V^jWj-}P!gl@
zL4j8dsEG*}z{DoSOO2+dL$8!uQ$WDhmR6t_+S2j+cF%6-?CzYNb6TKX^7Wtj=b!)o
zcFw;uv$F`1hJVXe3jECx+w+8&DTF8hmH}G;>QlNbIoQprN)wjM0Hy$ofLDQ!fgb<~
zTn4&;{wO*i&j6*s=fD<`FD*#+AMZKVV|dCG3c4Tqx8(i6HsCv;8BoJOBl>;{JO+$Q
zfnEGAmMnzdFMz*+;qVOW+X<hu;uA=))g5C?z5<^YZUI-9|5f;&o**l;*&yF7!{o{_
z{1;#zwHti>2mM4dnIu{)x!w@N9UonG!?q6C0jw2^BGZhKEIAc64*_oi2Y`B`Z6XbW
z<GUEX_?zjxOyzU1+ZO8HiVUg?>jumI($eZQzbdJ^B{`RI-ZF92^;clG#`Evqv!@uM
zpxZC08p1fF+3j!1=fQ(qbZ(~dJFw$DhB&-UDrXM<GC{t~omIDqnK_Ilna8IR<Q#!r
zw&%=}>8MWz?geH5bAb84LLfJa9LQ{79xxNg0`37O0>PZlJMOtR7A*M!`kL~<um2Uc
zj{{EuuL17^dx66M?}yJO=dqiB-j{RCKLF>MW5Bn-XTaOQCg2fZMhr(&?m2m}3--GI
zcx87VK^f03*|tmY$9vfgJm7H;<L&&e<s%$FS-!gc0Jv~2*bi{KCm_9Bh}JWq>j(6H
zqovIJ+8jeTA9JH63q~nlecYJ$6Pz)wB<GD|fHV1*0M7ozlJCaloLi|xjt_Ywlt=XA
z_sw|WdCL6dUMLOt%3!0$7aUhho~c(WUTm<j60&gJ2{oy(%H%gGJ^j!h{kkz2k8us0
zeu91ya4@uekyP{6)~XX{yOn;mb@bc*#c;<O{mGO5^o#KrS0H`}FU~2PGyVu^v-`|l
zQ>$uD#&T|M?NiIwH>i=|Oh5FeUyL``%$fIbAJ8zyIBx*oizCW;eng1{8dwi|rjQ#c
zjx*Q#@ck$9De2t6Gyld17u4(To%g`H2%8I1=gfEN&d_m4h4Z|Ko|;}+Kp%*aI_K}<
zt1sY>zvbxV{0sPU{s@l4=;d4!%6D{+^Z7Bzndc^BEjO-#v;Q5)$?a6~IomLAaK83G
zGpWxTz3>&j-#2h>Ywx%BG=a4n9HuO<^5!?aa5wZ}_S_q_wa2dA)mXddV9#LKZ}8rk
z7vvor2XM}Muv*FbE<L<mUc2#BkVAH*dT#64fGrizZat#}+GFD29_hz_$+|9;wW>NE
zXXZutyC{5e{rauqy5FrT+1sqf`S*)hH_Byaz?O>g%1-59SJ;2|zLtPJ<Js#b<A;r<
zC7I9WbB);*YR`dIb#ox#S{0RCQVSlfwb%E>PuHt&4z+tmwC}z#5YzALgY7CGcH9rJ
zAN%_+_S>_+RSCp3@TLAN@T0LEzvq*i&#2zM5Yh<97%f*~^N~C*T<%pxyDr+&&#R@a
zPYr~-v*SF0c!4~M9q%LHyTiztzt6%-b>!Gpf9SaNl6}oe%!w$<WUj+ySM7L#=QWn|
zhv3UIVe@Z+XK~u98g=esZ$jZKYP+0wBRmUyN2;g^KEq*-&Ry!Y<HVUST#h_%ngZ}l
z%GHI+>8q>N?~&m1sK@`g{F<7$6z_8G^8+~n^-}2LU3^BTudWG=>*LjeI?ws|UFsuW
zTd+TQ0Gr-wQb&<1^{2bl$;KX42YIlxL%p=UQ3=!j9(uOZj`nUp<{bUmW9!~${ITP=
zJ?A@}C0C%#bv(#b*U>N6w3&FWQO@A|cP@0ZP+#DifAxMWvz>OZxBJl-{m@@xd|SZ}
zUqPdnCGSH0lOZ|lJQ&A?t{<xG_DPJVK88E-O*Gv*OJc#2(}0Skcn`&I<l1>goMrRP
z!`T-v_uSF>Cd@Nc{r>KBne&4c!_%$=cvp@R-V!|U1z+Q5SF}Igcvnq@Z81=Nhq&|o
ziEBru&CcbeQH?2D+P4f#=Ahp?U?;$D5<S4J$dw!L%X52vZ(zJ!kJC_mUBg`Mn<RD4
z96lM6XJz@o2A~Mw`Q#zsPvA7b+`A5Nf9vjZS*M=ue*v^-KlXnaC;;e}{s;e$1mouW
zcu<E+m5FrK1IaSvKveceB~-S)Lu4Lfdy`NDlx1mH*)&<4?$nDh8|{F;82vIKd8J3C
uaAlFB7qg=>BPz$BC?;p{cV!vtxUVM4hlS{%#QpYA;t$7{<DrV3@%bP7NFa>>

literal 1631
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

diff --git a/public/favicon.ico b/public/favicon.ico
index 70f2fec128e177d72b2c55297ae4c0a8cbef95d2..79000c9cc43c2044b5ab5129202e993aa2cf70af 100644
GIT binary patch
literal 9086
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

literal 1410
zcmV-|1%3Je0096204*>80096X0Bi*S02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|EdT%j
zFbD<!004zj^WOjf1v5!RK~!jg)tXyu6jd02zcah-w!2W;0@4COO6UW03Ikp-#2X<7
zqe3tdK}<}H8bgeilsGX+d{GB4=z}CgO&~G)z{MzuKA<5&q8KA~3R9{9L@rw?hSJh*
z%kFk&e3)%v+1c5hr8?zHHrbr{&zWy#{>-_Jpa2WBc3RaY0B+mZE~TUPBA^+#8JGs#
z1k?i6Kou|!D9ilPnO{F}3Fra3f%8BdI18e!BAoi^=avN)fT9`bs_f|`3Q5n`j7J2l
z0u}=^3dLUsabQ32rLM}my#jNjhp$x8j5mPS0qH+c^u`9>(p7nb+nvvnRy0F|AZCJr
z^Z0}24A2Dh>#A%I7mi3PngLEeb^(<XkvjhaHgFl30`v{vaS33?#uLMjpq;TJ430+y
z(4ng`^FQnuDFi^#j1Pd9f^jQ~k91Xj0YGHZVlvKaXslBw5M5FxE#42>rbymvRhvd$
zXHN#IQao$HNsr~gR{_iTK&+I2yMxy7hkcI(cz5(;k0yz+(ewGCK?3T6w(!Xm38x3V
zk%&q_$SWdk*({zljurE2sIMv`ZQ5SpB!?{I`bt(RH8j;%k{q%;<I|>1eN`DN=GCxx
z*0_T010syaIAdZg%-7F05-YzlI{o6;3%t4aZ^}ct)hru!Jw2PbbyptV(Q|{W-u@?&
z%UM#U&4vf2vig?Vk+MY6V)-Y>xR4mir)5g{qzBU$TOXg9B@D3U)`{HLINnuw{gS#Y
zVSu@Hm9#9W!*aQS_cvB$2?N9;5?fczWH6og38nH%*G9w4o)mGdwQO!R<~0@rDT{~X
zYS;LO<?0*>)3RCCG{H4~_T&gP(QrQLK?!HfnuAwvS$6I*A;`Iqs|Ed(0}SOqmdHDm
zN~A2>;sdV7cIn-Ou1V5pnZ(Z4i>~oITQ3qV%RW^|671I9<J;l`B$9d4qelW<Gd>a)
ztlM#l&fauZ`R0A+`0aG=#Rvgg4s@~qcwbie{$qV?Inaf0Ny0;?6Kvksl~oq+NwIFn
zDI(##?}tl5(ToHT%@=Wb$U>PGqq;K0;rIZ3DGQeu#|X(Gn}&%IZmuooRCkJ#7m{8A
zn6}OMNQik;qx1}#=<x&<Vb8hr9-(MPH&EjhHOAN`0q%)AcIlLGR(@_I&PqUU&=!6W
z&>`WhuiY@1Vf&y2{1dc@5B@mZ(wvfj&Y(?v@CrC9Os4}DDVD9eDt`-(^pSvNis55j
zm7i~Z*HM)&r^^opEL4ambX9(C;X6k;vc4I}3`-TwhyzoDG;`t85WILum2*13;ZFVs
zAB~x#qU25|umPB$tMW6ZaPO_d%BCY=vj<pHWW#54Rc=r;Lk1L_{g(wmBhGR}G0Vig
zz)9dZ&hm1bjs0Vr+I${B+0+hz{;K<u%+*W11!t5QOkI`pPAf8P#cZ4LLWl~mB_IhR
z0d~Kx%6TV$#d5XuF5uB3YfZO9p?F)%oa;S*Nk}mAIMkwR*}NQ-Fyw9&eFHpLWZec`
zmH!%bqaqlYB4l<19`jN6cSSSq^?O2P)6pycHKU}x9k+eNrNCYvZRo&fz<0VTd-ksL
zHDiu|JAk`@+jUh|{KyXDdZmhHJOykkrNIonI5Q#>XLqUwm*qEIl}ozQt}{qomA3;+
zOKC8}1fU+64osrJdZAzPPJ4A#{vL<`pO5AVM+5JDZ;O<!%4-oK2D}E0#^A~Zb^?n^
zZJ?x_Qr<QeBDfQn1I)r1Y)!%We4;!P){iqQiUTKr4&Z>U%D+HypGf56U(lhXQHZr~
Q>;M1&07*qoM6N<$f`R#uZ~y=R


From 07d93716aa226714bc13f87bd716a562139e6f60 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 24 Jul 2017 20:05:29 +0200
Subject: [PATCH 350/382] Improve remote profile disclaimer (#4342)

* Improve remote profile disclaimer

* yarn run manage:translations
---
 .../features/account/components/action_bar.js | 53 ++++++++++++-------
 app/javascript/mastodon/locales/ar.json       |  3 +-
 app/javascript/mastodon/locales/bg.json       |  3 +-
 app/javascript/mastodon/locales/ca.json       |  3 +-
 app/javascript/mastodon/locales/de.json       |  3 +-
 .../mastodon/locales/defaultMessages.json     | 12 +++--
 app/javascript/mastodon/locales/en.json       |  3 +-
 app/javascript/mastodon/locales/eo.json       |  3 +-
 app/javascript/mastodon/locales/es.json       |  3 +-
 app/javascript/mastodon/locales/fa.json       |  3 +-
 app/javascript/mastodon/locales/fi.json       |  3 +-
 app/javascript/mastodon/locales/fr.json       |  3 +-
 app/javascript/mastodon/locales/he.json       |  3 +-
 app/javascript/mastodon/locales/hr.json       |  3 +-
 app/javascript/mastodon/locales/hu.json       |  3 +-
 app/javascript/mastodon/locales/id.json       |  3 +-
 app/javascript/mastodon/locales/io.json       |  3 +-
 app/javascript/mastodon/locales/it.json       |  3 +-
 app/javascript/mastodon/locales/ja.json       |  3 +-
 app/javascript/mastodon/locales/ko.json       |  3 +-
 app/javascript/mastodon/locales/nl.json       |  3 +-
 app/javascript/mastodon/locales/no.json       |  3 +-
 app/javascript/mastodon/locales/oc.json       |  3 +-
 app/javascript/mastodon/locales/pl.json       |  3 +-
 app/javascript/mastodon/locales/pt-BR.json    |  3 +-
 app/javascript/mastodon/locales/pt.json       |  3 +-
 app/javascript/mastodon/locales/ru.json       |  3 +-
 app/javascript/mastodon/locales/th.json       |  3 +-
 app/javascript/mastodon/locales/tr.json       |  3 +-
 app/javascript/mastodon/locales/uk.json       |  3 +-
 app/javascript/mastodon/locales/zh-CN.json    |  3 +-
 app/javascript/mastodon/locales/zh-HK.json    |  3 +-
 app/javascript/mastodon/locales/zh-TW.json    |  3 +-
 app/javascript/styles/components.scss         | 22 ++++++++
 34 files changed, 126 insertions(+), 54 deletions(-)

diff --git a/app/javascript/mastodon/features/account/components/action_bar.js b/app/javascript/mastodon/features/account/components/action_bar.js
index 374da103e..b8df724c6 100644
--- a/app/javascript/mastodon/features/account/components/action_bar.js
+++ b/app/javascript/mastodon/features/account/components/action_bar.js
@@ -16,7 +16,6 @@ const messages = defineMessages({
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   report: { id: 'account.report', defaultMessage: 'Report @{name}' },
   media: { id: 'account.media', defaultMessage: 'Media' },
-  disclaimer: { id: 'account.disclaimer', defaultMessage: 'This user is from another instance. This number may be larger.' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Hide everything from {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unhide {domain}' },
 });
@@ -68,7 +67,19 @@ export default class ActionBar extends React.PureComponent {
 
     if (account.get('acct') !== account.get('username')) {
       const domain = account.get('acct').split('@')[1];
-      extraInfo = <abbr title={intl.formatMessage(messages.disclaimer)}>*</abbr>;
+
+      extraInfo = (
+        <div className='account__disclaimer'>
+          <FormattedMessage
+            id='account.disclaimer_full'
+            defaultMessage="Information below may reflect the user's profile incompletely."
+          />
+          {' '}
+          <a target='_blank' rel='noopener' href={account.get('url')}>
+            <FormattedMessage id='account.view_full_profile' defaultMessage='View full profile' />
+          </a>
+        </div>
+      );
 
       menu.push(null);
 
@@ -80,26 +91,30 @@ export default class ActionBar extends React.PureComponent {
     }
 
     return (
-      <div className='account__action-bar'>
-        <div className='account__action-bar-dropdown'>
-          <DropdownMenu items={menu} icon='bars' size={24} direction='right' />
-        </div>
+      <div>
+        {extraInfo}
 
-        <div className='account__action-bar-links'>
-          <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
-            <span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span>
-            <strong><FormattedNumber value={account.get('statuses_count')} /> {extraInfo}</strong>
-          </Link>
+        <div className='account__action-bar'>
+          <div className='account__action-bar-dropdown'>
+            <DropdownMenu items={menu} icon='bars' size={24} direction='right' />
+          </div>
 
-          <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
-            <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span>
-            <strong><FormattedNumber value={account.get('following_count')} /> {extraInfo}</strong>
-          </Link>
+          <div className='account__action-bar-links'>
+            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}`}>
+              <span><FormattedMessage id='account.posts' defaultMessage='Posts' /></span>
+              <strong><FormattedNumber value={account.get('statuses_count')} /></strong>
+            </Link>
 
-          <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
-            <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
-            <strong><FormattedNumber value={account.get('followers_count')} /> {extraInfo}</strong>
-          </Link>
+            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/following`}>
+              <span><FormattedMessage id='account.follows' defaultMessage='Follows' /></span>
+              <strong><FormattedNumber value={account.get('following_count')} /></strong>
+            </Link>
+
+            <Link className='account__action-bar__tab' to={`/accounts/${account.get('id')}/followers`}>
+              <span><FormattedMessage id='account.followers' defaultMessage='Followers' /></span>
+              <strong><FormattedNumber value={account.get('followers_count')} /></strong>
+            </Link>
+          </div>
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 89ddb2d15..7f27d78cd 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,7 +1,7 @@
 {
   "account.block": "حظر @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "هذا المستخدم من مثيل خادم آخر. قد يكون هذا الرقم أكبر.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "تعديل الملف الشخصي",
   "account.follow": "تابِع",
   "account.followers": "المتابعون",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "إلغاء المتابعة",
   "account.unmute": "إلغاء الكتم عن @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "يمكنك ضغط {combo} لتخطّي هذه في المرّة القادمة",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 3dba91b82..68aaf56b0 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Блокирай",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Редактирай профила си",
   "account.follow": "Последвай",
   "account.followers": "Последователи",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Не следвай",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 54f2e5e22..6fdcde4b4 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquejar @{name}",
   "account.block_domain": "Amagar tot de {domain}",
-  "account.disclaimer": "Aquest usuari és d'un altra instància. Aquest número podria ser més gran.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Editar perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidors",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Mostra {domain}",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Treure silenci de @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Pots premer {combo} per saltar-te això el proper cop",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index a041e6655..f911c7b75 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -1,7 +1,7 @@
 {
   "account.block": "@{name} blocken",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Dieser Benutzer ist von einer anderen Instanz. Diese Zahl könnte größer sein.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Profil bearbeiten",
   "account.follow": "Folgen",
   "account.followers": "Folgende",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Entfolgen",
   "account.unmute": "@{name} nicht mehr stummschalten",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Du kannst {combo} drücken, um dies beim nächsten Mal zu überspringen",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index a50c8b338..047a89ebb 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -358,10 +358,6 @@
         "defaultMessage": "Media",
         "id": "account.media"
       },
-      {
-        "defaultMessage": "This user is from another instance. This number may be larger.",
-        "id": "account.disclaimer"
-      },
       {
         "defaultMessage": "Hide everything from {domain}",
         "id": "account.block_domain"
@@ -370,6 +366,14 @@
         "defaultMessage": "Unhide {domain}",
         "id": "account.unblock_domain"
       },
+      {
+        "defaultMessage": "Information below may reflect the user's profile incompletely.",
+        "id": "account.disclaimer_full"
+      },
+      {
+        "defaultMessage": "View full profile",
+        "id": "account.view_full_profile"
+      },
       {
         "defaultMessage": "Posts",
         "id": "account.posts"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index b6e92dda0..3a201b9c1 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Edit profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 029cef883..0bb5159c8 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloki @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Redakti la profilon",
   "account.follow": "Sekvi",
   "account.followers": "Sekvantoj",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Malsekvi",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 36ad66ace..a39b608c6 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquear",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Editar perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Dejar de seguir",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 113daef77..6842558d9 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -1,7 +1,7 @@
 {
   "account.block": "مسدودسازی @{name}",
   "account.block_domain": "پنهان‌سازی همه چیز از سرور {domain}",
-  "account.disclaimer": "این کاربر عضو سرور متفاوتی است. شاید عدد واقعی بیشتر از این باشد.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "ویرایش نمایه",
   "account.follow": "پی بگیرید",
   "account.followers": "پیگیران",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "رفع پنهان‌سازی از {domain}",
   "account.unfollow": "پایان پیگیری",
   "account.unmute": "باصدا کردن @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index da9e5d0f2..efc9b1053 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Estä @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Muokkaa",
   "account.follow": "Seuraa",
   "account.followers": "Seuraajia",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Lopeta seuraaminen",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5b734a253..c7418e246 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquer",
   "account.block_domain": "Tout masquer de {domain}",
-  "account.disclaimer": "Ce compte est situé sur une autre instance. Les nombres peuvent être plus grands.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Modifier le profil",
   "account.follow": "Suivre",
   "account.followers": "Abonné⋅e⋅s",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Ne plus masquer {domain}",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
   "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.",
   "bundle_column_error.retry": "Réessayer",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c8dc4fe8d..36be0842b 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -1,7 +1,7 @@
 {
   "account.block": "חסימת @{name}",
   "account.block_domain": "להסתיר הכל מהקהילה {domain}",
-  "account.disclaimer": "משתמש זה מגיע מקהילה אחרת. המספר הזה עשוי להיות גדול יותר.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "עריכת פרופיל",
   "account.follow": "מעקב",
   "account.followers": "עוקבים",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "הסר חסימה מקהילת {domain}",
   "account.unfollow": "הפסקת מעקב",
   "account.unmute": "הפסקת השתקת @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index fd669b2b2..363c4c490 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokiraj @{name}",
   "account.block_domain": "Sakrij sve sa {domain}",
-  "account.disclaimer": "Ovaj korisnik je sa druge instance. Ovaj broj bi mogao biti veći.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Uredi profil",
   "account.follow": "Slijedi",
   "account.followers": "Sljedbenici",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Otkrij {domain}",
   "account.unfollow": "Prestani slijediti",
   "account.unmute": "Poništi utišavanje @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Možeš pritisnuti {combo} kako bi ovo preskočio sljedeći put",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index b3672cb7a..d43570f0d 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokkolás",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Profil szerkesztése",
   "account.follow": "Követés",
   "account.followers": "Követők",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Követés abbahagyása",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 8a17262fe..916f313bb 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokir @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Pengguna ini berasal dari server lain. Angka berikut mungkin lebih besar.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Ubah profil",
   "account.follow": "Ikuti",
   "account.followers": "Pengikut",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Berhenti mengikuti",
   "account.unmute": "Berhenti membisukan @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 154ca66ce..a87cc9328 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokusar @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Ca uzero esas de altra instaluro. Ca nombro forsan esas plu granda.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Modifikar profilo",
   "account.follow": "Sequar",
   "account.followers": "Sequanti",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Ne plus sequar",
   "account.unmute": "Ne plus celar @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 6cb274bae..243ed7344 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blocca @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Questo utente si trova su un altro server. Questo numero potrebbe essere maggiore.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Modifica profilo",
   "account.follow": "Segui",
   "account.followers": "Seguaci",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Non seguire",
   "account.unmute": "Non silenziare @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio la prossima volta",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index c52f8c2bb..ca36122f7 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,7 +1,7 @@
 {
   "account.block": "ブロック",
   "account.block_domain": "{domain}全体を非表示",
-  "account.disclaimer": "このユーザーは他のインスタンスに所属しているため、数字が正確で無い場合があります。",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "プロフィールを編集",
   "account.follow": "フォロー",
   "account.followers": "フォロワー",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "{domain}を表示",
   "account.unfollow": "フォロー解除",
   "account.unmute": "ミュート解除",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
   "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_column_error.retry": "再試行",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index fbd0098d7..768efa37d 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -1,7 +1,7 @@
 {
   "account.block": "차단",
   "account.block_domain": "{domain} 전체를 숨김",
-  "account.disclaimer": "이 사용자는 다른 인스턴스에 소속되어 있으므로, 수치가 정확하지 않을 수도 있습니다.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "프로필 편집",
   "account.follow": "팔로우",
   "account.followers": "팔로워",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "{domain} 숨김 해제",
   "account.unfollow": "팔로우 해제",
   "account.unmute": "뮤트 해제",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "다음부터 {combo}를 누르면 이 과정을 건너뛸 수 있습니다.",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index f7b0bbf68..66b622d56 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokkeer @{name}",
   "account.block_domain": "Negeer alles van {domain}",
-  "account.disclaimer": "Deze gebruiker zit op een andere server. Dit getal kan hoger zijn.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Profiel bewerken",
   "account.follow": "Volgen",
   "account.followers": "Volgers",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "{domain} niet meer negeren",
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet meer negeren",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 98f59f774..8727f6147 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokkér @{name}",
   "account.block_domain": "Skjul alt fra {domain}",
-  "account.disclaimer": "Denne brukeren er fra en annen instans. Dette tallet kan være høyere.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Rediger profil",
   "account.follow": "Følg",
   "account.followers": "Følgere",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Vis {domain}",
   "account.unfollow": "Avfølg",
   "account.unmute": "Avdemp @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 34469deac..c39d57333 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blocar @{name}",
   "account.block_domain": "Tot amagar del domeni {domain}",
-  "account.disclaimer": "Aqueste compte es sus una autra instància. Los nombres pòdon èsser mai grandes.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Modificar lo perfil",
   "account.follow": "Sègre",
   "account.followers": "Seguidors",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Desblocar {domain}",
   "account.unfollow": "Quitar de sègre",
   "account.unmute": "Quitar de rescondre @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.body": "Quicòm a fach meuca pendent lo cargament d’aqueste compausant.",
   "bundle_column_error.retry": "Tornar ensejar",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 92782ec2a..857e4df10 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokuj @{name}",
   "account.block_domain": "Blokuj wszystko z {domain}",
-  "account.disclaimer": "Ten użytkownik pochodzi z innej instancji. Ta liczba może być większa.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Edytuj profil",
   "account.follow": "Śledź",
   "account.followers": "Śledzący",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Odblokuj domenę {domain}",
   "account.unfollow": "Przestań śledzić",
   "account.unmute": "Cofnij wyciszenie @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_column_error.retry": "Spróbuj ponownie",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 3944e33e9..86da7c4e6 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Editar perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 3944e33e9..86da7c4e6 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquear @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Essa conta está localizado em outra instância. Os nomes podem ser maiores.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Editar perfil",
   "account.follow": "Seguir",
   "account.followers": "Seguidores",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Não silenciar @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Pode clicar {combo} para não voltar a ver",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 9e8573efa..16af3fe7e 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Блокировать",
   "account.block_domain": "Блокировать все с {domain}",
-  "account.disclaimer": "Это пользователь с другого узла. Число может быть больше.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Изменить профиль",
   "account.follow": "Подписаться",
   "account.followers": "Подписаны",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unfollow": "Отписаться",
   "account.unmute": "Снять глушение",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Нажмите {combo}, чтобы пропустить это в следующий раз",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 63bed6d8c..be5c0815d 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Block @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "This user is from another instance. This number may be larger.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Edit profile",
   "account.follow": "Follow",
   "account.followers": "Followers",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Unfollow",
   "account.unmute": "Unmute @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 5bd308e95..9d4d5fa17 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Engelle @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "Bu kullanıcının hesabı farklı sunucuda bulunduğu için bu sayı daha fazla olabilir.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Profili düzenle",
   "account.follow": "Takip et",
   "account.followers": "Takipçiler",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "Takipten vazgeç",
   "account.unmute": "Sesi aç @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Bir dahaki sefere {combo} tuşuna basabilirsiniz",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index e1611505d..60a551bb6 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Заблокувати",
   "account.block_domain": "Заглушити {domain}",
-  "account.disclaimer": "Це користувач з іншої інстанції. Число може бути більше.",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "Налаштування профілю",
   "account.follow": "Підписатися",
   "account.followers": "Підписники",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Розблокувати {domain}",
   "account.unfollow": "Відписатися",
   "account.unmute": "Зняти глушення",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоб пропустити це наступного разу",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 18bf872e5..97f1f5e27 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,7 +1,7 @@
 {
   "account.block": "屏蔽 @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "由于这个账户处于另一个服务器实例上，实际数字会比这个更多。",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "修改个人资料",
   "account.follow": "关注",
   "account.followers": "关注者",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "取消关注",
   "account.unmute": "取消 @{name} 的静音",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "如你想在下次路过时显示，请按{combo}，",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index a461085c7..c65c3d45c 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -1,7 +1,7 @@
 {
   "account.block": "封鎖 @{name}",
   "account.block_domain": "Hide everything from {domain}",
-  "account.disclaimer": "由於這個用戶在另一個服務站，實際數字會比這個更多。",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "修改個人資料",
   "account.follow": "關注",
   "account.followers": "關注的人",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "Unhide {domain}",
   "account.unfollow": "取消關注",
   "account.unmute": "取消 @{name} 的靜音",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "如你想在下次路過這顯示，請按{combo}，",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index d766fb394..12e840b16 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -1,7 +1,7 @@
 {
   "account.block": "封鎖 @{name}",
   "account.block_domain": "隱藏來自 {domain} 的一切",
-  "account.disclaimer": "這使用者來自其他副本，實際數字可能更大。",
+  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
   "account.edit_profile": "編輯用戶資訊",
   "account.follow": "關注",
   "account.followers": "專注者",
@@ -17,6 +17,7 @@
   "account.unblock_domain": "不再隱藏 {domain}",
   "account.unfollow": "取消關注",
   "account.unmute": "不再消音 @{name}",
+  "account.view_full_profile": "View full profile",
   "boost_modal.combo": "下次你可以按 {combo} 來跳過",
   "bundle_column_error.body": "Something went wrong while loading this component.",
   "bundle_column_error.retry": "Try again",
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index c4c4420eb..1be07b023 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -855,6 +855,28 @@
   }
 }
 
+.account__disclaimer {
+  padding: 10px;
+  border-top: 1px solid lighten($ui-base-color, 8%);
+  color: $ui-base-lighter-color;
+
+  strong {
+    font-weight: 500;
+  }
+
+  a {
+    font-weight: 500;
+    color: inherit;
+    text-decoration: underline;
+
+    &:hover,
+    &:focus,
+    &:active {
+      text-decoration: none;
+    }
+  }
+}
+
 .account__header__content {
   color: $ui-primary-color;
   font-size: 14px;

From de105d64d519bb7d4b9c0cac1e66c8205406782b Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 25 Jul 2017 01:05:35 +0200
Subject: [PATCH 351/382] fix(getting_started): No scrollbar if not needed
 (#4350)

---
 app/javascript/styles/components.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 1be07b023..8de456754 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1878,7 +1878,7 @@
 
 .getting-started__wrapper {
   position: relative;
-  overflow-y: scroll;
+  overflow-y: auto;
 }
 
 .getting-started__footer {

From 23e854cb9176f7458fd7c2f66071486c21db239a Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 25 Jul 2017 01:05:44 +0200
Subject: [PATCH 352/382] fix(components/bundle): Exit early in load function
 (#4349)

---
 .../mastodon/features/ui/components/bundle.js       | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/javascript/mastodon/features/ui/components/bundle.js b/app/javascript/mastodon/features/ui/components/bundle.js
index 72798f690..fc88e0c70 100644
--- a/app/javascript/mastodon/features/ui/components/bundle.js
+++ b/app/javascript/mastodon/features/ui/components/bundle.js
@@ -52,14 +52,8 @@ class Bundle extends React.Component {
   load = (props) => {
     const { fetchComponent, onFetch, onFetchSuccess, onFetchFail, renderDelay } = props || this.props;
 
-    this.setState({ mod: undefined });
     onFetch();
 
-    if (renderDelay !== 0) {
-      this.timestamp = new Date();
-      this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
-    }
-
     if (Bundle.cache[fetchComponent.name]) {
       const mod = Bundle.cache[fetchComponent.name];
 
@@ -68,6 +62,13 @@ class Bundle extends React.Component {
       return Promise.resolve();
     }
 
+    this.setState({ mod: undefined });
+
+    if (renderDelay !== 0) {
+      this.timestamp = new Date();
+      this.timeout = setTimeout(() => this.setState({ forceRender: true }), renderDelay);
+    }
+
     return fetchComponent()
       .then((mod) => {
         Bundle.cache[fetchComponent.name] = mod;

From ebf5a060843697d6c51ddfa2f80c1cff1054799e Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 25 Jul 2017 01:05:51 +0200
Subject: [PATCH 353/382] fix(column): Use passive wheel listener (#4348)

* chore(yarn): Install detect-passive-events

* fix(column): Use passive listener
---
 app/javascript/mastodon/components/column.js | 11 ++++++++++-
 package.json                                 |  1 +
 yarn.lock                                    |  4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/components/column.js b/app/javascript/mastodon/components/column.js
index 3cbb745c5..93f1d6260 100644
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import detectPassiveEvents from 'detect-passive-events';
 import scrollTop from '../scroll';
 
 export default class Column extends React.PureComponent {
@@ -30,11 +31,19 @@ export default class Column extends React.PureComponent {
     this.node = c;
   }
 
+  componentDidMount () {
+    this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents ? { passive: true } : false);
+  }
+
+  componentWillUnmount () {
+    this.node.removeEventListener('wheel', this.handleWheel);
+  }
+
   render () {
     const { children } = this.props;
 
     return (
-      <div role='region' className='column' ref={this.setRef} onWheel={this.handleWheel}>
+      <div role='region' className='column' ref={this.setRef}>
         {children}
       </div>
     );
diff --git a/package.json b/package.json
index c90e49db5..132d7017d 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "compression-webpack-plugin": "^0.4.0",
     "cross-env": "^5.0.1",
     "css-loader": "^0.28.4",
+    "detect-passive-events": "^1.0.2",
     "dotenv": "^4.0.0",
     "emojione": "^2.2.7",
     "emojione-picker": "^2.2.1",
diff --git a/yarn.lock b/yarn.lock
index dcf09643e..0f895f3b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2328,6 +2328,10 @@ detect-node@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
 
+detect-passive-events@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/detect-passive-events/-/detect-passive-events-1.0.2.tgz#0e39d7b675907eff55b8965f5be3fc0b0f4178b9"
+
 diff@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"

From c80046a77bce2dd27d60fa22bd7d98b4ea5af331 Mon Sep 17 00:00:00 2001
From: Petko Bordjukov <ignisf@users.noreply.github.com>
Date: Tue, 25 Jul 2017 02:14:01 +0300
Subject: [PATCH 354/382] Update Capistrano lock version in config/deploy.rb
 (#4352)

Deployment with Capistrano was failing due to a mismatch between the loaded
version of Capistrano and the one specified in the deployment
configuration. Bumping the version in config/deploy.rb fixes this issue.
---
 config/deploy.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/deploy.rb b/config/deploy.rb
index 0f3511485..33b88b109 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lock '3.8.1'
+lock '3.8.2'
 
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')

From f52ce92f2bc989154a69d20ab12cad927f94bc24 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpraat@users.noreply.github.com>
Date: Tue, 25 Jul 2017 02:12:50 +0200
Subject: [PATCH 355/382] Update and (almost) completing Dutch strings for 1.5
 (#4351)

* Update and expanding Dutch strings for 1.5

Only privacy policy is not translated, but is included. Hopefully I have time to translate this another time (you can set your own privacy policy now anyway).

* Missing file

* A few changes cause of changes in another file

* Fix

* Update Dutch strings for 1.5

* nl

* fix

don't know how that ended up there

* Update nl.yml
---
 app/javascript/mastodon/locales/nl.json |  38 ++--
 config/locales/activerecord.nl.yml      |  12 ++
 config/locales/devise.nl.yml            |  20 +-
 config/locales/doorkeeper.nl.yml        |   6 +-
 config/locales/nl.yml                   | 264 +++++++++++++++++++++++-
 5 files changed, 298 insertions(+), 42 deletions(-)
 create mode 100644 config/locales/activerecord.nl.yml

diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 66b622d56..fbfabc5d1 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokkeer @{name}",
   "account.block_domain": "Negeer alles van {domain}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.disclaimer_full": "De informatie hieronder kan mogelijk een incompleet beeld geven van dit gebruikersprofiel.",
   "account.edit_profile": "Profiel bewerken",
   "account.follow": "Volgen",
   "account.followers": "Volgers",
@@ -17,14 +17,14 @@
   "account.unblock_domain": "{domain} niet meer negeren",
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet meer negeren",
-  "account.view_full_profile": "View full profile",
+  "account.view_full_profile": "Volledig profiel tonen", 
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
-  "bundle_column_error.body": "Something went wrong while loading this component.",
-  "bundle_column_error.retry": "Try again",
-  "bundle_column_error.title": "Network error",
-  "bundle_modal_error.close": "Close",
-  "bundle_modal_error.message": "Something went wrong while loading this component.",
-  "bundle_modal_error.retry": "Try again",
+  "bundle_column_error.body": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
+  "bundle_column_error.retry": "Opnieuw proberen",
+  "bundle_column_error.title": "Netwerkfout",
+  "bundle_modal_error.close": "Sluiten",
+  "bundle_modal_error.message": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
+  "bundle_modal_error.retry": "Opnieuw proberen",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.community": "Lokale tijdlijn",
   "column.favourites": "Favorieten",
@@ -44,20 +44,20 @@
   "compose_form.privacy_disclaimer": "Jouw privétoot wordt afgeleverd aan de vermelde gebruikers op {domains}. Vertrouw jij {domainsCount, plural, one {die server} other {die servers}}? Het privé plaatsen van toots werkt alleen op Mastodon-servers. Wanneer {domains} {domainsCount, plural, one {geen Mastodon-server is} other {geen Mastodon-servers zijn}}, dan wordt er niet aangegeven dat de toot privé is, waardoor het kan worden geboost of op een andere manier zichtbaar wordt gemaakt voor mensen waarvoor het niet was bedoeld.",
   "compose_form.publish": "Toot",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive": "Media als gevoelig markeren",
+  "compose_form.sensitive": "Media als gevoelig markeren (nsfw)",
   "compose_form.spoiler": "Tekst achter waarschuwing verbergen",
   "compose_form.spoiler_placeholder": "Waarschuwingstekst",
   "confirmation_modal.cancel": "Annuleren",
   "confirmations.block.confirm": "Blokkeren",
-  "confirmations.block.message": "Weet je zeker dat je {name} wilt blokkeren?",
+  "confirmations.block.message": "Weet je het zeker dat je {name} wilt blokkeren?",
   "confirmations.delete.confirm": "Verwijderen",
-  "confirmations.delete.message": "Weet je zeker dat je deze toot wilt verwijderen?",
+  "confirmations.delete.message": "Weet je het zeker dat je deze toot wilt verwijderen?",
   "confirmations.domain_block.confirm": "Negeer alles van deze server",
   "confirmations.domain_block.message": "Weet je het echt, echt zeker dat je alles van {domain} wil negeren? In de meeste gevallen is het blokkeren of negeren van een paar specifieke personen voldoende en gewenst.",
   "confirmations.mute.confirm": "Negeren",
-  "confirmations.mute.message": "Weet je zeker dat je {name} wilt negeren?",
-  "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
+  "confirmations.mute.message": "Weet je het zeker dat je {name} wilt negeren?",
+  "confirmations.unfollow.confirm": "Ontvolgen",
+  "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
   "emoji_button.activity": "Activiteiten",
   "emoji_button.flags": "Vlaggen",
   "emoji_button.food": "Eten en drinken",
@@ -68,7 +68,7 @@
   "emoji_button.search": "Zoeken...",
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en plekken",
-  "empty_column.community": "De lokale tijdlijn is leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
+  "empty_column.community": "De lokale tijdlijn is nog leeg. Toot iets in het openbaar om de bal aan het rollen te krijgen!",
   "empty_column.hashtag": "Er is nog niks te vinden onder deze hashtag.",
   "empty_column.home": "Jij volgt nog niemand. Bezoek {public} of gebruik het zoekvenster om andere mensen te ontmoeten.",
   "empty_column.home.inactivity": "Deze tijdlijn is leeg. Wanneer je een tijdje inactief bent geweest wordt deze snel opnieuw aangemaakt.",
@@ -107,13 +107,13 @@
   "notification.mention": "{name} vermeldde jou",
   "notification.reblog": "{name} boostte jouw toot",
   "notifications.clear": "Meldingen verwijderen",
-  "notifications.clear_confirmation": "Weet je zeker dat je al jouw meldingen wilt verwijderen?",
+  "notifications.clear_confirmation": "Weet je het zeker dat je al jouw meldingen wilt verwijderen?",
   "notifications.column_settings.alert": "Desktopmeldingen",
   "notifications.column_settings.favourite": "Favorieten:",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.mention": "Vermeldingen:",
-  "notifications.column_settings.push": "Push notifications",
-  "notifications.column_settings.push_meta": "This device",
+  "notifications.column_settings.push": "Pushmeldingen",
+  "notifications.column_settings.push_meta": "Dit apparaat",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
@@ -147,12 +147,12 @@
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
+  "report.heading": "Rapporteren",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
   "search.placeholder": "Zoeken",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
-  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.favourite": "Favoriet",
diff --git a/config/locales/activerecord.nl.yml b/config/locales/activerecord.nl.yml
new file mode 100644
index 000000000..b39c8cd78
--- /dev/null
+++ b/config/locales/activerecord.nl.yml
@@ -0,0 +1,12 @@
+nl:
+  activerecord:
+    errors:
+      models:
+        account:
+          attributes:
+            username:
+              invalid: alleen letters, nummers en underscores
+        status:
+          attributes:
+            reblog:
+              taken: van toot bestaat al
diff --git a/config/locales/devise.nl.yml b/config/locales/devise.nl.yml
index 1739feacd..f8f59e660 100644
--- a/config/locales/devise.nl.yml
+++ b/config/locales/devise.nl.yml
@@ -2,7 +2,7 @@
 nl:
   devise:
     confirmations:
-      confirmed: Je account is bevestigd.
+      confirmed: Jouw account is bevestigd.
       send_instructions: Je ontvangt via e-mail instructies hoe je jouw account kunt bevestigen. Kijk tussen je spam wanneer niks werd ontvangen.
       send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw account kunt bevestigen. Kijk tussen je spam wanneer niks werd ontvangen.
     failure:
@@ -10,8 +10,8 @@ nl:
       inactive: Jouw account is nog niet geactiveerd.
       invalid: Ongeldig e-mailadres of wachtwoord.
       invalid_token: Ongeldige bevestigingscode.
-      last_attempt: Je hebt nog één poging over voordat jouw account geblokkeerd wordt.
-      locked: Jouw account is geblokkeerd.
+      last_attempt: Je hebt nog één poging over voordat jouw account wordt opgeschort.
+      locked: Jouw account is opgeschort.
       not_found_in_database: Ongeldig e-mailadres of wachtwoord.
       timeout: Jouw sessie is verlopen, log opnieuw in.
       unauthenticated: Je dient in te loggen of te registreren.
@@ -24,21 +24,21 @@ nl:
       reset_password_instructions:
         subject: 'Mastodon: Wachtwoord opnieuw instellen'
       unlock_instructions:
-        subject: 'Mastodon: Instructies om account te deblokkeren' 
+        subject: 'Mastodon: Instructies om opschorten account ongedaan te maken' 
     omniauth_callbacks:
       failure: Kon je niet aanmelden met jouw %{kind} account, omdat "%{reason}".
       success: Successvol aangemeld met jouw %{kind} account.
     passwords:
       no_token: Je kunt deze pagina niet benaderen zonder dat je een e-mail om je wachtwoord opnieuw in te stellen hebt ontvangen.
       send_instructions: Je ontvangt via e-mail instructies hoe je jouw wachtwoord opnieuw moet instellen. Kijk tussen je spam wanneer niks werd ontvangen.
-      send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw wachtwoord opnieuw moet instellen. Kijk tussen je spam wanneer niks werd ontvangen.
+      send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw wachtwoord opnieuw kunt instellen. Kijk tussen je spam wanneer niks werd ontvangen.
       updated: Jouw wachtwoord is gewijzigd. Je bent nu ingelogd.
       updated_not_active: Jouw wachtwoord is gewijzigd.
     registrations:
       destroyed: Jouw account is verwijderd. Wellicht tot ziens!
       signed_up: Je bent geregistreerd.
       signed_up_but_inactive: Je bent geregistreerd. Je kon alleen niet automatisch ingelogd worden omdat jouw account nog niet geactiveerd is.
-      signed_up_but_locked: Je bent ingeschreven. Je kon alleen niet automatisch ingelogd worden omdat jouw account geblokkeerd is.
+      signed_up_but_locked: Je bent ingeschreven. Je kon alleen niet automatisch ingelogd worden omdat jouw account is opgeschort.
       signed_up_but_unconfirmed: Je ontvangt via e-mail instructies hoe je jouw account kunt activeren. Kijk tussen je spam wanneer niks werd ontvangen.
       update_needs_confirmation: Je hebt je e-mailadres succesvol gewijzigd, maar we moeten je nieuwe mailadres nog bevestigen. Controleer jouw e-mail en klik op de link in de mail om jouw e-mailadres te bevestigen. Kijk tussen je spam wanneer niks werd ontvangen.
       updated: Jouw accountgegevens zijn opgeslagen.
@@ -46,16 +46,16 @@ nl:
       signed_in: Je bent succesvol ingelogd.
       signed_out: Je bent succesvol uitgelogd.
     unlocks:
-      send_instructions: Je ontvangt via e-mail instructies hoe je jouw account kunt deblokkeren. Kijk tussen je spam wanneer niks werd ontvangen.
-      send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je jouw account kunt deblokkeren. Kijk tussen je spam wanneer niks werd ontvangen.
-      unlocked: Jouw account is gedeblokkeerd. Je kunt nu weer inloggen.
+      send_instructions: Je ontvangt via e-mail instructies hoe je het opschorten van jouw account ongedaan kunt maken. Kijk tussen je spam wanneer niks werd ontvangen.
+      send_paranoid_instructions: Als jouw e-mailadres in de database staat, ontvang je via e-mail instructies hoe je het opschorten van jouw account ongedaan kunt maken. Kijk tussen je spam wanneer niks werd ontvangen.
+      unlocked: Jouw account is niet meer opgeschort. Je kunt nu weer inloggen.
   errors:
     messages:
       already_confirmed: is reeds bevestigd
       confirmation_period_expired: moet worden bevestigd binnen %{period}, probeer het nog een keer
       expired: is verlopen, vraag een nieuwe aan
       not_found: niet gevonden
-      not_locked: is niet geblokkeerd
+      not_locked: is niet opgeschort
       not_saved:
         one: '1 fout verhinderde het opslaan van deze %{resource}:'
         other: "%{count} fouten verhinderden het opslaan van deze %{resource}:"
diff --git a/config/locales/doorkeeper.nl.yml b/config/locales/doorkeeper.nl.yml
index 9edbb8c9f..77cf2503b 100644
--- a/config/locales/doorkeeper.nl.yml
+++ b/config/locales/doorkeeper.nl.yml
@@ -109,6 +109,6 @@ nl:
       application:
         title: OAuth-autorisatie vereist
     scopes:
-      follow: volg, blokkeer, deblokkeer en stop het volgen van accounts
-      read: lees jouw accountgegevens
-      write: namens jou plaatsen
+      follow: accounts te volgen, te negeren en te blokkeren.
+      read: jouw accountgegevens te lezen
+      write: namens jou berichten te plaatsen
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 016cddc22..58282259d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -5,15 +5,34 @@ nl:
     about_this: Over deze server
     closed_registrations: Registreren op deze server is momenteel uitgeschakeld.
     contact: Contact
+    contact_missing: Niet ingesteld
+    contact_unavailable: N/A
     description_headline: Wat is %{domain}?
     domain_count_after: andere servers
     domain_count_before: Verbonden met
+    extended_description_html: |
+      <h3>Een goede plek voor richtlijnen</h3>
+      <p>De uitgebreide omschrijving is nog niet ingevuld.</p>
+    features:
+      humane_approach_body: Na van de fouten van andere netwerken te hebben geleerd, tracht Mastodon ethische ontwerpkeuzes te maken om misbruik van social media te voorkomen.
+      humane_approach_title: Een meer menselijke aanpak
+      not_a_product_body: Mastodon is geen commercieel netwerk. Dus geen advertenties, geen datamining en geen besloten systemen. Er is geen centrale organisatie die alles bepaald.
+      not_a_product_title: Jij bent een persoon, geen product
+      real_conversation_body: Met 500 karakters tot jouw beschikking, en ondersteuning voor tekst- en media-waarschuwingen, kan je jezelf uiten zoals jij dat wil.
+      real_conversation_title: Voor echte gesprekken gemaakt
+      within_reach_body: Meerdere apps voor iOS, Android en andere platformen, met dank aan het ontwikkelaarsvriendelijke API-systeem, zorgen ervoor dat je overal op de hoogte blijft.
+      within_reach_title: Altijd binnen bereik
+    find_another_instance: Vind een andere server
+    generic_description: "%{domain} is een server in het Mastodon-netwerk"
+    hosted_on: Mastodon op %{domain}
+    learn_more: Meer leren
     other_instances: Andere servers
     source_code: Broncode
     status_count_after: toots
     status_count_before: Zij schreven
     user_count_after: gebruikers
     user_count_before: Thuisbasis van
+    what_is_mastodon: Wat is Mastodon?
   accounts:
     follow: Volgen
     followers: Volgers
@@ -23,8 +42,99 @@ nl:
     people_who_follow: Mensen die %{name} volgen
     posts: Toots
     remote_follow: Extern volgen
+    reserved_username: Deze gebruikersnaam is gereserveerd
     unfollow: Ontvolgen
   admin:
+    accounts:
+      are_you_sure: Weet je het zeker?
+      confirm: Bevestigen
+      confirmed: Bevestigd
+      disable_two_factor_authentication: 2FA uitschakelen
+      display_name: Weergavenaam
+      domain: Domein
+      edit: Bewerken
+      email: E-mail
+      feed_url: Feed-URL
+      followers: Volgers
+      follows: Volgt
+      ip: IP
+      location:
+        all: Alles
+        local: Lokaal
+        remote: Extern
+        title: Locatie
+      media_attachments: Media-bijlagen
+      moderation:
+        all: Alles
+        silenced: Genegeerd
+        suspended: Opgeschort
+        title: Moderatie
+      most_recent_activity: Laatst actief
+      most_recent_ip: Laatst gebruikt IP-adres
+      not_subscribed: Niet geabonneerd
+      order:
+        alphabetic: Alfabetisch
+        most_recent: Meest recent
+        title: 
+      perform_full_suspension: Volledig opschorten
+      profile_url: Profiel-URL
+      public: Openbaar
+      push_subscription_expires: PuSH-abonnement verloopt op
+      redownload: Avatar vernieuwen
+      reset: Opnieuw
+      reset_password: Wachtwoord opnieuw instellen
+      resubscribe: Opnieuw abonneren
+      salmon_url: Salmon-URL
+      search: Zoeken
+      show:
+        created_reports: Toots door dit account gerapporteerd
+        report: gerapporteerd
+        targeted_reports: Toots van dit account gerapporteerd
+      silence: Negeren
+      statuses: Toots
+      subscribe: Abonneren
+      title: Accounts
+      undo_silenced: Niet meer negeren
+      undo_suspension: Niet meer opschorten
+      unsubscribe: Opzeggen
+      username: Gebruikersnaam
+      web: Webapp
+    domain_blocks:
+      add_new: Nieuwe toevoegen
+      created_msg: Domeinblokkade wordt nu verwerkt
+      destroyed_msg: Domeinblokkade is ongedaan gemaakt
+      domain: Domein
+      new:
+        create: Blokkade aanmaken
+        hint: Een domeinblokkade voorkomt niet dat accountgegevens van dit domein aan de database worden toegevoegd, maar dat er met terugwerkende kracht en automatisch bepaalde moderatiemethoden op deze accounts worden toegepast. 
+        severity:
+          desc_html: "<strong>Negeren</strong> zorgt ervoor dat berichten van accounts van dit domein voor iedereen onzichtbaar zijn, behalve als een account wordt gevolgd. <strong>Opschorten</strong> zorgt ervoor dat alle berichten, media en profielgegevens van accounts van dit domein worden verwijderd. Gebruik <strong>Geen</strong> wanneer je alleen mediabestanden wilt weigeren."
+          noop: Geen
+          silence: Negeren
+          suspend: Opschorten
+        title: Nieuwe domeinblokkade
+      reject_media: Mediabestanden verwerpen
+      reject_media_hint: Verwijderd lokaal opgeslagen mediabestanden en weigert deze in de toekomst te downloaden. Irrelevant voor opgeschorte domeinen.
+      severities:
+        noop: Geen
+        silence: Negeren
+        suspend: Opschorten
+      severity: Zwaarte
+      show:
+        affected_accounts:
+          one: Eén account in de database aangepast
+          other: "%{count} accounts in de database aangepast"
+        retroactive:
+          silence: Alle genegeerde accounts van dit domein niet meer negeren
+          suspend: Alle opgeschorste accounts van dit domein niet meer opschorten
+        title: Domeinblokkade voor %{domain} ongedaan maken
+        undo: Ongedaan maken
+      title: Domeinblokkades 
+      undo: Ongedaan maken
+    instances:
+      account_count: Bekende accounts
+      domain_name: Domein
+      title: Bekende servers
     reports:
       action_taken_by: Actie uitgevoerd door
       are_you_sure: Weet je het zeker?
@@ -38,13 +148,14 @@ nl:
         'false': Media tonen
         'true': Media verbergen
       report: 'Gerapporteerde toot #%{id}'
+      report_contents: Inhoud
       reported_account: Gerapporteerde account
       reported_by: Gerapporteerd door
       resolved: Opgelost
-      silence_account: Account stilzwijgen
+      silence_account: Account negeren
       status: Toot
-      suspend_account: Account blokkeren
-      target: Target
+      suspend_account: Account opschorten
+      target: Gerapporteerde account
       title: Gerapporteerde toots
       unresolved: Onopgelost
       view: Weergeven
@@ -56,7 +167,11 @@ nl:
         closed_message:
           desc_html: Wordt op de voorpagina weergegeven wanneer registratie van nieuwe accounts is uitgeschakeld<br>En ook hier kan je HTML gebruiken
           title: Bericht wanneer registratie is uitgeschakeld
+        deletion:
+          desc_html: Toestaan dat iedereen hun eigen account kan verwijderen
+          title:  Verwijderen account toestaan
         open:
+          desc_html: Toestaan dat iedereen een account kan registereren
           title: Open registratie
       site_description:
         desc_html: Dit wordt als een alinea op de voorpagina getoond en gebruikt als meta-tag in de paginabron.<br>Je kan HTML gebruiken, zoals <code>&lt;a&gt;</code> en <code>&lt;em&gt;</code>.
@@ -64,8 +179,35 @@ nl:
       site_description_extended:
         desc_html: Wordt op de uitgebreide informatiepagina weergegeven<br>Je kan ook hier HTML gebruiken
         title: Uitgebreide omschrijving Mastodon-server
+      site_terms:
+        desc_html: Je kan hier jouw eigen privacybeleid, gebruikersvoorwaarden en ander juridisch jargon kwijt. Je kan HTML gebruiken.
+        title: Aangepaste gebruikersvoorwaarden
       site_title: Naam Mastodon-server
+      timeline_preview:
+        desc_html: Toon de openbare tijdlijn op de startpagina
+        title: Voorbeeld tijdlijn
       title: Server-instellingen
+    statuses:
+      back_to_account: Terug naar accountpagina
+      batch:
+        delete: Verwijderen
+        nsfw_off: NSFW UIT
+        nsfw_on: NSFW AAN
+      execute: Uitvoeren
+      failed_to_execute: Uitvoeren mislukt
+      media:
+        hide: Media verbergen
+        show: Media tonen
+        title: Media
+      no_media: Geen media
+      title: Toots van account
+    subscriptions:
+      callback_url: Callback-URL
+      confirmed: Bevestigd
+      expires_in: Verloopt over
+      last_delivery: Laatste bezorging
+      title: PubSubHubbub
+      topic: Account
     title: Beheer
   admin_mailer:
     new_report:
@@ -76,8 +218,9 @@ nl:
     signature: Mastodon-meldingen van %{instance}
     view: 'Bekijk:'
   applications:
-    invalid_url: De opgegevens URL is ongeldig
+    invalid_url: De opgegeven URL is ongeldig
   auth:
+    agreement_html: Wanneer je op registeren klikt ga je akkoord met <a href="%{rules_path}">onze gebruikersvoorwaarden</a> en <a href="%{terms_path}">ons privacybeleid</a>.
     change_password: Beveiliging
     delete_account: Account verwijderen
     delete_account_html: Wanneer je jouw account graag wilt verwijderen, kan je dat <a href="%{path}">hier doen</a>. We vragen jou daar om een bevestiging.
@@ -92,6 +235,12 @@ nl:
   authorize_follow:
     error: Helaas, er is een fout opgetreden bij het opzoeken van de externe account
     follow: Volgen
+    follow_request: 'Jij hebt een volgverzoek ingediend bij:'
+    following: 'Succes! Jij volgt nu:'
+    post_follow:
+      close: Of je kan dit venster gewoon sluiten.
+      return: Ga terug naar het profiel van de gebruiker
+      web: Ga naar de webapp
     prompt_html: 'Je (<strong>%{self}</strong>) hebt toestemming gevraagd om iemand te mogen volgen:'
     title: Volg %{acct}
   datetime:
@@ -124,7 +273,7 @@ nl:
       content: Veiligheidsverificatie mislukt. Blokkeer je toevallig cookies?
       title: Veiligheidsverificatie mislukt
     '429': Te veel verbindingsaanvragen.
-    noscript: Schakel JavaScript in om Mastodon te kunnen gebruiken.
+    noscript: Schakel JavaScript in om de webapplicatie van Mastodon te gebruiken. Als alternatief kan je een Mastodon-app zoeken voor jouw platform.
   exports:
     blocks: Jij blokkeert
     csv: CSV
@@ -158,8 +307,12 @@ nl:
       following: Volglijst
       muting: Negeerlijst
     upload: Uploaden
-  landing_strip_html: "<strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt."
+  landing_strip_html: <strong>%{name}</strong> is een gebruiker op %{link_to_root_path}. Je kunt deze volgen en ermee communiceren als je ergens in deze fediverse een account hebt.
   landing_strip_signup_html: Als je dat niet hebt, kun je je <a href="%{sign_up_path}">hier registreren</a>.
+  media_attachments:
+    validations:
+      images_and_video: Een video kan niet aan een toot met afbeeldingen worden gekoppeld
+      too_many: Er kunnen niet meer dan 4 afbeeldingen toegevoegd worden
   notification_mailer:
     digest:
       body: 'Hier is een korte samenvatting van wat je hebt gemist op %{instance} sinds jouw laatste bezoek op %{since}:'
@@ -184,10 +337,26 @@ nl:
       subject: Jij bent vermeld door %{name}
     reblog:
       body: 'Jouw toot werd door %{name} geboost:'
-      subject: "%{name} booste jouw toot"
+      subject: "%{name} boostte jouw toot"
   pagination:
     next: Volgende
     prev: Vorige
+    truncate: "&hellip;"
+  push_notifications:
+    favourite:
+      title: "%{name} markeerde jouw toot als favoriet"
+    follow:
+      title: "%{name} volgt jou nu"
+    mention:
+      action_boost: Boost
+      action_expand: Meer tonen
+      action_favourite: Favoriet
+      title: "%{name} vermeldde jou"
+    reblog:
+      title: "%{name} boostte jouw toot"
+    subscribed:
+      body: Je kan nu pushmeldingen ontvangen.
+      title: Aanmelding bevestigd!
   remote_follow:
     acct: Geef jouw account@domein.tld op waarvandaan je wilt volgen
     missing_resource: Kon vereiste doorverwijzings-URL voor jouw account niet vinden
@@ -229,10 +398,13 @@ nl:
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
+    revoke: Intrekken
+    revoke_success: Sessie succesvol ingetrokken
     title: Sessies
   settings:
     authorized_apps: Geautoriseerde apps
     back: Terug naar Mastodon
+    delete: Account deletion
     edit_profile: Profiel bewerken
     export: Export
     followers: Geautoriseerde volgers
@@ -241,9 +413,9 @@ nl:
     settings: Instellingen
     two_factor_authentication: Tweestapsverificatie
   statuses:
-    open_in_web: Openen in web
+    open_in_web: In de webapp openen
     over_character_limit: Limiet van %{max} tekens overschreden
-    show_more: Toon meer
+    show_more: Meer tonen
     visibilities:
       private: Alleen volgers
       private_long: Alleen aan volgers tonen
@@ -255,6 +427,76 @@ nl:
     click_to_show: Klik om te tonen
     reblogged: boostte
     sensitive_content: Gevoelige inhoud
+  terms:
+    body_html: |
+      <h2>Privacy Policy</h2>
+
+      <h3 id="collect">What information do we collect?</h3>
+
+      <p>We collect information from you when you register on our site and gather data when you participate in the forum by reading, writing, and evaluating the content shared here.</p>
+
+      <p>When registering on our site, you may be asked to enter your name and e-mail address. You may, however, visit our site without registering. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address.</p>
+
+      <p>When registered and posting, we record the IP address that the post originated from. We also may retain server logs which include the IP address of every request to our server.</p>
+
+      <h3 id="use">What do we use your information for?</h3>
+
+      <p>Any of the information we collect from you may be used in one of the following ways:</p>
+
+      <ul>
+        <li>To personalize your experience &mdash; your information helps us to better respond to your individual needs.</li>
+        <li>To improve our site &mdash; we continually strive to improve our site offerings based on the information and feedback we receive from you.</li>
+        <li>To improve customer service &mdash; your information helps us to more effectively respond to your customer service requests and support needs.</li>
+        <li>To send periodic emails &mdash; The email address you provide may be used to send you information, notifications that you request about changes to topics or in response to your user name, respond to inquiries, and/or other requests or questions.</li>
+      </ul>
+
+      <h3 id="protect">How do we protect your information?</h3>
+
+      <p>We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information.</p>
+
+      <h3 id="data-retention">What is your data retention policy?</h3>
+
+      <p>We will make a good faith effort to:</p>
+
+      <ul>
+        <li>Retain server logs containing the IP address of all requests to this server no more than 90 days.</li>
+        <li>Retain the IP addresses associated with registered users and their posts no more than 5 years.</li>
+      </ul>
+
+      <h3 id="cookies">Do we use cookies?</h3>
+
+      <p>Yes. Cookies are small files that a site or its service provider transfers to your computer's hard drive through your Web browser (if you allow). These cookies enable the site to recognize your browser and, if you have a registered account, associate it with your registered account.</p>
+
+      <p>We use cookies to understand and save your preferences for future visits and compile aggregate data about site traffic and site interaction so that we can offer better site experiences and tools in the future. We may contract with third-party service providers to assist us in better understanding our site visitors. These service providers are not permitted to use the information collected on our behalf except to help us conduct and improve our business.</p>
+
+      <h3 id="disclose">Do we disclose any information to outside parties?</h3>
+
+      <p>We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety. However, non-personally identifiable visitor information may be provided to other parties for marketing, advertising, or other uses.</p>
+
+      <h3 id="third-party">Third party links</h3>
+
+      <p>Occasionally, at our discretion, we may include or offer third party products or services on our site. These third party sites have separate and independent privacy policies. We therefore have no responsibility or liability for the content and activities of these linked sites. Nonetheless, we seek to protect the integrity of our site and welcome any feedback about these sites.</p>
+
+      <h3 id="coppa">Children's Online Privacy Protection Act Compliance</h3>
+
+      <p>Our site, products and services are all directed to people who are at least 13 years old. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA (<a href="https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act">Children's Online Privacy Protection Act</a>) do not use this site.</p>
+
+      <h3 id="online">Online Privacy Policy Only</h3>
+
+      <p>This online privacy policy applies only to information collected through our site and not to information collected offline.</p>
+
+      <h3 id="consent">Your Consent</h3>
+
+      <p>By using our site, you consent to our web site privacy policy.</p>
+
+      <h3 id="changes">Changes to our Privacy Policy</h3>
+
+      <p>If we decide to change our privacy policy, we will post those changes on this page.</p>
+
+      <p>This document is CC-BY-SA. It was last updated May 31, 2013.</p>
+
+      <p>Originally adapted from the <a href="https://github.com/discourse/discourse">Discourse privacy policy</a>.</p>
+    title: "%{instance} Terms of Service and Privacy Policy"
   time:
     formats:
       default: "%d %B %Y om %H:%M"
@@ -263,11 +505,13 @@ nl:
     description_html: Na het instellen van <strong>tweestapsverificatie</strong>, kun jij je alleen aanmelden als je jouw mobiele telefoon bij je hebt. Hiermee genereer je namelijk de in te voeren aanmeldcode.
     disable: Uitschakelen
     enable: Inschakelen
+    enabled: Tweestapsverificatie is ingeschakeld
     enabled_success: Inschakelen tweestapsverificatie geslaagd
     generate_recovery_codes: Herstelcodes genereren
     instructions_html: "<strong>Scan deze QR-code in Google Authenticator of een soortgelijke app op jouw mobiele telefoon</strong>. Van nu af aan genereert deze app aanmeldcodes die je bij het aanmelden moet invoeren."
     lost_recovery_codes: Met herstelcodes kun je toegang tot jouw account krijgen wanneer je jouw telefoon bent kwijtgeraakt. Wanneer je jouw herstelcodes bent kwijtgeraakt, kan je ze hier opnieuw genereren. Jouw oude herstelcodes zijn daarna ongeldig.
-    manual_instructions: Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.
+    manual_instructions: 'Hieronder vind je de geheime code in platte tekst. Voor het geval je de QR-code niet kunt scannen en het handmatig moet invoeren.'
+    recovery_codes: Herstelcodes back-uppen
     recovery_codes_regenerated: Opnieuw genereren herstelcodes geslaagd
     recovery_instructions_html: Wanneer je ooit de toegang verliest tot jouw telefoon, kan je met behulp van een van de herstelcodes hieronder opnieuw toegang krijgen tot jouw account. Zorg ervoor dat je de herstelcodes op een veilige plek bewaard. (Je kunt ze bijvoorbeeld printen en ze samen met andere belangrijke documenten bewaren.)
     setup: Instellen

From 696bcff6bfe5250bae06d3c252f46dbe6ac65624 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 25 Jul 2017 02:13:05 +0200
Subject: [PATCH 356/382] fix(status_list): Guard against missing ref (#4353)

---
 .../mastodon/components/status_list.js        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index 98f0de0a8..dc6f956bf 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -31,16 +31,18 @@ export default class StatusList extends ImmutablePureComponent {
   intersectionObserverWrapper = new IntersectionObserverWrapper();
 
   handleScroll = debounce(() => {
-    const { scrollTop, scrollHeight, clientHeight } = this.node;
-    const offset = scrollHeight - scrollTop - clientHeight;
-    this._oldScrollPosition = scrollHeight - scrollTop;
+    if (this.node) {
+      const { scrollTop, scrollHeight, clientHeight } = this.node;
+      const offset = scrollHeight - scrollTop - clientHeight;
+      this._oldScrollPosition = scrollHeight - scrollTop;
 
-    if (250 > offset && this.props.onScrollToBottom && !this.props.isLoading) {
-      this.props.onScrollToBottom();
-    } else if (scrollTop < 100 && this.props.onScrollToTop) {
-      this.props.onScrollToTop();
-    } else if (this.props.onScroll) {
-      this.props.onScroll();
+      if (250 > offset && this.props.onScrollToBottom && !this.props.isLoading) {
+        this.props.onScrollToBottom();
+      } else if (scrollTop < 100 && this.props.onScrollToTop) {
+        this.props.onScrollToTop();
+      } else if (this.props.onScroll) {
+        this.props.onScroll();
+      }
     }
   }, 200, {
     trailing: true,

From 6957c5b5c65adc5af0d30215aa27681d4b604fb1 Mon Sep 17 00:00:00 2001
From: Komic <contact@komic.eu>
Date: Tue, 25 Jul 2017 05:01:47 +0200
Subject: [PATCH 357/382] Small fr.json update (#4354)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Small fr.json update

• Translation for #4342
• Fixed a couple of typos as well as a few weird phrasings

* insert final newline
---
 app/javascript/mastodon/locales/fr.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index c7418e246..3cc1f152a 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Bloquer",
   "account.block_domain": "Tout masquer de {domain}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.disclaimer_full": "Les données ci-dessous peuvent ne pas refléter ce profil dans sa totalité.",
   "account.edit_profile": "Modifier le profil",
   "account.follow": "Suivre",
   "account.followers": "Abonné⋅e⋅s",
@@ -17,7 +17,7 @@
   "account.unblock_domain": "Ne plus masquer {domain}",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
-  "account.view_full_profile": "View full profile",
+"account.view_full_profile": "Afficher le profil complet",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
   "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.",
   "bundle_column_error.retry": "Réessayer",
@@ -42,9 +42,9 @@
   "compose_form.lock_disclaimer.lock": "verrouillé",
   "compose_form.placeholder": "Qu’avez-vous en tête ?",
   "compose_form.privacy_disclaimer": "Votre statut privé va être transmis aux personnes mentionnées sur {domains}. Avez-vous confiance en {domainsCount, plural, one {ce serveur} other {ces serveurs}} pour ne pas divulguer votre statut ? Les statuts privés ne fonctionnent que sur les instances de Mastodon. Si {domains} {domainsCount, plural, one {n’est pas une instance de Mastodon} other {ne sont pas des instances de Mastodon}}, il n’y aura aucune indication que votre statut est privé, et il pourrait être partagé ou rendu visible d’une autre manière à d’autres personnes imprévues.",
-  "compose_form.publish": "Pouet ",
+  "compose_form.publish": "Pouet ",
   "compose_form.publish_loud": "{publish}!",
-  "compose_form.sensitive": "Marquer le média comme délicat",
+  "compose_form.sensitive": "Marquer le média comme sensible",
   "compose_form.spoiler": "Masquer le texte derrière un avertissement",
   "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement",
   "confirmation_modal.cancel": "Annuler",
@@ -69,13 +69,13 @@
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Lieux et voyages",
   "empty_column.community": "Le fil public local est vide. Écrivez-donc quelque chose pour le remplir !",
-  "empty_column.hashtag": "Il n’y a encore aucun contenu relatif à ce hashtag",
+  "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag",
   "empty_column.home": "Vous ne suivez encore personne. Visitez {public} ou bien utilisez la recherche pour vous connecter à d’autres utilisateur⋅ice⋅s.",
   "empty_column.home.inactivity": "Votre accueil est vide. Si vous ne vous êtes pas connecté⋅e depuis un moment, il se remplira automatiquement très bientôt.",
   "empty_column.home.public_timeline": "le fil public",
   "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres utilisateur⋅ice⋅s pour débuter la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des utilisateur⋅ice⋅s d’autres instances pour remplir le fil public.",
-  "follow_request.authorize": "Autoriser",
+  "follow_request.authorize": "Accepter",
   "follow_request.reject": "Rejeter",
   "getting_started.appsshort": "Applications",
   "getting_started.faq": "FAQ",
@@ -127,8 +127,8 @@
   "onboarding.page_one.welcome": "Bienvenue sur Mastodon !",
   "onboarding.page_six.admin": "L’administrateur⋅trice de votre instance est {admin}",
   "onboarding.page_six.almost_done": "Nous y sommes presque…",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres. Et maintenant… Bon Appetoot!",
+  "onboarding.page_six.appetoot": "Bon Appétoot!",
+  "onboarding.page_six.apps_available": "De nombreuses {apps} sont disponibles pour iOS, Android et autres. Et maintenant… Bon Appétoot!",
   "onboarding.page_six.github": "Mastodon est un logiciel libre, gratuit et open-source. Vous pouvez rapporter des bogues, suggérer des fonctionnalités, ou contribuer à son développement sur {github}.",
   "onboarding.page_six.guidelines": "règles de la communauté",
   "onboarding.page_six.read_guidelines": "S’il vous plaît, n’oubliez pas de lire les {guidelines} !",
@@ -152,7 +152,7 @@
   "report.target": "Signalement",
   "search.placeholder": "Rechercher",
   "search_results.total": "{count, number} {count, plural, one {résultat} other {résultats}}",
-  "standalone.public_title": "Coup d'oeil",
+  "standalone.public_title": "Coup d'œil",
   "status.cannot_reblog": "Cette publication ne peut être boostée",
   "status.delete": "Effacer",
   "status.favourite": "Ajouter aux favoris",
@@ -166,8 +166,8 @@
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
-  "status.sensitive_toggle": "Cliquer pour dévoiler",
-  "status.sensitive_warning": "Contenu délicat",
+  "status.sensitive_toggle": "Cliquer pour afficher",
+  "status.sensitive_warning": "Contenu sensible",
   "status.show_less": "Replier",
   "status.show_more": "Déplier",
   "status.unmute_conversation": "Ne plus masquer la conversation",
@@ -181,7 +181,7 @@
   "upload_form.undo": "Annuler",
   "upload_progress.label": "Envoi en cours…",
   "video_player.expand": "Agrandir la vidéo",
-  "video_player.toggle_sound": "Mettre/Couper le son",
+  "video_player.toggle_sound": "Activer/Désactiver le son",
   "video_player.toggle_visible": "Afficher/Cacher la vidéo",
   "video_player.video_error": "Erreur lors de la lecture de la vidéo"
 }

From a31d24ee183c9d8053595510681258ecd67924fb Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 25 Jul 2017 15:39:49 +0200
Subject: [PATCH 358/382] i18n: Update Polish translation (#4361)

---
 app/javascript/mastodon/locales/pl.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 857e4df10..af069b6d7 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,7 +1,7 @@
 {
   "account.block": "Blokuj @{name}",
   "account.block_domain": "Blokuj wszystko z {domain}",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.disclaimer_full": "Poniższe informacje mogą nie odwzorowywać bezbłędnie profilu użytkownika.",
   "account.edit_profile": "Edytuj profil",
   "account.follow": "Śledź",
   "account.followers": "Śledzący",
@@ -17,7 +17,7 @@
   "account.unblock_domain": "Odblokuj domenę {domain}",
   "account.unfollow": "Przestań śledzić",
   "account.unmute": "Cofnij wyciszenie @{name}",
-  "account.view_full_profile": "View full profile",
+  "account.view_full_profile": "Wyświetl pełny profil",
   "boost_modal.combo": "Naciśnij {combo}, aby pominąć to następnym razem",
   "bundle_column_error.body": "Coś poszło nie tak podczas ładowania tego składnika.",
   "bundle_column_error.retry": "Spróbuj ponownie",

From 02744f29ef1bc563b53841cb34557c97928b52a1 Mon Sep 17 00:00:00 2001
From: Clworld <clworld@ggtea.org>
Date: Tue, 25 Jul 2017 22:57:40 +0900
Subject: [PATCH 359/382] Update Japanese translations for landing page (for
 Mobile). (#4362)

---
 config/locales/ja.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 74448ff42..6763ed301 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2,7 +2,7 @@
 ja:
   about:
     about_mastodon_html: Mastodon は、オープンなウェブプロトコルを採用した、自由でオープンソースなソーシャルネットワークです。電子メールのような分散型の仕組みを採っています。
-    about_this: このインスタンスについて
+    about_this: 詳細情報
     closed_registrations: 現在このインスタンスでの新規登録は受け付けていません。しかし、他のインスタンスにアカウントを作成しても全く同じネットワークに参加することができます。
     contact: 連絡先
     description_headline: "%{domain} とは？"
@@ -395,7 +395,7 @@ ja:
     title: セッション
   settings:
     authorized_apps: 認証済みアプリ
-    back: 戻る
+    back: Mastodon に戻る
     delete: アカウントの削除
     edit_profile: プロフィールを編集
     export: データのエクスポート

From e5c0aa6493427b7251da558897877f8aa6ad8e4e Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Tue, 25 Jul 2017 22:59:43 +0900
Subject: [PATCH 360/382] Send short account URL to remote instance (regression
 from #3844) (#4355)

* Send short account URL to remote instance (regression from #3844)

Resolve #4347

* remove format: 'json'
---
 app/views/well_known/webfinger/show.json.rabl | 2 +-
 app/views/well_known/webfinger/show.xml.ruby  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/well_known/webfinger/show.json.rabl b/app/views/well_known/webfinger/show.json.rabl
index af11cd207..762d1860d 100644
--- a/app/views/well_known/webfinger/show.json.rabl
+++ b/app/views/well_known/webfinger/show.json.rabl
@@ -8,7 +8,7 @@ end
 
 node(:links) do
   [
-    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: account_url(@account) },
+    { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account) },
     { rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom') },
     { rel: 'self', type: 'application/activity+json', href: account_url(@account) },
     { rel: 'salmon', href: api_salmon_url(@account.id) },
diff --git a/app/views/well_known/webfinger/show.xml.ruby b/app/views/well_known/webfinger/show.xml.ruby
index 844742d68..b0158b8bd 100644
--- a/app/views/well_known/webfinger/show.xml.ruby
+++ b/app/views/well_known/webfinger/show.xml.ruby
@@ -3,7 +3,7 @@ Nokogiri::XML::Builder.new do |xml|
     xml.Subject @canonical_account_uri
     xml.Alias short_account_url(@account)
     xml.Alias account_url(@account)
-    xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: TagManager.instance.url_for(@account))
+    xml.Link(rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: short_account_url(@account))
     xml.Link(rel: 'http://schemas.google.com/g/2010#updates-from', type: 'application/atom+xml', href: account_url(@account, format: 'atom'))
     xml.Link(rel: 'self', type: 'application/activity+json', href: account_url(@account))
     xml.Link(rel: 'salmon', href: api_salmon_url(@account.id))

From a6ea7e282fc0cbb837cb1c1e344c31264600114c Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Tue, 25 Jul 2017 23:01:03 +0900
Subject: [PATCH 361/382] Merge queries in Api::V1::FavouritesController
 (#4359)

---
 app/controllers/api/v1/favourites_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/api/v1/favourites_controller.rb b/app/controllers/api/v1/favourites_controller.rb
index 92c0a62a9..9d73bb337 100644
--- a/app/controllers/api/v1/favourites_controller.rb
+++ b/app/controllers/api/v1/favourites_controller.rb
@@ -20,9 +20,7 @@ class Api::V1::FavouritesController < Api::BaseController
 
   def cached_favourites
     cache_collection(
-      Status.where(
-        id: results.map(&:status_id)
-      ),
+      Status.reorder(nil).joins(:favourites).merge(results),
       Status
     )
   end

From edadc93757de8a0754315333d1fe8642604dd194 Mon Sep 17 00:00:00 2001
From: Clworld <clworld@ggtea.org>
Date: Tue, 25 Jul 2017 23:20:26 +0900
Subject: [PATCH 362/382] Allow longer link text on landing page (reduce
 padding for Mobile) (#4363)

* Allow longer link text on landing page (reduce padding for Mobile)

* remove empty line
---
 app/javascript/styles/about.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index daf0e4ac5..8aa5d8eb4 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -721,6 +721,16 @@
         text-align: center;
       }
 
+      .nav {
+        display: flex;
+        flex-flow: row wrap;
+        justify-content: space-around;
+      }
+
+      .links a {
+        padding: 12px 8px;
+      }
+
       .heading h1 {
         padding: 30px 0;
       }

From 9f97c8c7505bbf21b97bb94a180fe4eee14287ad Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Wed, 26 Jul 2017 02:12:57 +0900
Subject: [PATCH 363/382] Fix multiple-gif display in user page (#4364)

Divide media-items to equal width, and hide overlaps.
---
 app/javascript/styles/stream_entries.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/javascript/styles/stream_entries.scss b/app/javascript/styles/stream_entries.scss
index 3856942e1..9e062c57e 100644
--- a/app/javascript/styles/stream_entries.scss
+++ b/app/javascript/styles/stream_entries.scss
@@ -263,7 +263,9 @@
     border: medium none;
     display: block;
     flex: 1 1 auto;
+    width: 100%;
     height: 100%;
+    overflow: hidden;
     margin-right: 2px;
 
     &:last-child {

From 7232cdf7e8249f79078005931b1165e54e413fa9 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Tue, 25 Jul 2017 20:38:39 +0200
Subject: [PATCH 364/382] feat(status_action_bar): Web share button (#4365)

---
 .../mastodon/components/status_action_bar.js        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 7bb394e71..4e02e6fad 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -12,6 +12,7 @@ const messages = defineMessages({
   mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' },
   block: { id: 'account.block', defaultMessage: 'Block @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
+  share: { id: 'status.share', defaultMessage: 'Share' },
   replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
@@ -57,6 +58,13 @@ export default class StatusActionBar extends ImmutablePureComponent {
     this.props.onReply(this.props.status, this.context.router.history);
   }
 
+  handleShareClick = () => {
+    navigator.share({
+      text: this.props.status.get('search_index'),
+      url: this.props.status.get('url'),
+    });
+  }
+
   handleFavouriteClick = () => {
     this.props.onFavourite(this.props.status);
   }
@@ -136,11 +144,16 @@ export default class StatusActionBar extends ImmutablePureComponent {
       replyTitle = intl.formatMessage(messages.replyAll);
     }
 
+    const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && (
+      <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.share)} icon='share-alt' onClick={this.handleShareClick} />
+    );
+
     return (
       <div className='status__action-bar'>
         <IconButton className='status__action-bar-button' disabled={anonymousAccess} title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
         <IconButton className='status__action-bar-button' disabled={anonymousAccess || reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} />
         <IconButton className='status__action-bar-button star-icon' disabled={anonymousAccess} animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        {shareButton}
 
         <div className='status__action-bar-dropdown'>
           <DropdownMenu disabled={anonymousAccess} items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />

From 9891ff80f9679ed3dfdd6e8352abfb661f321a00 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Wed, 26 Jul 2017 04:31:56 +0900
Subject: [PATCH 365/382] Adjust mobile landing page (#4366)

* Adjust mobile landing page

Change mobile viewport threshold to 840px in consideration of padding. Fix loss of "container hero" padding in about/more under 675px.

* Fix indent
---
 app/javascript/styles/about.scss | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 8aa5d8eb4..5a4bcef61 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -646,7 +646,7 @@
     }
   }
 
-  @media screen and (max-width: 800px) {
+  @media screen and (max-width: 840px) {
     .container {
       padding: 0 20px;
     }
@@ -688,6 +688,10 @@
   @media screen and (max-width: 675px) {
     .header-wrapper {
       padding-top: 0;
+
+      &.compact .hero .heading {
+        padding-bottom: 20px;
+      }
     }
 
     .header .container,
@@ -701,15 +705,9 @@
     }
 
     .header {
-      padding-top: 0;
 
       .hero {
         margin-top: 30px;
-        padding: 0;
-
-        .heading {
-          padding-bottom: 20px;
-        }
       }
 
       .floats {

From 7062cb764fe450981b4a8b482b01f85fed1914a0 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Tue, 25 Jul 2017 23:56:04 +0200
Subject: [PATCH 366/382] i18n: Update Polish translation (#4367)

---
 app/javascript/mastodon/locales/pl.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index af069b6d7..29e6ca471 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -168,6 +168,7 @@
   "status.report": "Zgłoś @{name}",
   "status.sensitive_toggle": "Naciśnij aby wyświetlić",
   "status.sensitive_warning": "Wrażliwa zawartość",
+  "status.share": "Udostępnij",
   "status.show_less": "Pokaż mniej",
   "status.show_more": "Pokaż więcej",
   "status.unmute_conversation": "Cofnij wyciezenie konwersacji",

From 4115043dc7be6e5cc8a5bb2e95ef97d391111611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Wed, 26 Jul 2017 02:00:36 +0200
Subject: [PATCH 367/382] Added external link icons to joinmastodon navbar
 buttons (#4368)

---
 app/views/about/more.html.haml | 5 ++++-
 app/views/about/show.html.haml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
index 11315fefa..6342c7248 100644
--- a/app/views/about/more.html.haml
+++ b/app/views/about/more.html.haml
@@ -29,7 +29,10 @@
             - else
               = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
           %li= link_to t('about.about_this'), about_more_path
-          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
+          %li
+            = link_to 'https://joinmastodon.org/' do
+              = "#{t('about.other_instances')}"
+              %i.fa.fa-external-link{ style: 'padding-left: 5px;' }
 
       .container.hero
         .heading
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index a3c8e4a84..d0c9a6650 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -33,7 +33,10 @@
             - else
               = link_to t('auth.login'), new_user_session_path, class: 'webapp-btn'
           %li= link_to t('about.about_this'), about_more_path
-          %li= link_to t('about.other_instances'), 'https://joinmastodon.org/'
+          %li
+            = link_to 'https://joinmastodon.org/' do
+              = "#{t('about.other_instances')}"
+              %i.fa.fa-external-link{ style: 'padding-left: 5px;' }
 
       .container.hero
         .floats

From 2f8bfb3d387e1c187f90c9dbbaaa011447269213 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 26 Jul 2017 02:01:27 +0200
Subject: [PATCH 368/382] Improve accessibility (#4369)

* fix(compose): Use nav and remove redundant aria-label

* fix(tabs_tab): Use nav and add aria-label

* fix(app): Add aria-label for settings toggle button

* chore: Run yarn manage:translations
---
 .../mastodon/components/column_header.js      | 13 +++++++--
 .../mastodon/features/compose/index.js        | 18 ++++++------
 .../features/ui/components/tabs_bar.js        | 28 ++++++++++++-------
 app/javascript/mastodon/locales/ar.json       |  3 ++
 app/javascript/mastodon/locales/bg.json       |  3 ++
 app/javascript/mastodon/locales/ca.json       |  3 ++
 app/javascript/mastodon/locales/de.json       |  3 ++
 .../mastodon/locales/defaultMessages.json     | 12 ++++++++
 app/javascript/mastodon/locales/en.json       |  3 ++
 app/javascript/mastodon/locales/eo.json       |  3 ++
 app/javascript/mastodon/locales/es.json       |  3 ++
 app/javascript/mastodon/locales/fa.json       |  3 ++
 app/javascript/mastodon/locales/fi.json       |  3 ++
 app/javascript/mastodon/locales/fr.json       |  5 +++-
 app/javascript/mastodon/locales/he.json       |  3 ++
 app/javascript/mastodon/locales/hr.json       |  3 ++
 app/javascript/mastodon/locales/hu.json       |  3 ++
 app/javascript/mastodon/locales/id.json       |  3 ++
 app/javascript/mastodon/locales/io.json       |  3 ++
 app/javascript/mastodon/locales/it.json       |  3 ++
 app/javascript/mastodon/locales/ja.json       |  3 ++
 app/javascript/mastodon/locales/ko.json       |  3 ++
 app/javascript/mastodon/locales/nl.json       |  7 +++--
 app/javascript/mastodon/locales/no.json       |  3 ++
 app/javascript/mastodon/locales/oc.json       |  3 ++
 app/javascript/mastodon/locales/pl.json       |  2 ++
 app/javascript/mastodon/locales/pt-BR.json    |  3 ++
 app/javascript/mastodon/locales/pt.json       |  3 ++
 app/javascript/mastodon/locales/ru.json       |  3 ++
 app/javascript/mastodon/locales/th.json       |  3 ++
 app/javascript/mastodon/locales/tr.json       |  3 ++
 app/javascript/mastodon/locales/uk.json       |  3 ++
 app/javascript/mastodon/locales/zh-CN.json    |  3 ++
 app/javascript/mastodon/locales/zh-HK.json    |  3 ++
 app/javascript/mastodon/locales/zh-TW.json    |  3 ++
 35 files changed, 144 insertions(+), 25 deletions(-)

diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 5b2a4d84c..89e2f9189 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -1,8 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
 
+const messages = defineMessages({
+  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
+  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
+});
+
+@injectIntl
 export default class ColumnHeader extends React.PureComponent {
 
   static contextTypes = {
@@ -10,6 +16,7 @@ export default class ColumnHeader extends React.PureComponent {
   };
 
   static propTypes = {
+    intl: PropTypes.object.isRequired,
     title: PropTypes.node.isRequired,
     icon: PropTypes.string.isRequired,
     active: PropTypes.bool,
@@ -54,7 +61,7 @@ export default class ColumnHeader extends React.PureComponent {
   }
 
   render () {
-    const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton } = this.props;
+    const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage } } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -116,7 +123,7 @@ export default class ColumnHeader extends React.PureComponent {
     }
 
     if (children || multiColumn) {
-      collapseButton = <button className={collapsibleButtonClassName} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
+      collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
     }
 
     return (
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js
index e3cf2d33b..b3f410f3b 100644
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@@ -64,23 +64,23 @@ export default class Compose extends React.PureComponent {
     if (multiColumn) {
       const { columns } = this.props;
       header = (
-        <div className='drawer__header'>
-          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' aria-label={intl.formatMessage(messages.start)} className='fa fa-fw fa-asterisk' /></Link>
+        <nav className='drawer__header'>
+          <Link to='/getting-started' className='drawer__tab' title={intl.formatMessage(messages.start)}><i role='img' className='fa fa-fw fa-asterisk' /></Link>
           {!columns.some(column => column.get('id') === 'HOME') && (
-            <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' aria-label={intl.formatMessage(messages.home_timeline)} /></Link>
+            <Link to='/timelines/home' className='drawer__tab' title={intl.formatMessage(messages.home_timeline)}><i role='img' className='fa fa-fw fa-home' /></Link>
           )}
           {!columns.some(column => column.get('id') === 'NOTIFICATIONS') && (
-            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)}><i role='img' className='fa fa-fw fa-bell' aria-label={intl.formatMessage(messages.notifications)} /></Link>
+            <Link to='/notifications' className='drawer__tab' title={intl.formatMessage(messages.notifications)}><i role='img' className='fa fa-fw fa-bell' /></Link>
           )}
           {!columns.some(column => column.get('id') === 'COMMUNITY') && (
-            <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' aria-label={intl.formatMessage(messages.community)} className='fa fa-fw fa-users' /></Link>
+            <Link to='/timelines/public/local' className='drawer__tab' title={intl.formatMessage(messages.community)}><i role='img' className='fa fa-fw fa-users' /></Link>
           )}
           {!columns.some(column => column.get('id') === 'PUBLIC') && (
-            <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' aria-label={intl.formatMessage(messages.public)} className='fa fa-fw fa-globe' /></Link>
+            <Link to='/timelines/public' className='drawer__tab' title={intl.formatMessage(messages.public)}><i role='img' className='fa fa-fw fa-globe' /></Link>
           )}
-          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)}><i role='img' aria-label={intl.formatMessage(messages.preferences)} className='fa fa-fw fa-cog' /></a>
-          <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' aria-label={intl.formatMessage(messages.logout)} className='fa fa-fw fa-sign-out' /></a>
-        </div>
+          <a href='/settings/preferences' className='drawer__tab' title={intl.formatMessage(messages.preferences)}><i role='img' className='fa fa-fw fa-cog' /></a>
+          <a href='/auth/sign_out' className='drawer__tab' data-method='delete' title={intl.formatMessage(messages.logout)}><i role='img' className='fa fa-fw fa-sign-out' /></a>
+        </nav>
       );
     }
 
diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index baec86d0d..4d488f82d 100644
--- a/app/javascript/mastodon/features/ui/components/tabs_bar.js
+++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js
@@ -1,16 +1,17 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 import NavLink from 'react-router-dom/NavLink';
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, injectIntl } from 'react-intl';
 
 export const links = [
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
-  <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' to='/statuses/new' data-preview-title-id='tabs_bar.compose' data-preview-icon='pencil' ><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' to='/timelines/home' data-preview-title-id='column.home' data-preview-icon='home' ><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' to='/notifications' data-preview-title-id='column.notifications' data-preview-icon='bell' ><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
 
-  <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
-  <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
+  <NavLink className='tabs-bar__link secondary' to='/timelines/public/local' data-preview-title-id='column.community' data-preview-icon='users' ><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
+  <NavLink className='tabs-bar__link secondary' exact to='/timelines/public' data-preview-title-id='column.public' data-preview-icon='globe' ><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
 
-  <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='tabs_bar.federated_timeline' data-preview-icon='asterisk' ><i className='fa fa-fw fa-asterisk' /></NavLink>,
+  <NavLink className='tabs-bar__link primary' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started' data-preview-title-id='getting_started.heading' data-preview-icon='asterisk' ><i className='fa fa-fw fa-asterisk' /></NavLink>,
 ];
 
 export function getIndex (path) {
@@ -21,13 +22,20 @@ export function getLink (index) {
   return links[index].props.to;
 }
 
+@injectIntl
 export default class TabsBar extends React.Component {
 
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+  }
+
   render () {
+    const { intl: { formatMessage } } = this.props;
+
     return (
-      <div className='tabs-bar'>
-        {React.Children.toArray(links)}
-      </div>
+      <nav className='tabs-bar'>
+        {links.map(link => React.cloneElement(link, { key: link.props.to, 'aria-label': formatMessage({ id: link.props['data-preview-title-id'] }) }))}
+      </nav>
     );
   }
 
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 7f27d78cd..8ce254bde 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -34,7 +34,9 @@
   "column.notifications": "الإشعارات",
   "column.public": "الخيط العام الموحد",
   "column_back_button.label": "العودة",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "التصفح",
   "column_subheading.settings": "الإعدادات",
@@ -168,6 +170,7 @@
   "status.report": "إبلِغ عن @{name}",
   "status.sensitive_toggle": "اضغط للعرض",
   "status.sensitive_warning": "محتوى حساس",
+  "status.share": "Share",
   "status.show_less": "إعرض أقلّ",
   "status.show_more": "أظهر المزيد",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 68aaf56b0..e3db1c7e1 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -34,7 +34,9 @@
   "column.notifications": "Известия",
   "column.public": "Публичен канал",
   "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Покажи",
   "status.sensitive_warning": "Деликатно съдържание",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6fdcde4b4..2bb51653f 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notificacions",
   "column.public": "Línia de temps federada",
   "column_back_button.label": "Enrere",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navegació",
   "column_subheading.settings": "Configuració",
@@ -168,6 +170,7 @@
   "status.report": "Informar sobre @{name}",
   "status.sensitive_toggle": "Clic per veure",
   "status.sensitive_warning": "Contingut sensible",
+  "status.share": "Share",
   "status.show_less": "Mostra menys",
   "status.show_more": "Mostra més",
   "status.unmute_conversation": "Activar conversació",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index f911c7b75..eb67b5a06 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -34,7 +34,9 @@
   "column.notifications": "Mitteilungen",
   "column.public": "Gesamtes bekanntes Netz",
   "column_back_button.label": "Zurück",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "@{name} melden",
   "status.sensitive_toggle": "Klicke, um sie zu sehen",
   "status.sensitive_warning": "Heikle Inhalte",
+  "status.share": "Share",
   "status.show_less": "Weniger anzeigen",
   "status.show_more": "Mehr anzeigen",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index 047a89ebb..89538f8c3 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -53,6 +53,14 @@
   },
   {
     "descriptors": [
+      {
+        "defaultMessage": "Show settings",
+        "id": "column_header.show_settings"
+      },
+      {
+        "defaultMessage": "Hide settings",
+        "id": "column_header.hide_settings"
+      },
       {
         "defaultMessage": "Unpin",
         "id": "column_header.unpin"
@@ -138,6 +146,10 @@
         "defaultMessage": "Reply",
         "id": "status.reply"
       },
+      {
+        "defaultMessage": "Share",
+        "id": "status.share"
+      },
       {
         "defaultMessage": "Reply to thread",
         "id": "status.replyAll"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 3a201b9c1..816ce68ae 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notifications",
   "column.public": "Federated timeline",
   "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Click to view",
   "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 0bb5159c8..a9a6ad150 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -34,7 +34,9 @@
   "column.notifications": "Sciigoj",
   "column.public": "Fratara tempolinio",
   "column_back_button.label": "Reveni",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Alklaki por vidi",
   "status.sensitive_warning": "Tikla enhavo",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index a39b608c6..a3c2cae3a 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notificaciones",
   "column.public": "Historia federada",
   "column_back_button.label": "Atrás",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Reportar",
   "status.sensitive_toggle": "Click para ver",
   "status.sensitive_warning": "Contenido sensible",
+  "status.share": "Share",
   "status.show_less": "Mostrar menos",
   "status.show_more": "Mostrar más",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6842558d9..cb918d414 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -34,7 +34,9 @@
   "column.notifications": "اعلان‌ها",
   "column.public": "نوشته‌های همه‌جا",
   "column_back_button.label": "بازگشت",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "گشت و گذار",
   "column_subheading.settings": "تنظیمات",
@@ -168,6 +170,7 @@
   "status.report": "گزارش دادن @{name}",
   "status.sensitive_toggle": "برای دیدن کلیک کنید",
   "status.sensitive_warning": "محتوای حساس",
+  "status.share": "Share",
   "status.show_less": "نهفتن",
   "status.show_more": "نمایش",
   "status.unmute_conversation": "باصداکردن گفتگو",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index efc9b1053..0ad2c5bb9 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -34,7 +34,9 @@
   "column.notifications": "Ilmoitukset",
   "column.public": "Yleinen aikajana",
   "column_back_button.label": "Takaisin",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Klikkaa nähdäksesi",
   "status.sensitive_warning": "Arkaluontoista sisältöä",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 3cc1f152a..9ae9b2d39 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -17,7 +17,7 @@
   "account.unblock_domain": "Ne plus masquer {domain}",
   "account.unfollow": "Ne plus suivre",
   "account.unmute": "Ne plus masquer",
-"account.view_full_profile": "Afficher le profil complet",
+  "account.view_full_profile": "Afficher le profil complet",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour pouvoir passer ceci, la prochaine fois",
   "bundle_column_error.body": "Une erreur s'est produite lors du chargement de ce composant.",
   "bundle_column_error.retry": "Réessayer",
@@ -34,7 +34,9 @@
   "column.notifications": "Notifications",
   "column.public": "Fil public global",
   "column_back_button.label": "Retour",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Épingler",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Retirer",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Paramètres",
@@ -168,6 +170,7 @@
   "status.report": "Signaler @{name}",
   "status.sensitive_toggle": "Cliquer pour afficher",
   "status.sensitive_warning": "Contenu sensible",
+  "status.share": "Share",
   "status.show_less": "Replier",
   "status.show_more": "Déplier",
   "status.unmute_conversation": "Ne plus masquer la conversation",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 36be0842b..eb3c5d9da 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -34,7 +34,9 @@
   "column.notifications": "התראות",
   "column.public": "בפרהסיה",
   "column_back_button.label": "חזרה",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "ניווט",
   "column_subheading.settings": "אפשרויות",
@@ -168,6 +170,7 @@
   "status.report": "דיווח על @{name}",
   "status.sensitive_toggle": "לחצו כדי לראות",
   "status.sensitive_warning": "תוכן רגיש",
+  "status.share": "Share",
   "status.show_less": "הראה פחות",
   "status.show_more": "הראה יותר",
   "status.unmute_conversation": "הסרת השתקת שיחה",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 363c4c490..099f3a7ae 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notifikacije",
   "column.public": "Federalni timeline",
   "column_back_button.label": "Natrag",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigacija",
   "column_subheading.settings": "Postavke",
@@ -168,6 +170,7 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_toggle": "Klikni da bi vidio",
   "status.sensitive_warning": "Osjetljiv sadržaj",
+  "status.share": "Share",
   "status.show_less": "Pokaži manje",
   "status.show_more": "Pokaži više",
   "status.unmute_conversation": "Poništi utišavanje razgovora",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index d43570f0d..c2d6dd672 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -34,7 +34,9 @@
   "column.notifications": "Értesítések",
   "column.public": "Nyilvános",
   "column_back_button.label": "Vissza",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Katt a megtekintéshez",
   "status.sensitive_warning": "Érzékeny tartalom",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 916f313bb..7c9e75892 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notifikasi",
   "column.public": "Linimasa gabunggan",
   "column_back_button.label": "Kembali",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigasi",
   "column_subheading.settings": "Pengaturan",
@@ -168,6 +170,7 @@
   "status.report": "Laporkan @{name}",
   "status.sensitive_toggle": "Klik untuk menampilkan",
   "status.sensitive_warning": "Konten sensitif",
+  "status.share": "Share",
   "status.show_less": "Tampilkan lebih sedikit",
   "status.show_more": "Tampilkan semua",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index a87cc9328..e961a8c39 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -34,7 +34,9 @@
   "column.notifications": "Savigi",
   "column.public": "Federata tempolineo",
   "column_back_button.label": "Retro",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Denuncar @{name}",
   "status.sensitive_toggle": "Kliktar por vidar",
   "status.sensitive_warning": "Trubliva kontenajo",
+  "status.share": "Share",
   "status.show_less": "Montrar mine",
   "status.show_more": "Montrar plue",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 243ed7344..b7d2c1d8c 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notifiche",
   "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Segnala @{name}",
   "status.sensitive_toggle": "Clicca per vedere",
   "status.sensitive_warning": "Materiale sensibile",
+  "status.share": "Share",
   "status.show_less": "Mostra meno",
   "status.show_more": "Mostra di più",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ca36122f7..8e0f9f4fa 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -34,7 +34,9 @@
   "column.notifications": "通知",
   "column.public": "連合タイムライン",
   "column_back_button.label": "戻る",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "ピン留めする",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "ピン留めを外す",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
@@ -168,6 +170,7 @@
   "status.report": "通報",
   "status.sensitive_toggle": "クリックして表示",
   "status.sensitive_warning": "閲覧注意",
+  "status.share": "Share",
   "status.show_less": "隠す",
   "status.show_more": "もっと見る",
   "status.unmute_conversation": "会話のミュートを解除",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 768efa37d..817e53718 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -34,7 +34,9 @@
   "column.notifications": "알림",
   "column.public": "연합 타임라인",
   "column_back_button.label": "돌아가기",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "고정하기",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "고정 해제",
   "column_subheading.navigation": "내비게이션",
   "column_subheading.settings": "설정",
@@ -168,6 +170,7 @@
   "status.report": "신고",
   "status.sensitive_toggle": "클릭해서 표시하기",
   "status.sensitive_warning": "민감한 미디어",
+  "status.share": "Share",
   "status.show_less": "숨기기",
   "status.show_more": "더 보기",
   "status.unmute_conversation": "이 대화의 뮤트 해제하기",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index fbfabc5d1..70be3275b 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -17,7 +17,7 @@
   "account.unblock_domain": "{domain} niet meer negeren",
   "account.unfollow": "Ontvolgen",
   "account.unmute": "@{name} niet meer negeren",
-  "account.view_full_profile": "Volledig profiel tonen", 
+  "account.view_full_profile": "Volledig profiel tonen",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "bundle_column_error.body": "Tijdens het laden van dit onderdeel is er iets fout gegaan.",
   "bundle_column_error.retry": "Opnieuw proberen",
@@ -34,7 +34,9 @@
   "column.notifications": "Meldingen",
   "column.public": "Globale tijdlijn",
   "column_back_button.label": "terug",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Vastmaken",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Losmaken",
   "column_subheading.navigation": "Navigatie",
   "column_subheading.settings": "Instellingen",
@@ -147,12 +149,12 @@
   "privacy.unlisted.long": "Niet op openbare tijdlijnen tonen",
   "privacy.unlisted.short": "Minder openbaar",
   "reply_indicator.cancel": "Annuleren",
-  "report.heading": "Rapporteren",
   "report.placeholder": "Extra opmerkingen",
   "report.submit": "Verzenden",
   "report.target": "Rapporteren van",
   "search.placeholder": "Zoeken",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
+  "standalone.public_title": "A look inside...",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.favourite": "Favoriet",
@@ -168,6 +170,7 @@
   "status.report": "Rapporteer @{name}",
   "status.sensitive_toggle": "Klik om te zien",
   "status.sensitive_warning": "Gevoelige inhoud",
+  "status.share": "Share",
   "status.show_less": "Minder tonen",
   "status.show_more": "Meer tonen",
   "status.unmute_conversation": "Conversatie niet meer negeren",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 8727f6147..e74ffb3fb 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -34,7 +34,9 @@
   "column.notifications": "Varsler",
   "column.public": "Felles tidslinje",
   "column_back_button.label": "Tilbake",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigasjon",
   "column_subheading.settings": "Innstillinger",
@@ -168,6 +170,7 @@
   "status.report": "Rapporter @{name}",
   "status.sensitive_toggle": "Klikk for å vise",
   "status.sensitive_warning": "Følsomt innhold",
+  "status.share": "Share",
   "status.show_less": "Vis mindre",
   "status.show_more": "Vis mer",
   "status.unmute_conversation": "Ikke demp samtale",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index c39d57333..21e434ead 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notificacions",
   "column.public": "Flux public global",
   "column_back_button.label": "Tornar",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Penjar",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Despenjar",
   "column_subheading.navigation": "Navigacion",
   "column_subheading.settings": "Paramètres",
@@ -168,6 +170,7 @@
   "status.report": "Senhalar @{name}",
   "status.sensitive_toggle": "Clicar per mostrar",
   "status.sensitive_warning": "Contengut sensible",
+  "status.share": "Share",
   "status.show_less": "Tornar plegar",
   "status.show_more": "Desplegar",
   "status.unmute_conversation": "Conversacions amb silenci levat",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 29e6ca471..60689372e 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -34,7 +34,9 @@
   "column.notifications": "Powiadomienia",
   "column.public": "Globalna oś czasu",
   "column_back_button.label": "Wróć",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Przypnij",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Cofnij przypięcie",
   "column_subheading.navigation": "Nawigacja",
   "column_subheading.settings": "Ustawienia",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 86da7c4e6..ac3675909 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notificações",
   "column.public": "Global",
   "column_back_button.label": "Voltar",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Denúnciar @{name}",
   "status.sensitive_toggle": "Clique para ver",
   "status.sensitive_warning": "Conteúdo sensível",
+  "status.share": "Share",
   "status.show_less": "Mostrar menos",
   "status.show_more": "Mostrar mais",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json
index 86da7c4e6..ac3675909 100644
--- a/app/javascript/mastodon/locales/pt.json
+++ b/app/javascript/mastodon/locales/pt.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notificações",
   "column.public": "Global",
   "column_back_button.label": "Voltar",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Denúnciar @{name}",
   "status.sensitive_toggle": "Clique para ver",
   "status.sensitive_warning": "Conteúdo sensível",
+  "status.share": "Share",
   "status.show_less": "Mostrar menos",
   "status.show_more": "Mostrar mais",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 16af3fe7e..e9bddf918 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -34,7 +34,9 @@
   "column.notifications": "Уведомления",
   "column.public": "Глобальная лента",
   "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Закрепить",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Открепить",
   "column_subheading.navigation": "Навигация",
   "column_subheading.settings": "Настройки",
@@ -168,6 +170,7 @@
   "status.report": "Пожаловаться",
   "status.sensitive_toggle": "Нажмите для просмотра",
   "status.sensitive_warning": "Чувствительный контент",
+  "status.share": "Share",
   "status.show_less": "Свернуть",
   "status.show_more": "Развернуть",
   "status.unmute_conversation": "Снять глушение с треда",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index be5c0815d..e41f4193c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -34,7 +34,9 @@
   "column.notifications": "Notifications",
   "column.public": "Federated timeline",
   "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigation",
   "column_subheading.settings": "Settings",
@@ -168,6 +170,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_toggle": "Click to view",
   "status.sensitive_warning": "Sensitive content",
+  "status.share": "Share",
   "status.show_less": "Show less",
   "status.show_more": "Show more",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 9d4d5fa17..aafa6739c 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -34,7 +34,9 @@
   "column.notifications": "Bildirimler",
   "column.public": "Federe zaman tüneli",
   "column_back_button.label": "Geri",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Navigasyon",
   "column_subheading.settings": "Ayarlar",
@@ -168,6 +170,7 @@
   "status.report": "@{name}'i raporla",
   "status.sensitive_toggle": "Görmek için tıklayınız",
   "status.sensitive_warning": "Hassas içerik",
+  "status.share": "Share",
   "status.show_less": "Daha azı",
   "status.show_more": "Daha fazlası",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 60a551bb6..3f496d953 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -34,7 +34,9 @@
   "column.notifications": "Сповіщення",
   "column.public": "Глобальна стрічка",
   "column_back_button.label": "Назад",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "Навігація",
   "column_subheading.settings": "Налаштування",
@@ -168,6 +170,7 @@
   "status.report": "Поскаржитися",
   "status.sensitive_toggle": "Натисніть, щоб подивитися",
   "status.sensitive_warning": "Непристойний зміст",
+  "status.share": "Share",
   "status.show_less": "Згорнути",
   "status.show_more": "Розгорнути",
   "status.unmute_conversation": "Зняти глушення з діалогу",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 97f1f5e27..e27061d95 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -34,7 +34,9 @@
   "column.notifications": "通知",
   "column.public": "跨站公共时间轴",
   "column_back_button.label": "Back",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "导航",
   "column_subheading.settings": "设置",
@@ -168,6 +170,7 @@
   "status.report": "举报 @{name}",
   "status.sensitive_toggle": "点击显示",
   "status.sensitive_warning": "敏感内容",
+  "status.share": "Share",
   "status.show_less": "减少显示",
   "status.show_more": "显示更多",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index c65c3d45c..1ce4153bf 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -34,7 +34,9 @@
   "column.notifications": "通知",
   "column.public": "跨站時間軸",
   "column_back_button.label": "返回",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "瀏覽",
   "column_subheading.settings": "設定",
@@ -168,6 +170,7 @@
   "status.report": "舉報 @{name}",
   "status.sensitive_toggle": "點擊顯示",
   "status.sensitive_warning": "敏感內容",
+  "status.share": "Share",
   "status.show_less": "減少顯示",
   "status.show_more": "顯示更多",
   "status.unmute_conversation": "Unmute conversation",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 12e840b16..6b1310463 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -34,7 +34,9 @@
   "column.notifications": "通知",
   "column.public": "聯盟時間軸",
   "column_back_button.label": "上一頁",
+  "column_header.hide_settings": "Hide settings",
   "column_header.pin": "Pin",
+  "column_header.show_settings": "Show settings",
   "column_header.unpin": "Unpin",
   "column_subheading.navigation": "瀏覽",
   "column_subheading.settings": "設定",
@@ -168,6 +170,7 @@
   "status.report": "通報 @{name}",
   "status.sensitive_toggle": "點來看",
   "status.sensitive_warning": "敏感內容",
+  "status.share": "Share",
   "status.show_less": "看少點",
   "status.show_more": "看更多",
   "status.unmute_conversation": "不消音對話",

From 7bf0afb1dc5cb3d91f568f974b330cafa2922c2a Mon Sep 17 00:00:00 2001
From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Wed, 26 Jul 2017 10:35:25 +0900
Subject: [PATCH 369/382] Add index favourites on account_id and id (#4360)

---
 ...70720000000_add_index_favourites_on_account_id_and_id.rb | 6 ++++++
 db/schema.rb                                                | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb

diff --git a/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb b/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
new file mode 100644
index 000000000..99903584c
--- /dev/null
+++ b/db/migrate/20170720000000_add_index_favourites_on_account_id_and_id.rb
@@ -0,0 +1,6 @@
+class AddIndexFavouritesOnAccountIdAndId < ActiveRecord::Migration[5.1]
+  def change
+    # Used to query favourites of an account ordered by id.
+    add_index :favourites, [:account_id, :id]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cf7b0722f..2501e451d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170718211102) do
+ActiveRecord::Schema.define(version: 20170720000000) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -103,6 +103,7 @@ ActiveRecord::Schema.define(version: 20170718211102) do
     t.integer "status_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["account_id", "id"], name: "index_favourites_on_account_id_and_id"
     t.index ["account_id", "status_id"], name: "index_favourites_on_account_id_and_status_id", unique: true
     t.index ["status_id"], name: "index_favourites_on_status_id"
   end

From 7874c6d630ddd54b08e96b67831a5eb2352bd7b1 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 26 Jul 2017 09:09:16 +0200
Subject: [PATCH 370/382] i18n: Update Polish translation (#4371)

---
 app/javascript/mastodon/locales/pl.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 60689372e..a24c920f4 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -34,9 +34,9 @@
   "column.notifications": "Powiadomienia",
   "column.public": "Globalna oś czasu",
   "column_back_button.label": "Wróć",
-  "column_header.hide_settings": "Hide settings",
+  "column_header.hide_settings": "Ukryj ustawienia",
   "column_header.pin": "Przypnij",
-  "column_header.show_settings": "Show settings",
+  "column_header.show_settings": "Pokaż ustawienia",
   "column_header.unpin": "Cofnij przypięcie",
   "column_subheading.navigation": "Nawigacja",
   "column_subheading.settings": "Ustawienia",

From aa8fa71df6c57297ea859d3deca5794612d4d281 Mon Sep 17 00:00:00 2001
From: Lynx Kotoura <lynx@lv9.org>
Date: Wed, 26 Jul 2017 20:45:49 +0900
Subject: [PATCH 371/382] Fix padding in hero container of landing page (#4373)

* Fix padding in hero container, landing page

Erase hero container padding to fit registration form to full width. By this setting, heading padding disappears, so I adjust heading padding.

* Specify attribute strictly for heading padding

To overwrite padding-bottom in superior settings.

* Make padding shorthand more concise
---
 app/javascript/styles/about.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/styles/about.scss b/app/javascript/styles/about.scss
index 5a4bcef61..9be95c028 100644
--- a/app/javascript/styles/about.scss
+++ b/app/javascript/styles/about.scss
@@ -708,6 +708,11 @@
 
       .hero {
         margin-top: 30px;
+        padding: 0;
+
+        .heading {
+          padding: 0 20px 20px;
+        }
       }
 
       .floats {

From 6a6a62f13fd7846ba032543635580980b74ea14c Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 26 Jul 2017 13:46:53 +0200
Subject: [PATCH 372/382] Improve accessibility (part 2) (#4377)

* fix(column_header): Invalid ARIA role

* fix(column): Remove hidden nodes from the DOM

* refactor(column_link): Remove unused property hideOnMobile

* fix(column_header): Use aria-pressed

* fix(column_header): Make collapsed content not focusable, add focusable property

* fix(column_loading): Make header non-focusable

* fix(column_settings): Use role to group the toggles
---
 .../mastodon/components/column_header.js      | 13 +++--
 .../components/column_settings.js             | 56 +++++++++++--------
 .../mastodon/features/ui/components/column.js | 12 ++--
 .../features/ui/components/column_header.js   |  5 +-
 .../features/ui/components/column_link.js     |  6 +-
 .../features/ui/components/column_loading.js  |  2 +-
 app/javascript/styles/components.scss         | 12 ----
 7 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/app/javascript/mastodon/components/column_header.js b/app/javascript/mastodon/components/column_header.js
index 89e2f9189..d3256fbec 100644
--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -21,6 +21,7 @@ export default class ColumnHeader extends React.PureComponent {
     icon: PropTypes.string.isRequired,
     active: PropTypes.bool,
     multiColumn: PropTypes.bool,
+    focusable: PropTypes.bool,
     showBackButton: PropTypes.bool,
     children: PropTypes.node,
     pinned: PropTypes.bool,
@@ -29,6 +30,10 @@ export default class ColumnHeader extends React.PureComponent {
     onClick: PropTypes.func,
   };
 
+  static defaultProps = {
+    focusable: true,
+  }
+
   state = {
     collapsed: true,
     animating: false,
@@ -61,7 +66,7 @@ export default class ColumnHeader extends React.PureComponent {
   }
 
   render () {
-    const { title, icon, active, children, pinned, onPin, multiColumn, showBackButton, intl: { formatMessage } } = this.props;
+    const { title, icon, active, children, pinned, onPin, multiColumn, focusable, showBackButton, intl: { formatMessage } } = this.props;
     const { collapsed, animating } = this.state;
 
     const wrapperClassName = classNames('column-header__wrapper', {
@@ -123,12 +128,12 @@ export default class ColumnHeader extends React.PureComponent {
     }
 
     if (children || multiColumn) {
-      collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
+      collapseButton = <button className={collapsibleButtonClassName} aria-label={formatMessage(collapsed ? messages.show : messages.hide)} aria-pressed={collapsed ? 'false' : 'true'} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
     }
 
     return (
       <div className={wrapperClassName}>
-        <div role='button heading' tabIndex='0' className={buttonClassName} onClick={this.handleTitleClick}>
+        <div role='heading' tabIndex={focusable && '0'} className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
           <i className={`fa fa-fw fa-${icon} column-header__icon`} />
           {title}
 
@@ -138,7 +143,7 @@ export default class ColumnHeader extends React.PureComponent {
           </div>
         </div>
 
-        <div className={collapsibleClassName} onTransitionEnd={this.handleTransitionEnd}>
+        <div className={collapsibleClassName} tabIndex={collapsed && -1} onTransitionEnd={this.handleTransitionEnd}>
           <div className='column-header__collapsible-inner'>
             {(!collapsed || animating) && collapsedContent}
           </div>
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.js b/app/javascript/mastodon/features/notifications/components/column_settings.js
index 31cac5bc7..88a29d4d3 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.js
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.js
@@ -36,40 +36,48 @@ export default class ColumnSettings extends React.PureComponent {
           <ClearColumnButton onClick={onClear} />
         </div>
 
-        <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
+        <div role='group' aria-labelledby='notifications-follow'>
+          <span id='notifications-follow' className='column-settings__section'><FormattedMessage id='notifications.column_settings.follow' defaultMessage='New followers:' /></span>
 
-        <div className='column-settings__row'>
-          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
-          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'follow']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'follow']} onChange={onChange} label={showStr} />
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'follow']} onChange={onChange} label={soundStr} />
+          <div className='column-settings__row'>
+            <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'follow']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'follow']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'follow']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'follow']} onChange={onChange} label={soundStr} />
+          </div>
         </div>
 
-        <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favourites:' /></span>
+        <div role='group' aria-labelledby='notifications-favourite'>
+          <span id='notifications-favourite' className='column-settings__section'><FormattedMessage id='notifications.column_settings.favourite' defaultMessage='Favourites:' /></span>
 
-        <div className='column-settings__row'>
-          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
-          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'favourite']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'favourite']} onChange={onChange} label={showStr} />
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
+          <div className='column-settings__row'>
+            <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'favourite']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'favourite']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'favourite']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'favourite']} onChange={onChange} label={soundStr} />
+          </div>
         </div>
 
-        <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
+        <div role='group' aria-labelledby='notifications-mention'>
+          <span id='notifications-mention' className='column-settings__section'><FormattedMessage id='notifications.column_settings.mention' defaultMessage='Mentions:' /></span>
 
-        <div className='column-settings__row'>
-          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
-          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'mention']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'mention']} onChange={onChange} label={showStr} />
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'mention']} onChange={onChange} label={soundStr} />
+          <div className='column-settings__row'>
+            <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'mention']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'mention']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'mention']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'mention']} onChange={onChange} label={soundStr} />
+          </div>
         </div>
 
-        <span className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
+        <div role='group' aria-labelledby='notifications-reblog'>
+          <span id='notifications-reblog' className='column-settings__section'><FormattedMessage id='notifications.column_settings.reblog' defaultMessage='Boosts:' /></span>
 
-        <div className='column-settings__row'>
-          <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
-          {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'reblog']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={showStr} />
-          <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
+          <div className='column-settings__row'>
+            <SettingToggle prefix='notifications_desktop' settings={settings} settingKey={['alerts', 'reblog']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingKey={['alerts', 'reblog']} meta={pushMeta} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['shows', 'reblog']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingKey={['sounds', 'reblog']} onChange={onChange} label={soundStr} />
+          </div>
         </div>
       </div>
     );
diff --git a/app/javascript/mastodon/features/ui/components/column.js b/app/javascript/mastodon/features/ui/components/column.js
index ce1dca171..2d46264a2 100644
--- a/app/javascript/mastodon/features/ui/components/column.js
+++ b/app/javascript/mastodon/features/ui/components/column.js
@@ -3,6 +3,7 @@ import ColumnHeader from './column_header';
 import PropTypes from 'prop-types';
 import { debounce } from 'lodash';
 import scrollTop from '../../../scroll';
+import { isMobile } from '../../../is_mobile';
 
 export default class Column extends React.PureComponent {
 
@@ -37,13 +38,12 @@ export default class Column extends React.PureComponent {
   render () {
     const { heading, icon, children, active, hideHeadingOnMobile } = this.props;
 
-    let columnHeaderId = null;
-    let header = '';
+    const showHeading = !hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth));
 
-    if (heading) {
-      columnHeaderId = heading.replace(/ /g, '-');
-      header = <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} hideOnMobile={hideHeadingOnMobile} columnHeaderId={columnHeaderId} />;
-    }
+    const columnHeaderId = showHeading && heading.replace(/ /g, '-');
+    const header = showHeading && (
+      <ColumnHeader icon={icon} active={active} type={heading} onClick={this.handleHeaderClick} columnHeaderId={columnHeaderId} />
+    );
     return (
       <div
         ref={this.setRef}
diff --git a/app/javascript/mastodon/features/ui/components/column_header.js b/app/javascript/mastodon/features/ui/components/column_header.js
index dc601d6e1..af195ea9c 100644
--- a/app/javascript/mastodon/features/ui/components/column_header.js
+++ b/app/javascript/mastodon/features/ui/components/column_header.js
@@ -8,7 +8,6 @@ export default class ColumnHeader extends React.PureComponent {
     type: PropTypes.string,
     active: PropTypes.bool,
     onClick: PropTypes.func,
-    hideOnMobile: PropTypes.bool,
     columnHeaderId: PropTypes.string,
   };
 
@@ -17,7 +16,7 @@ export default class ColumnHeader extends React.PureComponent {
   }
 
   render () {
-    const { type, active, hideOnMobile, columnHeaderId } = this.props;
+    const { type, active, columnHeaderId } = this.props;
 
     let icon = '';
 
@@ -26,7 +25,7 @@ export default class ColumnHeader extends React.PureComponent {
     }
 
     return (
-      <div role='button heading' tabIndex='0' className={`column-header ${active ? 'active' : ''} ${hideOnMobile ? 'hidden-on-mobile' : ''}`} onClick={this.handleClick} id={columnHeaderId || null}>
+      <div role='heading' tabIndex='0' className={`column-header ${active ? 'active' : ''}`} onClick={this.handleClick} id={columnHeaderId || null}>
         {icon}
         {type}
       </div>
diff --git a/app/javascript/mastodon/features/ui/components/column_link.js b/app/javascript/mastodon/features/ui/components/column_link.js
index cbdb6534f..ad7ec9318 100644
--- a/app/javascript/mastodon/features/ui/components/column_link.js
+++ b/app/javascript/mastodon/features/ui/components/column_link.js
@@ -2,17 +2,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import Link from 'react-router-dom/Link';
 
-const ColumnLink = ({ icon, text, to, href, method, hideOnMobile }) => {
+const ColumnLink = ({ icon, text, to, href, method }) => {
   if (href) {
     return (
-      <a href={href} className={`column-link ${hideOnMobile ? 'hidden-on-mobile' : ''}`} data-method={method}>
+      <a href={href} className='column-link' data-method={method}>
         <i className={`fa fa-fw fa-${icon} column-link__icon`} />
         {text}
       </a>
     );
   } else {
     return (
-      <Link to={to} className={`column-link ${hideOnMobile ? 'hidden-on-mobile' : ''}`}>
+      <Link to={to} className='column-link'>
         <i className={`fa fa-fw fa-${icon} column-link__icon`} />
         {text}
       </Link>
diff --git a/app/javascript/mastodon/features/ui/components/column_loading.js b/app/javascript/mastodon/features/ui/components/column_loading.js
index 7ecfaf77a..1c4058926 100644
--- a/app/javascript/mastodon/features/ui/components/column_loading.js
+++ b/app/javascript/mastodon/features/ui/components/column_loading.js
@@ -6,7 +6,7 @@ import ColumnHeader from '../../../components/column_header';
 
 const ColumnLoading = ({ title = '', icon = ' ' }) => (
   <Column>
-    <ColumnHeader icon={icon} title={title} multiColumn={false} />
+    <ColumnHeader icon={icon} title={title} multiColumn={false} focusable={false} />
     <div className='scrollable' />
   </Column>
 );
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 8de456754..a51cd962e 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1743,12 +1743,6 @@
   &:hover {
     background: lighten($ui-base-color, 11%);
   }
-
-  &.hidden-on-mobile {
-    @media screen and (max-width: 1024px) {
-      display: none;
-    }
-  }
 }
 
 .column-link__icon {
@@ -2132,12 +2126,6 @@ button.icon-button.active i.fa-retweet {
     }
   }
 
-  &.hidden-on-mobile {
-    @media screen and (max-width: 1024px) {
-      display: none;
-    }
-  }
-
   &:focus,
   &:active {
     outline: 0;

From 7905739c2a2bd1df0e128a4f9867704c4f2d0262 Mon Sep 17 00:00:00 2001
From: m4sk1n <me@m4sk.in>
Date: Wed, 26 Jul 2017 13:47:41 +0200
Subject: [PATCH 373/382] s/PubSubHubbub/WebSub/g (#4372)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 README.md                | 4 ++--
 config/locales/ca.yml    | 2 +-
 config/locales/de.yml    | 2 +-
 config/locales/en.yml    | 2 +-
 config/locales/fa.yml    | 2 +-
 config/locales/fr.yml    | 2 +-
 config/locales/he.yml    | 2 +-
 config/locales/id.yml    | 2 +-
 config/locales/io.yml    | 2 +-
 config/locales/ja.yml    | 2 +-
 config/locales/ko.yml    | 2 +-
 config/locales/nl.yml    | 2 +-
 config/locales/no.yml    | 2 +-
 config/locales/oc.yml    | 2 +-
 config/locales/pl.yml    | 2 +-
 config/locales/pt-BR.yml | 2 +-
 config/locales/pt.yml    | 2 +-
 config/locales/ru.yml    | 2 +-
 config/locales/th.yml    | 2 +-
 config/locales/tr.yml    | 2 +-
 config/locales/uk.yml    | 2 +-
 config/locales/zh-CN.yml | 2 +-
 config/locales/zh-TW.yml | 2 +-
 23 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index dd7c519a8..13e580e3f 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 Mastodon is a free, open-source social network server. A decentralized solution to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly.
 
-An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [PubsubHubbub](https://en.wikipedia.org/wiki/PubSubHubbub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)).
+An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [WebSub](https://en.wikipedia.org/wiki/WebSub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)).
 
 Click on the screenshot to watch a demo of the UI:
 
@@ -34,7 +34,7 @@ If you would like, you can [support the development of this project on Patreon][
 ## Features
 
 - **Fully interoperable with GNU social and any OStatus platform**
-  Whatever implements Atom feeds, ActivityStreams, Salmon, PubSubHubbub and Webfinger is part of the network
+  Whatever implements Atom feeds, ActivityStreams, Salmon, WebSub and Webfinger is part of the network
 - **Real-time timeline updates**
   See the updates of people you're following appear in real-time in the UI via WebSockets
 - **Federated thread resolving**
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ce4831ac2..725b120ec 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -161,7 +161,7 @@ ca:
       confirmed: Confirmat
       expires_in: Expira en
       last_delivery: Últim lliurament
-      title: PubSubHubbub
+      title: WebSub
       topic: Tòpic
     title: Administració
   application_mailer:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 04d3fd0b8..87c5fa67a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -144,7 +144,7 @@ de:
       confirmed: Bestätigt
       expires_in: Verfällt in
       last_delivery: Letzte Zustellung
-      title: PubSubHubbub
+      title: WebSub
       topic: Thema
     title: Administration
   application_mailer:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fa1ac0e3..cb4c51a11 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,7 +207,7 @@ en:
       confirmed: Confirmed
       expires_in: Expires in
       last_delivery: Last delivery
-      title: PubSubHubbub
+      title: WebSub
       topic: Topic
     title: Administration
   admin_mailer:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c42016eb3..23d2512a2 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -147,7 +147,7 @@ fa:
       confirmed: تأییدشده
       expires_in: مهلت انقضا
       last_delivery: آخرین ارسال
-      title: PubSubHubbub
+      title: WebSub
       topic: موضوع
     title: مدیریت
   application_mailer:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 13514bfc3..7fde60a2b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -200,7 +200,7 @@ fr:
       confirmed: Confirmé
       expires_in: Expire dans
       last_delivery: Dernière livraison
-      title: PubSubHubbub
+      title: WebSub
       topic: Sujet
     title: Administration
   admin_mailer:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index dc6caf87a..7772e6a76 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -155,7 +155,7 @@ he:
       confirmed: מאושר
       expires_in: פג תוקף ב-
       last_delivery: משלוח אחרון
-      title: PubSubHubbub
+      title: WebSub
       topic: נושא
     title: ניהול
   application_mailer:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e0e82d378..0d5937cfb 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -146,7 +146,7 @@ id:
       confirmed: Dikonfirmasi
       expires_in: Kadaluarsa dalam
       last_delivery: Terakhir dikirim
-      title: PubSubHubbub
+      title: WebSub
       topic: Topik
     title: Administrasi
   application_mailer:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4f7323a6f..c9abd5711 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -144,7 +144,7 @@ io:
       confirmed: Confirmed
       expires_in: Expires in
       last_delivery: Last delivery
-      title: PubSubHubbub
+      title: WebSub
       topic: Topic
     title: Administration
   application_mailer:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6763ed301..74e0df982 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -200,7 +200,7 @@ ja:
       confirmed: 確認済み
       expires_in: 期限
       last_delivery: 最終配送
-      title: PubSubHubbub
+      title: WebSub
       topic: トピック
     title: 管理
   admin_mailer:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a081de38d..aae0e62e7 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -161,7 +161,7 @@ ko:
       confirmed: 확인됨
       expires_in: 기한
       last_delivery: 최종 발송
-      title: PubSubHubbub
+      title: WebSub
       topic: 토픽
     title: 관리
   admin_mailer:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 58282259d..e65658d8b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -206,7 +206,7 @@ nl:
       confirmed: Bevestigd
       expires_in: Verloopt over
       last_delivery: Laatste bezorging
-      title: PubSubHubbub
+      title: WebSub
       topic: Account
     title: Beheer
   admin_mailer:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 122ad5675..b2e5773de 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -148,7 +148,7 @@
       confirmed: Bekreftet
       expires_in: Utløper om
       last_delivery: Siste levering
-      title: PubSubHubbub
+      title: WebSub
       topic: Emne
     title: Administrasjon
   application_mailer:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 6d9996dbc..c1ec633f6 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -180,7 +180,7 @@ oc:
       confirmed: Confirmat
       expires_in: S’acaba dins
       last_delivery: Darrièra distribucion
-      title: PubSubHubbub
+      title: WebSub
       topic: Subjècte
     title: Administracion
   application_mailer:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 02c97e955..584c07730 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -205,7 +205,7 @@ pl:
       confirmed: Potwierdzono
       expires_in: Wygasa
       last_delivery: Ostatnio doręczono
-      title: PubSubHubbub
+      title: WebSub
       topic: Temat
     title: Administracja
   admin_mailer:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9bd1b0d28..68b1c549c 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -147,7 +147,7 @@ pt-BR:
       confirmed: Confirmado
       expires_in: Expira em
       last_delivery: Última entrega
-      title: PubSubHubbub
+      title: WebSub
       topic: Tópico
     title: Administração
   application_mailer:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 6bf592d1c..f6dd32200 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -142,7 +142,7 @@ pt:
       confirmed: Confirmado
       expires_in: Expira em
       last_delivery: Última entrega
-      title: PubSubHubbub
+      title: WebSub
       topic: Tópico
     title: Administração
   application_mailer:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 141017f40..90276c362 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -138,7 +138,7 @@ ru:
       confirmed: Подтверждено
       expires_in: Истекает через
       last_delivery: Последняя доставка
-      title: PubSubHubbub
+      title: WebSub
       topic: Тема
     title: Администрирование
   application_mailer:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 89782209e..801f4886f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -148,7 +148,7 @@ th:
       confirmed: ยืนยัน
       expires_in: หมดอายุภายใน
       last_delivery: จัดส่งครั้งล่าสุด
-      title: PubSubHubbub
+      title: WebSub
       topic: ชื่อเรื่อง
     title: แอดมิน
   application_mailer:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a1f2d2078..ac378090c 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -147,7 +147,7 @@ tr:
       confirmed: Onaylandı
       expires_in: Bitiş Tarihi
       last_delivery: Son gönderim
-      title: PubSubHubbub
+      title: WebSub
       topic: Konu
     title: Yönetim
   application_mailer:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3237ea1db..22fff6961 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -138,7 +138,7 @@ uk:
       confirmed: Підтверджено
       expires_in: Спливає через
       last_delivery: Остання доставка
-      title: PubSubHubbub
+      title: WebSub
       topic: Тема
     title: Адміністрування
   application_mailer:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 0b0263294..5018b48b8 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -154,7 +154,7 @@ zh-CN:
       confirmed: 确定
       expires_in: 期限
       last_delivery: 数据最后送抵时间
-      title: PubSubHubbub 订阅
+      title: WebSub 订阅
       topic: 所订阅资源
     title: 管理
   application_mailer:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e25edc890..0ea3457c7 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -118,7 +118,7 @@ zh-TW:
       confirmed: 已確認
       expires_in: 期限
       last_delivery: 最後遞送
-      title: PubSubHubbub
+      title: WebSub
       topic: 主題
     title: 管理介面
   application_mailer:

From 4ba33f99fc9d903b3b6b836ea86051c407eb4b0a Mon Sep 17 00:00:00 2001
From: mayaeh <mayaeh@marimo-net.org>
Date: Wed, 26 Jul 2017 21:57:51 +0900
Subject: [PATCH 374/382] Update Japanese translations (#4376)

* Update Japanese translations for remote profile, settings toggle button and web share button.

* Update Japanese translation for remote profile.
---
 app/javascript/mastodon/locales/ja.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 8e0f9f4fa..f01838be2 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -1,7 +1,7 @@
 {
   "account.block": "ブロック",
   "account.block_domain": "{domain}全体を非表示",
-  "account.disclaimer_full": "Information below may reflect the user's profile incompletely.",
+  "account.disclaimer_full": "以下の情報は不正確な可能性があります。",
   "account.edit_profile": "プロフィールを編集",
   "account.follow": "フォロー",
   "account.followers": "フォロワー",
@@ -17,7 +17,7 @@
   "account.unblock_domain": "{domain}を表示",
   "account.unfollow": "フォロー解除",
   "account.unmute": "ミュート解除",
-  "account.view_full_profile": "View full profile",
+  "account.view_full_profile": "全ての情報を見る",
   "boost_modal.combo": "次からは{combo}を押せば、これをスキップできます。",
   "bundle_column_error.body": "コンポーネントの読み込み中に問題が発生しました。",
   "bundle_column_error.retry": "再試行",
@@ -34,9 +34,9 @@
   "column.notifications": "通知",
   "column.public": "連合タイムライン",
   "column_back_button.label": "戻る",
-  "column_header.hide_settings": "Hide settings",
+  "column_header.hide_settings": "設定を隠す",
   "column_header.pin": "ピン留めする",
-  "column_header.show_settings": "Show settings",
+  "column_header.show_settings": "設定を表示",
   "column_header.unpin": "ピン留めを外す",
   "column_subheading.navigation": "ナビゲーション",
   "column_subheading.settings": "設定",
@@ -170,7 +170,7 @@
   "status.report": "通報",
   "status.sensitive_toggle": "クリックして表示",
   "status.sensitive_warning": "閲覧注意",
-  "status.share": "Share",
+  "status.share": "共有",
   "status.show_less": "隠す",
   "status.show_more": "もっと見る",
   "status.unmute_conversation": "会話のミュートを解除",

From b8adb4d7fa6546f415d93d0af8e1d7b0e24a3f54 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 26 Jul 2017 15:03:23 +0200
Subject: [PATCH 375/382] fix(column): Crash when heading is undefined (#4378)

---
 app/javascript/mastodon/features/ui/components/column.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/ui/components/column.js b/app/javascript/mastodon/features/ui/components/column.js
index 2d46264a2..aea102aac 100644
--- a/app/javascript/mastodon/features/ui/components/column.js
+++ b/app/javascript/mastodon/features/ui/components/column.js
@@ -38,7 +38,7 @@ export default class Column extends React.PureComponent {
   render () {
     const { heading, icon, children, active, hideHeadingOnMobile } = this.props;
 
-    const showHeading = !hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth));
+    const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth)));
 
     const columnHeaderId = showHeading && heading.replace(/ /g, '-');
     const header = showHeading && (

From 8b43d6bf9c3c85b093ae9581d7400776aaa97322 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 26 Jul 2017 16:14:39 +0200
Subject: [PATCH 376/382] fix(web_push_notification_worker): Guard against
 deleted notifications (#4379)

---
 app/workers/web_push_notification_worker.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/workers/web_push_notification_worker.rb b/app/workers/web_push_notification_worker.rb
index da4043ddb..51b8daae7 100644
--- a/app/workers/web_push_notification_worker.rb
+++ b/app/workers/web_push_notification_worker.rb
@@ -9,6 +9,8 @@ class WebPushNotificationWorker
     session_activation = SessionActivation.find(session_activation_id)
     notification = Notification.find(notification_id)
 
+    return if session_activation.nil? || notification.nil?
+
     begin
       session_activation.web_push_subscription.push(notification)
     rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription => e

From a248be4fcedc2908e4fc073ccea3ee3185264417 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Wed, 26 Jul 2017 19:03:56 +0200
Subject: [PATCH 377/382] fix(columns_area): Manually set tabs style when
 swiping (#4320)

---
 .../mastodon/features/ui/components/columns_area.js      | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js
index 7de66ce3f..63bd1b021 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area.js
+++ b/app/javascript/mastodon/features/ui/components/columns_area.js
@@ -56,6 +56,15 @@ export default class ColumnsArea extends ImmutablePureComponent {
 
   handleSwipe = (index) => {
     this.pendingIndex = index;
+
+    const nextLinkTranslationId = links[index].props['data-preview-title-id'];
+    const currentLinkSelector = '.tabs-bar__link.active';
+    const nextLinkSelector = `.tabs-bar__link[data-preview-title-id="${nextLinkTranslationId}"]`;
+
+    // HACK: Remove the active class from the current link and set it to the next one
+    // React-router does this for us, but too late, feeling laggy.
+    document.querySelector(currentLinkSelector).classList.remove('active');
+    document.querySelector(nextLinkSelector).classList.add('active');
   }
 
   handleAnimationEnd = () => {

From 55bee84c97fd662375907520c56fe3a661458e15 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jul 2017 23:35:03 +0200
Subject: [PATCH 378/382] Fix infinite scroll fluidity (#4381)

---
 app/javascript/mastodon/components/status_list.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/mastodon/components/status_list.js b/app/javascript/mastodon/components/status_list.js
index dc6f956bf..48858cf13 100644
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -6,7 +6,7 @@ import StatusContainer from '../containers/status_container';
 import LoadMore from './load_more';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
-import { debounce } from 'lodash';
+import { throttle } from 'lodash';
 
 export default class StatusList extends ImmutablePureComponent {
 
@@ -30,13 +30,13 @@ export default class StatusList extends ImmutablePureComponent {
 
   intersectionObserverWrapper = new IntersectionObserverWrapper();
 
-  handleScroll = debounce(() => {
+  handleScroll = throttle(() => {
     if (this.node) {
       const { scrollTop, scrollHeight, clientHeight } = this.node;
       const offset = scrollHeight - scrollTop - clientHeight;
       this._oldScrollPosition = scrollHeight - scrollTop;
 
-      if (250 > offset && this.props.onScrollToBottom && !this.props.isLoading) {
+      if (400 > offset && this.props.onScrollToBottom && !this.props.isLoading) {
         this.props.onScrollToBottom();
       } else if (scrollTop < 100 && this.props.onScrollToTop) {
         this.props.onScrollToTop();
@@ -44,7 +44,7 @@ export default class StatusList extends ImmutablePureComponent {
         this.props.onScroll();
       }
     }
-  }, 200, {
+  }, 150, {
     trailing: true,
   });
 

From 92cb451da80051f242fe1fce32421f89841f4adc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 26 Jul 2017 23:36:33 +0200
Subject: [PATCH 379/382] Fix #4026 - Accept backup codes for disabling 2FA
 (#4382)

---
 .../settings/two_factor_authentications_controller.rb      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/settings/two_factor_authentications_controller.rb b/app/controllers/settings/two_factor_authentications_controller.rb
index 983483881..863cc7351 100644
--- a/app/controllers/settings/two_factor_authentications_controller.rb
+++ b/app/controllers/settings/two_factor_authentications_controller.rb
@@ -18,7 +18,7 @@ module Settings
     end
 
     def destroy
-      if current_user.validate_and_consume_otp!(confirmation_params[:code])
+      if acceptable_code?
         current_user.otp_required_for_login = false
         current_user.save!
         redirect_to settings_two_factor_authentication_path
@@ -38,5 +38,10 @@ module Settings
     def verify_otp_required
       redirect_to settings_two_factor_authentication_path if current_user.otp_required_for_login?
     end
+
+    def acceptable_code?
+      current_user.validate_and_consume_otp!(confirmation_params[:code]) ||
+        current_user.invalidate_otp_backup_code!(confirmation_params[:code])
+    end
   end
 end

From f5e228ad2e2503d7cbe3da975e7d2b473e60712b Mon Sep 17 00:00:00 2001
From: Jeroen <jeroenpraat@users.noreply.github.com>
Date: Thu, 27 Jul 2017 00:37:35 +0200
Subject: [PATCH 380/382] Update Dutch strings (#4389)

---
 app/javascript/mastodon/locales/nl.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 70be3275b..d79b0799a 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -34,9 +34,9 @@
   "column.notifications": "Meldingen",
   "column.public": "Globale tijdlijn",
   "column_back_button.label": "terug",
-  "column_header.hide_settings": "Hide settings",
+  "column_header.hide_settings": "Instellingen verbergen",
   "column_header.pin": "Vastmaken",
-  "column_header.show_settings": "Show settings",
+  "column_header.show_settings": "Instellingen tonen",
   "column_header.unpin": "Losmaken",
   "column_subheading.navigation": "Navigatie",
   "column_subheading.settings": "Instellingen",
@@ -154,7 +154,7 @@
   "report.target": "Rapporteren van",
   "search.placeholder": "Zoeken",
   "search_results.total": "{count, number} {count, plural, one {resultaat} other {resultaten}}",
-  "standalone.public_title": "A look inside...",
+  "standalone.public_title": "Een kijkje binnenin...",
   "status.cannot_reblog": "Deze toot kan niet geboost worden",
   "status.delete": "Verwijderen",
   "status.favourite": "Favoriet",
@@ -168,9 +168,9 @@
   "status.reply": "Reageren",
   "status.replyAll": "Reageer op iedereen",
   "status.report": "Rapporteer @{name}",
-  "status.sensitive_toggle": "Klik om te zien",
+  "status.sensitive_toggle": "Klik om te bekijken",
   "status.sensitive_warning": "Gevoelige inhoud",
-  "status.share": "Share",
+  "status.share": "Delen",
   "status.show_less": "Minder tonen",
   "status.show_more": "Meer tonen",
   "status.unmute_conversation": "Conversatie niet meer negeren",

From 994d948c3947b75140c2a2a7de5b81713c7b8ea3 Mon Sep 17 00:00:00 2001
From: Clworld <clworld@ggtea.org>
Date: Thu, 27 Jul 2017 07:38:20 +0900
Subject: [PATCH 381/382] Add callback_url/acct information for Sidekiq PuSH
 workers Exception. (#4281)

* Add destination informations to exception on SubscribeWorker and DeliveryWorker.

* Simplify delivery error message.

* Prevent changing Exception type...

* fix typo.
---
 app/lib/exceptions.rb                        | 10 +++++-----
 app/workers/pubsubhubbub/delivery_worker.rb  |  2 ++
 app/workers/pubsubhubbub/subscribe_worker.rb |  2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 34d84a34f..b2489711d 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -8,11 +8,11 @@ module Mastodon
 
   class UnexpectedResponseError < Error
     def initialize(response = nil)
-      @response = response
-    end
-
-    def to_s
-      "#{@response.uri} returned code #{@response.code}"
+      if response.respond_to? :uri
+        super("#{response.uri} returned code #{response.code}")
+      else
+        super
+      end
     end
   end
 end
diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb
index 035a59048..88645cf33 100644
--- a/app/workers/pubsubhubbub/delivery_worker.rb
+++ b/app/workers/pubsubhubbub/delivery_worker.rb
@@ -16,6 +16,8 @@ class Pubsubhubbub::DeliveryWorker
     @subscription = Subscription.find(subscription_id)
     @payload = payload
     process_delivery unless blocked_domain?
+  rescue => e
+    raise e.class, "Delivery failed for #{subscription&.callback_url}: #{e.message}"
   end
 
   private
diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb
index 6865e7136..9178079d4 100644
--- a/app/workers/pubsubhubbub/subscribe_worker.rb
+++ b/app/workers/pubsubhubbub/subscribe_worker.rb
@@ -22,5 +22,7 @@ class Pubsubhubbub::SubscribeWorker
     account = Account.find(account_id)
     logger.debug "PuSH re-subscribing to #{account.acct}"
     ::SubscribeService.new.call(account)
+  rescue => e
+    raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}"
   end
 end

From f49339ca9ca2fbc7feca30be217ed2311ebd106a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Thu, 27 Jul 2017 01:02:15 +0200
Subject: [PATCH 382/382] Fix multipoint shortcode bug (#4387)

* Fix multipoint shortcode bug

* Added testcase for composite emoji shortcode
---
 app/lib/emoji.rb                  | 2 +-
 spec/helpers/emoji_helper_spec.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/lib/emoji.rb b/app/lib/emoji.rb
index e444b6893..6de70e9b4 100644
--- a/app/lib/emoji.rb
+++ b/app/lib/emoji.rb
@@ -32,7 +32,7 @@ class Emoji
 
   def codepoint_to_unicode(codepoint)
     if codepoint.include?('-')
-      codepoint.split('-').map(&:hex).pack('U')
+      codepoint.split('-').map(&:hex).pack('U*')
     else
       [codepoint.hex].pack('U')
     end
diff --git a/spec/helpers/emoji_helper_spec.rb b/spec/helpers/emoji_helper_spec.rb
index 1eedfb719..6edf7672f 100644
--- a/spec/helpers/emoji_helper_spec.rb
+++ b/spec/helpers/emoji_helper_spec.rb
@@ -7,6 +7,11 @@ RSpec.describe EmojiHelper, type: :helper do
       expect(emojify(text)).to eq '📖 Book'
     end
 
+    it 'converts composite emoji shortcodes to unicode' do
+      text = ':couple_ww:'
+      expect(emojify(text)).to eq '👩❤👩'
+    end
+
     it 'does not convert shortcodes that are part of a string into unicode' do
       text = ':see_no_evil::hear_no_evil::speak_no_evil:'
       expect(emojify(text)).to eq text