Glitchy favicon

Glitched up default favicon based on new mastodon favicon :3
2026-03-29 03:00:33 +02:00 · 2017-07-28 12:20:45 -04:00
626 changed files with 5066 additions and 13666 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,6 +4,7 @@ public/system
 public/assets
 public/packs
 node_modules
+storybook
 neo4j
 vendor/bundle
 .DS_Store
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -26,7 +26,7 @@ LOCAL_HTTPS=true
 # ALTERNATE_DOMAINS=example1.com,example2.com

 # Application secrets
-# Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
+# Generate each with the `rake secret` task (`docker-compose run --rm web rake secret` if you use docker compose)
 PAPERCLIP_SECRET=
 SECRET_KEY_BASE=
 OTP_SECRET=
@@ -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.
 #
-# Generate with `RAILS_ENV=production bundle exec rake mastodon:webpush:generate_vapid_key` task (`docker-compose run --rm web rake mastodon:webpush:generate_vapid_key` if you use docker compose)
+# 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=
@@ -69,7 +69,7 @@ SMTP_FROM_ADDRESS=notifications@example.com
 #SMTP_CA_FILE=/etc/ssl/certs/ca-certificates.crt
 #SMTP_OPENSSL_VERIFY_MODE=peer
 #SMTP_ENABLE_STARTTLS_AUTO=true
-#SMTP_TLS=true
+

 # Optional user upload path and URL (images, avatars). Default is :rails_root/public/system. If you set this variable, you are responsible for making your HTTP server (eg. nginx) serve these files.
 # PAPERCLIP_ROOT_PATH=/var/lib/mastodon/public-system
@@ -98,15 +98,6 @@ SMTP_FROM_ADDRESS=notifications@example.com
 # S3_ENDPOINT=
 # S3_SIGNATURE_VERSION=

-# Swift (optional)
-# SWIFT_ENABLED=true
-# SWIFT_USERNAME=
-# SWIFT_TENANT=
-# SWIFT_PASSWORD=
-# SWIFT_AUTH_URL=
-# SWIFT_CONTAINER=
-# SWIFT_OBJECT_URL=
-
 # Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
 # S3_CLOUDFRONT_HOST=

--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -49,7 +49,6 @@ rules:
  - warn
  - allow:
    - error
-    - warn
  no-fallthrough: error
  no-irregular-whitespace: error
  no-mixed-spaces-and-tabs: warn
@@ -113,7 +112,7 @@ rules:
  jsx-a11y/iframe-has-title: warn
  jsx-a11y/img-has-alt: warn
  jsx-a11y/img-redundant-alt: warn
-  jsx-a11y/label-has-for: off
+  jsx-a11y/label-has-for: warn
  jsx-a11y/mouse-events-have-key-events: warn
  jsx-a11y/no-access-key: warn
  jsx-a11y/no-distracting-elements: warn
@@ -122,6 +121,6 @@ rules:
  jsx-a11y/onclick-has-focus: warn
  jsx-a11y/onclick-has-role: warn
  jsx-a11y/role-has-required-aria-props: warn
-  jsx-a11y/role-supports-aria-props: off
+  jsx-a11y/role-supports-aria-props: warn
  jsx-a11y/scope: warn
  jsx-a11y/tabindex-no-positive: warn
--- 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/
--- a/.nanoignore
+++ b/.nanoignore
@@ -14,6 +14,7 @@ node_modules/
 public/assets/
 public/system/
 spec/
+storybook/
 tmp/
 .vagrant/
 vendor/bundle/
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -10,7 +10,6 @@ AllCops:
  - 'node_modules/**/*'
  - 'Vagrantfile'
  - 'vendor/**/*'
-  - 'lib/json_ld/*'

 Bundler/OrderedGems:
  Enabled: false
@@ -28,7 +27,6 @@ Metrics/AbcSize:
  Max: 100

 Metrics/BlockLength:
-  Max: 35
  Exclude:
    - 'lib/tasks/**/*'

@@ -37,10 +35,10 @@ Metrics/BlockNesting:

 Metrics/ClassLength:
  CountComments: false
-  Max: 300
+  Max: 200

 Metrics/CyclomaticComplexity:
-  Max: 25
+  Max: 15

 Metrics/LineLength:
  AllowURI: true
@@ -55,11 +53,11 @@ Metrics/ModuleLength:
  Max: 200

 Metrics/ParameterLists:
-  Max: 5
+  Max: 4
  CountKeywordArgs: true

 Metrics/PerceivedComplexity:
-  Max: 20
+  Max: 10

 Rails:
  Enabled: true
--- a/.slugignore
+++ b/.slugignore
@@ -2,3 +2,4 @@ node_modules/
 .cache/
 docs/
 spec/
+storybook/
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ cache:
  - node_modules
  - public/assets
  - public/packs-test
-  - tmp/cache/babel-loader
 dist: trusty
 sudo: required

--- a/10
+++ b/10
@@ -1,9 +1,7 @@
-ffmpeg
-libicu-dev
-libidn11
-libidn11-dev
-libpq-dev
+protobuf-compiler
 libprotobuf-dev
+ffmpeg
 libxdamage1
 libxfixes3
-protobuf-compiler
+libicu-dev
+libidn11-dev
--- a/15
+++ b/15
@@ -1,15 +0,0 @@
-# CODEOWNERS for tootsuite/mastodon
-
-# Translators
-# To add translator, copy these lines, replace `fr` with appropriate language code and replace `@żelipapą` with user's GitHub nickname preceded by `@` sign or e-mail address.
-# /app/javascript/mastodon/locales/fr.json @żelipapą
-# /app/views/user_mailer/*.fr.html.erb @żelipapą
-# /app/views/user_mailer/*.fr.text.erb @żelipapą
-# /config/locales/*.fr.yml @żelipapą
-# /config/locales/fr.yml @żelipapą
-
-/app/javascript/mastodon/locales/pl.json @m4sk1n
-/app/views/user_mailer/*.pl.html.erb @m4sk1n
-/app/views/user_mailer/*.pl.text.erb @m4sk1n
-/config/locales/*.pl.yml @m4sk1n
-/config/locales/pl.yml @m4sk1n
--- a/36
+++ b/36
@@ -1,4 +1,4 @@
-FROM ruby:2.4.1-alpine3.6
+FROM ruby:2.4.1-alpine

 LABEL maintainer="https://github.com/tootsuite/mastodon" \
      description="A GNU Social-compatible microblogging server"
@@ -7,19 +7,19 @@ ENV UID=991 GID=991 \
    RAILS_SERVE_STATIC_FILES=true \
    RAILS_ENV=production NODE_ENV=production

-ARG LIBICONV_VERSION=1.15
-ARG LIBICONV_DOWNLOAD_SHA256=ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178
-
 EXPOSE 3000 4000

 WORKDIR /mastodon

-RUN apk -U upgrade \
+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 \
    icu-dev \
    libidn-dev \
-    libtool \
+    libxml2-dev \
+    libxslt-dev \
    postgresql-dev \
    protobuf-dev \
    python \
@@ -29,33 +29,23 @@ RUN apk -U upgrade \
    file \
    git \
    icu-libs \
-    imagemagick \
+    imagemagick@edge \
    libidn \
    libpq \
-    nodejs-npm \
-    nodejs \
+    libxml2 \
+    libxslt \
+    nodejs-npm@edge \
+    nodejs@edge \
    protobuf \
    su-exec \
    tini \
-    yarn \
+    yarn@edge \
 && update-ca-certificates \
- && wget -O libiconv.tar.gz "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$LIBICONV_VERSION.tar.gz" \
- && echo "$LIBICONV_DOWNLOAD_SHA256 *libiconv.tar.gz" | sha256sum -c - \
- && mkdir -p /tmp/src \
- && tar -xzf libiconv.tar.gz -C /tmp/src \
- && rm libiconv.tar.gz \
- && cd /tmp/src/libiconv-$LIBICONV_VERSION \
- && ./configure --prefix=/usr/local \
- && make -j$(getconf _NPROCESSORS_ONLN)\
- && make install \
- && libtool --finish /usr/local/lib \
- && cd /mastodon \
 && rm -rf /tmp/* /var/cache/apk/*

 COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/

-RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
- && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \
+RUN bundle install --deployment --without test development \
 && yarn --ignore-optional --pure-lockfile

 COPY . /mastodon
--- a/7
+++ b/7
@@ -15,7 +15,6 @@ gem 'pghero', '~> 1.7'
 gem 'dotenv-rails', '~> 2.2'

 gem 'aws-sdk', '~> 2.9'
-gem 'fog-openstack', '~> 0.1'
 gem 'paperclip', '~> 5.1'
 gem 'paperclip-av-transcoder', '~> 0.6'

@@ -23,8 +22,7 @@ gem 'active_model_serializers', '~> 0.10'
 gem 'addressable', '~> 2.5'
 gem 'bootsnap'
 gem 'browser'
-gem 'charlock_holmes', '~> 0.7.5'
-gem 'iso-639'
+gem 'charlock_holmes', '~> 0.7.3'
 gem 'cld3', '~> 3.1'
 gem 'devise', '~> 4.2'
 gem 'devise-two-factor', '~> 3.0'
@@ -70,9 +68,6 @@ gem 'tzinfo-data', '~> 1.2017'
 gem 'webpacker', '~> 2.0'
 gem 'webpush'

-gem 'json-ld-preloaded', '~> 2.2.1'
-gem 'rdf-normalize', '~> 0.3.1'
-
 group :development, :test do
  gem 'fabrication', '~> 2.16'
  gem 'fuubar', '~> 2.2'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,25 +1,25 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (5.1.3)
-      actionpack (= 5.1.3)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
      nio4r (~> 2.0)
      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
+    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.3)
-      actionview (= 5.1.3)
-      activesupport (= 5.1.3)
+    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.3)
-      activesupport (= 5.1.3)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
      builder (~> 3.1)
      erubi (~> 1.4)
      rails-dom-testing (~> 2.0)
@@ -30,22 +30,22 @@ GEM
      case_transform (>= 0.2)
      jsonapi-renderer (>= 0.1.1.beta1, < 0.2)
    active_record_query_trace (1.5.4)
-    activejob (5.1.3)
-      activesupport (= 5.1.3)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
      globalid (>= 0.3.6)
-    activemodel (5.1.3)
-      activesupport (= 5.1.3)
-    activerecord (5.1.3)
-      activemodel (= 5.1.3)
-      activesupport (= 5.1.3)
+    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.3)
+    activesupport (5.1.2)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (~> 0.7)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
    airbrussh (1.3.0)
      sshkit (>= 1.6.1, != 1.7.0)
    annotate (2.7.2)
@@ -57,14 +57,14 @@ GEM
      encryptor (~> 3.0.0)
    av (0.9.0)
      cocaine (~> 0.5.3)
-    aws-sdk (2.10.21)
-      aws-sdk-resources (= 2.10.21)
-    aws-sdk-core (2.10.21)
+    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.10.21)
-      aws-sdk-core (= 2.10.21)
-    aws-sigv4 (1.0.1)
+    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)
      coderay (>= 1.0.0)
@@ -72,15 +72,15 @@ GEM
      rack (>= 0.9.0)
    binding_of_caller (0.7.2)
      debug_inspector (>= 0.0.1)
-    bootsnap (1.1.2)
+    bootsnap (1.1.1)
      msgpack (~> 1.0)
-    brakeman (3.7.2)
+    brakeman (3.6.2)
    browser (2.4.0)
    builder (3.2.3)
    bullet (5.5.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.10.0)
-    bundler-audit (0.6.0)
+    bundler-audit (0.5.0)
      bundler (~> 1.2)
      thor (~> 0.18)
    capistrano (3.8.2)
@@ -108,7 +108,7 @@ GEM
      xpath (~> 2.0)
    case_transform (0.2)
      activesupport
-    charlock_holmes (0.7.5)
+    charlock_holmes (0.7.3)
    chunky_png (1.3.8)
    cld3 (3.1.3)
      ffi (>= 1.1.0, < 1.10.0)
@@ -154,31 +154,18 @@ GEM
    erubis (2.7.0)
    et-orbi (1.0.5)
      tzinfo
-    excon (0.58.0)
    execjs (2.7.0)
-    fabrication (2.16.2)
+    fabrication (2.16.1)
    faker (1.7.3)
      i18n (~> 0.5)
    fast_blank (1.0.0)
    ffi (1.9.18)
-    fog-core (1.45.0)
-      builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
-    fog-json (1.0.2)
-      fog-core (~> 1.0)
-      multi_json (~> 1.10)
-    fog-openstack (0.1.21)
-      fog-core (>= 1.40)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    formatador (0.2.5)
    fuubar (2.2.0)
      rspec-core (~> 3.0)
      ruby-progressbar (~> 1.4)
    globalid (0.4.0)
      activesupport (>= 4.2.0)
-    goldfinger (2.0.1)
+    goldfinger (2.0.0)
      addressable (~> 2.5)
      http (~> 2.2)
      nokogiri (~> 1.8)
@@ -192,9 +179,7 @@ GEM
      activesupport (>= 4.0.1)
      hamlit (>= 1.2.0)
      railties (>= 4.0.1)
-    hamster (3.0.0)
-      concurrent-ruby (~> 1.0)
-    hashdiff (0.3.5)
+    hashdiff (0.3.4)
    highline (1.7.8)
    hiredis (0.6.1)
    hkdf (0.3.0)
@@ -209,11 +194,11 @@ GEM
    http-form_data (1.0.3)
    http_accept_language (2.1.1)
    http_parser.rb (0.6.0)
-    httplog (0.99.7)
+    httplog (0.99.4)
      colorize
      rack
-    i18n (0.8.6)
-    i18n-tasks (0.9.16)
+    i18n (0.8.4)
+    i18n-tasks (0.9.15)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
      easy_translate (>= 0.5.0)
@@ -224,18 +209,9 @@ GEM
      rainbow (~> 2.2)
      terminal-table (>= 1.5.1)
    idn-ruby (0.1.0)
-    ipaddress (0.8.3)
-    iso-639 (0.2.8)
    jmespath (1.3.1)
    json (2.1.0)
-    json-ld (2.1.5)
-      multi_json (~> 1.12)
-      rdf (~> 2.2)
-    json-ld-preloaded (2.2.1)
-      json-ld (~> 2.1, >= 2.1.5)
-      multi_json (~> 1.11)
-      rdf (~> 2.2)
-    jsonapi-renderer (0.1.3)
+    jsonapi-renderer (0.1.2)
    jwt (1.5.6)
    kaminari (1.0.1)
      activesupport (>= 4.1.0)
@@ -277,7 +253,7 @@ GEM
    mime-types-data (3.2016.0521)
    mimemagic (0.3.2)
    mini_portile2 (2.2.0)
-    minitest (5.10.3)
+    minitest (5.10.2)
    msgpack (1.1.0)
    multi_json (1.12.1)
    net-scp (1.2.1)
@@ -288,7 +264,7 @@ GEM
      mini_portile2 (~> 2.2.0)
    nokogumbo (1.4.13)
      nokogiri
-    oj (3.3.4)
+    oj (3.2.0)
    openssl (2.0.4)
    orm_adapter (0.5.0)
    ostatus2 (2.0.1)
@@ -307,14 +283,14 @@ GEM
      av (~> 0.9.0)
      paperclip (>= 2.5.2)
    parallel (1.11.2)
-    parallel_tests (2.14.2)
+    parallel_tests (2.14.1)
      parallel
    parser (2.4.0.0)
      ast (~> 2.2)
    pg (0.21.0)
    pghero (1.7.0)
      activerecord
-    pkg-config (1.2.4)
+    pkg-config (1.2.3)
    powerpack (0.1.1)
    pry (0.10.4)
      coderay (~> 1.1.0)
@@ -322,7 +298,7 @@ GEM
      slop (~> 3.4)
    pry-rails (0.3.6)
      pry (>= 0.10.4)
-    public_suffix (3.0.0)
+    public_suffix (2.0.5)
    puma (3.9.1)
    pundit (1.1.0)
      activesupport (>= 3.0.0)
@@ -337,17 +313,17 @@ GEM
    rack-test (0.6.3)
      rack (>= 1.0)
    rack-timeout (0.4.2)
-    rails (5.1.3)
-      actioncable (= 5.1.3)
-      actionmailer (= 5.1.3)
-      actionpack (= 5.1.3)
-      actionview (= 5.1.3)
-      activejob (= 5.1.3)
-      activemodel (= 5.1.3)
-      activerecord (= 5.1.3)
-      activesupport (= 5.1.3)
-      bundler (>= 1.3.0)
-      railties (= 5.1.3)
+    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.2)
      sprockets-rails (>= 2.0.0)
    rails-controller-testing (1.0.2)
      actionpack (~> 5.x, >= 5.0.1)
@@ -361,28 +337,23 @@ GEM
    rails-i18n (5.0.4)
      i18n (~> 0.7)
      railties (~> 5.0)
-    rails-settings-cached (0.6.6)
+    rails-settings-cached (0.6.5)
      rails (>= 4.2.0)
-    railties (5.1.3)
-      actionpack (= 5.1.3)
-      activesupport (= 5.1.3)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
      method_source
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
    rainbow (2.2.2)
      rake
    rake (12.0.0)
-    rdf (2.2.8)
-      hamster (~> 3.0)
-      link_header (~> 0.0, >= 0.0.8)
-    rdf-normalize (0.3.2)
-      rdf (~> 2.0)
    redis (3.3.3)
    redis-actionpack (5.0.1)
      actionpack (>= 4.0, < 6)
      redis-rack (>= 1, < 3)
      redis-store (>= 1.1.0, < 1.4.0)
-    redis-activesupport (5.0.3)
+    redis-activesupport (5.0.2)
      activesupport (>= 3, < 6)
      redis-store (~> 1.3.0)
    redis-namespace (1.5.3)
@@ -442,7 +413,7 @@ GEM
    scss_lint (0.54.0)
      rake (>= 0.9, < 13)
      sass (~> 3.4.20)
-    sidekiq (5.0.4)
+    sidekiq (5.0.3)
      concurrent-ruby (~> 1.0)
      connection_pool (~> 2.2, >= 2.2.0)
      rack-protection (>= 1.5.0)
@@ -450,12 +421,12 @@ GEM
    sidekiq-bulk (0.1.1)
      activesupport
      sidekiq
-    sidekiq-scheduler (2.1.8)
+    sidekiq-scheduler (2.1.7)
      redis (~> 3)
      rufus-scheduler (~> 3.2)
      sidekiq (>= 3)
      tilt (>= 1.4.0)
-    sidekiq-unique-jobs (5.0.9)
+    sidekiq-unique-jobs (5.0.8)
      sidekiq (>= 4.0, <= 6.0)
      thor (~> 0)
    simple-navigation (4.0.5)
@@ -479,15 +450,15 @@ GEM
    sshkit (1.13.1)
      net-scp (>= 1.1.2)
      net-ssh (>= 2.8.0)
-    statsd-instrument (2.1.4)
+    statsd-instrument (2.1.2)
    temple (0.8.0)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.0)
+    thor (0.19.4)
    thread (0.2.2)
    thread_safe (0.3.6)
-    tilt (2.0.8)
-    twitter-text (1.14.7)
+    tilt (2.0.7)
+    twitter-text (1.14.6)
      unf (~> 0.1.0)
    tzinfo (1.2.3)
      thread_safe (~> 0.1)
@@ -540,7 +511,7 @@ DEPENDENCIES
  capistrano-rbenv (~> 2.1)
  capistrano-yarn (~> 2.0)
  capybara (~> 2.14)
-  charlock_holmes (~> 0.7.5)
+  charlock_holmes (~> 0.7.3)
  cld3 (~> 3.1)
  climate_control (~> 0.2)
  devise (~> 4.2)
@@ -550,7 +521,6 @@ DEPENDENCIES
  fabrication (~> 2.16)
  faker (~> 1.7)
  fast_blank (~> 1.0)
-  fog-openstack (~> 0.1)
  fuubar (~> 2.2)
  goldfinger (~> 2.0)
  hamlit-rails (~> 0.2)
@@ -561,8 +531,6 @@ DEPENDENCIES
  httplog (~> 0.99)
  i18n-tasks (~> 0.9)
  idn-ruby
-  iso-639
-  json-ld-preloaded (~> 2.2.1)
  kaminari (~> 1.0)
  letter_opener (~> 1.4)
  letter_opener_web (~> 1.3)
@@ -592,7 +560,6 @@ DEPENDENCIES
  rails-controller-testing (~> 1.0)
  rails-i18n (~> 5.0)
  rails-settings-cached (~> 0.6)
-  rdf-normalize (~> 0.3.1)
  redis (~> 3.3)
  redis-namespace (~> 1.5)
  redis-rails (~> 5.0)
@@ -623,4 +590,4 @@ RUBY VERSION
   ruby 2.4.1p111

 BUNDLED WITH
-   1.15.4
+   1.15.2
--- a/README.md
+++ b/README.md
@@ -8,3 +8,4 @@ So here's the deal: we all work on this code, and then it runs on dev.glitch.soc

 - You can view documentation for this project at [glitch-soc.github.io/docs/](https://glitch-soc.github.io/docs/).
 - And contributing guidelines are available [here](CONTRIBUTING.md) and [here](https://glitch-soc.github.io/docs/contributing/).
+
--- 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.png",
+  "logo": "https://github.com/tootsuite/mastodon/raw/master/app/javascript/images/logo.svg",
  "env": {
    "HEROKU": {
      "description": "Leave this as true",
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -7,78 +7,24 @@ class AccountsController < ApplicationController
  def show
    respond_to do |format|
      format.html do
-        @pinned_statuses = []
-
-        if current_account && @account.blocking?(current_account)
-          @statuses = []
-          return
-        end
-
-        @pinned_statuses = cache_collection(@account.pinned_statuses, Status) if show_pinned_statuses?
-        @statuses        = filtered_statuses.paginate_by_max_id(20, params[:max_id], params[:since_id])
-        @statuses        = cache_collection(@statuses, Status)
-        @next_url        = next_url unless @statuses.empty?
+        @statuses = @account.statuses.permitted_for(@account, current_account).paginate_by_max_id(20, params[:max_id], params[:since_id])
+        @statuses = cache_collection(@statuses, Status)
      end

      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.reject { |entry| entry.status.nil? }))
+        render xml: OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.feed(@account, @entries.to_a))
      end

      format.json do
-        render json: @account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+        render json: @account, serializer: ActivityPub::ActorSerializer, adapter: ActivityPub::Adapter
      end
    end
  end

  private

-  def show_pinned_statuses?
-    [replies_requested?, media_requested?, params[:max_id].present?, params[:since_id].present?].none?
-  end
-
-  def filtered_statuses
-    default_statuses.tap do |statuses|
-      statuses.merge!(only_media_scope) if media_requested?
-      statuses.merge!(no_replies_scope) unless replies_requested?
-    end
-  end
-
-  def default_statuses
-    @account.statuses.where(visibility: [:public, :unlisted])
-  end
-
-  def only_media_scope
-    Status.where(id: account_media_status_ids)
-  end
-
-  def account_media_status_ids
-    @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
-  end
-
-  def no_replies_scope
-    Status.without_replies
-  end
-
  def set_account
    @account = Account.find_local!(params[:username])
  end
-
-  def next_url
-    if media_requested?
-      short_account_media_url(@account, max_id: @statuses.last.id)
-    elsif replies_requested?
-      short_account_with_replies_url(@account, max_id: @statuses.last.id)
-    else
-      short_account_url(@account, max_id: @statuses.last.id)
-    end
-  end
-
-  def media_requested?
-    request.path.ends_with?('/media')
-  end
-
-  def replies_requested?
-    request.path.ends_with?('/with_replies')
-  end
 end
--- a/app/controllers/activitypub/inboxes_controller.rb
+++ b/app/controllers/activitypub/inboxes_controller.rb
@@ -1,40 +0,0 @@
-# frozen_string_literal: true
-
-class ActivityPub::InboxesController < Api::BaseController
-  include SignatureVerification
-
-  before_action :set_account
-
-  def create
-    if signed_request_account
-      upgrade_account
-      process_payload
-      head 201
-    else
-      head 202
-    end
-  end
-
-  private
-
-  def set_account
-    @account = Account.find_local!(params[:account_username]) if params[:account_username]
-  end
-
-  def body
-    @body ||= request.body.read
-  end
-
-  def upgrade_account
-    if signed_request_account.ostatus?
-      signed_request_account.update(last_webfingered_at: nil)
-      ResolveRemoteAccountWorker.perform_async(signed_request_account.acct)
-    end
-
-    Pubsubhubbub::UnsubscribeWorker.perform_async(signed_request_account.id) if signed_request_account.subscribed?
-  end
-
-  def process_payload
-    ActivityPub::ProcessingWorker.perform_async(signed_request_account.id, body.force_encoding('UTF-8'))
-  end
-end
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -7,7 +7,7 @@ class ActivityPub::OutboxesController < Api::BaseController
    @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, content_type: 'application/activity+json'
+    render json: outbox_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
  end

  private
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -17,7 +17,7 @@ module Admin
    end

    def unsubscribe
-      Pubsubhubbub::UnsubscribeWorker.perform_async(@account.id)
+      UnsubscribeService.new.call(@account)
      redirect_to admin_account_path(@account.id)
    end

--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -13,7 +13,6 @@ module Admin
      closed_registrations_message
      open_deletion
      timeline_preview
-      bootstrap_timeline_accounts
    ).freeze

    BOOLEAN_SETTINGS = %w(
--- a/app/controllers/admin/statuses_controller.rb
+++ b/app/controllers/admin/statuses_controller.rb
@@ -9,7 +9,7 @@ module Admin
    before_action :set_account
    before_action :set_status, only: [:update, :destroy]

-    PER_PAGE = 20
+    PAR_PAGE = 20

    def index
      @statuses = @account.statuses
@@ -17,7 +17,7 @@ module Admin
        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(PER_PAGE)
+      @statuses = @statuses.preload(:media_attachments, :mentions).page(params[:page]).per(PAR_PAGE)

      @form = Form::StatusBatch.new
    end
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -43,7 +43,7 @@ class Api::BaseController < ApplicationController
    links = []
    links << [next_path, [%w(rel next)]] if next_path
    links << [prev_path, [%w(rel prev)]] if prev_path
-    response.headers['Link'] = LinkHeader.new(links) unless links.empty?
+    response.headers['Link'] = LinkHeader.new(links)
  end

  def limit_param(default_limit)
@@ -62,11 +62,10 @@ class Api::BaseController < ApplicationController
  end

  def require_user!
-    if current_user
-      set_user_activity
-    else
-      render json: { error: 'This method requires an authenticated user' }, status: 422
-    end
+    current_resource_owner
+    set_user_activity
+  rescue ActiveRecord::RecordNotFound
+    render json: { error: 'This method requires an authenticated user' }, status: 422
  end

  def render_empty
--- a/app/controllers/api/oembed_controller.rb
+++ b/app/controllers/api/oembed_controller.rb
@@ -4,14 +4,14 @@ class Api::OEmbedController < Api::BaseController
  respond_to :json

  def show
-    @status = status_finder.status
-    render json: @status, serializer: OEmbedSerializer, width: maxwidth_or_default, height: maxheight_or_default
+    @stream_entry = find_stream_entry.stream_entry
+    render json: @stream_entry, serializer: OEmbedSerializer, width: maxwidth_or_default, height: maxheight_or_default
  end

  private

-  def status_finder
-    StatusFinder.new(params[:url])
+  def find_stream_entry
+    StreamEntryFinder.new(params[:url])
  end

  def maxwidth_or_default
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 class Api::V1::Accounts::CredentialsController < Api::BaseController
-  before_action -> { doorkeeper_authorize! :read }, except: [:update]
  before_action -> { doorkeeper_authorize! :write }, only: [:update]
  before_action :require_user!

@@ -11,9 +10,8 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
  end

  def update
+    current_account.update!(account_params)
    @account = current_account
-    UpdateAccountService.new.call(@account, account_params, raise_error: true)
-    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
    render json: @account, serializer: REST::CredentialAccountSerializer
  end

--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -29,7 +29,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
  def account_statuses
    default_statuses.tap do |statuses|
      statuses.merge!(only_media_scope) if params[:only_media]
-      statuses.merge!(pinned_scope) if params[:pinned]
      statuses.merge!(no_replies_scope) if params[:exclude_replies]
    end
  end
@@ -54,10 +53,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
    @account.media_attachments.attached.reorder(nil).select(:status_id).distinct
  end

-  def pinned_scope
-    @account.pinned_statuses
-  end
-
  def no_replies_scope
    Status.without_replies
  end
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -14,10 +14,7 @@ class Api::V1::AccountsController < Api::BaseController

  def follow
    FollowService.new.call(current_user.account, @account.acct)
-
-    options = @account.locked? ? {} : { following_map: { @account.id => true }, requested_map: { @account.id => false } }
-
-    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships(options)
+    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
  end

  def block
@@ -26,7 +23,7 @@ class Api::V1::AccountsController < Api::BaseController
  end

  def mute
-    MuteService.new.call(current_user.account, @account, notifications: params[:notifications])
+    MuteService.new.call(current_user.account, @account)
    render json: @account, serializer: REST::RelationshipSerializer, relationships: relationships
  end

@@ -51,7 +48,7 @@ class Api::V1::AccountsController < Api::BaseController
    @account = Account.find(params[:id])
  end

-  def relationships(options = {})
-    AccountRelationshipsPresenter.new([@account.id], current_user.account_id, options)
+  def relationships
+    AccountRelationshipsPresenter.new([@account.id], current_user.account_id)
  end
 end
--- a/app/controllers/api/v1/extensions_controller.rb
+++ b/app/controllers/api/v1/extensions_controller.rb
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-require 'mastodon/extension'
-
-class Api::V1::ExtensionsController < Api::BaseController
-  def index
-    render json: Mastodon::Extension.all
-  end
-end
--- a/app/controllers/api/v1/follows_controller.rb
+++ b/app/controllers/api/v1/follows_controller.rb
@@ -10,12 +10,6 @@ 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)
-
-    if @account.nil?
-      username, domain = target_uri.split('@')
-      @account         = Account.find_remote!(username, domain)
-    end
-
    render json: @account, serializer: REST::AccountSerializer
  end

--- a/app/controllers/api/v1/mutes_controller.rb
+++ b/app/controllers/api/v1/mutes_controller.rb
@@ -8,15 +8,10 @@ class Api::V1::MutesController < Api::BaseController
  respond_to :json

  def index
-    @data = @accounts = load_accounts
+    @accounts = load_accounts
    render json: @accounts, each_serializer: REST::AccountSerializer
  end

-  def details
-    @data = @mutes = load_mutes
-    render json: @mutes, each_serializer: REST::MuteSerializer
-  end 
-
  private

  def load_accounts
@@ -27,10 +22,6 @@ class Api::V1::MutesController < Api::BaseController
    Account.includes(:muted_by).references(:muted_by)
  end

-  def load_mutes
-    paginated_mutes.includes(:account, :target_account).to_a
-  end
-
  def paginated_mutes
    Mute.where(account: current_account).paginate_by_max_id(
      limit_param(DEFAULT_ACCOUNTS_LIMIT),
@@ -45,34 +36,26 @@ class Api::V1::MutesController < Api::BaseController

  def next_path
    if records_continue?
-      url_for pagination_params(max_id: pagination_max_id)
+      api_v1_mutes_url pagination_params(max_id: pagination_max_id)
    end
  end

  def prev_path
-    unless@data.empty?
-      url_for pagination_params(since_id: pagination_since_id)
+    unless @accounts.empty?
+      api_v1_mutes_url pagination_params(since_id: pagination_since_id)
    end
  end

  def pagination_max_id
-    if params[:action] == "details"
-      @mutes.last.id
-    else
-      @accounts.last.muted_by_ids.last
-    end
+    @accounts.last.muted_by_ids.last
  end

  def pagination_since_id
-    if params[:action] == "details"
-      @mutes.first.id
-    else
-      @accounts.first.muted_by_ids.first
-    end
+    @accounts.first.muted_by_ids.first
  end

  def records_continue?
-    @data.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+    @accounts.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
  end

  def pagination_params(core_params)
--- a/app/controllers/api/v1/statuses/pins_controller.rb
+++ b/app/controllers/api/v1/statuses/pins_controller.rb
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Statuses::PinsController < Api::BaseController
-  include Authorization
-
-  before_action -> { doorkeeper_authorize! :write }
-  before_action :require_user!
-  before_action :set_status
-
-  respond_to :json
-
-  def create
-    StatusPin.create!(account: current_account, status: @status)
-    render json: @status, serializer: REST::StatusSerializer
-  end
-
-  def destroy
-    pin = StatusPin.find_by(account: current_account, status: @status)
-    pin&.destroy!
-    render json: @status, serializer: REST::StatusSerializer
-  end
-
-  private
-
-  def set_status
-    @status = Status.find(params[:status_id])
-  end
-end
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -29,7 +29,7 @@ class Api::V1::StatusesController < Api::BaseController
  end

  def card
-    @card = @status.preview_cards.first
+    @card = PreviewCard.find_by(status: @status)

    if @card.nil?
      render_empty
--- a/app/controllers/api/web/embeds_controller.rb
+++ b/app/controllers/api/web/embeds_controller.rb
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class Api::Web::EmbedsController < Api::BaseController
-  respond_to :json
-
-  before_action :require_user!
-
-  def create
-    status = StatusFinder.new(params[:url]).status
-    render json: status, serializer: OEmbedSerializer, width: 400
-  rescue ActiveRecord::RecordNotFound
-    oembed = OEmbed::Providers.get(params[:url])
-    render json: Oj.dump(oembed.fields)
-  rescue OEmbed::NotFound
-    render json: {}, status: :not_found
-  end
-end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -43,10 +43,6 @@ class ApplicationController < ActionController::Base
    forbidden if current_user.account.suspended?
  end

-  def after_sign_out_path_for(_resource_or_scope)
-    new_user_session_path
-  end
-
  protected

  def forbidden
--- a/app/controllers/auth/confirmations_controller.rb
+++ b/app/controllers/auth/confirmations_controller.rb
@@ -2,10 +2,4 @@

 class Auth::ConfirmationsController < Devise::ConfirmationsController
  layout 'auth'
-
-  def show
-    super do |user|
-      BootstrapTimelineWorker.perform_async(user.account_id) if user.errors.empty?
-    end
-  end
 end
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -1,20 +1,5 @@
 # frozen_string_literal: true

 class Auth::PasswordsController < Devise::PasswordsController
-  before_action :check_validity_of_reset_password_token, only: :edit
-
  layout 'auth'
-
-  private
-
-  def check_validity_of_reset_password_token
-    unless reset_password_token_is_valid?
-      flash[:error] = I18n.t('auth.invalid_reset_password_token')
-      redirect_to new_password_path(resource_name)
-    end
-  end
-
-  def reset_password_token_is_valid?
-    resource_class.with_reset_password_token(params[:reset_password_token]).present?
-  end
 end
--- a/app/controllers/authorize_follows_controller.rb
+++ b/app/controllers/authorize_follows_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class AuthorizeFollowsController < ApplicationController
-  layout 'modal'
+  layout 'public'

  before_action :authenticate_user!

--- a/app/controllers/concerns/account_controller_concern.rb
+++ b/app/controllers/concerns/account_controller_concern.rb
@@ -23,7 +23,6 @@ module AccountControllerConcern
      [
        webfinger_account_link,
        atom_account_url_link,
-        actor_url_link,
      ]
    )
  end
@@ -42,13 +41,6 @@ module AccountControllerConcern
    ]
  end

-  def actor_url_link
-    [
-      ActivityPub::TagManager.instance.uri_for(@account),
-      [%w(rel alternate), %w(type application/activity+json)],
-    ]
-  end
-
  def webfinger_account_url
    webfinger_url(resource: @account.to_webfinger_s)
  end
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -31,7 +31,7 @@ module SignatureVerification
      return
    end

-    account = account_from_key_id(signature_params['keyId'])
+    account = ResolveRemoteAccountService.new.call(signature_params['keyId'].gsub(/\Aacct:/, ''))

    if account.nil?
      @signed_request_account = nil
@@ -49,10 +49,6 @@ module SignatureVerification
    end
  end

-  def request_body
-    @request_body ||= request.raw_post
-  end
-
  private

  def build_signed_string(signed_headers)
@@ -61,8 +57,6 @@ module SignatureVerification
    signed_headers.split(' ').map do |signed_header|
      if signed_header == Request::REQUEST_TARGET
        "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
-      elsif signed_header == 'digest'
-        "digest: #{body_digest}"
      else
        "#{signed_header}: #{request.headers[to_header_name(signed_header)]}"
      end
@@ -79,10 +73,6 @@ module SignatureVerification
    (Time.now.utc - time_sent).abs <= 30
  end

-  def body_digest
-    "SHA-256=#{Digest::SHA256.base64digest(request_body)}"
-  end
-
  def to_header_name(name)
    name.split(/-/).map(&:capitalize).join('-')
  end
@@ -91,16 +81,7 @@ module SignatureVerification
    signature_params['keyId'].blank? ||
      signature_params['signature'].blank? ||
      signature_params['algorithm'].blank? ||
-      signature_params['algorithm'] != 'rsa-sha256'
-  end
-
-  def account_from_key_id(key_id)
-    if key_id.start_with?('acct:')
-      ResolveRemoteAccountService.new.call(key_id.gsub(/\Aacct:/, ''))
-    elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
-      account   = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
-      account ||= ActivityPub::FetchRemoteKeyService.new.call(key_id)
-      account
-    end
+      signature_params['algorithm'] != 'rsa-sha256' ||
+      !signature_params['keyId'].start_with?('acct:')
  end
 end
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -10,7 +10,7 @@ class FollowerAccountsController < ApplicationController
      format.html

      format.json do
-        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
      end
    end
  end
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -10,7 +10,7 @@ class FollowingAccountsController < ApplicationController
      format.html

      format.json do
-        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
      end
    end
  end
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -6,7 +6,6 @@ class HomeController < ApplicationController

  def index
    @body_classes = 'app-body'
-    @frontend     = (params[:frontend] and Rails.configuration.x.available_frontends.include? params[:frontend] + '.js') ? params[:frontend] : 'mastodon'
  end

  private
--- a/app/controllers/intents_controller.rb
+++ b/app/controllers/intents_controller.rb
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-class IntentsController < ApplicationController
-  def show
-    uri = Addressable::URI.parse(params[:uri])
-
-    if uri.scheme == 'web+mastodon'
-      case uri.host
-      when 'follow'
-        return redirect_to authorize_follow_path(acct: uri.query_values['uri'].gsub(/\Aacct:/, ''))
-      when 'share'
-        return redirect_to share_path(text: uri.query_values['text'])
-      end
-    end
-
-    not_found
-  end
-end
--- a/app/controllers/remote_follow_controller.rb
+++ b/app/controllers/remote_follow_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 class RemoteFollowController < ApplicationController
-  layout 'modal'
+  layout 'public'

  before_action :set_account
  before_action :gone, if: :suspended_account?
--- a/app/controllers/settings/applications_controller.rb
+++ b/app/controllers/settings/applications_controller.rb
@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-class Settings::ApplicationsController < ApplicationController
-  layout 'admin'
-
-  before_action :authenticate_user!
-  before_action :set_application, only: [:show, :update, :destroy, :regenerate]
-  before_action :prepare_scopes, only: [:create, :update]
-
-  def index
-    @applications = current_user.applications.page(params[:page])
-  end
-
-  def new
-    @application = Doorkeeper::Application.new(
-      redirect_uri: Doorkeeper.configuration.native_redirect_uri,
-      scopes: 'read write follow'
-    )
-  end
-
-  def show; end
-
-  def create
-    @application = current_user.applications.build(application_params)
-
-    if @application.save
-      redirect_to settings_applications_path, notice: I18n.t('applications.created')
-    else
-      render :new
-    end
-  end
-
-  def update
-    if @application.update(application_params)
-      redirect_to settings_applications_path, notice: I18n.t('generic.changes_saved_msg')
-    else
-      render :show
-    end
-  end
-
-  def destroy
-    @application.destroy
-    redirect_to settings_applications_path, notice: I18n.t('applications.destroyed')
-  end
-
-  def regenerate
-    @access_token = current_user.token_for_app(@application)
-    @access_token.destroy
-
-    redirect_to settings_application_path(@application), notice: I18n.t('applications.token_regenerated')
-  end
-
-  private
-
-  def set_application
-    @application = current_user.applications.find(params[:id])
-  end
-
-  def application_params
-    params.require(:doorkeeper_application).permit(
-      :name,
-      :redirect_uri,
-      :scopes,
-      :website
-    )
-  end
-
-  def prepare_scopes
-    scopes = params.fetch(:doorkeeper_application, {}).fetch(:scopes, nil)
-    params[:doorkeeper_application][:scopes] = scopes.join(' ') if scopes.is_a? Array
-  end
-end
--- a/app/controllers/settings/profiles_controller.rb
+++ b/app/controllers/settings/profiles_controller.rb
@@ -14,8 +14,7 @@ class Settings::ProfilesController < ApplicationController
  def show; end

  def update
-    if UpdateAccountService.new.call(@account, account_params)
-      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    if @account.update(account_params)
      redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
    else
      render :show
--- 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 acceptable_code?
+      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
@@ -38,10 +38,5 @@ 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
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class SharesController < ApplicationController
-  layout 'modal'
-
-  before_action :authenticate_user!
-  before_action :set_body_classes
-
-  def show
-    serializable_resource = ActiveModelSerializers::SerializableResource.new(InitialStatePresenter.new(initial_state_params), serializer: InitialStateSerializer)
-    @initial_state_json   = serializable_resource.to_json
-  end
-
-  private
-
-  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),
-      text: params[:text],
-    }
-  end
-
-  def set_body_classes
-    @body_classes = 'compose-standalone'
-  end
-end
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -9,7 +9,6 @@ class StatusesController < ApplicationController
  before_action :set_status
  before_action :set_link_headers
  before_action :check_account_suspension
-  before_action :redirect_to_original, only: [:show]

  def show
    respond_to do |format|
@@ -21,18 +20,13 @@ class StatusesController < ApplicationController
      end

      format.json do
-        render json: @status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+        render json: @status, serializer: ActivityPub::NoteSerializer, adapter: ActivityPub::Adapter
      end
    end
  end

  def activity
-    render json: @status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
-  end
-
-  def embed
-    response.headers['X-Frame-Options'] = 'ALLOWALL'
-    render 'stream_entries/embed', layout: 'embedded'
+    render json: @status, serializer: ActivityPub::ActivitySerializer, adapter: ActivityPub::Adapter
  end

  private
@@ -42,12 +36,7 @@ class StatusesController < ApplicationController
  end

  def set_link_headers
-    response.headers['Link'] = LinkHeader.new(
-      [
-        [account_stream_entry_url(@account, @status.stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]],
-        [ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]],
-      ]
-    )
+    response.headers['Link'] = LinkHeader.new([[account_stream_entry_url(@account, @status.stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
  end

  def set_status
@@ -64,8 +53,4 @@ class StatusesController < ApplicationController
  def check_account_suspension
    gone if @account.suspended?
  end
-
-  def redirect_to_original
-    redirect_to ::TagManager.instance.url_for(@status.reblog) if @status.reblog?
-  end
 end
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -25,7 +25,10 @@ class StreamEntriesController < ApplicationController
  end

  def embed
-    redirect_to embed_short_account_status_url(@account, @stream_entry.activity), status: 301
+    response.headers['X-Frame-Options'] = 'ALLOWALL'
+    return gone if @stream_entry.activity.nil?
+
+    render layout: 'embedded'
  end

  private
@@ -35,12 +38,7 @@ class StreamEntriesController < ApplicationController
  end

  def set_link_headers
-    response.headers['Link'] = LinkHeader.new(
-      [
-        [account_stream_entry_url(@account, @stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]],
-        [ActivityPub::TagManager.instance.uri_for(@stream_entry.activity), [%w(rel alternate), %w(type application/activity+json)]],
-      ]
-    )
+    response.headers['Link'] = LinkHeader.new([[account_stream_entry_url(@account, @stream_entry, format: 'atom'), [%w(rel alternate), %w(type application/atom+xml)]]])
  end

  def set_stream_entry
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -12,7 +12,7 @@ class TagsController < ApplicationController
      format.html

      format.json do
-        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+        render json: collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter
      end
    end
  end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -5,10 +5,6 @@ module ApplicationHelper
    current_page?(path) ? 'active' : ''
  end

-  def active_link_to(label, path, options = {})
-    link_to label, path, options.merge(class: active_nav_class(path))
-  end
-
  def show_landing_strip?
    !user_signed_in? && !single_user_mode?
  end
--- a/app/helpers/instance_helper.rb
+++ b/app/helpers/instance_helper.rb
@@ -2,7 +2,7 @@

 module InstanceHelper
  def site_title
-    Setting.site_title.presence || site_hostname
+    Setting.site_title.to_s
  end

  def site_hostname
--- a/app/helpers/jsonld_helper.rb
+++ b/app/helpers/jsonld_helper.rb
@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module JsonLdHelper
-  def equals_or_includes?(haystack, needle)
-    haystack.is_a?(Array) ? haystack.include?(needle) : haystack == needle
-  end
-
-  def first_of_value(value)
-    value.is_a?(Array) ? value.first : value
-  end
-
-  def value_or_id(value)
-    value.is_a?(String) || value.nil? ? value : value['id']
-  end
-
-  def supported_context?(json)
-    !json.nil? && equals_or_includes?(json['@context'], ActivityPub::TagManager::CONTEXT)
-  end
-
-  def canonicalize(json)
-    graph = RDF::Graph.new << JSON::LD::API.toRdf(json)
-    graph.dump(:normalize)
-  end
-
-  def fetch_resource(uri)
-    response = build_request(uri).perform
-    return if response.code != 200
-    body_to_json(response.to_s)
-  end
-
-  def body_to_json(body)
-    body.is_a?(String) ? Oj.load(body, mode: :strict) : body
-  rescue Oj::ParseError
-    nil
-  end
-
-  def merge_context(context, new_context)
-    if context.is_a?(Array)
-      context << new_context
-    else
-      [context, new_context]
-    end
-  end
-
-  private
-
-  def build_request(uri)
-    request = Request.new(:get, uri)
-    request.add_headers('Accept' => 'application/activity+json, application/ld+json')
-    request
-  end
-end
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -12,14 +12,6 @@ module RoutingHelper
  end

  def full_asset_url(source, options = {})
-    source = ActionController::Base.helpers.asset_url(source, options) unless use_storage?
-
-    URI.join(root_url, source).to_s
-  end
-
-  private
-
-  def use_storage?
-    Rails.configuration.x.use_s3 || Rails.configuration.x.use_swift
+    Rails.configuration.x.use_s3 ? source : URI.join(root_url, ActionController::Base.helpers.asset_url(source, options)).to_s
  end
 end
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -30,7 +30,6 @@ module SettingsHelper
    th: 'ภาษาไทย',
    tr: 'Türkçe',
    uk: 'Українська',
-    zh: '中文',
    'zh-CN': '简体中文',
    'zh-HK': '繁體中文（香港）',
    'zh-TW': '繁體中文（臺灣）',
@@ -40,10 +39,6 @@ module SettingsHelper
    HUMAN_LOCALES[locale]
  end

-  def filterable_languages
-    I18n.available_locales.map { |locale| locale.to_s.split('-').first.to_sym }.uniq
-  end
-
  def hash_to_object(hash)
    HashObject.new(hash)
  end
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true

 module StreamEntriesHelper
-  EMBEDDED_CONTROLLER = 'statuses'
+  EMBEDDED_CONTROLLER = 'stream_entries'
  EMBEDDED_ACTION = 'embed'

  def display_name(account)
--- a/app/javascript/glitch/components/account/header.js
+++ b/app/javascript/glitch/components/account/header.js
@@ -194,7 +194,11 @@ Here, we render our component using all the things we've defined above.
          <div>
            <a href={account.get('url')} target='_blank' rel='noopener'>
              <span className='account__header__avatar'>
-                <Avatar account={account} size={90} />
+                <Avatar
+                  src={account.get('avatar')}
+                  staticSrc={account.get('avatar_static')}
+                  size={90}
+                />
              </span>
              <span
                className='account__header__display-name'
--- a/app/javascript/glitch/components/column/notif_cleaning_widget/container.js
+++ b/app/javascript/glitch/components/column/notif_cleaning_widget/container.js
@@ -24,10 +24,7 @@ import NotificationPurgeButtons from './notification_purge_buttons';
 import {
  deleteMarkedNotifications,
  enterNotificationClearingMode,
-  markAllNotifications,
 } from '../../../../mastodon/actions/notifications';
-import { defineMessages, injectIntl } from 'react-intl';
-import { openModal } from '../../../../mastodon/actions/modal';

 //  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

@@ -42,39 +39,18 @@ deleting notifications.

 */

-const messages = defineMessages({
-  clearMessage: { id: 'notifications.marked_clear_confirmation', defaultMessage: 'Are you sure you want to permanently clear all selected notifications?' },
-  clearConfirm: { id: 'notifications.marked_clear', defaultMessage: 'Clear selected notifications' },
-});
-
-const mapDispatchToProps = (dispatch, { intl }) => ({
+const mapDispatchToProps = dispatch => ({
  onEnterCleaningMode(yes) {
    dispatch(enterNotificationClearingMode(yes));
  },

-  onDeleteMarked() {
-    dispatch(openModal('CONFIRM', {
-      message: intl.formatMessage(messages.clearMessage),
-      confirm: intl.formatMessage(messages.clearConfirm),
-      onConfirm: () => dispatch(deleteMarkedNotifications()),
-    }));
-  },
-
-  onMarkAll() {
-    dispatch(markAllNotifications(true));
-  },
-
-  onMarkNone() {
-    dispatch(markAllNotifications(false));
-  },
-
-  onInvert() {
-    dispatch(markAllNotifications(null));
+  onDeleteMarkedNotifications() {
+    dispatch(deleteMarkedNotifications());
  },
 });

 const mapStateToProps = state => ({
-  markNewForDelete: state.getIn(['notifications', 'markNewForDelete']),
+  active: state.getIn(['notifications', 'cleaningMode']),
 });

-export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(NotificationPurgeButtons));
+export default connect(mapStateToProps, mapDispatchToProps)(NotificationPurgeButtons);
--- a/app/javascript/glitch/components/column/notif_cleaning_widget/notification_purge_buttons.js
+++ b/app/javascript/glitch/components/column/notif_cleaning_widget/notification_purge_buttons.js
@@ -16,45 +16,83 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 //  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

 const messages = defineMessages({
-  btnAll : { id: 'notification_purge.btn_all', defaultMessage: 'Select\nall' },
-  btnNone : { id: 'notification_purge.btn_none', defaultMessage: 'Select\nnone' },
-  btnInvert : { id: 'notification_purge.btn_invert', defaultMessage: 'Invert\nselection' },
-  btnApply : { id: 'notification_purge.btn_apply', defaultMessage: 'Clear\nselected' },
+  enter : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },
+  accept : { id: 'notification_purge.confirm', defaultMessage: 'Dismiss selected notifications' },
+  abort : { id: 'notification_purge.abort', defaultMessage: 'Leave cleaning mode' },
 });

@injectIntl
 export default class NotificationPurgeButtons extends ImmutablePureComponent {

  static propTypes = {
-    onDeleteMarked : PropTypes.func.isRequired,
-    onMarkAll : PropTypes.func.isRequired,
-    onMarkNone : PropTypes.func.isRequired,
-    onInvert : PropTypes.func.isRequired,
+    // Nukes all marked notifications
+    onDeleteMarkedNotifications : PropTypes.func.isRequired,
+    // Enables or disables the mode
+    // and also clears the marked status of all notifications
+    onEnterCleaningMode : PropTypes.func.isRequired,
+    // Active state, changed via onStateChange()
+    active: PropTypes.bool.isRequired,
+    // i18n
    intl: PropTypes.object.isRequired,
-    markNewForDelete: PropTypes.bool,
  };

-  render () {
-    const { intl, markNewForDelete } = this.props;
+  onEnterBtnClick = () => {
+    this.props.onEnterCleaningMode(true);
+  }
+
+  onAcceptBtnClick = () => {
+    this.props.onDeleteMarkedNotifications();
+  }
+
+  onAbortBtnClick = () => {
+    this.props.onEnterCleaningMode(false);
+  }
+
+  render () {
+    const { intl, active } = this.props;
+
+    const msgEnter = intl.formatMessage(messages.enter);
+    const msgAccept = intl.formatMessage(messages.accept);
+    const msgAbort = intl.formatMessage(messages.abort);
+
+    let enterButton, acceptButton, abortButton;
+
+    if (active) {
+      acceptButton = (
+        <button
+          className='active'
+          aria-label={msgAccept}
+          title={msgAccept}
+          onClick={this.onAcceptBtnClick}
+        >
+          <i className='fa fa-check' />
+        </button>
+      );
+      abortButton = (
+        <button
+          className='active'
+          aria-label={msgAbort}
+          title={msgAbort}
+          onClick={this.onAbortBtnClick}
+        >
+          <i className='fa fa-times' />
+        </button>
+      );
+    } else {
+      enterButton = (
+        <button
+          aria-label={msgEnter}
+          title={msgEnter}
+          onClick={this.onEnterBtnClick}
+        >
+          <i className='fa fa-eraser' />
+        </button>
+      );
+    }

-    //className='active'
    return (
      <div className='column-header__notif-cleaning-buttons'>
-        <button onClick={this.props.onMarkAll} className={markNewForDelete ? 'active' : ''}>
-          <b>∀</b><br />{intl.formatMessage(messages.btnAll)}
-        </button>
-
-        <button onClick={this.props.onMarkNone} className={!markNewForDelete ? 'active' : ''}>
-          <b>∅</b><br />{intl.formatMessage(messages.btnNone)}
-        </button>
-
-        <button onClick={this.props.onInvert}>
-          <b>¬</b><br />{intl.formatMessage(messages.btnInvert)}
-        </button>
-
-        <button onClick={this.props.onDeleteMarked}>
-          <i className='fa fa-trash' /><br />{intl.formatMessage(messages.btnApply)}
-        </button>
+        {acceptButton}{abortButton}{enterButton}
      </div>
    );
  }
--- a/app/javascript/glitch/components/notification/container.js
+++ b/app/javascript/glitch/components/notification/container.js
@@ -45,7 +45,6 @@ const makeMapStateToProps = () => {
  const mapStateToProps = (state, props) => ({
    notification: getNotification(state, props.notification, props.accountId),
    settings: state.get('local_settings'),
-    notifCleaning: state.getIn(['notifications', 'cleaningMode']),
  });

  return mapStateToProps;
--- a/app/javascript/glitch/components/notification/follow.js
+++ b/app/javascript/glitch/components/notification/follow.js
@@ -1,12 +1,38 @@
-//  `<NotificationFollow>`
-//  ======================
+/*

-//  * * * * * * *  //
+`<NotificationFollow>`
+======================

-//  Imports
-//  -------
+This component renders a follow notification.

-//  Package imports.
+__Props:__
+
+ -  __`id` (`PropTypes.number.isRequired`) :__
+    This is the id of the notification.
+
+ -  __`onDeleteNotification` (`PropTypes.func.isRequired`) :__
+    The function to call when a notification should be
+    dismissed/deleted.
+
+ -  __`account` (`PropTypes.object.isRequired`) :__
+    The account associated with the follow notification, ie the account
+    which followed the user.
+
+ -  __`intl` (`PropTypes.object.isRequired`) :__
+    Our internationalization object, inserted by `@injectIntl`.
+
+*/
+
+//  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+/*
+
+Imports:
+--------
+
+*/
+
+//  Package imports  //
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
@@ -14,18 +40,22 @@ import { FormattedMessage } from 'react-intl';
 import escapeTextContentForBrowser from 'escape-html';
 import ImmutablePureComponent from 'react-immutable-pure-component';

-//  Mastodon imports.
+//  Mastodon imports  //
 import emojify from '../../../mastodon/emoji';
 import Permalink from '../../../mastodon/components/permalink';
 import AccountContainer from '../../../mastodon/containers/account_container';

-// Our imports.
+// Our imports //
 import NotificationOverlayContainer from '../notification/overlay/container';

-//  * * * * * * *  //
+//  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *

-//  Implementation
-//  --------------
+/*
+
+Implementation:
+---------------
+
+*/

 export default class NotificationFollow extends ImmutablePureComponent {

@@ -35,10 +65,24 @@ export default class NotificationFollow extends ImmutablePureComponent {
    notification         : ImmutablePropTypes.map.isRequired,
  };

+/*
+
+###  `render()`
+
+This actually renders the component.
+
+*/
+
  render () {
    const { account, notification } = this.props;

-    //  Links to the display name.
+/*
+
+`link` is a container for the account's `displayName`, which links to
+the account timeline using a `<Permalink>`.
+
+*/
+
    const displayName = account.get('display_name') || account.get('username');
    const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };
    const link = (
@@ -51,7 +95,12 @@ export default class NotificationFollow extends ImmutablePureComponent {
      />
    );

-    //  Renders.
+/*
+
+We can now render our component.
+
+*/
+
    return (
      <div className='notification notification-follow'>
        <div className='notification__message'>
--- a/app/javascript/glitch/components/notification/overlay/container.js
+++ b/app/javascript/glitch/components/notification/overlay/container.js
@@ -43,7 +43,7 @@ const mapDispatchToProps = dispatch => ({
 });

 const mapStateToProps = state => ({
-  show: state.getIn(['notifications', 'cleaningMode']),
+  revealed: state.getIn(['notifications', 'cleaningMode']),
 });

 export default connect(mapStateToProps, mapDispatchToProps)(NotificationOverlay);
--- a/app/javascript/glitch/components/notification/overlay/notification_overlay.js
+++ b/app/javascript/glitch/components/notification/overlay/notification_overlay.js
@@ -24,7 +24,7 @@ export default class NotificationOverlay extends ImmutablePureComponent {
  static propTypes = {
    notification    : ImmutablePropTypes.map.isRequired,
    onMarkForDelete : PropTypes.func.isRequired,
-    show            : PropTypes.bool.isRequired,
+    revealed        : PropTypes.bool.isRequired,
    intl            : PropTypes.object.isRequired,
  };

@@ -35,27 +35,25 @@ export default class NotificationOverlay extends ImmutablePureComponent {
  }

  render () {
-    const { notification, show, intl } = this.props;
+    const { notification, revealed, intl } = this.props;

    const active = notification.get('markedForDelete');
    const label = intl.formatMessage(messages.markForDeletion);

-    return show ? (
+    return (
      <div
        aria-label={label}
        role='checkbox'
        aria-checked={active}
        tabIndex={0}
-        className={`notification__dismiss-overlay ${active ? 'active' : ''}`}
+        className={`notification__dismiss-overlay ${active ? 'active' : ''} ${revealed ? 'show' : ''}`}
        onClick={this.onToggleMark}
      >
-        <div className='wrappy'>
-          <div className='ckbox' aria-hidden='true' title={label}>
-            {active ? (<i className='fa fa-check' />) : ''}
-          </div>
+        <div className='notification__dismiss-overlay__ckbox' aria-hidden='true' title={label}>
+          {active ? (<i className='fa fa-check' />) : ''}
        </div>
      </div>
-    ) : null;
+    );
  }

 }
--- a/app/javascript/glitch/components/status/action_bar.js
+++ b/app/javascript/glitch/components/status/action_bar.js
@@ -8,7 +8,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 //  Mastodon imports  //
 import RelativeTimestamp from '../../../mastodon/components/relative_timestamp';
 import IconButton from '../../../mastodon/components/icon_button';
-import DropdownMenuContainer from '../../../mastodon/containers/dropdown_menu_container';
+import DropdownMenu from '../../../mastodon/components/dropdown_menu';

 const messages = defineMessages({
  delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -16,7 +16,6 @@ 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' },
@@ -25,9 +24,6 @@ const messages = defineMessages({
  report: { id: 'status.report', defaultMessage: 'Report @{name}' },
  muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
-  pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
-  unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
 });

@injectIntl
@@ -47,9 +43,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
    onMute: PropTypes.func,
    onBlock: PropTypes.func,
    onReport: PropTypes.func,
-    onEmbed: PropTypes.func,
    onMuteConversation: PropTypes.func,
-    onPin: PropTypes.func,
    me: PropTypes.number,
    withDismiss: PropTypes.bool,
    intl: PropTypes.object.isRequired,
@@ -67,13 +61,6 @@ 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);
  }
@@ -86,10 +73,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
    this.props.onDelete(this.props.status);
  }

-  handlePinClick = () => {
-    this.props.onPin(this.props.status);
-  }
-
  handleMentionClick = () => {
    this.props.onMention(this.props.status.get('account'), this.context.router.history);
  }
@@ -106,10 +89,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
    this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
  }

-  handleEmbed = () => {
-    this.props.onEmbed(this.props.status);
-  }
-
  handleReport = () => {
    this.props.onReport(this.props.status);
  }
@@ -120,10 +99,9 @@ export default class StatusActionBar extends ImmutablePureComponent {

  render () {
    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;
-    const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));

    let menu = [];
    let reblogIcon = 'retweet';
@@ -131,23 +109,14 @@ export default class StatusActionBar extends ImmutablePureComponent {
    let replyTitle;

    menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
-
-    if (publicStatus) {
-      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
-    }
-
    menu.push(null);

-    if (status.getIn(['account', 'id']) === me || withDismiss) {
+    if (withDismiss) {
      menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
      menu.push(null);
    }

    if (status.getIn(['account', 'id']) === me) {
-      if (publicStatus) {
-        menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
-      }
-
      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
    } else {
      menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
@@ -157,6 +126,14 @@ export default class StatusActionBar extends ImmutablePureComponent {
      menu.push({ text: intl.formatMessage(messages.report, { name: status.getIn(['account', 'username']) }), action: this.handleReport });
    }

+    /*
+    if (status.get('visibility') === 'direct') {
+      reblogIcon = 'envelope';
+    } else if (status.get('visibility') === 'private') {
+      reblogIcon = 'lock';
+    }
+    */
+
    if (status.get('in_reply_to_id', null) === null) {
      replyIcon = 'reply';
      replyTitle = intl.formatMessage(messages.reply);
@@ -165,19 +142,14 @@ 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 || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? 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')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
-        {shareButton}
+        <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'>
-          <DropdownMenuContainer disabled={anonymousAccess} status={status} items={menu} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />
+          <DropdownMenu items={menu} disabled={anonymousAccess} icon='ellipsis-h' size={18} direction='right' ariaLabel='More' />
        </div>

        <a href={status.get('url')} className='status__relative-time' target='_blank' rel='noopener'><RelativeTimestamp timestamp={status.get('created_at')} /></a>
--- a/app/javascript/glitch/components/status/container.js
+++ b/app/javascript/glitch/components/status/container.js
@@ -38,11 +38,11 @@ import {
  favourite,
  unreblog,
  unfavourite,
-  pin,
-  unpin,
 } from '../../../mastodon/actions/interactions';
-import { blockAccount } from '../../../mastodon/actions/accounts';
-import { initMuteModal } from '../../../mastodon/actions/mutes';
+import {
+  blockAccount,
+  muteAccount,
+} from '../../../mastodon/actions/accounts';
 import {
  muteStatus,
  unmuteStatus,
@@ -80,6 +80,10 @@ const messages = defineMessages({
    id             : 'confirmations.block.confirm',
    defaultMessage : 'Block',
  },
+  muteConfirm : {
+    id             : 'confirmations.mute.confirm',
+    defaultMessage : 'Mute',
+  },
 });

                            /* * * * */
@@ -189,18 +193,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    }
  },

-  onPin (status) {
-    if (status.get('pinned')) {
-      dispatch(unpin(status));
-    } else {
-      dispatch(pin(status));
-    }
-  },
-
-  onEmbed (status) {
-    dispatch(openModal('EMBED', { url: status.get('url') }));
-  },
-
  onDelete (status) {
    if (!this.deleteModal) {
      dispatch(deleteStatus(status.get('id')));
@@ -238,7 +230,11 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
  },

  onMute (account) {
-    dispatch(initMuteModal(account));
+    dispatch(openModal('CONFIRM', {
+      message: <FormattedMessage id='confirmations.mute.message' defaultMessage='Are you sure you want to mute {name}?' values={{ name: <strong>@{account.get('acct')}</strong> }} />,
+      confirm: intl.formatMessage(messages.muteConfirm),
+      onConfirm: () => dispatch(muteAccount(account.get('id'))),
+    }));
  },

  onMuteConversation (status) {
--- a/app/javascript/glitch/components/status/content.js
+++ b/app/javascript/glitch/components/status/content.js
@@ -188,7 +188,7 @@ export default class StatusContent extends React.PureComponent {
      }

      return (
-        <div className={classNames}>
+        <div className={classNames} ref={this.setRef}>
          <p
            style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}
            onMouseDown={this.handleMouseDown}
@@ -205,7 +205,6 @@ export default class StatusContent extends React.PureComponent {

          <div className={`status__content__spoiler ${!hidden ? 'status__content__spoiler--visible' : ''}`}>
            <div
-              ref={this.setRef}
              style={directionStyle}
              onMouseDown={this.handleMouseDown}
              onMouseUp={this.handleMouseUp}
@@ -219,11 +218,11 @@ export default class StatusContent extends React.PureComponent {
    } else if (parseClick) {
      return (
        <div
+          ref={this.setRef}
          className={classNames}
          style={directionStyle}
        >
          <div
-            ref={this.setRef}
            onMouseDown={this.handleMouseDown}
            onMouseUp={this.handleMouseUp}
            dangerouslySetInnerHTML={content}
@@ -234,10 +233,11 @@ export default class StatusContent extends React.PureComponent {
    } else {
      return (
        <div
+          ref={this.setRef}
          className='status__content'
          style={directionStyle}
        >
-          <div ref={this.setRef} dangerouslySetInnerHTML={content} />
+          <div dangerouslySetInnerHTML={content} />
          {media}
        </div>
      );
--- a/app/javascript/glitch/components/status/gallery/item.js
+++ b/app/javascript/glitch/components/status/gallery/item.js
@@ -17,24 +17,6 @@ export default class StatusGalleryItem extends React.PureComponent {
    autoPlayGif: PropTypes.bool.isRequired,
  };

-  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;

@@ -130,8 +112,6 @@ export default class StatusGalleryItem extends React.PureComponent {
            role='application'
            src={attachment.get('url')}
            onClick={this.handleClick}
-            onMouseEnter={this.handleMouseEnter}
-            onMouseLeave={this.handleMouseLeave}
            autoPlay={autoPlay}
            loop
            muted
--- a/app/javascript/glitch/components/status/header.js
+++ b/app/javascript/glitch/components/status/header.js
@@ -9,30 +9,41 @@ component for better documentation and maintainance by

 */

-//  * * * * * * *  //
+                            /* * * * */

-//  Imports
-//  -------
+/*

-//  Package imports.
+Imports:
+--------
+
+*/
+
+//  Package imports  //
 import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl } from 'react-intl';

-//  Mastodon imports.
+//  Mastodon imports  //
 import Avatar from '../../../mastodon/components/avatar';
 import AvatarOverlay from '../../../mastodon/components/avatar_overlay';
 import DisplayName from '../../../mastodon/components/display_name';
 import IconButton from '../../../mastodon/components/icon_button';
 import VisibilityIcon from './visibility_icon';

-//  * * * * * * *  //
+                            /* * * * */

-//  Initial setup
-//  -------------
+/*
+
+Inital setup:
+-------------
+
+The `messages` constant is used to define any messages that we need
+from inside props. In our case, these are the `collapse` and
+`uncollapse` messages used with our collapse/uncollapse buttons.
+
+*/

-//  Messages for use with internationalization stuff.
 const messages = defineMessages({
  collapse: { id: 'status.collapse', defaultMessage: 'Collapse' },
  uncollapse: { id: 'status.uncollapse', defaultMessage: 'Uncollapse' },
@@ -42,10 +53,43 @@ const messages = defineMessages({
  direct: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
 });

-//  * * * * * * *  //
+                            /* * * * */

-//  The component
-//  -------------
+/*
+
+The `<StatusHeader>` component:
+-------------------------------
+
+The `<StatusHeader>` component wraps together the header information
+(avatar, display name) and upper buttons and icons (collapsing, media
+icons) into a single `<header>` element.
+
+###  Props
+
+ -  __`account`, `friend` (`ImmutablePropTypes.map`) :__
+    These give the accounts associated with the status. `account` is
+    the author of the post; `friend` will have their avatar appear
+    in the overlay if provided.
+
+ -  __`mediaIcon` (`PropTypes.string`) :__
+    If a mediaIcon should be placed in the header, this string
+    specifies it.
+
+ -  __`collapsible`, `collapsed` (`PropTypes.bool`) :__
+    These props tell whether a post can be, and is, collapsed.
+
+ -  __`parseClick` (`PropTypes.func`) :__
+    This function will be called when the user clicks inside the header
+    information.
+
+ -  __`setExpansion` (`PropTypes.func`) :__
+    This function is used to set the expansion state of the post.
+
+ -  __`intl` (`PropTypes.object`) :__
+    This is our internationalization object, provided by
+    `injectIntl()`.
+
+*/

@injectIntl
 export default class StatusHeader extends React.PureComponent {
@@ -61,7 +105,18 @@ export default class StatusHeader extends React.PureComponent {
    intl: PropTypes.object.isRequired,
  };

-  //  Handles clicks on collapsed button
+/*
+
+###  Implementation
+
+####  `handleCollapsedClick()`.
+
+`handleCollapsedClick()` is just a simple callback for our collapsing
+button. It calls `setExpansion` to set the collapsed state of the
+status.
+
+*/
+
  handleCollapsedClick = (e) => {
    const { collapsed, setExpansion } = this.props;
    if (e.button === 0) {
@@ -70,13 +125,29 @@ export default class StatusHeader extends React.PureComponent {
    }
  }

-  //  Handles clicks on account name/image
+/*
+
+####  `handleAccountClick()`.
+
+`handleAccountClick()` handles any clicks on the header info. It calls
+`parseClick()` with our `account` as the anticipatory `destination`.
+
+*/
+
  handleAccountClick = (e) => {
    const { status, parseClick } = this.props;
    parseClick(e, `/accounts/${+status.getIn(['account', 'id'])}`);
  }

-  //  Rendering.
+/*
+
+####  `render()`.
+
+`render()` actually puts our element on the screen. `<StatusHeader>`
+has a very straightforward rendering process.
+
+*/
+
  render () {
    const {
      status,
@@ -91,28 +162,16 @@ export default class StatusHeader extends React.PureComponent {

    return (
      <header className='status__info'>
-        <a
-          href={account.get('url')}
-          target='_blank'
-          className='status__avatar'
-          onClick={this.handleAccountClick}
-        >
-          {
-            friend ? (
-              <AvatarOverlay account={account} friend={friend} />
-            ) : (
-              <Avatar account={account} size={48} />
-            )
-          }
-        </a>
-        <a
-          href={account.get('url')}
-          target='_blank'
-          className='status__display-name'
-          onClick={this.handleAccountClick}
-        >
-          <DisplayName account={account} />
-        </a>
+        {
+
+/*
+
+We have to include the status icons before the header content because
+it is rendered as a float.
+
+*/
+
+        }
        <div className='status__info__icons'>
          {mediaIcon ? (
            <i
@@ -138,6 +197,39 @@ export default class StatusHeader extends React.PureComponent {
            />
          ) : null}
        </div>
+        {
+
+/*
+
+This begins our header content. It is all wrapped inside of a link
+which gets handled by `handleAccountClick`. We use an `<AvatarOverlay>`
+if we have a `friend` and a normal `<Avatar>` if we don't.
+
+*/
+
+        }
+        <a
+          href={account.get('url')}
+          target='_blank'
+          className='status__display-name'
+          onClick={this.handleAccountClick}
+        >
+          <div className='status__avatar'>{
+            friend ? (
+              <AvatarOverlay
+                staticSrc={account.get('avatar_static')}
+                overlaySrc={friend.get('avatar_static')}
+              />
+            ) : (
+              <Avatar
+                src={account.get('avatar')}
+                staticSrc={account.get('avatar_static')}
+                size={48}
+              />
+            )
+          }</div>
+          <DisplayName account={account} />
+        </a>

      </header>
    );
--- a/app/javascript/glitch/components/status/index.js
+++ b/app/javascript/glitch/components/status/index.js
@@ -165,13 +165,10 @@ export default class Status extends ImmutablePureComponent {
    onReblog                    : PropTypes.func,
    onModalReblog               : PropTypes.func,
    onDelete                    : PropTypes.func,
-    onPin                       : PropTypes.func,
    onMention                   : PropTypes.func,
    onMute                      : PropTypes.func,
    onMuteConversation          : PropTypes.func,
    onBlock                     : PropTypes.func,
-    onEmbed                     : PropTypes.func,
-    onHeightChange              : PropTypes.func,
    onReport                    : PropTypes.func,
    onOpenMedia                 : PropTypes.func,
    onOpenVideo                 : PropTypes.func,
@@ -667,26 +664,6 @@ backgrounds for collapsed statuses are enabled.
      ) background = attachments.getIn([0, 'preview_url']);
    }

-/*
-
-Here we prepare extra data-* attributes for CSS selectors.
-Users can use those for theming, hiding avatars etc via UserStyle
-
-*/
-
-    const selectorAttribs = {
-      'data-status-by': `@${status.getIn(['account', 'acct'])}`,
-    };
-
-    if (prepend && account) {
-      const notifKind = {
-        favourite: 'favourited',
-        reblog: 'boosted',
-        reblogged_by: 'boosted',
-      }[prepend];
-
-      selectorAttribs[`data-${notifKind}-by`] = `@${account.get('acct')}`;
-    }

 /*

@@ -717,7 +694,6 @@ collapsed.
          ),
        }}
        ref={handleRef}
-        {...selectorAttribs}
      >
        {prepend && account ? (
          <StatusPrepend
--- a/app/javascript/glitch/locales/en.json
+++ b/app/javascript/glitch/locales/en.json
@@ -5,7 +5,6 @@
  "layout.desktop": "Desktop",
  "layout.mobile": "Mobile",
  "navigation_bar.app_settings": "App settings",
-  "getting_started.onboarding": "Show me around",
  "onboarding.page_one.federation": "{domain} is an 'instance' of Mastodon. Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
  "onboarding.page_one.welcome": "Welcome to {domain}!",
  "onboarding.page_six.github": "{domain} runs on Glitchsoc. Glitchsoc is a friendly {fork} of {Mastodon}, and is compatible with any Mastodon instance or app. Glitchsoc is entirely free and open-source. You can report bugs, request features, or contribute to the code on {github}.",
@@ -30,14 +29,5 @@
  "settings.navbar_under": "Navbar at the bottom (Mobile only)",
  "status.collapse": "Collapse",
  "status.uncollapse": "Uncollapse",
-
-  "notification.markForDeletion": "Mark for deletion",
-  "notifications.clear": "Clear all my notifications",
-  "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?",
-  "notifications.marked_clear": "Clear selected notifications",
-
-  "notification_purge.btn_all": "Select\nall",
-  "notification_purge.btn_none": "Select\nnone",
-  "notification_purge.btn_invert": "Invert\nselection",
-  "notification_purge.btn_apply": "Clear\nselected"
+  "notification.markForDeletion": "Mark for deletion"
 }
--- a/app/javascript/glitch/util/bio_metadata.js
+++ b/app/javascript/glitch/util/bio_metadata.js
@@ -74,27 +74,17 @@ functions are:

 \*********************************************************************/

-/*  "u" FLAG COMPATABILITY  */
-
-let compat_mode = false;
-try {
-  new RegExp('.', 'u');
-} catch (e) {
-  compat_mode = true;
-}
-
 /*  CONVENIENCE FUNCTIONS  */

-const unirex = str => compat_mode ? new RegExp(str) : new RegExp(str, 'u');
+const unirex = str => new RegExp(str, 'u');
 const rexstr = exp => '(?:' + exp.source + ')';

 /*  CHARACTER CLASSES  */

 const DOCUMENT_START    = /^/;
 const DOCUMENT_END      = /$/;
-const ALLOWED_CHAR      =  unirex( //  `c-printable` in the YAML 1.2 spec.
-    compat_mode ? '[\t\n\r\x20-\x7e\x85\xa0-\ufffd]' : '[\t\n\r\x20-\x7e\x85\xa0-\ud7ff\ue000-\ufffd\u{10000}-\u{10FFFF}]'
-  );
+const ALLOWED_CHAR      =  //  `c-printable` in the YAML 1.2 spec.
+  /[\t\n\r\x20-\x7e\x85\xa0-\ud7ff\ue000-\ufffd\u{10000}-\u{10FFFF}]/u;
 const WHITE_SPACE       = /[ \t]/;
 const INDENTATION       = / */;  //  Indentation must be only spaces.
 const LINE_BREAK        = /\r?\n|\r|<br\s*\/?>/;
--- a/app/javascript/images/index.svg
+++ b/app/javascript/images/index.svg
@@ -0,0 +1 @@
+<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 39.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 313.82 155.40609 265.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="#3000d4"/><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 299.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 66.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 66.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 100.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#25FF25"/></svg>
--- a/app/javascript/mastodon/actions/accounts.js
+++ b/app/javascript/mastodon/actions/accounts.js
@@ -240,11 +240,11 @@ export function unblockAccountFail(error) {
 };


-export function muteAccount(id, notifications) {
+export function muteAccount(id) {
  return (dispatch, getState) => {
    dispatch(muteAccountRequest(id));

-    api(getState).post(`/api/v1/accounts/${id}/mute`, { notifications }).then(response => {
+    api(getState).post(`/api/v1/accounts/${id}/mute`).then(response => {
      // Pass in entire statuses map so we can use it to filter stuff in different parts of the reducers
      dispatch(muteAccountSuccess(response.data, getState().get('statuses')));
    }).catch(error => {
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -1,12 +1,6 @@
 import api from '../api';
-import emojione from 'emojione';

-import {
-  updateTimeline,
-  refreshHomeTimeline,
-  refreshCommunityTimeline,
-  refreshPublicTimeline,
-} from './timelines';
+import { updateTimeline } from './timelines';

 export const COMPOSE_CHANGE          = 'COMPOSE_CHANGE';
 export const COMPOSE_SUBMIT_REQUEST  = 'COMPOSE_SUBMIT_REQUEST';
@@ -23,7 +17,6 @@ export const COMPOSE_UPLOAD_UNDO     = 'COMPOSE_UPLOAD_UNDO';

 export const COMPOSE_SUGGESTIONS_CLEAR = 'COMPOSE_SUGGESTIONS_CLEAR';
 export const COMPOSE_SUGGESTIONS_READY = 'COMPOSE_SUGGESTIONS_READY';
-export const COMPOSE_SUGGESTIONS_READY_TXT = 'COMPOSE_SUGGESTIONS_READY_TXT';
 export const COMPOSE_SUGGESTION_SELECT = 'COMPOSE_SUGGESTION_SELECT';

 export const COMPOSE_MOUNT   = 'COMPOSE_MOUNT';
@@ -105,20 +98,16 @@ export function submitCompose() {
      dispatch(submitComposeSuccess({ ...response.data }));

      // To make the app more responsive, immediately get the status into the columns
-
-      const insertOrRefresh = (timelineId, refreshAction) => {
-        if (getState().getIn(['timelines', timelineId, 'online'])) {
-          dispatch(updateTimeline(timelineId, { ...response.data }));
-        } else if (getState().getIn(['timelines', timelineId, 'loaded'])) {
-          dispatch(refreshAction());
-        }
-      };
-
-      insertOrRefresh('home', refreshHomeTimeline);
+      dispatch(updateTimeline('home', { ...response.data }));

      if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
-        insertOrRefresh('community', refreshCommunityTimeline);
-        insertOrRefresh('public', refreshPublicTimeline);
+        if (getState().getIn(['timelines', 'community', 'loaded'])) {
+          dispatch(updateTimeline('community', { ...response.data }));
+        }
+
+        if (getState().getIn(['timelines', 'public', 'loaded'])) {
+          dispatch(updateTimeline('public', { ...response.data }));
+        }
      }
    }).catch(function (error) {
      dispatch(submitComposeFail(error));
@@ -213,56 +202,18 @@ export function clearComposeSuggestions() {
  };
 };

-let allShortcodes = null; // cached list of all shortcodes for suggestions
-
 export function fetchComposeSuggestions(token) {
-  let leading = token[0];
-
-  if (leading === '@') {
-    // handle search
-    return (dispatch, getState) => {
-      api(getState).get('/api/v1/accounts/search', {
-        params: {
-          q: token.slice(1), // remove the '@'
-          resolve: false,
-          limit: 4,
-        },
-      }).then(response => {
-        dispatch(readyComposeSuggestions(token, response.data));
-      });
-    };
-  } else if (leading === ':') {
-    // shortcode
-    if (!allShortcodes) {
-      allShortcodes = Object.keys(emojione.emojioneList);
-      // TODO when we have custom emojons merged, add them to this shortcode list
-    }
-    return (dispatch) => {
-      const innertxt = token.slice(1);
-      if (innertxt.length > 1) { // prevent searching single letter, causes lag
-        dispatch(readyComposeSuggestionsTxt(token, allShortcodes.filter((sc) => {
-          return sc.indexOf(innertxt) !== -1;
-        }).sort((a, b) => {
-          if (a.indexOf(token) === 0 && b.indexOf(token) === 0) return a.localeCompare(b);
-          if (a.indexOf(token) === 0) return -1;
-          if (b.indexOf(token) === 0) return 1;
-          return a.localeCompare(b);
-        })));
-      }
-    };
-  } else {
-    // hashtag
-    return (dispatch, getState) => {
-      api(getState).get('/api/v1/search', {
-        params: {
-          q: token,
-          resolve: true,
-        },
-      }).then(response => {
-        dispatch(readyComposeSuggestionsTxt(token, response.data.hashtags.map((ht) => `#${ht}`)));
-      });
-    };
-  }
+  return (dispatch, getState) => {
+    api(getState).get('/api/v1/accounts/search', {
+      params: {
+        q: token,
+        resolve: false,
+        limit: 4,
+      },
+    }).then(response => {
+      dispatch(readyComposeSuggestions(token, response.data));
+    });
+  };
 };

 export function readyComposeSuggestions(token, accounts) {
@@ -273,19 +224,9 @@ export function readyComposeSuggestions(token, accounts) {
  };
 };

-export function readyComposeSuggestionsTxt(token, items) {
-  return {
-    type: COMPOSE_SUGGESTIONS_READY_TXT,
-    token,
-    items,
-  };
-};
-
 export function selectComposeSuggestion(position, token, accountId) {
  return (dispatch, getState) => {
-    const completion = (typeof accountId === 'string') ?
-      accountId.slice(1) : // text suggestion: discard the leading : or # - the replacing code replaces only what follows
-      getState().getIn(['accounts', accountId, 'acct']);
+    const completion = getState().getIn(['accounts', accountId, 'acct']);

    dispatch({
      type: COMPOSE_SUGGESTION_SELECT,
--- a/app/javascript/mastodon/actions/interactions.js
+++ b/app/javascript/mastodon/actions/interactions.js
@@ -24,14 +24,6 @@ export const FAVOURITES_FETCH_REQUEST = 'FAVOURITES_FETCH_REQUEST';
 export const FAVOURITES_FETCH_SUCCESS = 'FAVOURITES_FETCH_SUCCESS';
 export const FAVOURITES_FETCH_FAIL    = 'FAVOURITES_FETCH_FAIL';

-export const PIN_REQUEST = 'PIN_REQUEST';
-export const PIN_SUCCESS = 'PIN_SUCCESS';
-export const PIN_FAIL    = 'PIN_FAIL';
-
-export const UNPIN_REQUEST = 'UNPIN_REQUEST';
-export const UNPIN_SUCCESS = 'UNPIN_SUCCESS';
-export const UNPIN_FAIL    = 'UNPIN_FAIL';
-
 export function reblog(status) {
  return function (dispatch, getState) {
    dispatch(reblogRequest(status));
@@ -241,73 +233,3 @@ export function fetchFavouritesFail(id, error) {
    error,
  };
 };
-
-export function pin(status) {
-  return (dispatch, getState) => {
-    dispatch(pinRequest(status));
-
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/pin`).then(response => {
-      dispatch(pinSuccess(status, response.data));
-    }).catch(error => {
-      dispatch(pinFail(status, error));
-    });
-  };
-};
-
-export function pinRequest(status) {
-  return {
-    type: PIN_REQUEST,
-    status,
-  };
-};
-
-export function pinSuccess(status, response) {
-  return {
-    type: PIN_SUCCESS,
-    status,
-    response,
-  };
-};
-
-export function pinFail(status, error) {
-  return {
-    type: PIN_FAIL,
-    status,
-    error,
-  };
-};
-
-export function unpin (status) {
-  return (dispatch, getState) => {
-    dispatch(unpinRequest(status));
-
-    api(getState).post(`/api/v1/statuses/${status.get('id')}/unpin`).then(response => {
-      dispatch(unpinSuccess(status, response.data));
-    }).catch(error => {
-      dispatch(unpinFail(status, error));
-    });
-  };
-};
-
-export function unpinRequest(status) {
-  return {
-    type: UNPIN_REQUEST,
-    status,
-  };
-};
-
-export function unpinSuccess(status, response) {
-  return {
-    type: UNPIN_SUCCESS,
-    status,
-    response,
-  };
-};
-
-export function unpinFail(status, error) {
-  return {
-    type: UNPIN_FAIL,
-    status,
-    error,
-  };
-};
--- a/app/javascript/mastodon/actions/mutes.js
+++ b/app/javascript/mastodon/actions/mutes.js
@@ -1,6 +1,5 @@
 import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
-import { openModal } from '../../mastodon/actions/modal';

 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
@@ -10,9 +9,6 @@ export const MUTES_EXPAND_REQUEST = 'MUTES_EXPAND_REQUEST';
 export const MUTES_EXPAND_SUCCESS = 'MUTES_EXPAND_SUCCESS';
 export const MUTES_EXPAND_FAIL    = 'MUTES_EXPAND_FAIL';

-export const MUTES_INIT_MODAL = 'MUTES_INIT_MODAL';
-export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS';
-
 export function fetchMutes() {
  return (dispatch, getState) => {
    dispatch(fetchMutesRequest());
@@ -84,20 +80,3 @@ export function expandMutesFail(error) {
    error,
  };
 };
-
-export function initMuteModal(account) {
-  return dispatch => {
-    dispatch({
-      type: MUTES_INIT_MODAL,
-      account,
-    });
-
-    dispatch(openModal('MUTE'));
-  };
-}
-
-export function toggleHideNotifications() {
-  return dispatch => {
-    dispatch({ type: MUTES_TOGGLE_HIDE_NOTIFICATIONS });
-  };
-}
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -10,7 +10,6 @@ export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_DELETE_MARKED_REQUEST = 'NOTIFICATIONS_DELETE_MARKED_REQUEST';
 export const NOTIFICATIONS_DELETE_MARKED_SUCCESS = 'NOTIFICATIONS_DELETE_MARKED_SUCCESS';
 export const NOTIFICATIONS_DELETE_MARKED_FAIL = 'NOTIFICATIONS_DELETE_MARKED_FAIL';
-export const NOTIFICATIONS_MARK_ALL_FOR_DELETE = 'NOTIFICATIONS_MARK_ALL_FOR_DELETE';
 export const NOTIFICATIONS_ENTER_CLEARING_MODE = 'NOTIFICATIONS_ENTER_CLEARING_MODE'; // arg: yes
 // Unmark notifications (when the cleaning mode is left)
 export const NOTIFICATIONS_UNMARK_ALL_FOR_DELETE = 'NOTIFICATIONS_UNMARK_ALL_FOR_DELETE';
@@ -211,11 +210,13 @@ export function deleteMarkedNotifications() {
    });

    if (ids.length === 0) {
+      dispatch(enterNotificationClearingMode(false));
      return;
    }

    api(getState).delete(`/api/v1/notifications/destroy_multiple?ids[]=${ids.join('&ids[]=')}`).then(() => {
      dispatch(deleteMarkedNotificationsSuccess());
+      dispatch(expandNotifications()); // Load more (to fill the empty space)
    }).catch(error => {
      console.error(error);
      dispatch(deleteMarkedNotificationsFail(error));
@@ -230,13 +231,6 @@ export function enterNotificationClearingMode(yes) {
  };
 };

-export function markAllNotifications(yes) {
-  return {
-    type: NOTIFICATIONS_MARK_ALL_FOR_DELETE,
-    yes: yes, // true, false or null. null = invert
-  };
-};
-
 export function deleteMarkedNotificationsRequest() {
  return {
    type: NOTIFICATIONS_DELETE_MARKED_REQUEST,
--- a/app/javascript/mastodon/actions/pin_statuses.js
+++ b/app/javascript/mastodon/actions/pin_statuses.js
@@ -1,39 +0,0 @@
-import api from '../api';
-
-export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
-export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
-export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';
-
-export function fetchPinnedStatuses() {
-  return (dispatch, getState) => {
-    dispatch(fetchPinnedStatusesRequest());
-
-    const accountId = getState().getIn(['meta', 'me']);
-    api(getState).get(`/api/v1/accounts/${accountId}/statuses`, { params: { pinned: true } }).then(response => {
-      dispatch(fetchPinnedStatusesSuccess(response.data, null));
-    }).catch(error => {
-      dispatch(fetchPinnedStatusesFail(error));
-    });
-  };
-};
-
-export function fetchPinnedStatusesRequest() {
-  return {
-    type: PINNED_STATUSES_FETCH_REQUEST,
-  };
-};
-
-export function fetchPinnedStatusesSuccess(statuses, next) {
-  return {
-    type: PINNED_STATUSES_FETCH_SUCCESS,
-    statuses,
-    next,
-  };
-};
-
-export function fetchPinnedStatusesFail(error) {
-  return {
-    type: PINNED_STATUSES_FETCH_FAIL,
-    error,
-  };
-};
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -23,9 +23,6 @@ export const STATUS_UNMUTE_REQUEST = 'STATUS_UNMUTE_REQUEST';
 export const STATUS_UNMUTE_SUCCESS = 'STATUS_UNMUTE_SUCCESS';
 export const STATUS_UNMUTE_FAIL    = 'STATUS_UNMUTE_FAIL';

-export const STATUS_SET_HEIGHT = 'STATUS_SET_HEIGHT';
-export const STATUSES_CLEAR_HEIGHT = 'STATUSES_CLEAR_HEIGHT';
-
 export function fetchStatusRequest(id, skipLoading) {
  return {
    type: STATUS_FETCH_REQUEST,
@@ -218,17 +215,3 @@ export function unmuteStatusFail(id, error) {
    error,
  };
 };
-
-export function setStatusHeight (id, height) {
-  return {
-    type: STATUS_SET_HEIGHT,
-    id,
-    height,
-  };
-};
-
-export function clearStatusesHeight () {
-  return {
-    type: STATUSES_CLEAR_HEIGHT,
-  };
-};
--- a/app/javascript/mastodon/actions/streaming.js
+++ b/app/javascript/mastodon/actions/streaming.js
@@ -1,94 +0,0 @@
-import createStream from '../stream';
-import {
-  updateTimeline,
-  deleteFromTimelines,
-  refreshHomeTimeline,
-  connectTimeline,
-  disconnectTimeline,
-} from './timelines';
-import { updateNotifications, refreshNotifications } from './notifications';
-import { getLocale } from '../locales';
-
-const { messages } = getLocale();
-
-export function connectTimelineStream (timelineId, path, pollingRefresh = null) {
-  return (dispatch, getState) => {
-    const streamingAPIBaseURL = getState().getIn(['meta', 'streaming_api_base_url']);
-    const accessToken = getState().getIn(['meta', 'access_token']);
-    const locale = getState().getIn(['meta', 'locale']);
-    let polling = null;
-
-    const setupPolling = () => {
-      polling = setInterval(() => {
-        pollingRefresh(dispatch);
-      }, 20000);
-    };
-
-    const clearPolling = () => {
-      if (polling) {
-        clearInterval(polling);
-        polling = null;
-      }
-    };
-
-    const subscription = createStream(streamingAPIBaseURL, accessToken, path, {
-
-      connected () {
-        if (pollingRefresh) {
-          clearPolling();
-        }
-        dispatch(connectTimeline(timelineId));
-      },
-
-      disconnected () {
-        if (pollingRefresh) {
-          setupPolling();
-        }
-        dispatch(disconnectTimeline(timelineId));
-      },
-
-      received (data) {
-        switch(data.event) {
-        case 'update':
-          dispatch(updateTimeline(timelineId, JSON.parse(data.payload)));
-          break;
-        case 'delete':
-          dispatch(deleteFromTimelines(data.payload));
-          break;
-        case 'notification':
-          dispatch(updateNotifications(JSON.parse(data.payload), messages, locale));
-          break;
-        }
-      },
-
-      reconnected () {
-        if (pollingRefresh) {
-          clearPolling();
-          pollingRefresh(dispatch);
-        }
-        dispatch(connectTimeline(timelineId));
-      },
-
-    });
-
-    const disconnect = () => {
-      if (subscription) {
-        subscription.close();
-      }
-      clearPolling();
-    };
-
-    return disconnect;
-  };
-}
-
-function refreshHomeTimelineAndNotification (dispatch) {
-  dispatch(refreshHomeTimeline());
-  dispatch(refreshNotifications());
-}
-
-export const connectUserStream = () => connectTimelineStream('home', 'user', refreshHomeTimelineAndNotification);
-export const connectCommunityStream = () => connectTimelineStream('community', 'public:local');
-export const connectMediaStream = () => connectTimelineStream('community', 'public:local');
-export const connectPublicStream = () => connectTimelineStream('public', 'public');
-export const connectHashtagStream = (tag) => connectTimelineStream(`hashtag:${tag}`, `hashtag&tag=${tag}`);
--- a/app/javascript/mastodon/components/account.js
+++ b/app/javascript/mastodon/components/account.js
@@ -14,8 +14,6 @@ const messages = defineMessages({
  requested: { id: 'account.requested', defaultMessage: 'Awaiting approval' },
  unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
  unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
-  mute_notifications: { id: 'account.mute_notifications', defaultMessage: 'You are not currently muting notifications from @{name}. Click to mute notifications' },
-  unmute_notifications: { id: 'account.unmute_notifications', defaultMessage: 'You are currently muting notifications from @{name}. Click to unmute notifications' },
 });

@injectIntl
@@ -28,7 +26,6 @@ export default class Account extends ImmutablePureComponent {
    onBlock: PropTypes.func.isRequired,
    onMute: PropTypes.func.isRequired,
    intl: PropTypes.object.isRequired,
-    hidden: PropTypes.bool,
  };

  handleFollow = () => {
@@ -43,30 +40,13 @@ export default class Account extends ImmutablePureComponent {
    this.props.onMute(this.props.account);
  }

-  handleMuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, true);
-  }
-
-  handleUnmuteNotifications = () => {
-    this.props.onMuteNotifications(this.props.account, false);
-  }
-
  render () {
-    const { account, me, intl, hidden } = this.props;
+    const { account, me, intl } = this.props;

    if (!account) {
      return <div />;
    }

-    if (hidden) {
-      return (
-        <div>
-          {account.get('display_name')}
-          {account.get('username')}
-        </div>
-      );
-    }
-
    let buttons;

    if (account.get('id') !== me && account.get('relationship', null) !== null) {
@@ -80,18 +60,7 @@ export default class Account extends ImmutablePureComponent {
      } else if (blocking) {
        buttons = <IconButton active icon='unlock-alt' title={intl.formatMessage(messages.unblock, { name: account.get('username') })} onClick={this.handleBlock} />;
      } else if (muting) {
-        let hidingNotificationsButton;
-        if (muting.get('notifications')) {
-          hidingNotificationsButton = <IconButton active icon='bell' title={intl.formatMessage(messages.unmute_notifications, { name: account.get('username')  })} onClick={this.handleUnmuteNotifications} />;
-        } else {
-          hidingNotificationsButton = <IconButton active icon='bell-slash' title={intl.formatMessage(messages.mute_notifications, { name: account.get('username')  })} onClick={this.handleMuteNotifications} />;
-        }
-        buttons = (
-          <div>
-            <IconButton active icon='volume-up' title={intl.formatMessage(messages.unmute, { name: account.get('username') })} onClick={this.handleMute} />
-            {hidingNotificationsButton}
-          </div>
-        );
+        buttons = <IconButton active icon='volume-up' title={intl.formatMessage(messages.unmute, { name: account.get('username') })} onClick={this.handleMute} />;
      } else {
        buttons = <IconButton icon={following ? 'user-times' : 'user-plus'} title={intl.formatMessage(following ? messages.unfollow : messages.follow)} onClick={this.handleFollow} active={following} />;
      }
@@ -101,7 +70,7 @@ export default class Account extends ImmutablePureComponent {
      <div className='account'>
        <div className='account__wrapper'>
          <Permalink key={account.get('id')} className='account__display-name' href={account.get('url')} to={`/accounts/${account.get('id')}`}>
-            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <div className='account__avatar-wrapper'><Avatar src={account.get('avatar')} staticSrc={account.get('avatar_static')} size={36} /></div>
            <DisplayName account={account} />
          </Permalink>

--- a/app/javascript/mastodon/components/autosuggest_textarea.js
+++ b/app/javascript/mastodon/components/autosuggest_textarea.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import AutosuggestAccountContainer from '../features/compose/containers/autosuggest_account_container';
-import AutosuggestShortcode from '../features/compose/components/autosuggest_shortcode';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import { isRtl } from '../rtl';
@@ -19,12 +18,11 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
    word = str.slice(left, right + caretPosition);
  }

-  if (!word || word.trim().length < 2 || ['@', ':', '#'].indexOf(word[0]) === -1) {
+  if (!word || word.trim().length < 2 || word[0] !== '@') {
    return [null, null];
  }

-  word = word.trim().toLowerCase();
-  // was: .slice(1); - we leave the leading char there, handler can decide what to do based on it
+  word = word.trim().toLowerCase().slice(1);

  if (word.length > 0) {
    return [left + 1, word];
@@ -43,7 +41,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
    onSuggestionSelected: PropTypes.func.isRequired,
    onSuggestionsClearRequested: PropTypes.func.isRequired,
    onSuggestionsFetchRequested: PropTypes.func.isRequired,
-    onLocalSuggestionsFetchRequested: PropTypes.func.isRequired,
    onChange: PropTypes.func.isRequired,
    onKeyUp: PropTypes.func,
    onKeyDown: PropTypes.func,
@@ -67,13 +64,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {

    if (token !== null && this.state.lastToken !== token) {
      this.setState({ lastToken: token, selectedSuggestion: 0, tokenStart });
-      if (token[0] === ':') {
-        // faster debounce for shortcodes.
-        // hashtags have long debounce because they're fetched from server.
-        this.props.onLocalSuggestionsFetchRequested(token);
-      } else {
-        this.props.onSuggestionsFetchRequested(token);
-      }
+      this.props.onSuggestionsFetchRequested(token);
    } else if (token === null) {
      this.setState({ lastToken: null });
      this.props.onSuggestionsClearRequested();
@@ -137,9 +128,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
  }

  onSuggestionClick = (e) => {
-    // leave suggestion string unchanged if it's a hash / shortcode suggestion. convert account number to int.
-    const suggestionStr = e.currentTarget.getAttribute('data-index');
-    const suggestion = [':', '#'].indexOf(suggestionStr[0]) !== -1 ? suggestionStr : Number(suggestionStr);
+    const suggestion = Number(e.currentTarget.getAttribute('data-index'));
    e.preventDefault();
    this.props.onSuggestionSelected(this.state.tokenStart, this.state.lastToken, suggestion);
    this.textarea.focus();
@@ -162,15 +151,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
    }
  }

-  componentDidUpdate () {
-    if (this.refs.selected) {
-      if (this.refs.selected.scrollIntoViewIfNeeded)
-        this.refs.selected.scrollIntoViewIfNeeded();
-      else
-        this.refs.selected.scrollIntoView({ behavior: 'auto', block: 'nearest' });
-    }
-  }
-
  render () {
    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus } = this.props;
    const { suggestionsHidden, selectedSuggestion } = this.state;
@@ -180,38 +160,26 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
      style.direction = 'rtl';
    }

-    let makeItem = (suggestion) => {
-      if (suggestion[0] === ':') return <AutosuggestShortcode shortcode={suggestion} />;
-      if (suggestion[0] === '#') return suggestion; // hashtag
-
-      // else - accounts are always returned as IDs with no prefix
-      return <AutosuggestAccountContainer id={suggestion} />;
-    };
-
    return (
      <div className='autosuggest-textarea'>
-        <label>
-          <span style={{ display: 'none' }}>{placeholder}</span>
-          <Textarea
-            inputRef={this.setTextarea}
-            className='autosuggest-textarea__textarea'
-            disabled={disabled}
-            placeholder={placeholder}
-            autoFocus={autoFocus}
-            value={value}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown}
-            onKeyUp={onKeyUp}
-            onBlur={this.onBlur}
-            onPaste={this.onPaste}
-            style={style}
-          />
-        </label>
+        <Textarea
+          inputRef={this.setTextarea}
+          className='autosuggest-textarea__textarea'
+          disabled={disabled}
+          placeholder={placeholder}
+          autoFocus={autoFocus}
+          value={value}
+          onChange={this.onChange}
+          onKeyDown={this.onKeyDown}
+          onKeyUp={onKeyUp}
+          onBlur={this.onBlur}
+          onPaste={this.onPaste}
+          style={style}
+        />

        <div className={`autosuggest-textarea__suggestions ${suggestionsHidden || suggestions.isEmpty() ? '' : 'autosuggest-textarea__suggestions--visible'}`}>
          {suggestions.map((suggestion, i) => (
            <div
-              ref={i === selectedSuggestion ? 'selected' : null}
              role='button'
              tabIndex='0'
              key={suggestion}
@@ -219,7 +187,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
              className={`autosuggest-textarea__suggestions__item ${i === selectedSuggestion ? 'selected' : ''}`}
              onMouseDown={this.onSuggestionClick}
            >
-              {makeItem(suggestion)}
+              <AutosuggestAccountContainer id={suggestion} />
            </div>
          ))}
        </div>
--- a/app/javascript/mastodon/components/avatar.js
+++ b/app/javascript/mastodon/components/avatar.js
@@ -1,11 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import ImmutablePropTypes from 'react-immutable-proptypes';

 export default class Avatar extends React.PureComponent {

  static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
+    src: PropTypes.string.isRequired,
+    staticSrc: PropTypes.string,
    size: PropTypes.number.isRequired,
    style: PropTypes.object,
    animate: PropTypes.bool,
@@ -33,12 +33,9 @@ export default class Avatar extends React.PureComponent {
  }

  render () {
-    const { account, size, animate, inline } = this.props;
+    const { src, size, staticSrc, animate, inline } = this.props;
    const { hovering } = this.state;

-    const src = account.get('avatar');
-    const staticSrc = account.get('avatar_static');
-
    let className = 'account__avatar';

    if (inline) {
@@ -64,7 +61,6 @@ export default class Avatar extends React.PureComponent {
        onMouseEnter={this.handleMouseEnter}
        onMouseLeave={this.handleMouseLeave}
        style={style}
-        data-avatar-of={`@${account.get('acct')}`}
      />
    );
  }
--- a/app/javascript/mastodon/components/avatar_overlay.js
+++ b/app/javascript/mastodon/components/avatar_overlay.js
@@ -1,28 +1,28 @@
 import React from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
+import PropTypes from 'prop-types';

 export default class AvatarOverlay extends React.PureComponent {

  static propTypes = {
-    account: ImmutablePropTypes.map.isRequired,
-    friend: ImmutablePropTypes.map.isRequired,
+    staticSrc: PropTypes.string.isRequired,
+    overlaySrc: PropTypes.string.isRequired,
  };

  render() {
-    const { account, friend } = this.props;
+    const { staticSrc, overlaySrc } = this.props;

    const baseStyle = {
-      backgroundImage: `url(${account.get('avatar_static')})`,
+      backgroundImage: `url(${staticSrc})`,
    };

    const overlayStyle = {
-      backgroundImage: `url(${friend.get('avatar_static')})`,
+      backgroundImage: `url(${overlaySrc})`,
    };

    return (
      <div className='account__avatar-overlay'>
-        <div className='account__avatar-overlay-base' style={baseStyle} data-avatar-of={`@${account.get('acct')}`} />
-        <div className='account__avatar-overlay-overlay' style={overlayStyle} data-avatar-of={`@${friend.get('acct')}`} />
+        <div className='account__avatar-overlay-base' style={baseStyle} />
+        <div className='account__avatar-overlay-overlay' style={overlayStyle} />
      </div>
    );
  }
--- a/app/javascript/mastodon/components/column.js
+++ b/app/javascript/mastodon/components/column.js
@@ -1,13 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import detectPassiveEvents from 'detect-passive-events';
-import { scrollTop } from '../scroll';
+import scrollTop from '../scroll';

 export default class Column extends React.PureComponent {

  static propTypes = {
    children: PropTypes.node,
-    extraClasses: PropTypes.string,
  };

  scrollTop () {
@@ -33,7 +32,7 @@ export default class Column extends React.PureComponent {
  }

  componentDidMount () {
-    this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents.hasSupport ? { passive: true } : false);
+    this.node.addEventListener('wheel', this.handleWheel,  detectPassiveEvents ? { passive: true } : false);
  }

  componentWillUnmount () {
@@ -41,10 +40,10 @@ export default class Column extends React.PureComponent {
  }

  render () {
-    const { children, extraClasses } = this.props;
+    const { children } = this.props;

    return (
-      <div role='region' className={`column ${extraClasses || ''}`} ref={this.setRef}>
+      <div role='region' className='column' ref={this.setRef}>
        {children}
      </div>
    );
--- a/app/javascript/mastodon/components/column_back_button.js
+++ b/app/javascript/mastodon/components/column_back_button.js
@@ -19,10 +19,10 @@ export default class ColumnBackButton extends React.PureComponent {

  render () {
    return (
-      <button onClick={this.handleClick} className='column-back-button'>
+      <div role='button' tabIndex='0' onClick={this.handleClick} className='column-back-button'>
        <i className='fa fa-fw fa-chevron-left column-back-button__icon' />
        <FormattedMessage id='column_back_button.label' defaultMessage='Back' />
-      </button>
+      </div>
    );
  }

--- a/app/javascript/mastodon/components/column_header.js
+++ b/app/javascript/mastodon/components/column_header.js
@@ -8,11 +8,8 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import NotificationPurgeButtonsContainer from '../../glitch/components/column/notif_cleaning_widget/container';

 const messages = defineMessages({
-  show: { id: 'column_header.show_settings', defaultMessage: 'Show settings' },
-  hide: { id: 'column_header.hide_settings', defaultMessage: 'Hide settings' },
-  moveLeft: { id: 'column_header.moveLeft_settings', defaultMessage: 'Move column to the left' },
-  moveRight: { id: 'column_header.moveRight_settings', defaultMessage: 'Move column to the right' },
-  enterNotifCleaning : { id: 'notification_purge.start', defaultMessage: 'Enter notification cleaning mode' },
+  titleNotifClearing: { id: 'column.notifications_clearing', defaultMessage: 'Dismiss selected notifications:' },
+  titleNotifClearingShort: { id: 'column.notifications_clearing_short', defaultMessage: 'Dismiss selected:' },
 });

@injectIntl
@@ -23,17 +20,14 @@ export default class ColumnHeader extends React.PureComponent {
  };

  static propTypes = {
-    intl: PropTypes.object.isRequired,
    title: PropTypes.node.isRequired,
    icon: PropTypes.string.isRequired,
    active: PropTypes.bool,
    localSettings : ImmutablePropTypes.map,
    multiColumn: PropTypes.bool,
-    focusable: PropTypes.bool,
    showBackButton: PropTypes.bool,
    notifCleaning: PropTypes.bool, // true only for the notification column
    notifCleaningActive: PropTypes.bool,
-    onEnterCleaningMode: PropTypes.func,
    children: PropTypes.node,
    pinned: PropTypes.bool,
    onPin: PropTypes.func,
@@ -42,14 +36,9 @@ export default class ColumnHeader extends React.PureComponent {
    intl: PropTypes.object.isRequired,
  };

-  static defaultProps = {
-    focusable: true,
-  }
-
  state = {
    collapsed: true,
    animating: false,
-    animatingNCD: false,
  };

  handleToggleClick = (e) => {
@@ -82,20 +71,16 @@ export default class ColumnHeader extends React.PureComponent {
    this.setState({ animating: false });
  }

-  handleTransitionEndNCD = () => {
-    this.setState({ animatingNCD: false });
-  }
-
-  onEnterCleaningMode = () => {
-    this.setState({ animatingNCD: true });
-    this.props.onEnterCleaningMode(!this.props.notifCleaningActive);
-  }
-
  render () {
-    const { intl, icon, active, children, pinned, onPin, multiColumn, focusable, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props;
-    const { collapsed, animating, animatingNCD } = this.state;
+    const { intl, icon, active, children, pinned, onPin, multiColumn, showBackButton, notifCleaning, localSettings } = this.props;
+    const { collapsed, animating } = this.state;

    let title = this.props.title;
+    if (notifCleaning && this.props.notifCleaningActive) {
+      title = intl.formatMessage(localSettings.getIn(['stretch']) ?
+        messages.titleNotifClearing :
+        messages.titleNotifClearingShort);
+    }

    const wrapperClassName = classNames('column-header__wrapper', {
      'active': active,
@@ -114,20 +99,8 @@ export default class ColumnHeader extends React.PureComponent {
      'active': !collapsed,
    });

-    const notifCleaningButtonClassName = classNames('column-header__button', {
-      'active': notifCleaningActive,
-    });
-
-    const notifCleaningDrawerClassName = classNames('ncd column-header__collapsible', {
-      'collapsed': !notifCleaningActive,
-      'animating': animatingNCD,
-    });
-
    let extraContent, pinButton, moveButtons, backButton, collapseButton;

-    //*glitch
-    const msgEnterNotifCleaning = intl.formatMessage(messages.enterNotifCleaning);
-
    if (children) {
      extraContent = (
        <div key='extra-content' className='column-header__collapsible__extra'>
@@ -141,8 +114,8 @@ export default class ColumnHeader extends React.PureComponent {

      moveButtons = (
        <div key='move-buttons' className='column-header__setting-arrows'>
-          <button title={formatMessage(messages.moveLeft)} aria-label={formatMessage(messages.moveLeft)} className='text-btn column-header__setting-btn' onClick={this.handleMoveLeft}><i className='fa fa-chevron-left' /></button>
-          <button title={formatMessage(messages.moveRight)} aria-label={formatMessage(messages.moveRight)} className='text-btn column-header__setting-btn' onClick={this.handleMoveRight}><i className='fa fa-chevron-right' /></button>
+          <button className='text-btn column-header__setting-btn' onClick={this.handleMoveLeft}><i className='fa fa-chevron-left' /></button>
+          <button className='text-btn column-header__setting-btn' onClick={this.handleMoveRight}><i className='fa fa-chevron-right' /></button>
        </div>
      );
    } else if (multiColumn) {
@@ -168,39 +141,23 @@ export default class ColumnHeader extends React.PureComponent {
    }

    if (children || multiColumn) {
-      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>;
+      collapseButton = <button className={collapsibleButtonClassName} onClick={this.handleToggleClick}><i className='fa fa-sliders' /></button>;
    }

    return (
      <div className={wrapperClassName}>
-        <h1 tabIndex={focusable && '0'} role='button' className={buttonClassName} aria-label={title} onClick={this.handleTitleClick}>
+        <div role='button heading' tabIndex='0' className={buttonClassName} onClick={this.handleTitleClick}>
          <i className={`fa fa-fw fa-${icon} column-header__icon`} />
          {title}
+
          <div className='column-header__buttons'>
+            {notifCleaning ? (<NotificationPurgeButtonsContainer />) : null}
            {backButton}
-            { notifCleaning ? (
-              <button
-                aria-label={msgEnterNotifCleaning}
-                title={msgEnterNotifCleaning}
-                onClick={this.onEnterCleaningMode}
-                className={notifCleaningButtonClassName}
-              >
-                <i className='fa fa-eraser' />
-              </button>
-            ) : null}
            {collapseButton}
          </div>
-        </h1>
+        </div>

-        { notifCleaning ? (
-          <div className={notifCleaningDrawerClassName} onTransitionEnd={this.handleTransitionEndNCD}>
-            <div className='column-header__collapsible-inner nopad-drawer'>
-              {(notifCleaningActive || animatingNCD) ? (<NotificationPurgeButtonsContainer />) : null }
-            </div>
-          </div>
-        ) : null}
-
-        <div className={collapsibleClassName} tabIndex={collapsed && -1} onTransitionEnd={this.handleTransitionEnd}>
+        <div className={collapsibleClassName} onTransitionEnd={this.handleTransitionEnd}>
          <div className='column-header__collapsible-inner'>
            {(!collapsed || animating) && collapsedContent}
          </div>
--- a/app/javascript/mastodon/components/display_name.js
+++ b/app/javascript/mastodon/components/display_name.js
@@ -1,5 +1,7 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import escapeTextContentForBrowser from 'escape-html';
+import emojify from '../emoji';

 export default class DisplayName extends React.PureComponent {

@@ -8,11 +10,12 @@ export default class DisplayName extends React.PureComponent {
  };

  render () {
-    const displayNameHtml = { __html: this.props.account.get('display_name_html') };
+    const displayName     = this.props.account.get('display_name').length === 0 ? this.props.account.get('username') : this.props.account.get('display_name');
+    const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };

    return (
      <span className='display-name'>
-        <strong className='display-name__html' dangerouslySetInnerHTML={displayNameHtml} /> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
+        <strong className='display-name__html' dangerouslySetInnerHTML={displayNameHTML} /> <span className='display-name__account'>@{this.props.account.get('acct')}</span>
      </span>
    );
  }
--- a/app/javascript/mastodon/components/dropdown_menu.js
+++ b/app/javascript/mastodon/components/dropdown_menu.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
 import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown';
 import PropTypes from 'prop-types';

@@ -10,23 +9,16 @@ export default class DropdownMenu extends React.PureComponent {
  };

  static propTypes = {
-    isUserTouching: PropTypes.func,
-    isModalOpen: PropTypes.bool.isRequired,
-    onModalOpen: PropTypes.func,
-    onModalClose: PropTypes.func,
    icon: PropTypes.string.isRequired,
    items: PropTypes.array.isRequired,
    size: PropTypes.number.isRequired,
    direction: PropTypes.string,
-    status: ImmutablePropTypes.map,
    ariaLabel: PropTypes.string,
    disabled: PropTypes.bool,
  };

  static defaultProps = {
    ariaLabel: 'Menu',
-    isModalOpen: false,
-    isUserTouching: () => false,
  };

  state = {
@@ -42,10 +34,6 @@ export default class DropdownMenu extends React.PureComponent {
    const i = Number(e.currentTarget.getAttribute('data-index'));
    const { action, to } = this.props.items[i];

-    if (this.props.isModalOpen) {
-      this.props.onModalClose();
-    }
-
    // Don't call e.preventDefault() when the item uses 'href' property.
    // ex. "Edit profile" on the account action bar

@@ -60,32 +48,10 @@ export default class DropdownMenu extends React.PureComponent {
    this.dropdown.hide();
  }

-  handleShow = () => {
-    if (this.props.isUserTouching()) {
-      this.props.onModalOpen({
-        status: this.props.status,
-        actions: this.props.items,
-        onClick: this.handleClick,
-      });
-    } else {
-      this.setState({ expanded: true });
-    }
-  }
+  handleShow = () => this.setState({ expanded: true })

  handleHide = () => this.setState({ expanded: false })

-  handleToggle = (e) => {
-    if (e.key === 'Enter') {
-      if (this.props.isUserTouching()) {
-        this.handleShow();
-      } else {
-        this.setState({ expanded: !this.state.expanded });
-      }
-    } else if (e.key === 'Escape') {
-      this.setState({ expanded: false });
-    }
-  }
-
  renderItem = (item, i) => {
    if (item === null) {
      return <li key={`sep-${i}`} className='dropdown__sep' />;
@@ -95,7 +61,7 @@ export default class DropdownMenu extends React.PureComponent {

    return (
      <li className='dropdown__content-list-item' key={`${text}-${i}`}>
-        <a href={href} target='_blank' rel='noopener' role='button' tabIndex='0' autoFocus={i === 0} onClick={this.handleClick} data-index={i} className='dropdown__content-list-link'>
+        <a href={href} target='_blank' rel='noopener' onClick={this.handleClick} data-index={i} className='dropdown__content-list-link'>
          {text}
        </a>
      </li>
@@ -105,7 +71,6 @@ export default class DropdownMenu extends React.PureComponent {
  render () {
    const { icon, items, size, direction, ariaLabel, disabled } = this.props;
    const { expanded }   = this.state;
-    const isUserTouching = this.props.isUserTouching();
    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`;
@@ -119,26 +84,20 @@ export default class DropdownMenu extends React.PureComponent {
    }

    const dropdownItems = expanded && (
-      <ul role='group' className='dropdown__content-list' onClick={this.handleHide}>
+      <ul className='dropdown__content-list'>
        {items.map(this.renderItem)}
      </ul>
    );

-    // No need to render the actual dropdown if we use the modal. If we
-    // don't render anything <Dropdow /> breaks, so we just put an empty div.
-    const dropdownContent = !isUserTouching ? (
-      <DropdownContent className={directionClass} >
-        {dropdownItems}
-      </DropdownContent>
-    ) : <div />;
-
    return (
-      <Dropdown ref={this.setRef} active={isUserTouching ? false : expanded} onShow={this.handleShow} onHide={this.handleHide}>
-        <DropdownTrigger className='icon-button' style={iconStyle} role='button' aria-expanded={expanded} onKeyDown={this.handleToggle} tabIndex='0' aria-label={ariaLabel}>
+      <Dropdown ref={this.setRef} onShow={this.handleShow} onHide={this.handleHide}>
+        <DropdownTrigger className='icon-button' style={iconStyle} aria-label={ariaLabel}>
          <i className={iconClassname} aria-hidden />
        </DropdownTrigger>

-        {dropdownContent}
+        <DropdownContent className={directionClass}>
+          {dropdownItems}
+        </DropdownContent>
      </Dropdown>
    );
  }
--- a/app/javascript/mastodon/components/icon_button.js
+++ b/app/javascript/mastodon/components/icon_button.js
@@ -12,8 +12,6 @@ export default class IconButton extends React.PureComponent {
    onClick: PropTypes.func,
    size: PropTypes.number,
    active: PropTypes.bool,
-    pressed: PropTypes.bool,
-    expanded: PropTypes.bool,
    style: PropTypes.object,
    activeStyle: PropTypes.object,
    disabled: PropTypes.bool,
@@ -21,7 +19,6 @@ export default class IconButton extends React.PureComponent {
    animate: PropTypes.bool,
    flip: PropTypes.bool,
    overlay: PropTypes.bool,
-    tabIndex: PropTypes.string,
  };

  static defaultProps = {
@@ -30,7 +27,6 @@ export default class IconButton extends React.PureComponent {
    disabled: false,
    animate: false,
    overlay: false,
-    tabIndex: '0',
  };

  handleClick = (e) =>  {
@@ -73,33 +69,15 @@ export default class IconButton extends React.PureComponent {
      classes.push(this.props.className);
    }

-    const flipDeg = this.props.flip ? -180 : -360;
-    const rotateDeg = this.props.active ? flipDeg : 0;
-
-    const motionDefaultStyle = {
-      rotate: rotateDeg,
-    };
-
-    const springOpts = {
-      stiffness: this.props.flip ? 60 : 120,
-      damping: 7,
-    };
-    const motionStyle = {
-      rotate: this.props.animate ? spring(rotateDeg, springOpts) : 0,
-    };
-
    return (
-      <Motion defaultStyle={motionDefaultStyle} style={motionStyle}>
+      <Motion defaultStyle={{ rotate: this.props.active ? (this.props.flip ? -180 : -360) : 0 }} style={{ rotate: this.props.animate ? spring(this.props.active ? (this.props.flip ? -180 : -360) : 0, { stiffness: this.props.flip ? 60 : 120, damping: 7 }) : 0 }}>
        {({ rotate }) =>
          <button
            aria-label={this.props.title}
-            aria-pressed={this.props.pressed}
-            aria-expanded={this.props.expanded}
            title={this.props.title}
            className={classes.join(' ')}
            onClick={this.handleClick}
            style={style}
-            tabIndex={this.props.tabIndex}
          >
            <i style={{ transform: `rotate(${rotate}deg)` }} className={`fa fa-fw fa-${this.props.icon}`} aria-hidden='true' />
          </button>
--- a/app/javascript/mastodon/components/intersection_observer_article.js
+++ b/app/javascript/mastodon/components/intersection_observer_article.js
@@ -1,122 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import scheduleIdleTask from '../features/ui/util/schedule_idle_task';
-import getRectFromEntry from '../features/ui/util/get_rect_from_entry';
-
-export default class IntersectionObserverArticle extends ImmutablePureComponent {
-
-  static propTypes = {
-    intersectionObserverWrapper: PropTypes.object,
-    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    index: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    listLength: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-    children: PropTypes.node,
-  };
-
-  state = {
-    isHidden: false, // set to true in requestIdleCallback to trigger un-render
-  }
-
-  shouldComponentUpdate (nextProps, nextState) {
-    if (!nextState.isIntersecting && nextState.isHidden) {
-      // It's only if we're not intersecting (i.e. offscreen) and isHidden is true
-      // that either "isIntersecting" or "isHidden" matter, and then they're
-      // the only things that matter (and updated ARIA attributes).
-      return this.state.isIntersecting || !this.state.isHidden || nextProps.listLength !== this.props.listLength;
-    } else if (nextState.isIntersecting && !this.state.isIntersecting) {
-      // If we're going from a non-intersecting state to an intersecting state,
-      // (i.e. offscreen to onscreen), then we definitely need to re-render
-      return true;
-    }
-    // Otherwise, diff based on "updateOnProps" and "updateOnStates"
-    return super.shouldComponentUpdate(nextProps, nextState);
-  }
-
-  componentDidMount () {
-    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.observe(
-      this.props.id,
-      this.node,
-      this.handleIntersection
-    );
-
-    this.componentMounted = true;
-  }
-
-  componentWillUnmount () {
-    if (this.props.intersectionObserverWrapper) {
-      this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
-    }
-
-    this.componentMounted = false;
-  }
-
-  handleIntersection = (entry) => {
-    if (this.node && this.node.children.length !== 0) {
-      // save the height of the fully-rendered element
-      this.height = getRectFromEntry(entry).height;
-
-      if (this.props.onHeightChange) {
-        this.props.onHeightChange(this.props.status, this.height);
-      }
-    }
-
-    this.setState((prevState) => {
-      if (prevState.isIntersecting && !entry.isIntersecting) {
-        scheduleIdleTask(this.hideIfNotIntersecting);
-      }
-      return {
-        isIntersecting: entry.isIntersecting,
-        isHidden: false,
-      };
-    });
-  }
-
-  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.
-    // See: https://github.com/tootsuite/mastodon/issues/2900
-    this.setState((prevState) => ({ isHidden: !prevState.isIntersecting }));
-  }
-
-  handleRef = (node) => {
-    this.node = node;
-  }
-
-  render () {
-    const { children, id, index, listLength } = this.props;
-    const { isIntersecting, isHidden } = this.state;
-
-    if (!isIntersecting && isHidden) {
-      return (
-        <article
-          ref={this.handleRef}
-          aria-posinset={index}
-          aria-setsize={listLength}
-          style={{ height: `${this.height}px`, opacity: 0, overflow: 'hidden' }}
-          data-id={id}
-          tabIndex='0'
-        >
-          {children && React.cloneElement(children, { hidden: true })}
-        </article>
-      );
-    }
-
-    return (
-      <article ref={this.handleRef} aria-posinset={index} aria-setsize={listLength} data-id={id} tabIndex='0'>
-        {children && React.cloneElement(children, { hidden: false })}
-      </article>
-    );
-  }
-
-}
--- a/app/javascript/mastodon/components/media_gallery.js
+++ b/app/javascript/mastodon/components/media_gallery.js
@@ -215,10 +215,10 @@ export default class MediaGallery extends React.PureComponent {
      }

      children = (
-        <button className='media-spoiler' onClick={this.handleOpen}>
+        <div role='button' tabIndex='0' className='media-spoiler' onClick={this.handleOpen}>
          <span className='media-spoiler__warning'>{warning}</span>
          <span className='media-spoiler__trigger'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
-        </button>
+        </div>
      );
    } else {
      const size = media.take(4).size;
--- a/app/javascript/mastodon/components/scrollable_list.js
+++ b/app/javascript/mastodon/components/scrollable_list.js
@@ -1,204 +0,0 @@
-import React, { PureComponent } from 'react';
-import { ScrollContainer } from 'react-router-scroll';
-import PropTypes from 'prop-types';
-import IntersectionObserverArticle from './intersection_observer_article';
-import LoadMore from './load_more';
-import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
-import { throttle } from 'lodash';
-import { List as ImmutableList } from 'immutable';
-
-export default class ScrollableList extends PureComponent {
-
-  static propTypes = {
-    scrollKey: PropTypes.string.isRequired,
-    onScrollToBottom: PropTypes.func,
-    onScrollToTop: PropTypes.func,
-    onScroll: PropTypes.func,
-    trackScroll: PropTypes.bool,
-    shouldUpdateScroll: PropTypes.func,
-    isLoading: PropTypes.bool,
-    hasMore: PropTypes.bool,
-    prepend: PropTypes.node,
-    emptyMessage: PropTypes.node,
-    children: PropTypes.node,
-  };
-
-  static defaultProps = {
-    trackScroll: true,
-  };
-
-  state = {
-    lastMouseMove: null,
-  };
-
-  intersectionObserverWrapper = new IntersectionObserverWrapper();
-
-  handleScroll = throttle(() => {
-    if (this.node) {
-      const { scrollTop, scrollHeight, clientHeight } = this.node;
-      const offset = scrollHeight - scrollTop - clientHeight;
-      this._oldScrollPosition = scrollHeight - scrollTop;
-
-      if (400 > 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();
-      }
-    }
-  }, 150, {
-    trailing: true,
-  });
-
-  handleMouseMove = throttle(() => {
-    this._lastMouseMove = new Date();
-  }, 300);
-
-  handleMouseLeave = () => {
-    this._lastMouseMove = null;
-  }
-
-  componentDidMount () {
-    this.attachScrollListener();
-    this.attachIntersectionObserver();
-
-    // Handle initial scroll posiiton
-    this.handleScroll();
-  }
-
-  componentDidUpdate (prevProps) {
-    const someItemInserted = React.Children.count(prevProps.children) > 0 &&
-      React.Children.count(prevProps.children) < React.Children.count(this.props.children) &&
-      this.getFirstChildKey(prevProps) !== this.getFirstChildKey(this.props);
-
-    // Reset the scroll position when a new child comes in in order not to
-    // jerk the scrollbar around if you're already scrolled down the page.
-    if (someItemInserted && this._oldScrollPosition && this.node.scrollTop > 0) {
-      const newScrollTop = this.node.scrollHeight - this._oldScrollPosition;
-
-      if (this.node.scrollTop !== newScrollTop) {
-        this.node.scrollTop = newScrollTop;
-      }
-    } else {
-      this._oldScrollPosition = this.node.scrollHeight - this.node.scrollTop;
-    }
-  }
-
-  componentWillUnmount () {
-    this.detachScrollListener();
-    this.detachIntersectionObserver();
-  }
-
-  attachIntersectionObserver () {
-    this.intersectionObserverWrapper.connect({
-      root: this.node,
-      rootMargin: '300% 0px',
-    });
-  }
-
-  detachIntersectionObserver () {
-    this.intersectionObserverWrapper.disconnect();
-  }
-
-  attachScrollListener () {
-    this.node.addEventListener('scroll', this.handleScroll);
-  }
-
-  detachScrollListener () {
-    this.node.removeEventListener('scroll', this.handleScroll);
-  }
-
-  getFirstChildKey (props) {
-    const { children } = props;
-    let firstChild = children;
-    if (children instanceof ImmutableList) {
-      firstChild = children.get(0);
-    } else if (Array.isArray(children)) {
-      firstChild = children[0];
-    }
-    return firstChild && firstChild.key;
-  }
-
-  setRef = (c) => {
-    this.node = c;
-  }
-
-  handleLoadMore = (e) => {
-    e.preventDefault();
-    this.props.onScrollToBottom();
-  }
-
-  _recentlyMoved () {
-    return this._lastMouseMove !== null && ((new Date()) - this._lastMouseMove < 600);
-  }
-
-  handleKeyDown = (e) => {
-    if (['PageDown', 'PageUp'].includes(e.key) || (e.ctrlKey && ['End', 'Home'].includes(e.key))) {
-      const article = (() => {
-        switch (e.key) {
-        case 'PageDown':
-          return e.target.nodeName === 'ARTICLE' && e.target.nextElementSibling;
-        case 'PageUp':
-          return e.target.nodeName === 'ARTICLE' && e.target.previousElementSibling;
-        case 'End':
-          return this.node.querySelector('[role="feed"] > article:last-of-type');
-        case 'Home':
-          return this.node.querySelector('[role="feed"] > article:first-of-type');
-        default:
-          return null;
-        }
-      })();
-
-
-      if (article) {
-        e.preventDefault();
-        article.focus();
-        article.scrollIntoView();
-      }
-    }
-  }
-
-  render () {
-    const { children, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;
-    const childrenCount = React.Children.count(children);
-
-    const loadMore     = <LoadMore visible={!isLoading && childrenCount > 0 && hasMore} onClick={this.handleLoadMore} />;
-    let scrollableArea = null;
-
-    if (isLoading || childrenCount > 0 || !emptyMessage) {
-      scrollableArea = (
-        <div className='scrollable' ref={this.setRef} onMouseMove={this.handleMouseMove} onMouseLeave={this.handleMouseLeave}>
-          <div role='feed' className='item-list' onKeyDown={this.handleKeyDown}>
-            {prepend}
-
-            {React.Children.map(this.props.children, (child, index) => (
-              <IntersectionObserverArticle key={child.key} id={child.key} index={index} listLength={childrenCount} intersectionObserverWrapper={this.intersectionObserverWrapper}>
-                {child}
-              </IntersectionObserverArticle>
-            ))}
-
-            {loadMore}
-          </div>
-        </div>
-      );
-    } else {
-      scrollableArea = (
-        <div className='empty-column-indicator' ref={this.setRef}>
-          {emptyMessage}
-        </div>
-      );
-    }
-
-    if (trackScroll) {
-      return (
-        <ScrollContainer scrollKey={scrollKey} shouldUpdateScroll={shouldUpdateScroll}>
-          {scrollableArea}
-        </ScrollContainer>
-      );
-    } else {
-      return scrollableArea;
-    }
-  }
-
-}
--- a/app/javascript/mastodon/components/setting_text.js
+++ b/app/javascript/mastodon/components/setting_text.js
@@ -19,15 +19,12 @@ export default class SettingText extends React.PureComponent {
    const { settings, settingKey, label } = this.props;

    return (
-      <label>
-        <span style={{ display: 'none' }}>{label}</span>
-        <input
-          className='setting-text'
-          value={settings.getIn(settingKey)}
-          onChange={this.handleChange}
-          placeholder={label}
-        />
-      </label>
+      <input
+        className='setting-text'
+        value={settings.getIn(settingKey)}
+        onChange={this.handleChange}
+        placeholder={label}
+      />
    );
  }

--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -11,12 +11,16 @@ import DisplayName from './display_name';
 import StatusContent from './status_content';
 import StatusActionBar from './status_action_bar';
 import { FormattedMessage } from 'react-intl';
+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';
+import getRectFromEntry from '../features/ui/util/get_rect_from_entry';

 export default class Status extends ImmutablePureComponent {

@@ -27,25 +31,25 @@ export default class Status extends ImmutablePureComponent {
  static propTypes = {
    status: ImmutablePropTypes.map,
    account: ImmutablePropTypes.map,
+    wrapped: PropTypes.bool,
    onReply: PropTypes.func,
    onFavourite: PropTypes.func,
    onReblog: PropTypes.func,
    onDelete: PropTypes.func,
-    onPin: PropTypes.func,
    onOpenMedia: PropTypes.func,
    onOpenVideo: PropTypes.func,
    onBlock: PropTypes.func,
-    onEmbed: PropTypes.func,
-    onHeightChange: PropTypes.func,
    me: PropTypes.number,
    boostModal: PropTypes.bool,
    autoPlayGif: PropTypes.bool,
    muted: PropTypes.bool,
-    hidden: PropTypes.bool,
+    intersectionObserverWrapper: PropTypes.object,
  };

  state = {
    isExpanded: false,
+    isIntersecting: true, // assume intersecting until told otherwise
+    isHidden: false, // set to true in requestIdleCallback to trigger un-render
  }

  // Avoid checking props that are functions (and whose equality will always
@@ -53,15 +57,91 @@ export default class Status extends ImmutablePureComponent {
  updateOnProps = [
    'status',
    'account',
+    'wrapped',
    'me',
    'boostModal',
    'autoPlayGif',
    'muted',
-    'hidden',
  ]

  updateOnStates = ['isExpanded']

+  shouldComponentUpdate (nextProps, nextState) {
+    if (!nextState.isIntersecting && nextState.isHidden) {
+      // It's only if we're not intersecting (i.e. offscreen) and isHidden is true
+      // that either "isIntersecting" or "isHidden" matter, and then they're
+      // the only things that matter.
+      return this.state.isIntersecting || !this.state.isHidden;
+    } else if (nextState.isIntersecting && !this.state.isIntersecting) {
+      // If we're going from a non-intersecting state to an intersecting state,
+      // (i.e. offscreen to onscreen), then we definitely need to re-render
+      return true;
+    }
+    // Otherwise, diff based on "updateOnProps" and "updateOnStates"
+    return super.shouldComponentUpdate(nextProps, nextState);
+  }
+
+  componentDidMount () {
+    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.observe(
+      this.props.id,
+      this.node,
+      this.handleIntersection
+    );
+
+    this.componentMounted = true;
+  }
+
+  componentWillUnmount () {
+    if (this.props.intersectionObserverWrapper) {
+      this.props.intersectionObserverWrapper.unobserve(this.props.id, this.node);
+    }
+
+    this.componentMounted = false;
+  }
+
+  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
+    const isIntersecting = (typeof entry.isIntersecting === 'boolean') ?
+      entry.isIntersecting : entry.intersectionRect.height > 0;
+    this.setState((prevState) => {
+      if (prevState.isIntersecting && !isIntersecting) {
+        scheduleIdleTask(this.hideIfNotIntersecting);
+      }
+      return {
+        isIntersecting: isIntersecting,
+        isHidden: false,
+      };
+    });
+  }
+
+  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.
+    // See: https://github.com/tootsuite/mastodon/issues/2900
+    this.setState((prevState) => ({ isHidden: !prevState.isIntersecting }));
+  }
+
+  handleRef = (node) => {
+    this.node = node;
+  }
+
  handleClick = () => {
    if (!this.context.router) {
      return;
@@ -95,16 +175,18 @@ export default class Status extends ImmutablePureComponent {
    let media = null;
    let statusAvatar;

-    const { status, account, hidden, ...other } = this.props;
-    const { isExpanded } = this.state;
+    // 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) {
      return null;
    }

-    if (hidden) {
+    if (!isIntersecting && isHidden) {
      return (
-        <div>
+        <div ref={this.handleRef} data-id={status.get('id')} style={{ height: `${this.height}px`, opacity: 0, overflow: 'hidden' }}>
          {status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}
          {status.get('content')}
        </div>
@@ -112,16 +194,22 @@ export default class Status extends ImmutablePureComponent {
    }

    if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
-      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+      let displayName = status.getIn(['account', 'display_name']);
+
+      if (displayName.length === 0) {
+        displayName = status.getIn(['account', 'username']);
+      }
+
+      const displayNameHTML = { __html: emojify(escapeTextContentForBrowser(displayName)) };

      return (
-        <div className='status__wrapper' data-id={status.get('id')} >
+        <div className='status__wrapper' ref={this.handleRef} data-id={status.get('id')} >
          <div className='status__prepend'>
            <div className='status__prepend-icon-wrapper'><i className='fa fa-fw fa-retweet status__prepend-icon' /></div>
-            <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><strong dangerouslySetInnerHTML={display_name_html} /></a> }} />
+            <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handleAccountClick} data-id={status.getIn(['account', 'id'])} href={status.getIn(['account', 'url'])} className='status__display-name muted'><strong dangerouslySetInnerHTML={displayNameHTML} /></a> }} />
          </div>

-          <Status {...other} status={status.get('reblog')} account={status.get('account')} />
+          <Status {...other} wrapped status={status.get('reblog')} account={status.get('account')} />
        </div>
      );
    }
@@ -145,13 +233,13 @@ export default class Status extends ImmutablePureComponent {
    }

    if (account === undefined || account === null) {
-      statusAvatar = <Avatar account={status.get('account')} size={48} />;
+      statusAvatar = <Avatar src={status.getIn(['account', 'avatar'])} staticSrc={status.getIn(['account', 'avatar_static'])} size={48} />;
    }else{
-      statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
+      statusAvatar = <AvatarOverlay staticSrc={status.getIn(['account', 'avatar_static'])} overlaySrc={account.get('avatar_static')} />;
    }

    return (
-      <div className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`} data-id={status.get('id')}>
+      <div className={`status ${this.props.muted ? 'muted' : ''} status-${status.get('visibility')}`} data-id={status.get('id')} ref={this.handleRef}>
        <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/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -5,7 +5,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import IconButton from './icon_button';
-import DropdownMenuContainer from '../containers/dropdown_menu_container';
+import DropdownMenu from './dropdown_menu';
 import { defineMessages, injectIntl } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';

@@ -24,9 +24,6 @@ const messages = defineMessages({
  report: { id: 'status.report', defaultMessage: 'Report @{name}' },
  muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
  unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
-  pin: { id: 'status.pin', defaultMessage: 'Pin on profile' },
-  unpin: { id: 'status.unpin', defaultMessage: 'Unpin from profile' },
-  embed: { id: 'status.embed', defaultMessage: 'Embed' },
 });

@injectIntl
@@ -46,9 +43,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
    onMute: PropTypes.func,
    onBlock: PropTypes.func,
    onReport: PropTypes.func,
-    onEmbed: PropTypes.func,
    onMuteConversation: PropTypes.func,
-    onPin: PropTypes.func,
    me: PropTypes.number,
    withDismiss: PropTypes.bool,
    intl: PropTypes.object.isRequired,
@@ -85,10 +80,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
    this.props.onDelete(this.props.status);
  }

-  handlePinClick = () => {
-    this.props.onPin(this.props.status);
-  }
-
  handleMentionClick = () => {
    this.props.onMention(this.props.status.get('account'), this.context.router.history);
  }
@@ -105,10 +96,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
    this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
  }

-  handleEmbed = () => {
-    this.props.onEmbed(this.props.status);
-  }
-
  handleReport = () => {
    this.props.onReport(this.props.status);
  }
@@ -119,10 +106,9 @@ export default class StatusActionBar extends ImmutablePureComponent {

  render () {
    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;
-    const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
+    const anonymousAccess = !me;

    let menu = [];
    let reblogIcon = 'retweet';
@@ -130,23 +116,14 @@ export default class StatusActionBar extends ImmutablePureComponent {
    let replyTitle;

    menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
-
-    if (publicStatus) {
-      menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
-    }
-
    menu.push(null);

-    if (status.getIn(['account', 'id']) === me || withDismiss) {
+    if (withDismiss) {
      menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
      menu.push(null);
    }

    if (status.getIn(['account', 'id']) === me) {
-      if (publicStatus) {
-        menu.push({ text: intl.formatMessage(status.get('pinned') ? messages.unpin : messages.pin), action: this.handlePinClick });
-      }
-
      menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
    } else {
      menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
@@ -177,12 +154,12 @@ export default class StatusActionBar extends ImmutablePureComponent {
    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 || !publicStatus} active={status.get('reblogged')} pressed={status.get('reblogged')} title={!publicStatus ? 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')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
+        <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'>
-          <DropdownMenuContainer disabled={anonymousAccess} status={status} 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>
    );
--- a/app/javascript/mastodon/components/status_content.js
+++ b/app/javascript/mastodon/components/status_content.js
@@ -3,7 +3,9 @@

 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import escapeTextContentForBrowser from 'escape-html';
 import PropTypes from 'prop-types';
+import emojify from '../emoji';
 import { isRtl } from '../rtl';
 import { FormattedMessage } from 'react-intl';
 import Permalink from './permalink';
@@ -120,8 +122,8 @@ export default class StatusContent extends React.PureComponent {

    const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;

-    const content = { __html: status.get('contentHtml') };
-    const spoilerContent = { __html: status.get('spoilerHtml') };
+    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,
@@ -147,7 +149,7 @@ export default class StatusContent extends React.PureComponent {
      }

      return (
-        <div className={classNames} ref={this.setRef} tabIndex='0' aria-label={status.get('search_index')} 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} />
            {' '}
@@ -156,15 +158,13 @@ export default class StatusContent extends React.PureComponent {

          {mentionsPlaceholder}

-          <div tabIndex={!hidden && 0} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
+          <div className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} />
        </div>
      );
    } else if (this.props.onClick) {
      return (
        <div
          ref={this.setRef}
-          tabIndex='0'
-          aria-label={status.get('search_index')}
          className={classNames}
          style={directionStyle}
          onMouseDown={this.handleMouseDown}
@@ -175,8 +175,6 @@ export default class StatusContent extends React.PureComponent {
    } else {
      return (
        <div
-          tabIndex='0'
-          aria-label={status.get('search_index')}
          ref={this.setRef}
          className='status__content'
          style={directionStyle}
--- a/app/javascript/mastodon/components/status_list.js
+++ b/app/javascript/mastodon/components/status_list.js
@@ -1,9 +1,12 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { ScrollContainer } from 'react-router-scroll';
 import PropTypes from 'prop-types';
 import StatusContainer from '../../glitch/components/status/container';
+import LoadMore from './load_more';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import ScrollableList from './scrollable_list';
+import IntersectionObserverWrapper from '../features/ui/util/intersection_observer_wrapper';
+import { debounce } from 'lodash';

 export default class StatusList extends ImmutablePureComponent {

@@ -25,21 +28,119 @@ export default class StatusList extends ImmutablePureComponent {
    trackScroll: true,
  };

+  intersectionObserverWrapper = new IntersectionObserverWrapper();
+
+  handleScroll = debounce(() => {
+    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();
+      }
+    }
+  }, 200, {
+    trailing: true,
+  });
+
+  componentDidMount () {
+    this.attachScrollListener();
+    this.attachIntersectionObserver();
+
+    // Handle initial scroll posiiton
+    this.handleScroll();
+  }
+
+  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 && 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;
+      }
+    }
+  }
+
+  componentWillUnmount () {
+    this.detachScrollListener();
+    this.detachIntersectionObserver();
+  }
+
+  attachIntersectionObserver () {
+    this.intersectionObserverWrapper.connect({
+      root: this.node,
+      rootMargin: '300% 0px',
+    });
+  }
+
+  detachIntersectionObserver () {
+    this.intersectionObserverWrapper.disconnect();
+  }
+
+  attachScrollListener () {
+    this.node.addEventListener('scroll', this.handleScroll);
+  }
+
+  detachScrollListener () {
+    this.node.removeEventListener('scroll', this.handleScroll);
+  }
+
+  setRef = (c) => {
+    this.node = c;
+  }
+
+  handleLoadMore = (e) => {
+    e.preventDefault();
+    this.props.onScrollToBottom();
+  }
+
  render () {
-    const { statusIds, ...other } = this.props;
-    const { isLoading } = other;
+    const { statusIds, scrollKey, trackScroll, shouldUpdateScroll, isLoading, hasMore, prepend, emptyMessage } = this.props;

-    const scrollableContent = (isLoading || statusIds.size > 0) ? (
-      statusIds.map((statusId) => (
-        <StatusContainer key={statusId} id={statusId} />
-      ))
-    ) : null;
+    const loadMore     = <LoadMore visible={!isLoading && statusIds.size > 0 && hasMore} onClick={this.handleLoadMore} />;
+    let scrollableArea = null;

-    return (
-      <ScrollableList {...other}>
-        {scrollableContent}
-      </ScrollableList>
-    );
+    if (isLoading || statusIds.size > 0 || !emptyMessage) {
+      scrollableArea = (
+        <div className='scrollable' ref={this.setRef}>
+          <div className='status-list'>
+            {prepend}
+
+            {statusIds.map((statusId) => {
+              return <StatusContainer key={statusId} id={statusId} intersectionObserverWrapper={this.intersectionObserverWrapper} />;
+            })}
+
+            {loadMore}
+          </div>
+        </div>
+      );
+    } else {
+      scrollableArea = (
+        <div className='empty-column-indicator' ref={this.setRef}>
+          {emptyMessage}
+        </div>
+      );
+    }
+
+    if (trackScroll) {
+      return (
+        <ScrollContainer scrollKey={scrollKey} shouldUpdateScroll={shouldUpdateScroll}>
+          {scrollableArea}
+        </ScrollContainer>
+      );
+    } else {
+      return scrollableArea;
+    }
  }

 }
--- a/app/javascript/mastodon/components/video_player.js
+++ b/app/javascript/mastodon/components/video_player.js
@@ -149,29 +149,29 @@ export default class VideoPlayer extends React.PureComponent {
    if (!this.state.visible) {
      if (sensitive) {
        return (
-          <button style={{ width: `${width}px`, height: `${height}px`, marginTop: '8px' }} 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>
-          </button>
+          </div>
        );
      } else {
        return (
-          <button style={{ width: `${width}px`, height: `${height}px`, marginTop: '8px' }} 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>
-          </button>
+          </div>
        );
      }
    }

    if (this.state.preview && !autoplay) {
      return (
-        <button className='media-spoiler-video' style={{ width: `${width}px`, height: `${height}px`, backgroundImage: `url(${media.get('preview_url')})` }} onClick={this.handleOpen}>
+        <div role='button' tabIndex='0' className='media-spoiler-video' style={{ width: `${width}px`, height: `${height}px`, backgroundImage: `url(${media.get('preview_url')})` }} onClick={this.handleOpen}>
          {spoilerButton}
          <div className='media-spoiler-video-play-icon'><i className='fa fa-play' /></div>
-        </button>
+        </div>
      );
    }

--- a/app/javascript/mastodon/containers/account_container.js
+++ b/app/javascript/mastodon/containers/account_container.js
@@ -12,7 +12,6 @@ import {
  unmuteAccount,
 } from '../actions/accounts';
 import { openModal } from '../actions/modal';
-import { initMuteModal } from '../actions/mutes';

 const messages = defineMessages({
  unfollowConfirm: { id: 'confirmations.unfollow.confirm', defaultMessage: 'Unfollow' },
@@ -33,7 +32,7 @@ const makeMapStateToProps = () => {
 const mapDispatchToProps = (dispatch, { intl }) => ({

  onFollow (account) {
-    if (account.getIn(['relationship', 'following']) || account.getIn(['relationship', 'requested'])) {
+    if (account.getIn(['relationship', 'following'])) {
      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> }} />,
@@ -60,14 +59,10 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    if (account.getIn(['relationship', 'muting'])) {
      dispatch(unmuteAccount(account.get('id')));
    } else {
-      dispatch(initMuteModal(account));
+      dispatch(muteAccount(account.get('id')));
    }
  },

-
-  onMuteNotifications (account, notifications) {
-    dispatch(muteAccount(account.get('id'), notifications));
-  },
 });

 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Account));
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				<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 39.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 313.82 155.40609 265.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="#3000d4"/><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 299.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 66.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 66.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 100.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" fill="#25FF25"/></svg>