From 251b04298e826818ecb48c2fdf96a83649e14e93 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 5 Jan 2017 03:17:23 +0100
Subject: Fix undesired delivering of private toot to remote accounts that
 follow author

---
 app/services/process_mentions_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/services')

diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index ee42a5df2..72568e702 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -28,7 +28,7 @@ class ProcessMentionsService < BaseService
     status.mentions.each do |mention|
       mentioned_account = mention.account
 
-      next if status.private_visibility? && !mentioned_account.following?(status.account)
+      next if status.private_visibility? && (!mentioned_account.following?(status.account) || !mentioned_account.local?)
 
       if mentioned_account.local?
         NotifyService.new.call(mentioned_account, mention)
-- 
cgit 


From 5c7add21761fc6b7d3c0af0819865242ce381960 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 7 Jan 2017 15:44:22 +0100
Subject: Fix #147 - Unreblogging will leave original status in feeds

---
 app/assets/javascripts/components/actions/timelines.jsx  | 4 +++-
 app/assets/javascripts/components/reducers/timelines.jsx | 9 +++++++--
 app/services/remove_status_service.rb                    | 7 ++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/actions/timelines.jsx b/app/assets/javascripts/components/actions/timelines.jsx
index 0e6f09190..8bb939d31 100644
--- a/app/assets/javascripts/components/actions/timelines.jsx
+++ b/app/assets/javascripts/components/actions/timelines.jsx
@@ -39,12 +39,14 @@ export function deleteFromTimelines(id) {
   return (dispatch, getState) => {
     const accountId  = getState().getIn(['statuses', id, 'account']);
     const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => [status.get('id'), status.get('account')]);
+    const reblogOf   = getState().getIn(['statuses', id, 'reblog'], null);
 
     dispatch({
       type: TIMELINE_DELETE,
       id,
       accountId,
-      references
+      references,
+      reblogOf
     });
   };
 };
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index b73c83e0f..c5e3a253f 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -145,7 +145,12 @@ const updateTimeline = (state, timeline, status, references) => {
   return state;
 };
 
-const deleteStatus = (state, id, accountId, references) => {
+const deleteStatus = (state, id, accountId, references, reblogOf) => {
+  if (reblogOf) {
+    // If we are deleting a reblog, just replace reblog with its original
+    return state.updateIn(['home', 'items'], list => list.map(item => item === id ? reblogOf : item));
+  }
+
   // Remove references from timelines
   ['home', 'mentions', 'public', 'tag'].forEach(function (timeline) {
     state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id));
@@ -220,7 +225,7 @@ export default function timelines(state = initialState, action) {
     case TIMELINE_UPDATE:
       return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
     case TIMELINE_DELETE:
-      return deleteStatus(state, action.id, action.accountId, action.references);
+      return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
     case CONTEXT_FETCH_SUCCESS:
       return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants));
     case ACCOUNT_TIMELINE_FETCH_SUCCESS:
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 836b8fdc5..7aca24d12 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -53,7 +53,12 @@ class RemoveStatusService < BaseService
   end
 
   def unpush(type, receiver, status)
-    redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
+    if status.reblog?
+      redis.zadd(FeedManager.instance.key(type, receiver.id), status.reblog_of_id, status.reblog_of_id)
+    else
+      redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
+    end
+
     FeedManager.instance.broadcast(receiver.id, type: 'delete', id: status.id)
   end
 
-- 
cgit 


From 7951e7ffd5cf5932f7206b52cd85f602abd9b25d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 11 Jan 2017 15:39:31 +0100
Subject: Add ruby version to Gemfile, move devDependencies in package.json to
 dependencies, fix bug in process feed service

---
 Gemfile                              | 1 +
 Gemfile.lock                         | 3 +++
 app/services/process_feed_service.rb | 2 ++
 package.json                         | 6 ++----
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/services')

diff --git a/Gemfile b/Gemfile
index 6bf95ec5e..590fb2124 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+ruby '2.3.1'
 
 gem 'rails', '~> 5.0.1.0'
 gem 'sass-rails', '~> 5.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2467b76cc..2408df68d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -463,5 +463,8 @@ DEPENDENCIES
   webmock
   will_paginate
 
+RUBY VERSION
+   ruby 2.3.1p112
+
 BUNDLED WITH
    1.13.6
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 3860a3504..f085fcd8e 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -56,6 +56,8 @@ class ProcessFeedService < BaseService
         end
       end
 
+      return if status.nil?
+
       status.save!
 
       NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
diff --git a/package.json b/package.json
index 8c75d632b..907e4a238 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
     "test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx",
     "storybook": "start-storybook -p 9001 -c storybook"
   },
-  "devDependencies": {
+  "dependencies": {
     "@kadira/storybook": "^2.24.0",
     "axios": "^0.14.0",
     "babel-plugin-react-transform": "^2.0.2",
@@ -52,9 +52,7 @@
     "reselect": "^2.5.4",
     "sass-loader": "^4.0.2",
     "sinon": "^1.17.6",
-    "style-loader": "^0.13.1"
-  },
-  "dependencies": {
+    "style-loader": "^0.13.1",
     "webpack": "^1.14.0"
   }
 }
-- 
cgit 


From b11fdc3ae3f90731c01149a5a36dc64e065d4ea2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 12 Jan 2017 20:46:24 +0100
Subject: Migrate from ledermann/rails-settings to rails-settings-cached which
 allows global settings with YAML-defined defaults. Add admin page for editing
 global settings. Add "site_description" setting that would show as a
 paragraph on the frontpage

---
 Gemfile                                            |  3 ++-
 Gemfile.lock                                       | 10 ++++---
 app/assets/javascripts/application_public.js       |  5 ++++
 app/assets/stylesheets/tables.scss                 |  4 +++
 app/controllers/about_controller.rb                |  4 +--
 app/controllers/admin/settings_controller.rb       | 25 +++++++++++++++++
 app/controllers/settings/preferences_controller.rb | 20 ++++++++------
 app/helpers/settings_helper.rb                     |  4 +++
 app/lib/hash_object.rb                             | 10 +++++++
 app/models/setting.rb                              | 31 ++++++++++++++++++++++
 app/models/user.rb                                 |  7 ++---
 app/services/notify_service.rb                     | 16 +++++------
 app/views/about/index.html.haml                    |  5 +++-
 app/views/admin/settings/index.html.haml           | 22 +++++++++++++++
 app/views/settings/preferences/show.html.haml      |  4 +--
 config/navigation.rb                               |  1 +
 config/routes.rb                                   |  1 +
 config/settings.yml                                | 23 ++++++++++++++++
 db/migrate/20170112154826_migrate_settings.rb      | 19 +++++++++++++
 db/schema.rb                                       | 10 +++----
 20 files changed, 189 insertions(+), 35 deletions(-)
 create mode 100644 app/controllers/admin/settings_controller.rb
 create mode 100644 app/lib/hash_object.rb
 create mode 100644 app/models/setting.rb
 create mode 100644 app/views/admin/settings/index.html.haml
 create mode 100644 config/settings.yml
 create mode 100644 db/migrate/20170112154826_migrate_settings.rb

(limited to 'app/services')

diff --git a/Gemfile b/Gemfile
index 590fb2124..6b8519369 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,7 @@ gem 'pg'
 gem 'pghero'
 gem 'dotenv-rails'
 gem 'font-awesome-rails'
+gem 'best_in_place', '~> 3.0.1'
 
 gem 'paperclip', '~> 5.0'
 gem 'paperclip-av-transcoder'
@@ -43,7 +44,7 @@ gem 'will_paginate'
 gem 'rack-attack'
 gem 'rack-cors', require: 'rack/cors'
 gem 'sidekiq'
-gem 'ledermann-rails-settings'
+gem 'rails-settings-cached'
 gem 'pg_search'
 gem 'simple-navigation'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2408df68d..2c009955e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,9 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     bcrypt (3.1.11)
+    best_in_place (3.0.3)
+      actionpack (>= 3.2)
+      railties (>= 3.2)
     better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -172,8 +175,6 @@ GEM
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    ledermann-rails-settings (2.4.2)
-      activerecord (>= 3.1)
     letter_opener (1.4.1)
       launchy (~> 2.2)
     link_header (0.0.8)
@@ -259,6 +260,8 @@ GEM
       nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails-settings-cached (0.6.5)
+      rails (>= 4.2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
@@ -405,6 +408,7 @@ DEPENDENCIES
   addressable
   autoprefixer-rails
   aws-sdk (>= 2.0)
+  best_in_place (~> 3.0.1)
   better_errors
   binding_of_caller
   browserify-rails
@@ -426,7 +430,6 @@ DEPENDENCIES
   i18n-tasks (~> 0.9.6)
   jbuilder (~> 2.0)
   jquery-rails
-  ledermann-rails-settings
   letter_opener
   link_header
   lograge
@@ -445,6 +448,7 @@ DEPENDENCIES
   rack-cors
   rack-timeout-puma
   rails (~> 5.0.1.0)
+  rails-settings-cached
   rails_12factor
   rails_autolink
   react-rails
diff --git a/app/assets/javascripts/application_public.js b/app/assets/javascripts/application_public.js
index f131a267a..9626c5dae 100644
--- a/app/assets/javascripts/application_public.js
+++ b/app/assets/javascripts/application_public.js
@@ -1,3 +1,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require extras
+//= require best_in_place
+
+$(function () {
+  $(".best_in_place").best_in_place();
+});
diff --git a/app/assets/stylesheets/tables.scss b/app/assets/stylesheets/tables.scss
index a37870786..279cc3069 100644
--- a/app/assets/stylesheets/tables.scss
+++ b/app/assets/stylesheets/tables.scss
@@ -36,6 +36,10 @@
       text-decoration: none;
     }
   }
+
+  strong {
+    font-weight: 500;
+  }
 }
 
 samp {
diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 7df58444f..84e5fbbd9 100644
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -4,10 +4,10 @@ class AboutController < ApplicationController
   before_action :set_body_classes
 
   def index
+    @description = Setting.site_description
   end
 
-  def terms
-  end
+  def terms; end
 
   private
 
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
new file mode 100644
index 000000000..af0be8823
--- /dev/null
+++ b/app/controllers/admin/settings_controller.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Admin::SettingsController < ApplicationController
+  before_action :require_admin!
+
+  layout 'admin'
+
+  def index
+    @settings = Setting.all_as_records
+  end
+
+  def update
+    @setting = Setting.where(var: params[:id]).first_or_initialize(var: params[:id])
+
+    if @setting.value != params[:setting][:value]
+      @setting.value = params[:setting][:value]
+      @setting.save
+    end
+
+    respond_to do |format|
+      format.html { redirect_to admin_settings_path }
+      format.json { respond_with_bip(@setting) }
+    end
+  end
+end
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 3b6d109a6..f273b5f21 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -8,14 +8,18 @@ class Settings::PreferencesController < ApplicationController
   def show; end
 
   def update
-    current_user.settings(:notification_emails).follow         = user_params[:notification_emails][:follow]         == '1'
-    current_user.settings(:notification_emails).follow_request = user_params[:notification_emails][:follow_request] == '1'
-    current_user.settings(:notification_emails).reblog         = user_params[:notification_emails][:reblog]         == '1'
-    current_user.settings(:notification_emails).favourite      = user_params[:notification_emails][:favourite]      == '1'
-    current_user.settings(:notification_emails).mention        = user_params[:notification_emails][:mention]        == '1'
-
-    current_user.settings(:interactions).must_be_follower  = user_params[:interactions][:must_be_follower]  == '1'
-    current_user.settings(:interactions).must_be_following = user_params[:interactions][:must_be_following] == '1'
+    current_user.settings['notification_emails'] = {
+      follow:         user_params[:notification_emails][:follow]         == '1',
+      follow_request: user_params[:notification_emails][:follow_request] == '1',
+      reblog:         user_params[:notification_emails][:reblog]         == '1',
+      favourite:      user_params[:notification_emails][:favourite]      == '1',
+      mention:        user_params[:notification_emails][:mention]        == '1',
+    }
+
+    current_user.settings['interactions'] = {
+      must_be_follower:  user_params[:interactions][:must_be_follower]  == '1',
+      must_be_following: user_params[:interactions][:must_be_following] == '1',
+    }
 
     if current_user.update(user_params.except(:notification_emails, :interactions))
       redirect_to settings_preferences_path, notice: I18n.t('generic.changes_saved_msg')
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index fa569e73a..aed8770c8 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -14,4 +14,8 @@ module SettingsHelper
   def human_locale(locale)
     HUMAN_LOCALES[locale]
   end
+
+  def hash_to_object(hash)
+    HashObject.new(hash)
+  end
 end
diff --git a/app/lib/hash_object.rb b/app/lib/hash_object.rb
new file mode 100644
index 000000000..274c020ad
--- /dev/null
+++ b/app/lib/hash_object.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class HashObject
+  def initialize(hash)
+    hash.each do |k, v|
+      instance_variable_set("@#{k}", v)
+      self.class.send(:define_method, k, proc { instance_variable_get("@#{k}") })
+    end
+  end
+end
diff --git a/app/models/setting.rb b/app/models/setting.rb
new file mode 100644
index 000000000..0a429a62b
--- /dev/null
+++ b/app/models/setting.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Setting < RailsSettings::Base
+  source Rails.root.join('config/settings.yml')
+  namespace Rails.env
+
+  def to_param
+    var
+  end
+
+  class << self
+    def all_as_records
+      vars    = thing_scoped
+      records = vars.map { |r| [r.var, r] }.to_h
+
+      default_settings.each do |key, default_value|
+        next if records.key?(key) || default_value.is_a?(Hash)
+        records[key] = Setting.new(var: key, value: default_value)
+      end
+
+      records
+    end
+
+    private
+
+    def default_settings
+      return {} unless RailsSettings::Default.enabled?
+      RailsSettings::Default.instance
+    end
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index d5a52da06..bf7d04d7c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class User < ApplicationRecord
+  include RailsSettings::Extend
+
   devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable
 
   belongs_to :account, inverse_of: :user
@@ -14,11 +16,6 @@ class User < ApplicationRecord
   scope :recent,   -> { order('id desc') }
   scope :admins,   -> { where(admin: true) }
 
-  has_settings do |s|
-    s.key :notification_emails, defaults: { follow: false, reblog: false, favourite: false, mention: false, follow_request: true }
-    s.key :interactions, defaults: { must_be_follower: false, must_be_following: false }
-  end
-
   def send_devise_notification(notification, *args)
     devise_mailer.send(notification, self, *args).deliver_later
   end
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 2fb1d3919..2eb0f417d 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -37,13 +37,13 @@ class NotifyService < BaseService
   end
 
   def blocked?
-    blocked   = @recipient.suspended?                                                                                             # Skip if the recipient account is suspended anyway
-    blocked ||= @recipient.id == @notification.from_account.id                                                                    # Skip for interactions with self
-    blocked ||= @recipient.blocking?(@notification.from_account)                                                                  # Skip for blocked accounts
-    blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))                      # Hellban
-    blocked ||= (@recipient.user.settings(:interactions).must_be_follower  && !@notification.from_account.following?(@recipient)) # Options
-    blocked ||= (@recipient.user.settings(:interactions).must_be_following && !@recipient.following?(@notification.from_account)) # Options
-    blocked ||= send("blocked_#{@notification.type}?")                                                                            # Type-dependent filters
+    blocked   = @recipient.suspended?                                                                                              # Skip if the recipient account is suspended anyway
+    blocked ||= @recipient.id == @notification.from_account.id                                                                     # Skip for interactions with self
+    blocked ||= @recipient.blocking?(@notification.from_account)                                                                   # Skip for blocked accounts
+    blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account))                       # Hellban
+    blocked ||= (@recipient.user.settings.interactions['must_be_follower']  && !@notification.from_account.following?(@recipient)) # Options
+    blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account)) # Options
+    blocked ||= send("blocked_#{@notification.type}?")                                                                             # Type-dependent filters
     blocked
   end
 
@@ -58,6 +58,6 @@ class NotifyService < BaseService
   end
 
   def email_enabled?
-    @recipient.user.settings(:notification_emails).send(@notification.type)
+    @recipient.user.settings.notification_emails[@notification.type]
   end
 end
diff --git a/app/views/about/index.html.haml b/app/views/about/index.html.haml
index 0c6516036..a593ff578 100644
--- a/app/views/about/index.html.haml
+++ b/app/views/about/index.html.haml
@@ -8,7 +8,7 @@
   %meta{ property: 'og:site_name', content: 'Mastodon' }/
   %meta{ property: 'og:type', content: 'website' }/
   %meta{ property: 'og:title', content: Rails.configuration.x.local_domain }/
-  %meta{ property: 'og:description', content: "Mastodon is a free, open-source social network server. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly" }/
+  %meta{ property: 'og:description', content: @description.blank? ? "Mastodon is a free, open-source social network server. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly" : strip_tags(@description) }/
   %meta{ property: 'og:image', content: asset_url('mastodon_small.jpg') }/
   %meta{ property: 'og:image:width', content: '400' }/
   %meta{ property: 'og:image:height', content: '400' }/
@@ -24,6 +24,9 @@
 
   .screenshot= image_tag 'screenshot.png'
 
+  - unless @description.blank?
+    %p= @description.html_safe
+
   .actions
     .info
       = link_to t('about.terms'), terms_path
diff --git a/app/views/admin/settings/index.html.haml b/app/views/admin/settings/index.html.haml
new file mode 100644
index 000000000..b8ca3a7a4
--- /dev/null
+++ b/app/views/admin/settings/index.html.haml
@@ -0,0 +1,22 @@
+- content_for :page_title do
+  Site Settings
+
+%table.table
+  %colgroup
+    %col{ width: '35%' }/
+  %thead
+    %tr
+      %th Setting
+      %th Click to edit
+  %tbody
+    %tr
+      %td
+        %strong Site description
+        %br/
+        Displayed as a paragraph on the frontpage and used as a meta tag.
+        %br/
+        You can use HTML tags, in particular
+        %code= '<a>'
+        and
+        %code= '<em>'
+      %td= best_in_place @settings['site_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_description'])
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index a0860c94b..a9a1d21ac 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -6,14 +6,14 @@
 
   = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }
 
-  = f.simple_fields_for :notification_emails, current_user.settings(:notification_emails) do |ff|
+  = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
     = ff.input :follow, as: :boolean, wrapper: :with_label
     = ff.input :follow_request, as: :boolean, wrapper: :with_label
     = ff.input :reblog, as: :boolean, wrapper: :with_label
     = ff.input :favourite, as: :boolean, wrapper: :with_label
     = ff.input :mention, as: :boolean, wrapper: :with_label
 
-  = f.simple_fields_for :interactions, current_user.settings(:interactions) do |ff|
+  = f.simple_fields_for :interactions, hash_to_object(current_user.settings.interactions) do |ff|
     = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
     = ff.input :must_be_following, as: :boolean, wrapper: :with_label
 
diff --git a/config/navigation.rb b/config/navigation.rb
index 1b6615ed0..9aaa12b0b 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -7,5 +7,6 @@ SimpleNavigation::Configuration.run do |navigation|
     primary.item :domain_blocks, safe_join([fa_icon('lock fw'), 'Domain Blocks']), admin_domain_blocks_url
     primary.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url
     primary.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url
+    primary.item :settings, safe_join([fa_icon('cogs fw'), 'Site Settings']), admin_settings_url
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index dd6944b29..c0262e933 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,6 +58,7 @@ Rails.application.routes.draw do
   namespace :admin do
     resources :pubsubhubbub, only: [:index]
     resources :domain_blocks, only: [:index, :create]
+    resources :settings, only: [:index, :update]
 
     resources :accounts, only: [:index, :show, :update] do
       member do
diff --git a/config/settings.yml b/config/settings.yml
new file mode 100644
index 000000000..2e309e46e
--- /dev/null
+++ b/config/settings.yml
@@ -0,0 +1,23 @@
+# config/app.yml for rails-settings-cached
+defaults: &defaults
+  site_description: ''
+  site_contact_username: ''
+  site_contact_email: ''
+  notification_emails:
+    follow: false
+    reblog: false
+    favourite: false
+    mention: false
+    follow_request: true
+  interactions:
+    must_be_follower: false
+    must_be_following: false
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults
diff --git a/db/migrate/20170112154826_migrate_settings.rb b/db/migrate/20170112154826_migrate_settings.rb
new file mode 100644
index 000000000..f6f6ed531
--- /dev/null
+++ b/db/migrate/20170112154826_migrate_settings.rb
@@ -0,0 +1,19 @@
+class MigrateSettings < ActiveRecord::Migration
+  def up
+    remove_index :settings, [:target_type, :target_id, :var]
+    rename_column :settings, :target_id, :thing_id
+    rename_column :settings, :target_type, :thing_type
+    change_column :settings, :thing_id, :integer, null: true, default: nil
+    change_column :settings, :thing_type, :string, null: true, default: nil
+    add_index :settings, [:thing_type, :thing_id, :var], unique: true
+  end
+
+  def down
+    remove_index :settings, [:thing_type, :thing_id, :var]
+    rename_column :settings, :thing_id, :target_id
+    rename_column :settings, :thing_type, :target_type
+    change_column :settings, :target_id, :integer, null: false
+    change_column :settings, :target_type, :string, null: false, default: ''
+    add_index :settings, [:target_type, :target_id, :var], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a5dd83c7..1cd1258db 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170109120109) do
+ActiveRecord::Schema.define(version: 20170112154826) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -238,13 +238,13 @@ ActiveRecord::Schema.define(version: 20170109120109) do
   end
 
   create_table "settings", force: :cascade do |t|
-    t.string   "var",         null: false
+    t.string   "var",        null: false
     t.text     "value"
-    t.string   "target_type", null: false
-    t.integer  "target_id",   null: false
+    t.string   "thing_type"
+    t.integer  "thing_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.index ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree
+    t.index ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree
   end
 
   create_table "statuses", force: :cascade do |t|
-- 
cgit 


From f63f0c46253f8d3c5524645160cbfe0c70cdec2f Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Sat, 14 Jan 2017 02:22:16 +0100
Subject: Fix too late return

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

(limited to 'app/services')

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index f085fcd8e..cc35e65b8 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -44,6 +44,8 @@ class ProcessFeedService < BaseService
       Rails.logger.debug "Creating remote status #{id}"
       status = status_from_xml(@xml)
 
+      return if status.nil?
+      
       if verb == :share
         original_status = status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
         status.reblog   = original_status
@@ -56,8 +58,6 @@ class ProcessFeedService < BaseService
         end
       end
 
-      return if status.nil?
-
       status.save!
 
       NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
-- 
cgit 


From d6bc0e8db4d25a4533feb56164b0d9cd3ef2af6e Mon Sep 17 00:00:00 2001
From: Effy Elden <git@effy.is>
Date: Sun, 15 Jan 2017 08:58:50 +1100
Subject: Add tracking of OAuth app that posted a status, extend OAuth apps to
 have optional website field, add application details to API, show application
 name and website on detailed status views. Resolves #11

---
 .../components/features/status/components/detailed_status.jsx     | 2 +-
 app/assets/stylesheets/components.scss                            | 2 +-
 app/controllers/api/v1/apps_controller.rb                         | 2 +-
 app/controllers/api/v1/statuses_controller.rb                     | 2 +-
 app/models/concerns/application.rb                                | 8 ++++++++
 app/models/status.rb                                              | 2 ++
 app/services/post_status_service.rb                               | 2 +-
 app/views/api/v1/apps/show.rabl                                   | 3 +++
 app/views/api/v1/statuses/_show.rabl                              | 4 ++++
 app/views/stream_entries/_detailed_status.html.haml               | 3 +++
 db/migrate/20170114194937_add_application_to_statuses.rb          | 5 +++++
 db/migrate/20170114203041_add_website_to_oauth_application.rb     | 5 +++++
 db/schema.rb                                                      | 4 +++-
 13 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 app/models/concerns/application.rb
 create mode 100644 app/views/api/v1/apps/show.rabl
 create mode 100644 db/migrate/20170114194937_add_application_to_statuses.rb
 create mode 100644 db/migrate/20170114203041_add_website_to_oauth_application.rb

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index b967d966f..7cbca4633 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -54,7 +54,7 @@ const DetailedStatus = React.createClass({
         {media}
 
         <div style={{ marginTop: '15px', color: '#616b86', fontSize: '14px', lineHeight: '18px' }}>
-          <a className='detailed-status__datetime' style={{ color: 'inherit' }} href={status.get('url')} target='_blank' rel='noopener'><FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /></a> · <Link to={`/statuses/${status.get('id')}/reblogs`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-retweet' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('reblogs_count')} /></span></Link> · <Link to={`/statuses/${status.get('id')}/favourites`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-star' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('favourites_count')} /></span></Link>
+          <a className='detailed-status__datetime' style={{ color: 'inherit' }} href={status.get('url')} target='_blank' rel='noopener'><FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /></a> · <a className='detailed-status__application' style={{ color: 'inherit' }} href={status.getIn(['application', 'website'])} target='_blank' rel='nooopener'>{status.getIn(['application', 'name'])}</a> · <Link to={`/statuses/${status.get('id')}/reblogs`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-retweet' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('reblogs_count')} /></span></Link> · <Link to={`/statuses/${status.get('id')}/favourites`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-star' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('favourites_count')} /></span></Link>
         </div>
       </div>
     );
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index f1edfce9d..9e9e564f9 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -183,7 +183,7 @@
   }
 }
 
-.status__display-name, .status__relative-time, .detailed-status__display-name, .detailed-status__datetime, .account__display-name {
+.status__display-name, .status__relative-time, .detailed-status__display-name, .detailed-status__datetime, .detailed-status__application, .account__display-name {
   text-decoration: none;
 }
 
diff --git a/app/controllers/api/v1/apps_controller.rb b/app/controllers/api/v1/apps_controller.rb
index 1b33770f4..ca9dd0b7e 100644
--- a/app/controllers/api/v1/apps_controller.rb
+++ b/app/controllers/api/v1/apps_controller.rb
@@ -4,6 +4,6 @@ class Api::V1::AppsController < ApiController
   respond_to :json
 
   def create
-    @app = Doorkeeper::Application.create!(name: params[:client_name], redirect_uri: params[:redirect_uris], scopes: (params[:scopes] || Doorkeeper.configuration.default_scopes))
+    @app = Doorkeeper::Application.create!(name: params[:client_name], redirect_uri: params[:redirect_uris], scopes: (params[:scopes] || Doorkeeper.configuration.default_scopes), website: params[:website])
   end
 end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index f7b4ed610..f033ef6c1 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -52,7 +52,7 @@ class Api::V1::StatusesController < ApiController
   end
 
   def create
-    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids], sensitive: params[:sensitive], visibility: params[:visibility])
+    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids], sensitive: params[:sensitive], visibility: params[:visibility], application: doorkeeper_token.application)
     render action: :show
   end
 
diff --git a/app/models/concerns/application.rb b/app/models/concerns/application.rb
new file mode 100644
index 000000000..613be34ee
--- /dev/null
+++ b/app/models/concerns/application.rb
@@ -0,0 +1,8 @@
+module ApplicationExtension
+  extend ActiveSupport::Concern
+  included do
+    validates :website
+  end
+end
+
+Doorkeeper::Application.send :include, ApplicationExtension
\ No newline at end of file
diff --git a/app/models/status.rb b/app/models/status.rb
index bc595c93b..8301ae16e 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -7,6 +7,8 @@ class Status < ApplicationRecord
 
   enum visibility: [:public, :unlisted, :private], _suffix: :visibility
 
+  belongs_to :application, class_name: 'Doorkeeper::Application'
+
   belongs_to :account, inverse_of: :statuses
   belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account'
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 55405c0db..86a84f512 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -10,7 +10,7 @@ class PostStatusService < BaseService
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @return [Status]
   def call(account, text, in_reply_to = nil, options = {})
-    status = account.statuses.create!(text: text, thread: in_reply_to, sensitive: options[:sensitive], visibility: options[:visibility])
+    status = account.statuses.create!(text: text, thread: in_reply_to, sensitive: options[:sensitive], visibility: options[:visibility], application: options[:application])
     attach_media(status, options[:media_ids])
     process_mentions_service.call(status)
     process_hashtags_service.call(status)
diff --git a/app/views/api/v1/apps/show.rabl b/app/views/api/v1/apps/show.rabl
new file mode 100644
index 000000000..30cfd81ab
--- /dev/null
+++ b/app/views/api/v1/apps/show.rabl
@@ -0,0 +1,3 @@
+object @application
+
+attributes :id, :name, :website
\ No newline at end of file
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl
index a3391a67e..a3fc78763 100644
--- a/app/views/api/v1/statuses/_show.rabl
+++ b/app/views/api/v1/statuses/_show.rabl
@@ -6,6 +6,10 @@ node(:url)              { |status| TagManager.instance.url_for(status) }
 node(:reblogs_count)    { |status| defined?(@reblogs_counts_map)    ? (@reblogs_counts_map[status.id]    || 0) : status.reblogs.count }
 node(:favourites_count) { |status| defined?(@favourites_counts_map) ? (@favourites_counts_map[status.id] || 0) : status.favourites.count }
 
+child :application do
+  extends 'api/v1/apps/show'
+end
+
 child :account do
   extends 'api/v1/accounts/show'
 end
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 32f7c2e40..bc9940915 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -28,6 +28,9 @@
     = link_to TagManager.instance.url_for(status), class: 'detailed-status__datetime u-url u-uid', target: @external_links ? '_blank' : nil, rel: 'noopener' do
       %span= l(status.created_at)
     ·
+    = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noooper' do
+      %span= status.application.name
+    ·
     %span
       = fa_icon('retweet')
       %span= status.reblogs.count
diff --git a/db/migrate/20170114194937_add_application_to_statuses.rb b/db/migrate/20170114194937_add_application_to_statuses.rb
new file mode 100644
index 000000000..b699db2ac
--- /dev/null
+++ b/db/migrate/20170114194937_add_application_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddApplicationToStatuses < ActiveRecord::Migration[5.0]
+  def change
+    add_column :statuses, :application_id, :int
+  end
+end
diff --git a/db/migrate/20170114203041_add_website_to_oauth_application.rb b/db/migrate/20170114203041_add_website_to_oauth_application.rb
new file mode 100644
index 000000000..ee674be72
--- /dev/null
+++ b/db/migrate/20170114203041_add_website_to_oauth_application.rb
@@ -0,0 +1,5 @@
+class AddWebsiteToOauthApplication < ActiveRecord::Migration[5.0]
+  def change
+    add_column :oauth_applications, :website, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1cd1258db..37da0c44e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170112154826) do
+ActiveRecord::Schema.define(version: 20170114203041) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -153,6 +153,7 @@ ActiveRecord::Schema.define(version: 20170112154826) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "superapp",     default: false, null: false
+    t.string   "website"
     t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
   end
 
@@ -259,6 +260,7 @@ ActiveRecord::Schema.define(version: 20170112154826) do
     t.boolean  "sensitive",              default: false
     t.integer  "visibility",             default: 0,     null: false
     t.integer  "in_reply_to_account_id"
+    t.integer  "application_id"
     t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree
     t.index ["reblog_of_id"], name: "index_statuses_on_reblog_of_id", using: :btree
-- 
cgit 


From e9737c2235ec56502e650bd1adad3f32bf85f0ef Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 15 Jan 2017 14:01:33 +0100
Subject: Fix tests, add applications to eager loading/cache for statuses, fix
 application website validation, don't link to app website if website isn't
 set, also comment out animated boost icon from #464 until it's consistent
 with non-animated version

---
 .rubocop.yml                                       |  1 +
 .../features/status/components/detailed_status.jsx | 10 +++++--
 app/assets/stylesheets/components.scss             | 35 +++++++++++-----------
 app/lib/application_extension.rb                   |  9 ++++++
 app/lib/url_validator.rb                           | 14 +++++++++
 app/models/concerns/application.rb                 |  8 -----
 app/models/status.rb                               |  2 +-
 app/services/post_status_service.rb                |  9 +++++-
 app/views/api/v1/apps/show.rabl                    |  2 +-
 .../stream_entries/_detailed_status.html.haml      | 10 ++++---
 config/application.rb                              |  1 +
 config/locales/en.yml                              |  6 ++--
 .../controllers/api/v1/statuses_controller_spec.rb |  3 +-
 spec/fabricators/application_fabricator.rb         |  5 ++++
 14 files changed, 78 insertions(+), 37 deletions(-)
 create mode 100644 app/lib/application_extension.rb
 create mode 100644 app/lib/url_validator.rb
 delete mode 100644 app/models/concerns/application.rb
 create mode 100644 spec/fabricators/application_fabricator.rb

(limited to 'app/services')

diff --git a/.rubocop.yml b/.rubocop.yml
index 28c735913..ab28c0fe1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -87,3 +87,4 @@ AllCops:
   - 'bin/*'
   - 'Rakefile'
   - 'node_modules/**/*'
+  - 'Vagrantfile'
diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index 7cbca4633..14a504c7c 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -32,7 +32,9 @@ const DetailedStatus = React.createClass({
 
   render () {
     const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
-    let media    = '';
+
+    let media           = '';
+    let applicationLink = '';
 
     if (status.get('media_attachments').size > 0) {
       if (status.getIn(['media_attachments', 0, 'type']) === 'video') {
@@ -42,6 +44,10 @@ const DetailedStatus = React.createClass({
       }
     }
 
+    if (status.get('application')) {
+      applicationLink = <span> · <a className='detailed-status__application' style={{ color: 'inherit' }} href={status.getIn(['application', 'website'])} target='_blank' rel='nooopener'>{status.getIn(['application', 'name'])}</a></span>;
+    }
+
     return (
       <div style={{ background: '#2f3441', padding: '14px 10px' }} className='detailed-status'>
         <a href={status.getIn(['account', 'url'])} onClick={this.handleAccountClick} className='detailed-status__display-name' style={{ display: 'block', overflow: 'hidden', marginBottom: '15px' }}>
@@ -54,7 +60,7 @@ const DetailedStatus = React.createClass({
         {media}
 
         <div style={{ marginTop: '15px', color: '#616b86', fontSize: '14px', lineHeight: '18px' }}>
-          <a className='detailed-status__datetime' style={{ color: 'inherit' }} href={status.get('url')} target='_blank' rel='noopener'><FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /></a> · <a className='detailed-status__application' style={{ color: 'inherit' }} href={status.getIn(['application', 'website'])} target='_blank' rel='nooopener'>{status.getIn(['application', 'name'])}</a> · <Link to={`/statuses/${status.get('id')}/reblogs`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-retweet' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('reblogs_count')} /></span></Link> · <Link to={`/statuses/${status.get('id')}/favourites`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-star' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('favourites_count')} /></span></Link>
+          <a className='detailed-status__datetime' style={{ color: 'inherit' }} href={status.get('url')} target='_blank' rel='noopener'><FormattedDate value={new Date(status.get('created_at'))} hour12={false} year='numeric' month='short' day='2-digit' hour='2-digit' minute='2-digit' /></a>{applicationLink} · <Link to={`/statuses/${status.get('id')}/reblogs`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-retweet' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('reblogs_count')} /></span></Link> · <Link to={`/statuses/${status.get('id')}/favourites`} style={{ color: 'inherit', textDecoration: 'none' }}><i className='fa fa-star' /><span style={{ fontWeight: '500', fontSize: '12px', marginLeft: '6px', display: 'inline-block' }}><FormattedNumber value={status.get('favourites_count')} /></span></Link>
         </div>
       </div>
     );
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index f4d822dcf..2d99fcfe8 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -663,20 +663,21 @@
   }
 }
 
-button i.fa-retweet {
-  height: 19px;
-  width: 24px;
-  background: image-url('boost_sprite.png') no-repeat;
-  background-position: 0 0;
-  transition: background-position 0.9s steps(11);
-  transition-duration: 0s;
-
-  &::before {
-    display: none !important;
-  }
-}
-
-button.active i.fa-retweet {
-  transition-duration: 0.9s;
-  background-position: 0 -209px;
-}
+// Commented out until sprite matches non-sprite icon visually
+// button i.fa-retweet {
+//   height: 19px;
+//   width: 24px;
+//   background: image-url('boost_sprite.png') no-repeat;
+//   background-position: 0 0;
+//   transition: background-position 0.9s steps(11);
+//   transition-duration: 0s;
+
+//   &::before {
+//     display: none !important;
+//   }
+// }
+
+// button.active i.fa-retweet {
+//   transition-duration: 0.9s;
+//   background-position: 0 -209px;
+// }
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
new file mode 100644
index 000000000..93c0f42f0
--- /dev/null
+++ b/app/lib/application_extension.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ApplicationExtension
+  extend ActiveSupport::Concern
+
+  included do
+    validates :website, url: true, unless: 'website.blank?'
+  end
+end
diff --git a/app/lib/url_validator.rb b/app/lib/url_validator.rb
new file mode 100644
index 000000000..4a5c4ef3f
--- /dev/null
+++ b/app/lib/url_validator.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class UrlValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, I18n.t('applications.invalid_url')) unless compliant?(value)
+  end
+
+  private
+
+  def compliant?(url)
+    parsed_url = Addressable::URI.parse(url)
+    !parsed_url.nil? && %w(http https).include?(parsed_url.scheme) && parsed_url.host
+  end
+end
diff --git a/app/models/concerns/application.rb b/app/models/concerns/application.rb
deleted file mode 100644
index 613be34ee..000000000
--- a/app/models/concerns/application.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module ApplicationExtension
-  extend ActiveSupport::Concern
-  included do
-    validates :website
-  end
-end
-
-Doorkeeper::Application.send :include, ApplicationExtension
\ No newline at end of file
diff --git a/app/models/status.rb b/app/models/status.rb
index 8301ae16e..5710f9cca 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -35,7 +35,7 @@ class Status < ApplicationRecord
   scope :remote, -> { where.not(uri: nil) }
   scope :local, -> { where(uri: nil) }
 
-  cache_associated :account, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account
+  cache_associated :account, :application, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account
 
   def local?
     uri.nil?
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 86a84f512..af31c923f 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -7,10 +7,17 @@ class PostStatusService < BaseService
   # @param [Status] in_reply_to Optional status to reply to
   # @param [Hash] options
   # @option [Boolean] :sensitive
+  # @option [String] :visibility
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
+  # @option [Doorkeeper::Application] :application
   # @return [Status]
   def call(account, text, in_reply_to = nil, options = {})
-    status = account.statuses.create!(text: text, thread: in_reply_to, sensitive: options[:sensitive], visibility: options[:visibility], application: options[:application])
+    status = account.statuses.create!(text:        text,
+                                      thread:      in_reply_to,
+                                      sensitive:   options[:sensitive],
+                                      visibility:  options[:visibility],
+                                      application: options[:application])
+
     attach_media(status, options[:media_ids])
     process_mentions_service.call(status)
     process_hashtags_service.call(status)
diff --git a/app/views/api/v1/apps/show.rabl b/app/views/api/v1/apps/show.rabl
index 30cfd81ab..6d9e607db 100644
--- a/app/views/api/v1/apps/show.rabl
+++ b/app/views/api/v1/apps/show.rabl
@@ -1,3 +1,3 @@
 object @application
 
-attributes :id, :name, :website
\ No newline at end of file
+attributes :name, :website
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 946adbd8e..bc09d3597 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -29,13 +29,15 @@
       %span= l(status.created_at)
     ·
     - if status.application
-      = link_to status.application.website, class: 'detailed-status__application', target: @external_links ? '_blank' : nil, rel: 'noopener' do
-        %span= status.application.name
+      - if status.application.website.blank?
+        %strong.detailed-status__application= status.application.name
+      - else
+        = link_to status.application.name, status.application.website, class: 'detailed-status__application', target: '_blank', rel: 'noopener'
       ·
-    %span
+    %span<
       = fa_icon('retweet')
       %span= status.reblogs.count
     ·
-    %span
+    %span<
       = fa_icon('star')
       %span= status.favourites.count
diff --git a/config/application.rb b/config/application.rb
index 79ace8521..e561d0473 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -46,6 +46,7 @@ module Mastodon
 
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'public'
+      Doorkeeper::Application.send :include, ApplicationExtension
     end
 
     config.action_dispatch.default_headers = {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 128a4d40e..f7d7ed729 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -8,6 +8,7 @@ en:
     domain_count_after: other instances
     domain_count_before: Connected to
     get_started: Get started
+    learn_more: Learn more
     links: Links
     source_code: Source code
     status_count_after: statuses
@@ -15,7 +16,6 @@ en:
     terms: Terms
     user_count_after: users
     user_count_before: Home to
-    learn_more: Learn more
   accounts:
     follow: Follow
     followers: Followers
@@ -28,6 +28,8 @@ en:
     unfollow: Unfollow
   application_mailer:
     signature: Mastodon notifications from %{instance}
+  applications:
+    invalid_url: The provided URL is invalid
   auth:
     change_password: Change password
     didnt_get_confirmation: Didn't receive confirmation instructions?
@@ -88,9 +90,9 @@ en:
     proceed: Proceed to follow
     prompt: 'You are going to follow:'
   settings:
+    back: Back to Mastodon
     edit_profile: Edit profile
     preferences: Preferences
-    back: Back to Mastodon
   stream_entries:
     click_to_show: Click to show
     favourited: favourited a post by
diff --git a/spec/controllers/api/v1/statuses_controller_spec.rb b/spec/controllers/api/v1/statuses_controller_spec.rb
index d9c73f952..669956659 100644
--- a/spec/controllers/api/v1/statuses_controller_spec.rb
+++ b/spec/controllers/api/v1/statuses_controller_spec.rb
@@ -4,7 +4,8 @@ RSpec.describe Api::V1::StatusesController, type: :controller do
   render_views
 
   let(:user)  { Fabricate(:user, account: Fabricate(:account, username: 'alice')) }
-  let(:token) { double acceptable?: true, resource_owner_id: user.id }
+  let(:app)   { Fabricate(:application, name: 'Test app', website: 'http://testapp.com') }
+  let(:token) { double acceptable?: true, resource_owner_id: user.id, application: app }
 
   before do
     allow(controller).to receive(:doorkeeper_token) { token }
diff --git a/spec/fabricators/application_fabricator.rb b/spec/fabricators/application_fabricator.rb
new file mode 100644
index 000000000..42b7009dc
--- /dev/null
+++ b/spec/fabricators/application_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:application, from: Doorkeeper::Application) do
+  name         'Example'
+  website      'http://example.com'
+  redirect_uri 'http://example.com/callback'
+end
-- 
cgit 


From f0de621e76b5a5ba3f7e67bd88c0183aac22b985 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 20 Jan 2017 01:00:14 +0100
Subject: Fix #463 - Fetch and display previews of URLs using OpenGraph tags

---
 Gemfile                                            |  1 +
 Gemfile.lock                                       |  2 +
 .../javascripts/components/actions/cards.jsx       | 40 +++++++++
 .../javascripts/components/actions/statuses.jsx    |  2 +
 .../components/features/status/components/card.jsx | 96 ++++++++++++++++++++++
 .../features/status/components/detailed_status.jsx |  3 +
 .../features/status/containers/card_container.jsx  |  8 ++
 .../javascripts/components/reducers/cards.jsx      | 14 ++++
 .../javascripts/components/reducers/index.jsx      |  4 +-
 app/assets/stylesheets/components.scss             |  6 ++
 app/controllers/api/v1/statuses_controller.rb      |  8 +-
 app/lib/statsd_monitor.rb                          | 11 ---
 app/models/preview_card.rb                         | 20 +++++
 app/models/status.rb                               |  1 +
 app/services/fetch_link_card_service.rb            | 33 ++++++++
 app/services/post_status_service.rb                |  1 +
 app/views/api/v1/statuses/card.rabl                |  5 ++
 app/workers/link_crawl_worker.rb                   | 13 +++
 config/application.rb                              |  3 +-
 config/initializers/inflections.rb                 |  1 +
 config/routes.rb                                   |  3 +-
 db/migrate/20170119214911_create_preview_cards.rb  | 17 ++++
 db/schema.rb                                       | 16 +++-
 lib/statsd_monitor.rb                              | 11 +++
 spec/fabricators/preview_card_fabricator.rb        |  5 ++
 spec/models/preview_card_spec.rb                   |  5 ++
 spec/models/subscription_spec.rb                   |  2 +-
 27 files changed, 313 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/components/actions/cards.jsx
 create mode 100644 app/assets/javascripts/components/features/status/components/card.jsx
 create mode 100644 app/assets/javascripts/components/features/status/containers/card_container.jsx
 create mode 100644 app/assets/javascripts/components/reducers/cards.jsx
 delete mode 100644 app/lib/statsd_monitor.rb
 create mode 100644 app/models/preview_card.rb
 create mode 100644 app/services/fetch_link_card_service.rb
 create mode 100644 app/views/api/v1/statuses/card.rabl
 create mode 100644 app/workers/link_crawl_worker.rb
 create mode 100644 db/migrate/20170119214911_create_preview_cards.rb
 create mode 100644 lib/statsd_monitor.rb
 create mode 100644 spec/fabricators/preview_card_fabricator.rb
 create mode 100644 spec/models/preview_card_spec.rb

(limited to 'app/services')

diff --git a/Gemfile b/Gemfile
index aa149c61e..bab7cebb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -48,6 +48,7 @@ gem 'rails-settings-cached'
 gem 'pg_search'
 gem 'simple-navigation'
 gem 'statsd-instrument'
+gem 'ruby-oembed', require: 'oembed'
 
 gem 'react-rails'
 gem 'browserify-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b33580fc..20ea37fcc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,6 +334,7 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-oembed (0.10.1)
     ruby-progressbar (1.8.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
@@ -457,6 +458,7 @@ DEPENDENCIES
   rspec-rails
   rspec-sidekiq
   rubocop
+  ruby-oembed
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   sidekiq
diff --git a/app/assets/javascripts/components/actions/cards.jsx b/app/assets/javascripts/components/actions/cards.jsx
new file mode 100644
index 000000000..808f1835b
--- /dev/null
+++ b/app/assets/javascripts/components/actions/cards.jsx
@@ -0,0 +1,40 @@
+import api from '../api';
+
+export const STATUS_CARD_FETCH_REQUEST = 'STATUS_CARD_FETCH_REQUEST';
+export const STATUS_CARD_FETCH_SUCCESS = 'STATUS_CARD_FETCH_SUCCESS';
+export const STATUS_CARD_FETCH_FAIL    = 'STATUS_CARD_FETCH_FAIL';
+
+export function fetchStatusCard(id) {
+  return (dispatch, getState) => {
+    dispatch(fetchStatusCardRequest(id));
+
+    api(getState).get(`/api/v1/statuses/${id}/card`).then(response => {
+      dispatch(fetchStatusCardSuccess(id, response.data));
+    }).catch(error => {
+      dispatch(fetchStatusCardFail(id, error));
+    });
+  };
+};
+
+export function fetchStatusCardRequest(id) {
+  return {
+    type: STATUS_CARD_FETCH_REQUEST,
+    id
+  };
+};
+
+export function fetchStatusCardSuccess(id, card) {
+  return {
+    type: STATUS_CARD_FETCH_SUCCESS,
+    id,
+    card
+  };
+};
+
+export function fetchStatusCardFail(id, error) {
+  return {
+    type: STATUS_CARD_FETCH_FAIL,
+    id,
+    error
+  };
+};
diff --git a/app/assets/javascripts/components/actions/statuses.jsx b/app/assets/javascripts/components/actions/statuses.jsx
index 21a56381e..9ac215727 100644
--- a/app/assets/javascripts/components/actions/statuses.jsx
+++ b/app/assets/javascripts/components/actions/statuses.jsx
@@ -1,6 +1,7 @@
 import api from '../api';
 
 import { deleteFromTimelines } from './timelines';
+import { fetchStatusCard } from './cards';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
@@ -31,6 +32,7 @@ export function fetchStatus(id) {
     api(getState).get(`/api/v1/statuses/${id}`).then(response => {
       dispatch(fetchStatusSuccess(response.data, skipLoading));
       dispatch(fetchContext(id));
+      dispatch(fetchStatusCard(id));
     }).catch(error => {
       dispatch(fetchStatusFail(id, error, skipLoading));
     });
diff --git a/app/assets/javascripts/components/features/status/components/card.jsx b/app/assets/javascripts/components/features/status/components/card.jsx
new file mode 100644
index 000000000..7161de364
--- /dev/null
+++ b/app/assets/javascripts/components/features/status/components/card.jsx
@@ -0,0 +1,96 @@
+import PureRenderMixin from 'react-addons-pure-render-mixin';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+
+const outerStyle = {
+  display: 'flex',
+  cursor: 'pointer',
+  fontSize: '14px',
+  border: '1px solid #363c4b',
+  borderRadius: '4px',
+  color: '#616b86',
+  marginTop: '14px',
+  textDecoration: 'none',
+  overflow: 'hidden'
+};
+
+const contentStyle = {
+  flex: '2',
+  padding: '8px',
+  paddingLeft: '14px'
+};
+
+const titleStyle = {
+  display: 'block',
+  fontWeight: '500',
+  marginBottom: '5px',
+  color: '#d9e1e8'
+};
+
+const descriptionStyle = {
+  color: '#d9e1e8'
+};
+
+const imageOuterStyle = {
+  flex: '1',
+  background: '#373b4a'
+};
+
+const imageStyle = {
+  display: 'block',
+  width: '100%',
+  height: 'auto',
+  margin: '0',
+  borderRadius: '4px 0 0 4px'
+};
+
+const hostStyle = {
+  display: 'block',
+  marginTop: '5px',
+  fontSize: '13px'
+};
+
+const getHostname = url => {
+  const parser = document.createElement('a');
+  parser.href = url;
+  return parser.hostname;
+};
+
+const Card = React.createClass({
+  propTypes: {
+    card: ImmutablePropTypes.map
+  },
+
+  mixins: [PureRenderMixin],
+
+  render () {
+    const { card } = this.props;
+
+    if (card === null) {
+      return null;
+    }
+
+    let image = '';
+
+    if (card.get('image')) {
+      image = (
+        <div style={imageOuterStyle}>
+          <img src={card.get('image')} alt={card.get('title')} style={imageStyle} />
+        </div>
+      );
+    }
+
+    return (
+      <a style={outerStyle} href={card.get('url')} className='status-card'>
+        {image}
+
+        <div style={contentStyle}>
+          <strong style={titleStyle}>{card.get('title')}</strong>
+          <p style={descriptionStyle}>{card.get('description')}</p>
+          <span style={hostStyle}>{getHostname(card.get('url'))}</span>
+        </div>
+      </a>
+    );
+  }
+});
+
+export default Card;
diff --git a/app/assets/javascripts/components/features/status/components/detailed_status.jsx b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
index 14a504c7c..f2d6ae48a 100644
--- a/app/assets/javascripts/components/features/status/components/detailed_status.jsx
+++ b/app/assets/javascripts/components/features/status/components/detailed_status.jsx
@@ -7,6 +7,7 @@ import MediaGallery from '../../../components/media_gallery';
 import VideoPlayer from '../../../components/video_player';
 import { Link } from 'react-router';
 import { FormattedDate, FormattedNumber } from 'react-intl';
+import CardContainer from '../containers/card_container';
 
 const DetailedStatus = React.createClass({
 
@@ -42,6 +43,8 @@ const DetailedStatus = React.createClass({
       } else {
         media = <MediaGallery sensitive={status.get('sensitive')} media={status.get('media_attachments')} height={300} onOpenMedia={this.props.onOpenMedia} />;
       }
+    } else {
+      media = <CardContainer statusId={status.get('id')} />;
     }
 
     if (status.get('application')) {
diff --git a/app/assets/javascripts/components/features/status/containers/card_container.jsx b/app/assets/javascripts/components/features/status/containers/card_container.jsx
new file mode 100644
index 000000000..5c8bfeec2
--- /dev/null
+++ b/app/assets/javascripts/components/features/status/containers/card_container.jsx
@@ -0,0 +1,8 @@
+import { connect } from 'react-redux';
+import Card from '../components/card';
+
+const mapStateToProps = (state, { statusId }) => ({
+  card: state.getIn(['cards', statusId], null)
+});
+
+export default connect(mapStateToProps)(Card);
diff --git a/app/assets/javascripts/components/reducers/cards.jsx b/app/assets/javascripts/components/reducers/cards.jsx
new file mode 100644
index 000000000..3c9395011
--- /dev/null
+++ b/app/assets/javascripts/components/reducers/cards.jsx
@@ -0,0 +1,14 @@
+import { STATUS_CARD_FETCH_SUCCESS } from '../actions/cards';
+
+import Immutable from 'immutable';
+
+const initialState = Immutable.Map();
+
+export default function cards(state = initialState, action) {
+  switch(action.type) {
+  case STATUS_CARD_FETCH_SUCCESS:
+    return state.set(action.id, Immutable.fromJS(action.card));
+  default:
+    return state;
+  }
+};
diff --git a/app/assets/javascripts/components/reducers/index.jsx b/app/assets/javascripts/components/reducers/index.jsx
index 80c913d2d..0798116c4 100644
--- a/app/assets/javascripts/components/reducers/index.jsx
+++ b/app/assets/javascripts/components/reducers/index.jsx
@@ -13,6 +13,7 @@ import search from './search';
 import notifications from './notifications';
 import settings from './settings';
 import status_lists from './status_lists';
+import cards from './cards';
 
 export default combineReducers({
   timelines,
@@ -28,5 +29,6 @@ export default combineReducers({
   relationships,
   search,
   notifications,
-  settings
+  settings,
+  cards
 });
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index fedf73b1d..7e61323ab 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -680,3 +680,9 @@ button.active i.fa-retweet {
   transition-duration: 0.9s;
   background-position: 0 -209px;
 }
+
+.status-card {
+  &:hover {
+    background: #363c4b;
+  }
+}
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index c661d81c1..37ed5e6dd 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -3,8 +3,8 @@
 class Api::V1::StatusesController < ApiController
   before_action -> { doorkeeper_authorize! :read }, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
   before_action -> { doorkeeper_authorize! :write }, only:  [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
-  before_action :require_user!, except: [:show, :context, :reblogged_by, :favourited_by]
-  before_action :set_status, only:      [:show, :context, :reblogged_by, :favourited_by]
+  before_action :require_user!, except: [:show, :context, :card, :reblogged_by, :favourited_by]
+  before_action :set_status, only:      [:show, :context, :card, :reblogged_by, :favourited_by]
 
   respond_to :json
 
@@ -21,6 +21,10 @@ class Api::V1::StatusesController < ApiController
     set_counters_maps(statuses)
   end
 
+  def card
+    @card = PreviewCard.find_by!(status: @status)
+  end
+
   def reblogged_by
     results   = @status.reblogs.paginate_by_max_id(DEFAULT_ACCOUNTS_LIMIT, params[:max_id], params[:since_id])
     accounts  = Account.where(id: results.map(&:account_id)).map { |a| [a.id, a] }.to_h
diff --git a/app/lib/statsd_monitor.rb b/app/lib/statsd_monitor.rb
deleted file mode 100644
index e48ce6541..000000000
--- a/app/lib/statsd_monitor.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-class StatsDMonitor
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    @app.call(env)
-  end
-end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
new file mode 100644
index 000000000..e59b05eb8
--- /dev/null
+++ b/app/models/preview_card.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class PreviewCard < ApplicationRecord
+  IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
+
+  belongs_to :status
+
+  has_attached_file :image, styles: { original: '120x120#' }, convert_options: { all: '-quality 80 -strip' }
+
+  validates :url, presence: true
+  validates_attachment_content_type :image, content_type: IMAGE_MIME_TYPES
+  validates_attachment_size :image, less_than: 1.megabytes
+
+  def save_with_optional_image!
+    save!
+  rescue ActiveRecord::RecordInvalid
+    self.image = nil
+    save!
+  end
+end
diff --git a/app/models/status.rb b/app/models/status.rb
index 5710f9cca..d5f52b55c 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -23,6 +23,7 @@ class Status < ApplicationRecord
   has_and_belongs_to_many :tags
 
   has_one :notification, as: :activity, dependent: :destroy
+  has_one :preview_card, dependent: :destroy
 
   validates :account, presence: true
   validates :uri, uniqueness: true, unless: 'local?'
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
new file mode 100644
index 000000000..2779b79b5
--- /dev/null
+++ b/app/services/fetch_link_card_service.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class FetchLinkCardService < BaseService
+  def call(status)
+    # Get first URL
+    url = URI.extract(status.text).reject { |uri| (uri =~ /\Ahttps?:\/\//).nil? }.first
+
+    return if url.nil?
+
+    response = http_client.get(url)
+
+    return if response.code != 200
+
+    page = Nokogiri::HTML(response.to_s)
+    card = PreviewCard.where(status: status).first_or_initialize(status: status, url: url)
+
+    card.title       = meta_property(page, 'og:title') || page.at_xpath('//title')&.content
+    card.description = meta_property(page, 'og:description') || meta_property(page, 'description')
+    card.image       = URI.parse(meta_property(page, 'og:image')) if meta_property(page, 'og:image')
+
+    card.save_with_optional_image!
+  end
+
+  private
+
+  def http_client
+    HTTP.timeout(:per_operation, write: 10, connect: 10, read: 10).follow
+  end
+
+  def meta_property(html, property)
+    html.at_xpath("//meta[@property=\"#{property}\"]")&.attribute('content')&.value || html.at_xpath("//meta[@name=\"#{property}\"]")&.attribute('content')&.value
+  end
+end
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index af31c923f..8765ef5e3 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -22,6 +22,7 @@ class PostStatusService < BaseService
     process_mentions_service.call(status)
     process_hashtags_service.call(status)
 
+    LinkCrawlWorker.perform_async(status.id)
     DistributionWorker.perform_async(status.id)
     Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
 
diff --git a/app/views/api/v1/statuses/card.rabl b/app/views/api/v1/statuses/card.rabl
new file mode 100644
index 000000000..8ba8dcbb1
--- /dev/null
+++ b/app/views/api/v1/statuses/card.rabl
@@ -0,0 +1,5 @@
+object @card
+
+attributes :url, :title, :description
+
+node(:image) { |card| card.image? ? full_asset_url(card.image.url(:original)) : nil }
diff --git a/app/workers/link_crawl_worker.rb b/app/workers/link_crawl_worker.rb
new file mode 100644
index 000000000..af3394b8b
--- /dev/null
+++ b/app/workers/link_crawl_worker.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class LinkCrawlWorker
+  include Sidekiq::Worker
+
+  sidekiq_options retry: false
+
+  def perform(status_id)
+    FetchLinkCardService.new.call(Status.find(status_id))
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+end
diff --git a/config/application.rb b/config/application.rb
index e97fb165b..d0b06bf95 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -3,6 +3,7 @@ require_relative 'boot'
 require 'rails/all'
 
 require_relative '../app/lib/exceptions'
+require_relative '../lib/statsd_monitor'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
@@ -30,7 +31,7 @@ module Mastodon
 
     config.active_job.queue_adapter = :sidekiq
 
-    config.middleware.insert(0, 'StatsDMonitor')
+    config.middleware.insert(0, ::StatsDMonitor)
 
     config.middleware.insert_before 0, Rack::Cors do
       allow do
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 8fd1ae72c..b5e43e705 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -12,4 +12,5 @@
 
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'StatsD'
+  inflect.acronym 'OEmbed'
 end
diff --git a/config/routes.rb b/config/routes.rb
index 42de503f0..4606c663a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,6 +86,7 @@ Rails.application.routes.draw do
       resources :statuses, only: [:create, :show, :destroy] do
         member do
           get :context
+          get :card
           get :reblogged_by
           get :favourited_by
 
@@ -146,7 +147,7 @@ Rails.application.routes.draw do
   get '/about',      to: 'about#index'
   get '/about/more', to: 'about#more'
   get '/terms',      to: 'about#terms'
-  
+
   root 'home#index'
 
   match '*unmatched_route', via: :all, to: 'application#raise_not_found'
diff --git a/db/migrate/20170119214911_create_preview_cards.rb b/db/migrate/20170119214911_create_preview_cards.rb
new file mode 100644
index 000000000..70ed91bbd
--- /dev/null
+++ b/db/migrate/20170119214911_create_preview_cards.rb
@@ -0,0 +1,17 @@
+class CreatePreviewCards < ActiveRecord::Migration[5.0]
+  def change
+    create_table :preview_cards do |t|
+      t.integer :status_id
+      t.string :url, null: false, default: ''
+
+      # OpenGraph
+      t.string :title, null: true
+      t.string :description, null: true
+      t.attachment :image
+
+      t.timestamps
+    end
+
+    add_index :preview_cards, :status_id, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 37da0c44e..abe6f1bfe 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170114203041) do
+ActiveRecord::Schema.define(version: 20170119214911) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -157,6 +157,20 @@ ActiveRecord::Schema.define(version: 20170114203041) do
     t.index ["uid"], name: "index_oauth_applications_on_uid", unique: true, using: :btree
   end
 
+  create_table "preview_cards", force: :cascade do |t|
+    t.integer  "status_id"
+    t.string   "url",                default: "", null: false
+    t.string   "title"
+    t.string   "description"
+    t.string   "image_file_name"
+    t.string   "image_content_type"
+    t.integer  "image_file_size"
+    t.datetime "image_updated_at"
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
+    t.index ["status_id"], name: "index_preview_cards_on_status_id", unique: true, using: :btree
+  end
+
   create_table "pubsubhubbub_subscriptions", force: :cascade do |t|
     t.string   "topic",      default: "",    null: false
     t.string   "callback",   default: "",    null: false
diff --git a/lib/statsd_monitor.rb b/lib/statsd_monitor.rb
new file mode 100644
index 000000000..e48ce6541
--- /dev/null
+++ b/lib/statsd_monitor.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class StatsDMonitor
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    @app.call(env)
+  end
+end
diff --git a/spec/fabricators/preview_card_fabricator.rb b/spec/fabricators/preview_card_fabricator.rb
new file mode 100644
index 000000000..448a94e7e
--- /dev/null
+++ b/spec/fabricators/preview_card_fabricator.rb
@@ -0,0 +1,5 @@
+Fabricator(:preview_card) do
+  status_id 1
+  url       "MyString"
+  html      "MyText"
+end
diff --git a/spec/models/preview_card_spec.rb b/spec/models/preview_card_spec.rb
new file mode 100644
index 000000000..14ef23923
--- /dev/null
+++ b/spec/models/preview_card_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe PreviewCard, type: :model do
+
+end
diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb
index d40bf0b44..9cb3d41ce 100644
--- a/spec/models/subscription_spec.rb
+++ b/spec/models/subscription_spec.rb
@@ -1,5 +1,5 @@
 require 'rails_helper'
 
 RSpec.describe Subscription, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+
 end
-- 
cgit 


From 05abd977c1ace4931ea679059cd600ed41337a1c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 20 Jan 2017 18:31:49 +0100
Subject: Fix preview cards layout, do preview card crawling for remote
 statuses

---
 .../components/features/status/components/card.jsx       | 16 ++++++++++------
 app/services/process_feed_service.rb                     |  3 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/features/status/components/card.jsx b/app/assets/javascripts/components/features/status/components/card.jsx
index 7161de364..ccb06dfd5 100644
--- a/app/assets/javascripts/components/features/status/components/card.jsx
+++ b/app/assets/javascripts/components/features/status/components/card.jsx
@@ -14,16 +14,20 @@ const outerStyle = {
 };
 
 const contentStyle = {
-  flex: '2',
+  flex: '1 1 auto',
   padding: '8px',
-  paddingLeft: '14px'
+  paddingLeft: '14px',
+  overflow: 'hidden'
 };
 
 const titleStyle = {
   display: 'block',
   fontWeight: '500',
   marginBottom: '5px',
-  color: '#d9e1e8'
+  color: '#d9e1e8',
+  overflow: 'hidden',
+  textOverflow: 'ellipsis',
+  whiteSpace: 'nowrap'
 };
 
 const descriptionStyle = {
@@ -31,7 +35,7 @@ const descriptionStyle = {
 };
 
 const imageOuterStyle = {
-  flex: '1',
+  flex: '0 0 100px',
   background: '#373b4a'
 };
 
@@ -84,8 +88,8 @@ const Card = React.createClass({
         {image}
 
         <div style={contentStyle}>
-          <strong style={titleStyle}>{card.get('title')}</strong>
-          <p style={descriptionStyle}>{card.get('description')}</p>
+          <strong style={titleStyle} title={card.get('title')}>{card.get('title')}</strong>
+          <p style={descriptionStyle}>{card.get('description').substring(0, 50)}</p>
           <span style={hostStyle}>{getHostname(card.get('url'))}</span>
         </div>
       </a>
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index cc35e65b8..4466abda3 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -45,7 +45,7 @@ class ProcessFeedService < BaseService
       status = status_from_xml(@xml)
 
       return if status.nil?
-      
+
       if verb == :share
         original_status = status_from_xml(@xml.at_xpath('.//activity:object', activity: TagManager::AS_XMLNS))
         status.reblog   = original_status
@@ -61,6 +61,7 @@ class ProcessFeedService < BaseService
       status.save!
 
       NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
+      LinkCrawlWorker.perform_async(status.reblog? ? status.reblog_of_id : status.id)
       Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
       DistributionWorker.perform_async(status.id)
       status
-- 
cgit 


From 9bd3b11cfb7fbfc42f0ebfecf238e037d44ca39d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 20 Jan 2017 20:14:02 +0100
Subject: Instead of refusing to create accounts, domain blocks auto-suspend
 new accounts from that domain

---
 app/assets/javascripts/components/store/configureStore.jsx | 3 +++
 app/services/follow_remote_account_service.rb              | 2 +-
 app/services/process_feed_service.rb                       | 2 +-
 app/services/update_remote_profile_service.rb              | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/store/configureStore.jsx b/app/assets/javascripts/components/store/configureStore.jsx
index 6f0823bf0..ad0427b52 100644
--- a/app/assets/javascripts/components/store/configureStore.jsx
+++ b/app/assets/javascripts/components/store/configureStore.jsx
@@ -4,8 +4,11 @@ import appReducer from '../reducers';
 import loadingBarMiddleware from '../middleware/loading_bar';
 import errorsMiddleware from '../middleware/errors';
 import soundsMiddleware from 'redux-sounds';
+import Howler from 'howler';
 import Immutable from 'immutable';
 
+Howler.mobileAutoEnable = false;
+
 const soundsData = {
   boop: '/sounds/boop.mp3'
 };
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index f640222b0..d17cf0f45 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -14,7 +14,6 @@ class FollowRemoteAccountService < BaseService
     username, domain = uri.split('@')
 
     return Account.find_local(username) if TagManager.instance.local_domain?(domain)
-    return nil if DomainBlock.blocked?(domain)
 
     account = Account.find_remote(username, domain)
     return account unless account.nil?
@@ -41,6 +40,7 @@ class FollowRemoteAccountService < BaseService
     account.url         = data.link('http://webfinger.net/rel/profile-page').href
     account.public_key  = magic_key_to_pem(data.link('magic-public-key').href)
     account.private_key = nil
+    account.suspended   = true if DomainBlock.blocked?(domain)
 
     xml  = get_feed(account.remote_url)
     hubs = get_hubs(xml)
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 4466abda3..fad03e580 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -61,7 +61,7 @@ class ProcessFeedService < BaseService
       status.save!
 
       NotifyService.new.call(status.reblog.account, status) if status.reblog? && status.reblog.account.local?
-      LinkCrawlWorker.perform_async(status.reblog? ? status.reblog_of_id : status.id)
+      # LinkCrawlWorker.perform_async(status.reblog? ? status.reblog_of_id : status.id)
       Rails.logger.debug "Queuing remote status #{status.id} (#{id}) for distribution"
       DistributionWorker.perform_async(status.id)
       status
diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb
index d961eda39..cfa547996 100644
--- a/app/services/update_remote_profile_service.rb
+++ b/app/services/update_remote_profile_service.rb
@@ -10,7 +10,7 @@ class UpdateRemoteProfileService < BaseService
     unless author_xml.nil?
       account.display_name      = author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).nil?
       account.note              = author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).nil?
-      account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank?
+      account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank? || account.suspended?
     end
 
     old_hub_url     = account.hub_url
-- 
cgit 


From 8f21f5522f4da4c1d4d62664890c07972eb30f54 Mon Sep 17 00:00:00 2001
From: Effy Elden <git@effy.is>
Date: Sat, 21 Jan 2017 21:02:42 +1100
Subject: Call uniq on the string version of mb_chars tags

---
 app/services/process_hashtags_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/services')

diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index ddcc64aa5..8d7fbe92b 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -4,7 +4,7 @@ class ProcessHashtagsService < BaseService
   def call(status, tags = [])
     tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local?
 
-    tags.map { |str| str.mb_chars.downcase }.uniq.each do |tag|
+    tags.map { |str| str.mb_chars.downcase }.uniq{ |t| t.to_s }.each do |tag|
       status.tags << Tag.where(name: tag).first_or_initialize(name: tag)
     end
 
-- 
cgit 


From aa9c51a34c4ca226a68f7116573bc37cd172c8f6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 13:56:57 +0100
Subject: Fix a couple unhandled exceptions

---
 app/controllers/stream_entries_controller.rb | 2 +-
 app/services/notify_service.rb               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/services')

diff --git a/app/controllers/stream_entries_controller.rb b/app/controllers/stream_entries_controller.rb
index 3f60bb0c4..5701b2efa 100644
--- a/app/controllers/stream_entries_controller.rb
+++ b/app/controllers/stream_entries_controller.rb
@@ -46,7 +46,7 @@ class StreamEntriesController < ApplicationController
     @stream_entry = @account.stream_entries.find(params[:id])
     @type         = @stream_entry.activity_type.downcase
 
-    raise ActiveRecord::RecordNotFound if @stream_entry.hidden? && (@stream_entry.activity_type != 'Status' || (@stream_entry.activity_type == 'Status' && !@stream_entry.activity.permitted?(current_account)))
+    raise ActiveRecord::RecordNotFound if @stream_entry.activity.nil? || (@stream_entry.hidden? && (@stream_entry.activity_type != 'Status' || (@stream_entry.activity_type == 'Status' && !@stream_entry.activity.permitted?(current_account))))
   end
 
   def check_account_suspension
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index 2eb0f417d..1ec36637c 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -6,7 +6,7 @@ class NotifyService < BaseService
     @activity     = activity
     @notification = Notification.new(account: @recipient, activity: @activity)
 
-    return if blocked?
+    return if blocked? || recipient.user.nil?
 
     create_notification
     send_email if email_enabled?
-- 
cgit 


From 6d98a731803eb37ff36f60ff004acfc4c27ae37b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 17:38:38 +0100
Subject: Domain blocks now have varying severity - auto-suspend vs
 auto-silence

---
 app/models/domain_block.rb                                |  2 ++
 app/services/block_domain_service.rb                      | 15 ++++++++-------
 app/services/follow_remote_account_service.rb             |  5 ++++-
 app/services/suspend_account_service.rb                   |  1 -
 app/views/admin/domain_blocks/index.html.haml             |  2 ++
 .../20170123162658_add_severity_to_domain_blocks.rb       |  5 +++++
 db/schema.rb                                              |  3 ++-
 spec/services/block_domain_service_spec.rb                |  4 ++--
 8 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 db/migrate/20170123162658_add_severity_to_domain_blocks.rb

(limited to 'app/services')

diff --git a/app/models/domain_block.rb b/app/models/domain_block.rb
index 9075b90a0..b4606da60 100644
--- a/app/models/domain_block.rb
+++ b/app/models/domain_block.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class DomainBlock < ApplicationRecord
+  enum severity: [:silence, :suspend]
+
   validates :domain, presence: true, uniqueness: true
 
   def self.blocked?(domain)
diff --git a/app/services/block_domain_service.rb b/app/services/block_domain_service.rb
index a8fafe412..9518b1fcf 100644
--- a/app/services/block_domain_service.rb
+++ b/app/services/block_domain_service.rb
@@ -1,15 +1,16 @@
 # frozen_string_literal: true
 
 class BlockDomainService < BaseService
-  def call(domain)
-    DomainBlock.find_or_create_by!(domain: domain)
+  def call(domain, severity)
+    DomainBlock.where(domain: domain).first_or_create!(domain: domain, severity: severity)
 
-    Account.where(domain: domain).find_each do |account|
-      if account.subscribed?
-        account.subscription(api_subscription_url(account.id)).unsubscribe
+    if severity == :silence
+      Account.where(domain: domain).update_all(silenced: true)
+    else
+      Account.where(domain: domain).find_each do |account|
+        account.subscription(api_subscription_url(account.id)).unsubscribe if account.subscribed?
+        SuspendAccountService.new.call(account)
       end
-
-      account.destroy!
     end
   end
 end
diff --git a/app/services/follow_remote_account_service.rb b/app/services/follow_remote_account_service.rb
index d17cf0f45..b39eafc70 100644
--- a/app/services/follow_remote_account_service.rb
+++ b/app/services/follow_remote_account_service.rb
@@ -35,12 +35,15 @@ class FollowRemoteAccountService < BaseService
 
     Rails.logger.debug "Creating new remote account for #{uri}"
 
+    domain_block = DomainBlock.find_by(domain: domain)
+
     account.remote_url  = data.link('http://schemas.google.com/g/2010#updates-from').href
     account.salmon_url  = data.link('salmon').href
     account.url         = data.link('http://webfinger.net/rel/profile-page').href
     account.public_key  = magic_key_to_pem(data.link('magic-public-key').href)
     account.private_key = nil
-    account.suspended   = true if DomainBlock.blocked?(domain)
+    account.suspended   = true if domain_block && domain_block.suspend?
+    account.silenced    = true if domain_block && domain_block.silence?
 
     xml  = get_feed(account.remote_url)
     hubs = get_hubs(xml)
diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb
index 04a086613..8528ef62a 100644
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@@ -18,7 +18,6 @@ class SuspendAccountService < BaseService
 
     @account.media_attachments.destroy_all
     @account.stream_entries.destroy_all
-    @account.mentions.destroy_all
     @account.notifications.destroy_all
     @account.favourites.destroy_all
     @account.active_relationships.destroy_all
diff --git a/app/views/admin/domain_blocks/index.html.haml b/app/views/admin/domain_blocks/index.html.haml
index aedf163f7..dbaeb4716 100644
--- a/app/views/admin/domain_blocks/index.html.haml
+++ b/app/views/admin/domain_blocks/index.html.haml
@@ -5,10 +5,12 @@
   %thead
     %tr
       %th Domain
+      %th Severity
   %tbody
     - @blocks.each do |block|
       %tr
         %td
           %samp= block.domain
+        %td= block.severity
 
 = will_paginate @blocks, pagination_options
diff --git a/db/migrate/20170123162658_add_severity_to_domain_blocks.rb b/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
new file mode 100644
index 000000000..dcbc32a1a
--- /dev/null
+++ b/db/migrate/20170123162658_add_severity_to_domain_blocks.rb
@@ -0,0 +1,5 @@
+class AddSeverityToDomainBlocks < ActiveRecord::Migration[5.0]
+  def change
+    add_column :domain_blocks, :severity, :integer, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index abe6f1bfe..6d28f059d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170119214911) do
+ActiveRecord::Schema.define(version: 20170123162658) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -58,6 +58,7 @@ ActiveRecord::Schema.define(version: 20170119214911) do
     t.string   "domain",     default: "", null: false
     t.datetime "created_at",              null: false
     t.datetime "updated_at",              null: false
+    t.integer  "severity",   default: 0
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true, using: :btree
   end
 
diff --git a/spec/services/block_domain_service_spec.rb b/spec/services/block_domain_service_spec.rb
index 9933d016f..d88b3b55c 100644
--- a/spec/services/block_domain_service_spec.rb
+++ b/spec/services/block_domain_service_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe BlockDomainService do
     bad_status2
     bad_attachment
 
-    subject.call('evil.org')
+    subject.call('evil.org', :suspend)
   end
 
   it 'creates a domain block' do
@@ -22,7 +22,7 @@ RSpec.describe BlockDomainService do
   end
 
   it 'removes remote accounts from that domain' do
-    expect(Account.find_remote('badguy666', 'evil.org')).to be_nil
+    expect(Account.find_remote('badguy666', 'evil.org').suspended?).to be true
   end
 
   it 'removes the remote accounts\'s statuses and media attachments' do
-- 
cgit 


From f2e08ff56855a2b14567f6218900823664a0ee2c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 17:40:23 +0100
Subject: Remove unneeded block check

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

(limited to 'app/services')

diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 11ec0d2dd..5f91e3127 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -17,8 +17,6 @@ class ProcessInteractionService < BaseService
     domain   = Addressable::URI.parse(url).host
     account  = Account.find_by(username: username, domain: domain)
 
-    return if DomainBlock.blocked?(domain)
-
     if account.nil?
       account = follow_remote_account_service.call("#{username}@#{domain}")
     end
-- 
cgit 


From cca82bf0a2f0ccbf0feda00763fd7df0877845b6 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 21:29:34 +0100
Subject: Move merging/unmerging of timelines into background. Move blocking
 into background as well since it's a computationally expensive

---
 app/controllers/api/v1/accounts_controller.rb |  9 +++++++--
 app/lib/feed_manager.rb                       |  9 +++++++++
 app/services/follow_service.rb                |  2 +-
 app/services/unfollow_service.rb              | 17 +----------------
 app/workers/block_worker.rb                   |  9 +++++++++
 app/workers/merge_worker.rb                   |  9 +++++++++
 app/workers/unmerge_worker.rb                 |  9 +++++++++
 7 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 app/workers/block_worker.rb
 create mode 100644 app/workers/merge_worker.rb
 create mode 100644 app/workers/unmerge_worker.rb

(limited to 'app/services')

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index bd52dfb2c..234844ed7 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -65,8 +65,13 @@ class Api::V1::AccountsController < ApiController
   end
 
   def block
-    BlockService.new.call(current_user.account, @account)
-    set_relationship
+    BlockWorker.perform_async(current_user.account_id, @account.id)
+
+    @following   = { @account.id => false }
+    @followed_by = { @account.id => false }
+    @blocking    = { @account.id => true }
+    @requested   = { @account.id => false }
+
     render action: :relationship
   end
 
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 19f9dc16f..cdd26e69c 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -50,6 +50,15 @@ class FeedManager
     trim(:home, into_account.id)
   end
 
+  def unmerge_from_timeline(from_account, into_account)
+    timeline_key = key(:home, into_account.id)
+
+    from_account.statuses.select('id').find_each do |status|
+      redis.zrem(timeline_key, status.id)
+      redis.zremrangebyscore(timeline_key, status.id, status.id)
+    end
+  end
+
   def inline_render(target_account, template, object)
     rabl_scope = Class.new do
       include RoutingHelper
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 555f01b6d..87c16a621 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -38,7 +38,7 @@ class FollowService < BaseService
       NotificationWorker.perform_async(follow.stream_entry.id, target_account.id)
     end
 
-    FeedManager.instance.merge_into_timeline(target_account, source_account)
+    MergeWorker.perform_async(target_account.id, source_account.id)
     Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id)
 
     follow
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index 7973a3611..f469793c1 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -7,21 +7,6 @@ class UnfollowService < BaseService
   def call(source_account, target_account)
     follow = source_account.unfollow!(target_account)
     NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) unless target_account.local?
-    unmerge_from_timeline(target_account, source_account)
-  end
-
-  private
-
-  def unmerge_from_timeline(from_account, into_account)
-    timeline_key = FeedManager.instance.key(:home, into_account.id)
-
-    from_account.statuses.select('id').find_each do |status|
-      redis.zrem(timeline_key, status.id)
-      redis.zremrangebyscore(timeline_key, status.id, status.id)
-    end
-  end
-
-  def redis
-    Redis.current
+    UnmergeWorker.perform_async(target_account.id, source_account.id)
   end
 end
diff --git a/app/workers/block_worker.rb b/app/workers/block_worker.rb
new file mode 100644
index 000000000..dc00db197
--- /dev/null
+++ b/app/workers/block_worker.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class BlockWorker
+  include Sidekiq::Worker
+
+  def perform(account_id, target_account_id)
+    BlockService.new.call(Account.find(account_id), Account.find(target_account_id))
+  end
+end
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
new file mode 100644
index 000000000..0f288f43f
--- /dev/null
+++ b/app/workers/merge_worker.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class MergeWorker
+  include Sidekiq::Worker
+
+  def perform(from_account_id, into_account_id)
+    FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id))
+  end
+end
diff --git a/app/workers/unmerge_worker.rb b/app/workers/unmerge_worker.rb
new file mode 100644
index 000000000..dbf7243de
--- /dev/null
+++ b/app/workers/unmerge_worker.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class UnmergeWorker
+  include Sidekiq::Worker
+
+  def perform(from_account_id, into_account_id)
+    FeedManager.instance.unmerge_from_timeline(Account.find(from_account_id), Account.find(into_account_id))
+  end
+end
-- 
cgit 


From 434cf8237e7960305b95199b2f0fab75d4da2e60 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 21:36:08 +0100
Subject: Optional domain block attribute that prevents media attachments from
 being downloaded

---
 app/services/process_feed_service.rb                          |  2 ++
 app/services/process_hashtags_service.rb                      |  2 +-
 .../20170123203248_add_reject_media_to_domain_blocks.rb       |  5 +++++
 db/schema.rb                                                  | 11 ++++++-----
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb

(limited to 'app/services')

diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index fad03e580..84273680d 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -180,6 +180,8 @@ class ProcessFeedService < BaseService
     end
 
     def media_from_xml(parent, xml)
+      return if DomainBlock.find_by(domain: parent.account.domain)&.reject_media?
+
       xml.xpath('./xmlns:link[@rel="enclosure"]', xmlns: TagManager::XMLNS).each do |link|
         next unless link['href']
 
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 8d7fbe92b..617a38159 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -4,7 +4,7 @@ class ProcessHashtagsService < BaseService
   def call(status, tags = [])
     tags = status.text.scan(Tag::HASHTAG_RE).map(&:first) if status.local?
 
-    tags.map { |str| str.mb_chars.downcase }.uniq{ |t| t.to_s }.each do |tag|
+    tags.map { |str| str.mb_chars.downcase }.uniq(&:to_s).each do |tag|
       status.tags << Tag.where(name: tag).first_or_initialize(name: tag)
     end
 
diff --git a/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb b/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
new file mode 100644
index 000000000..999fccda0
--- /dev/null
+++ b/db/migrate/20170123203248_add_reject_media_to_domain_blocks.rb
@@ -0,0 +1,5 @@
+class AddRejectMediaToDomainBlocks < ActiveRecord::Migration[5.0]
+  def change
+    add_column :domain_blocks, :reject_media, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6d28f059d..3876faa56 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170123162658) do
+ActiveRecord::Schema.define(version: 20170123203248) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -55,10 +55,11 @@ ActiveRecord::Schema.define(version: 20170123162658) do
   end
 
   create_table "domain_blocks", force: :cascade do |t|
-    t.string   "domain",     default: "", null: false
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
-    t.integer  "severity",   default: 0
+    t.string   "domain",       default: "", null: false
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.integer  "severity",     default: 0
+    t.boolean  "reject_media"
     t.index ["domain"], name: "index_domain_blocks_on_domain", unique: true, using: :btree
   end
 
-- 
cgit 


From d00189b55a2fe58f6ba6ccaa1f3712f55dc304dc Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 23 Jan 2017 21:55:29 +0100
Subject: Domains with reject_media? set to true won't download avatars either

---
 app/services/update_remote_profile_service.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/services')

diff --git a/app/services/update_remote_profile_service.rb b/app/services/update_remote_profile_service.rb
index cfa547996..ad9c56540 100644
--- a/app/services/update_remote_profile_service.rb
+++ b/app/services/update_remote_profile_service.rb
@@ -8,9 +8,12 @@ class UpdateRemoteProfileService < BaseService
     hub_link   = xml.at_xpath('./xmlns:link[@rel="hub"]', xmlns: TagManager::XMLNS)
 
     unless author_xml.nil?
-      account.display_name      = author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).nil?
-      account.note              = author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).nil?
-      account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank? || account.suspended?
+      account.display_name = author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:displayName', poco: TagManager::POCO_XMLNS).nil?
+      account.note         = author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).content unless author_xml.at_xpath('./poco:note', poco: TagManager::POCO_XMLNS).nil?
+
+      unless account.suspended? || DomainBlock.find_by(domain: account.domain)&.reject_media?
+        account.avatar_remote_url = author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'] unless author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS).nil? || author_xml.at_xpath('./xmlns:link[@rel="avatar"]', xmlns: TagManager::XMLNS)['href'].blank?
+      end
     end
 
     old_hub_url     = account.hub_url
-- 
cgit 


From bf0f6eb62d0f5bd1f0d8e4e2a6e9e8fd3b297b6c Mon Sep 17 00:00:00 2001
From: blackle <isabelle@blackle-mori.com>
Date: Thu, 12 Jan 2017 23:54:26 -0500
Subject: Implement a click-to-view spoiler system

---
 .../javascripts/components/actions/compose.jsx     | 18 ++++++
 .../components/components/status_content.jsx       | 18 ++++++
 .../features/compose/components/compose_form.jsx   | 29 ++++++++-
 .../compose/containers/compose_form_container.jsx  | 12 ++++
 .../javascripts/components/reducers/compose.jsx    | 10 +++
 app/assets/javascripts/extras.jsx                  | 10 +++
 app/assets/stylesheets/components.scss             | 44 ++++++++++++--
 app/controllers/api/v1/statuses_controller.rb      |  2 +-
 app/helpers/atom_builder_helper.rb                 |  2 +
 app/lib/formatter.rb                               | 17 +++++-
 app/models/status.rb                               |  4 +-
 app/services/post_status_service.rb                |  4 ++
 app/services/process_hashtags_service.rb           |  1 +
 app/validators/status_length_validator.rb          | 15 +++++
 app/views/api/v1/statuses/_show.rabl               |  2 +-
 .../20170112041538_add_spoiler_to_statuses.rb      |  5 ++
 .../20170114014334_add_spoiler_text_to_statuses.rb |  5 ++
 db/schema.rb                                       | 71 +---------------------
 18 files changed, 192 insertions(+), 77 deletions(-)
 create mode 100644 app/validators/status_length_validator.rb
 create mode 100644 db/migrate/20170112041538_add_spoiler_to_statuses.rb
 create mode 100644 db/migrate/20170114014334_add_spoiler_text_to_statuses.rb

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
index 05674ba89..948ccf872 100644
--- a/app/assets/javascripts/components/actions/compose.jsx
+++ b/app/assets/javascripts/components/actions/compose.jsx
@@ -23,6 +23,8 @@ export const COMPOSE_MOUNT   = 'COMPOSE_MOUNT';
 export const COMPOSE_UNMOUNT = 'COMPOSE_UNMOUNT';
 
 export const COMPOSE_SENSITIVITY_CHANGE = 'COMPOSE_SENSITIVITY_CHANGE';
+export const COMPOSE_SPOILERNESS_CHANGE = 'COMPOSE_SPOILERNESS_CHANGE';
+export const COMPOSE_SPOILER_TEXT_CHANGE = 'COMPOSE_SPOILER_TEXT_CHANGE';
 export const COMPOSE_VISIBILITY_CHANGE  = 'COMPOSE_VISIBILITY_CHANGE';
 export const COMPOSE_LISTABILITY_CHANGE = 'COMPOSE_LISTABILITY_CHANGE';
 
@@ -68,6 +70,8 @@ export function submitCompose() {
       in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
       media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')),
       sensitive: getState().getIn(['compose', 'sensitive']),
+      spoiler: getState().getIn(['compose', 'spoiler']),
+      spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
       visibility: getState().getIn(['compose', 'private']) ? 'private' : (getState().getIn(['compose', 'unlisted']) ? 'unlisted' : 'public')
     }).then(function (response) {
       dispatch(submitComposeSuccess({ ...response.data }));
@@ -218,6 +222,20 @@ export function changeComposeSensitivity(checked) {
   };
 };
 
+export function changeComposeSpoilerness(checked) {
+  return {
+    type: COMPOSE_SPOILERNESS_CHANGE,
+    checked
+  };
+};
+
+export function changeComposeSpoilerText(text) {
+  return {
+    type: COMPOSE_SPOILER_TEXT_CHANGE,
+    text
+  };
+};
+
 export function changeComposeVisibility(checked) {
   return {
     type: COMPOSE_VISIBILITY_CHANGE,
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index f2c88cee0..7287aa836 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -18,6 +18,12 @@ const StatusContent = React.createClass({
   componentDidMount () {
     const node  = ReactDOM.findDOMNode(this);
     const links = node.querySelectorAll('a');
+    const spoilers = node.querySelectorAll('.spoiler');
+
+    for (var i = 0; i < spoilers.length; ++i) {
+      let spoiler    = spoilers[i];
+      spoiler.addEventListener('click', this.onSpoilerClick.bind(this, spoiler), true);
+    }
 
     for (var i = 0; i < links.length; ++i) {
       let link    = links[i];
@@ -52,6 +58,18 @@ const StatusContent = React.createClass({
     }
   },
 
+  onSpoilerClick (spoiler, e) {
+    if (e.button === 0) {
+      //only toggle if we're not clicking a visible link
+      var hasClass = $(spoiler).hasClass('spoiler-on');
+      if (hasClass || e.target === spoiler) {
+        e.stopPropagation();
+        e.preventDefault();
+        $(spoiler).siblings(".spoiler").andSelf().toggleClass('spoiler-on', !hasClass);
+      }
+    }
+  },
+
   onNormalClick (e) {
     e.stopPropagation();
   },
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 80cb38e16..84d273299 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -14,6 +14,7 @@ import { Motion, spring } from 'react-motion';
 
 const messages = defineMessages({
   placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
+  spoiler_placeholder: { id: 'compose_form.spoiler_placeholder', defaultMessage: 'Content warning' },
   publish: { id: 'compose_form.publish', defaultMessage: 'Publish' }
 });
 
@@ -25,6 +26,8 @@ const ComposeForm = React.createClass({
     suggestion_token: React.PropTypes.string,
     suggestions: ImmutablePropTypes.list,
     sensitive: React.PropTypes.bool,
+    spoiler: React.PropTypes.bool,
+    spoiler_text: React.PropTypes.string,
     unlisted: React.PropTypes.bool,
     private: React.PropTypes.bool,
     fileDropDate: React.PropTypes.instanceOf(Date),
@@ -40,6 +43,8 @@ const ComposeForm = React.createClass({
     onFetchSuggestions: React.PropTypes.func.isRequired,
     onSuggestionSelected: React.PropTypes.func.isRequired,
     onChangeSensitivity: React.PropTypes.func.isRequired,
+    onChangeSpoilerness: React.PropTypes.func.isRequired,
+    onChangeSpoilerText: React.PropTypes.func.isRequired,
     onChangeVisibility: React.PropTypes.func.isRequired,
     onChangeListability: React.PropTypes.func.isRequired,
   },
@@ -77,6 +82,15 @@ const ComposeForm = React.createClass({
     this.props.onChangeSensitivity(e.target.checked);
   },
 
+  handleChangeSpoilerness (e) {
+    this.props.onChangeSpoilerness(e.target.checked);
+    this.props.onChangeSpoilerText('');
+  },
+
+  handleChangeSpoilerText (e) {
+    this.props.onChangeSpoilerText(e.target.value);
+  },
+
   handleChangeVisibility (e) {
     this.props.onChangeVisibility(e.target.checked);
   },
@@ -115,6 +129,14 @@ const ComposeForm = React.createClass({
 
     return (
       <div style={{ padding: '10px' }}>
+        <Motion defaultStyle={{ opacity: !this.props.spoiler ? 0 : 100, height: !this.props.spoiler ? 50 : 0 }} style={{ opacity: spring(!this.props.spoiler ? 0 : 100), height: spring(!this.props.spoiler ? 0 : 50) }}>
+          {({ opacity, height }) =>
+            <div className="spoiler-input" style={{ height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
+              <input placeholder={intl.formatMessage(messages.spoiler_placeholder)} value={this.props.spoiler_text} onChange={this.handleChangeSpoilerText} type="text" className="spoiler-input__input" />
+            </div>
+          }
+        </Motion>
+
         {replyArea}
 
         <AutosuggestTextarea
@@ -133,7 +155,7 @@ const ComposeForm = React.createClass({
 
         <div style={{ marginTop: '10px', overflow: 'hidden' }}>
           <div style={{ float: 'right' }}><Button text={intl.formatMessage(messages.publish)} onClick={this.handleSubmit} disabled={disabled} /></div>
-          <div style={{ float: 'right', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={this.props.text} /></div>
+          <div style={{ float: 'right', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={this.props.spoiler ? (this.props.spoiler_text + "\n" + this.props.text) : this.props.text} /></div>
           <UploadButtonContainer style={{ paddingTop: '4px' }} />
         </div>
 
@@ -142,6 +164,11 @@ const ComposeForm = React.createClass({
           <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.private' defaultMessage='Mark as private' /></span>
         </label>
 
+        <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle' }}>
+          <Toggle checked={this.props.spoiler} onChange={this.handleChangeSpoilerness} />
+          <span style={{ display: 'inline-block', verticalAlign: 'middle', marginBottom: '14px', marginLeft: '8px', color: '#9baec8' }}><FormattedMessage id='compose_form.spoiler' defaultMessage='Hide behind content warning' /></span>
+        </label>
+
         <Motion defaultStyle={{ opacity: (this.props.private || reply_to_other) ? 0 : 100, height: (this.props.private || reply_to_other) ? 39.5 : 0 }} style={{ opacity: spring((this.props.private || reply_to_other) ? 0 : 100), height: spring((this.props.private || reply_to_other) ? 0 : 39.5) }}>
           {({ opacity, height }) =>
             <label style={{ display: 'block', lineHeight: '24px', verticalAlign: 'middle', height: `${height}px`, overflow: 'hidden', opacity: opacity / 100 }}>
diff --git a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
index 1b5a506d5..8ccfce059 100644
--- a/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
+++ b/app/assets/javascripts/components/features/compose/containers/compose_form_container.jsx
@@ -8,6 +8,8 @@ import {
   fetchComposeSuggestions,
   selectComposeSuggestion,
   changeComposeSensitivity,
+  changeComposeSpoilerness,
+  changeComposeSpoilerText,
   changeComposeVisibility,
   changeComposeListability
 } from '../../../actions/compose';
@@ -22,6 +24,8 @@ const makeMapStateToProps = () => {
       suggestion_token: state.getIn(['compose', 'suggestion_token']),
       suggestions: state.getIn(['compose', 'suggestions']),
       sensitive: state.getIn(['compose', 'sensitive']),
+      spoiler: state.getIn(['compose', 'spoiler']),
+      spoiler_text: state.getIn(['compose', 'spoiler_text']),
       unlisted: state.getIn(['compose', 'unlisted']),
       private: state.getIn(['compose', 'private']),
       fileDropDate: state.getIn(['compose', 'fileDropDate']),
@@ -66,6 +70,14 @@ const mapDispatchToProps = function (dispatch) {
       dispatch(changeComposeSensitivity(checked));
     },
 
+    onChangeSpoilerness (checked) {
+      dispatch(changeComposeSpoilerness(checked));
+    },
+
+    onChangeSpoilerText (checked) {
+      dispatch(changeComposeSpoilerText(checked));
+    },
+
     onChangeVisibility (checked) {
       dispatch(changeComposeVisibility(checked));
     },
diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx
index 2df50c45b..1c6c3d4f4 100644
--- a/app/assets/javascripts/components/reducers/compose.jsx
+++ b/app/assets/javascripts/components/reducers/compose.jsx
@@ -17,6 +17,8 @@ import {
   COMPOSE_SUGGESTIONS_READY,
   COMPOSE_SUGGESTION_SELECT,
   COMPOSE_SENSITIVITY_CHANGE,
+  COMPOSE_SPOILERNESS_CHANGE,
+  COMPOSE_SPOILER_TEXT_CHANGE,
   COMPOSE_VISIBILITY_CHANGE,
   COMPOSE_LISTABILITY_CHANGE
 } from '../actions/compose';
@@ -27,6 +29,8 @@ import Immutable from 'immutable';
 const initialState = Immutable.Map({
   mounted: false,
   sensitive: false,
+  spoiler: false,
+  spoiler_text: '',
   unlisted: false,
   private: false,
   text: '',
@@ -56,6 +60,8 @@ function statusToTextMentions(state, status) {
 function clearAll(state) {
   return state.withMutations(map => {
     map.set('text', '');
+    map.set('spoiler', false);
+    map.set('spoiler_text', '');
     map.set('is_submitting', false);
     map.set('in_reply_to', null);
     map.update('media_attachments', list => list.clear());
@@ -98,6 +104,10 @@ export default function compose(state = initialState, action) {
       return state.set('mounted', false);
     case COMPOSE_SENSITIVITY_CHANGE:
       return state.set('sensitive', action.checked);
+    case COMPOSE_SPOILERNESS_CHANGE:
+      return state.set('spoiler', action.checked);
+    case COMPOSE_SPOILER_TEXT_CHANGE:
+      return state.set('spoiler_text', action.text);
     case COMPOSE_VISIBILITY_CHANGE:
       return state.set('private', action.checked);
     case COMPOSE_LISTABILITY_CHANGE:
diff --git a/app/assets/javascripts/extras.jsx b/app/assets/javascripts/extras.jsx
index 5738863dd..5784d17c2 100644
--- a/app/assets/javascripts/extras.jsx
+++ b/app/assets/javascripts/extras.jsx
@@ -14,6 +14,16 @@ $(() => {
     }
   });
 
+  $.each($('.spoiler'), (_, content) => {
+    $(content).on('click', e => {
+      var hasClass = $(content).hasClass('spoiler-on');
+      if (hasClass || e.target === content) {
+        e.preventDefault();
+        $(content).siblings(".spoiler").andSelf().toggleClass('spoiler-on', !hasClass);
+      }
+    });
+  });
+
   $('.media-spoiler').on('click', e => {
     $(e.target).hide();
   });
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 73d1acccd..681259861 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -584,21 +584,20 @@
   }
 }
 
-.autosuggest-textarea {
+.autosuggest-textarea, .spoiler-input {
   position: relative;
 }
 
-.autosuggest-textarea__textarea {
+.autosuggest-textarea__textarea, .spoiler-input__input {
   display: block;
   box-sizing: border-box;
   width: 100%;
-  height: 100px;
   resize: none;
+  margin: 0;
   color: $color1;
   padding: 7px;
   font-family: inherit;
   font-size: 14px;
-  margin: 0;
   resize: vertical;
 
   border: 3px dashed transparent;
@@ -609,6 +608,10 @@
   }
 }
 
+.autosuggest-textarea__textarea {
+  height: 100px;
+}
+
 .autosuggest-textarea__suggestions {
   position: absolute;
   top: 100%;
@@ -663,6 +666,39 @@
   }
 }
 
+.spoiler-helper {
+  margin-bottom: -20px !important;
+}
+
+.spoiler {
+  &::before {
+    margin-top: 20px;
+    display: block;
+    content: '';
+  }
+
+  display: inline;
+  cursor: pointer;
+  border-bottom: 1px dashed white;
+  .light & {
+    border-bottom: 1px dashed black;
+  }
+
+  &.spoiler-on {
+    &, & * {
+      color: transparent !important;
+    }
+    background: white;
+    .light & {
+      background: black;
+    }
+
+    .emojione {
+      opacity: 0;
+    }
+  }
+}
+
 button i.fa-retweet {
   height: 19px;
   width: 22px;
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index da87ebbad..0155b64a3 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -57,7 +57,7 @@ class Api::V1::StatusesController < ApiController
   end
 
   def create
-    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids], sensitive: params[:sensitive], visibility: params[:visibility], application: doorkeeper_token.application)
+    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids], sensitive: params[:sensitive], spoiler: params[:spoiler], spoiler_text: params[:spoiler_text], visibility: params[:visibility], application: doorkeeper_token.application)
     render action: :show
   end
 
diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index 036a72166..7547e77e4 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -207,6 +207,7 @@ module AtomBuilderHelper
           end
 
           category(xml, 'nsfw') if stream_entry.target.sensitive?
+          category(xml, 'spoiler') if stream_entry.target.spoiler?
         end
       end
     end
@@ -228,6 +229,7 @@ module AtomBuilderHelper
     end
 
     category(xml, 'nsfw') if stream_entry.activity.sensitive?
+    category(xml, 'spoiler') if stream_entry.activity.spoiler?
   end
 
   private
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 3565611bc..ccdef0382 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -14,7 +14,15 @@ class Formatter
 
     html = status.text
     html = encode(html)
-    html = simple_format(html, sanitize: false)
+
+    if (status.spoiler?)
+      spoilerhtml = status.spoiler_text
+      spoilerhtml = encode(spoilerhtml)
+      html = wrap_spoilers(html, spoilerhtml)
+    else
+      html = simple_format(html, sanitize: false)
+    end
+
     html = html.gsub(/\n/, '')
     html = link_urls(html)
     html = link_mentions(html, status.mentions)
@@ -43,6 +51,13 @@ class Formatter
     HTMLEntities.new.encode(html)
   end
 
+  def wrap_spoilers(html, spoilerhtml)
+    spoilerhtml = simple_format(spoilerhtml, {class: "spoiler-helper"}, {sanitize: false})
+    html = simple_format(html, {class: ["spoiler", "spoiler-on"]}, {sanitize: false})
+
+    spoilerhtml + html
+  end
+
   def link_urls(html)
     html.gsub(URI.regexp(%w(http https))) do |match|
       link_html(match)
diff --git a/app/models/status.rb b/app/models/status.rb
index d5f52b55c..42abe92e5 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Status < ApplicationRecord
+  include ActiveModel::Validations
   include Paginable
   include Streamable
   include Cacheable
@@ -27,7 +28,8 @@ class Status < ApplicationRecord
 
   validates :account, presence: true
   validates :uri, uniqueness: true, unless: 'local?'
-  validates :text, presence: true, length: { maximum: 500 }, if: proc { |s| s.local? && !s.reblog? }
+  validates :text, presence: true, if: proc { |s| s.local? && !s.reblog? }
+  validates_with StatusLengthValidator
   validates :text, presence: true, if: proc { |s| !s.local? && !s.reblog? }
   validates :reblog, uniqueness: { scope: :account, message: 'of status already exists' }, if: 'reblog?'
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 8765ef5e3..ef8aa4a91 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -8,6 +8,8 @@ class PostStatusService < BaseService
   # @param [Hash] options
   # @option [Boolean] :sensitive
   # @option [String] :visibility
+  # @option [Boolean] :spoiler
+  # @option [String] :spoiler_text
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @option [Doorkeeper::Application] :application
   # @return [Status]
@@ -15,6 +17,8 @@ class PostStatusService < BaseService
     status = account.statuses.create!(text:        text,
                                       thread:      in_reply_to,
                                       sensitive:   options[:sensitive],
+                                      spoiler:   options[:spoiler],
+                                      spoiler_text:   options[:spoiler_text],
                                       visibility:  options[:visibility],
                                       application: options[:application])
 
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 617a38159..9da7ef74e 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -9,5 +9,6 @@ class ProcessHashtagsService < BaseService
     end
 
     status.update(sensitive: true) if tags.include?('nsfw')
+    status.update(spoiler: true) if tags.include?('spoiler')
   end
 end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
new file mode 100644
index 000000000..5491d3d5f
--- /dev/null
+++ b/app/validators/status_length_validator.rb
@@ -0,0 +1,15 @@
+class StatusLengthValidator < ActiveModel::Validator
+  def validate(status)
+    if status.local? && !status.reblog?
+      combinedText = status.text
+      if (status.spoiler? && status.spoiler_text.present?)
+        combinedText = status.spoiler_text + "\n" + status.text
+      end
+
+      maxChars = 500
+      unless combinedText.length <= maxChars
+        status.errors[:text] << "is too long (maximum is #{maxChars})"
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl
index a3fc78763..8b54d5852 100644
--- a/app/views/api/v1/statuses/_show.rabl
+++ b/app/views/api/v1/statuses/_show.rabl
@@ -1,4 +1,4 @@
-attributes :id, :created_at, :in_reply_to_id, :sensitive, :visibility
+attributes :id, :created_at, :in_reply_to_id, :sensitive, :spoiler, :visibility
 
 node(:uri)              { |status| TagManager.instance.uri_for(status) }
 node(:content)          { |status| Formatter.instance.format(status) }
diff --git a/db/migrate/20170112041538_add_spoiler_to_statuses.rb b/db/migrate/20170112041538_add_spoiler_to_statuses.rb
new file mode 100644
index 000000000..3b46433f5
--- /dev/null
+++ b/db/migrate/20170112041538_add_spoiler_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddSpoilerToStatuses < ActiveRecord::Migration[5.0]
+  def change
+    add_column :statuses, :spoiler, :boolean, default: false
+  end
+end
diff --git a/db/migrate/20170114014334_add_spoiler_text_to_statuses.rb b/db/migrate/20170114014334_add_spoiler_text_to_statuses.rb
new file mode 100644
index 000000000..e4065d7db
--- /dev/null
+++ b/db/migrate/20170114014334_add_spoiler_text_to_statuses.rb
@@ -0,0 +1,5 @@
+class AddSpoilerTextToStatuses < ActiveRecord::Migration[5.0]
+  def change
+    add_column :statuses, :spoiler_text, :text, default: ""
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3876faa56..f228da01e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -186,74 +186,6 @@ ActiveRecord::Schema.define(version: 20170123203248) do
     t.index ["topic", "callback"], name: "index_pubsubhubbub_subscriptions_on_topic_and_callback", unique: true, using: :btree
   end
 
-  create_table "push_devices", force: :cascade do |t|
-    t.string   "service",    default: "", null: false
-    t.string   "token",      default: "", null: false
-    t.integer  "account",                 null: false
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
-    t.index ["service", "token"], name: "index_push_devices_on_service_and_token", unique: true, using: :btree
-  end
-
-  create_table "rpush_apps", force: :cascade do |t|
-    t.string   "name",                                null: false
-    t.string   "environment"
-    t.text     "certificate"
-    t.string   "password"
-    t.integer  "connections",             default: 1, null: false
-    t.datetime "created_at",                          null: false
-    t.datetime "updated_at",                          null: false
-    t.string   "type",                                null: false
-    t.string   "auth_key"
-    t.string   "client_id"
-    t.string   "client_secret"
-    t.string   "access_token"
-    t.datetime "access_token_expiration"
-  end
-
-  create_table "rpush_feedback", force: :cascade do |t|
-    t.string   "device_token", limit: 64, null: false
-    t.datetime "failed_at",               null: false
-    t.datetime "created_at",              null: false
-    t.datetime "updated_at",              null: false
-    t.integer  "app_id"
-    t.index ["device_token"], name: "index_rpush_feedback_on_device_token", using: :btree
-  end
-
-  create_table "rpush_notifications", force: :cascade do |t|
-    t.integer  "badge"
-    t.string   "device_token",      limit: 64
-    t.string   "sound",                        default: "default"
-    t.text     "alert"
-    t.text     "data"
-    t.integer  "expiry",                       default: 86400
-    t.boolean  "delivered",                    default: false,     null: false
-    t.datetime "delivered_at"
-    t.boolean  "failed",                       default: false,     null: false
-    t.datetime "failed_at"
-    t.integer  "error_code"
-    t.text     "error_description"
-    t.datetime "deliver_after"
-    t.datetime "created_at",                                       null: false
-    t.datetime "updated_at",                                       null: false
-    t.boolean  "alert_is_json",                default: false
-    t.string   "type",                                             null: false
-    t.string   "collapse_key"
-    t.boolean  "delay_while_idle",             default: false,     null: false
-    t.text     "registration_ids"
-    t.integer  "app_id",                                           null: false
-    t.integer  "retries",                      default: 0
-    t.string   "uri"
-    t.datetime "fail_after"
-    t.boolean  "processing",                   default: false,     null: false
-    t.integer  "priority"
-    t.text     "url_args"
-    t.string   "category"
-    t.boolean  "content_available",            default: false
-    t.text     "notification"
-    t.index ["delivered", "failed"], name: "index_rpush_notifications_multi", where: "((NOT delivered) AND (NOT failed))", using: :btree
-  end
-
   create_table "settings", force: :cascade do |t|
     t.string   "var",        null: false
     t.text     "value"
@@ -276,6 +208,9 @@ ActiveRecord::Schema.define(version: 20170123203248) do
     t.boolean  "sensitive",              default: false
     t.integer  "visibility",             default: 0,     null: false
     t.integer  "in_reply_to_account_id"
+    t.string   "conversation_uri"
+    t.boolean  "spoiler",                default: false
+    t.text     "spoiler_text",           default: ""
     t.integer  "application_id"
     t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
     t.index ["in_reply_to_id"], name: "index_statuses_on_in_reply_to_id", using: :btree
-- 
cgit 


From 8a880a3d464daf486a10d85b8ee49305aa6b1e5b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 24 Jan 2017 21:40:41 +0100
Subject: Make blocks create entries and unfollows instantly, but do the clean
 up in the background instead. Should fix delay where blocked person can
 interact with blocker for a short time before background job gets processed

---
 app/controllers/api/v1/accounts_controller.rb |  2 +-
 app/services/after_block_service.rb           | 31 +++++++++++++++++++++++++++
 app/services/block_service.rb                 | 27 +----------------------
 app/workers/block_worker.rb                   |  2 +-
 4 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 app/services/after_block_service.rb

(limited to 'app/services')

diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index a43619193..d97010c0e 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -65,7 +65,7 @@ class Api::V1::AccountsController < ApiController
   end
 
   def block
-    BlockWorker.perform_async(current_user.account_id, @account.id)
+    BlockService.new.call(current_user.account, @account)
 
     @following   = { @account.id => false }
     @followed_by = { @account.id => false }
diff --git a/app/services/after_block_service.rb b/app/services/after_block_service.rb
new file mode 100644
index 000000000..8c6197f2c
--- /dev/null
+++ b/app/services/after_block_service.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class AfterBlockService < BaseService
+  def call(account, target_account)
+    clear_timelines(account, target_account)
+    clear_notifications(account, target_account)
+  end
+
+  private
+
+  def clear_timelines(account, target_account)
+    mentions_key = FeedManager.instance.key(:mentions, account.id)
+    home_key     = FeedManager.instance.key(:home, account.id)
+
+    target_account.statuses.select('id').find_each do |status|
+      redis.zrem(mentions_key, status.id)
+      redis.zrem(home_key, status.id)
+    end
+  end
+
+  def clear_notifications(account, target_account)
+    Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all
+    Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all
+    Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all
+    Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all
+  end
+
+  def redis
+    Redis.current
+  end
+end
diff --git a/app/services/block_service.rb b/app/services/block_service.rb
index b08cf8ca8..e04b6cc39 100644
--- a/app/services/block_service.rb
+++ b/app/services/block_service.rb
@@ -9,32 +9,7 @@ class BlockService < BaseService
 
     block = account.block!(target_account)
 
-    clear_timelines(account, target_account)
-    clear_notifications(account, target_account)
-
+    BlockWorker.perform_async(account.id, target_account.id)
     NotificationWorker.perform_async(block.stream_entry.id, target_account.id) unless target_account.local?
   end
-
-  private
-
-  def clear_timelines(account, target_account)
-    mentions_key = FeedManager.instance.key(:mentions, account.id)
-    home_key     = FeedManager.instance.key(:home, account.id)
-
-    target_account.statuses.select('id').find_each do |status|
-      redis.zrem(mentions_key, status.id)
-      redis.zrem(home_key, status.id)
-    end
-  end
-
-  def clear_notifications(account, target_account)
-    Notification.where(account: account).joins(:follow).where(activity_type: 'Follow', follows: { account_id: target_account.id }).destroy_all
-    Notification.where(account: account).joins(mention: :status).where(activity_type: 'Mention', statuses: { account_id: target_account.id }).destroy_all
-    Notification.where(account: account).joins(:favourite).where(activity_type: 'Favourite', favourites: { account_id: target_account.id }).destroy_all
-    Notification.where(account: account).joins(:status).where(activity_type: 'Status', statuses: { account_id: target_account.id }).destroy_all
-  end
-
-  def redis
-    Redis.current
-  end
 end
diff --git a/app/workers/block_worker.rb b/app/workers/block_worker.rb
index dc00db197..0820490d3 100644
--- a/app/workers/block_worker.rb
+++ b/app/workers/block_worker.rb
@@ -4,6 +4,6 @@ class BlockWorker
   include Sidekiq::Worker
 
   def perform(account_id, target_account_id)
-    BlockService.new.call(Account.find(account_id), Account.find(target_account_id))
+    AfterBlockService.new.call(Account.find(account_id), Account.find(target_account_id))
   end
 end
-- 
cgit 


From 999cde94a6a2d67cf36160365378951d3b55b868 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 25 Jan 2017 00:49:08 +0100
Subject: Instead of using spoiler boolean and spoiler_text, simply check for
 non-blank spoiler_text Federate spoiler_text using warning attribute on
 <content /> instead of a <category term="spoiler" /> Clean up schema file
 from accidental development migrations

---
 .../javascripts/components/actions/compose.jsx     |   1 -
 .../components/components/status_content.jsx       |  65 ++++++-----
 .../features/compose/components/compose_form.jsx   |   2 +-
 .../features/compose/components/upload_form.jsx    |   3 +-
 .../javascripts/components/reducers/compose.jsx    | 124 ++++++++++-----------
 app/assets/javascripts/extras.jsx                  |  10 --
 app/assets/stylesheets/stream_entries.scss         |   2 +
 app/controllers/api/v1/statuses_controller.rb      |   7 +-
 app/helpers/atom_builder_helper.rb                 |  18 ++-
 app/lib/formatter.rb                               |  17 +--
 app/lib/status_length_validator.rb                 |  10 ++
 app/models/status.rb                               |   4 +-
 app/services/fetch_link_card_service.rb            |   4 +-
 app/services/post_status_service.rb                |  12 +-
 app/services/process_feed_service.rb               |   5 +
 app/services/process_hashtags_service.rb           |   1 -
 app/validators/status_length_validator.rb          |  15 ---
 app/views/api/v1/statuses/_show.rabl               |   2 +-
 .../stream_entries/_detailed_status.html.haml      |   5 +-
 app/views/stream_entries/_simple_status.html.haml  |   5 +-
 config/locales/en.yml                              |   2 +
 .../20170112041538_add_spoiler_to_statuses.rb      |   5 -
 db/schema.rb                                       |  15 ---
 23 files changed, 160 insertions(+), 174 deletions(-)
 create mode 100644 app/lib/status_length_validator.rb
 delete mode 100644 app/validators/status_length_validator.rb
 delete mode 100644 db/migrate/20170112041538_add_spoiler_to_statuses.rb

(limited to 'app/services')

diff --git a/app/assets/javascripts/components/actions/compose.jsx b/app/assets/javascripts/components/actions/compose.jsx
index 948ccf872..6d0188166 100644
--- a/app/assets/javascripts/components/actions/compose.jsx
+++ b/app/assets/javascripts/components/actions/compose.jsx
@@ -70,7 +70,6 @@ export function submitCompose() {
       in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
       media_ids: getState().getIn(['compose', 'media_attachments']).map(item => item.get('id')),
       sensitive: getState().getIn(['compose', 'sensitive']),
-      spoiler: getState().getIn(['compose', 'spoiler']),
       spoiler_text: getState().getIn(['compose', 'spoiler_text'], ''),
       visibility: getState().getIn(['compose', 'private']) ? 'private' : (getState().getIn(['compose', 'unlisted']) ? 'unlisted' : 'public')
     }).then(function (response) {
diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 74b52e485..ff90226d8 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -1,6 +1,7 @@
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 import emojify from '../emoji';
+import { FormattedMessage } from 'react-intl';
 
 const StatusContent = React.createClass({
 
@@ -13,17 +14,17 @@ const StatusContent = React.createClass({
     onClick: React.PropTypes.func
   },
 
+  getInitialState () {
+    return {
+      hidden: true
+    };
+  },
+
   mixins: [PureRenderMixin],
 
   componentDidMount () {
     const node  = ReactDOM.findDOMNode(this);
     const links = node.querySelectorAll('a');
-    const spoilers = node.querySelectorAll('.spoiler');
-
-    for (var i = 0; i < spoilers.length; ++i) {
-      let spoiler    = spoilers[i];
-      spoiler.addEventListener('click', this.onSpoilerClick.bind(this, spoiler), true);
-    }
 
     for (var i = 0; i < links.length; ++i) {
       let link    = links[i];
@@ -56,18 +57,6 @@ const StatusContent = React.createClass({
     }
   },
 
-  onSpoilerClick (spoiler, e) {
-    if (e.button === 0) {
-      //only toggle if we're not clicking a visible link
-      var hasClass = $(spoiler).hasClass('spoiler-on');
-      if (hasClass || e.target === spoiler) {
-        e.stopPropagation();
-        e.preventDefault();
-        $(spoiler).siblings(".spoiler").andSelf().toggleClass('spoiler-on', !hasClass);
-      }
-    }
-  },
-
   handleMouseDown (e) {
     this.startXY = [e.clientX, e.clientY];
   },
@@ -87,20 +76,40 @@ const StatusContent = React.createClass({
     this.startXY = null;
   },
 
+  handleSpoilerClick () {
+    this.setState({ hidden: !this.state.hidden });
+  },
+
   render () {
     const { status } = this.props;
+    const { hidden } = this.state;
 
     const content = { __html: emojify(status.get('content')) };
-
-    return (
-      <div
-        className='status__content'
-        style={{ cursor: 'pointer' }}
-        dangerouslySetInnerHTML={content}
-        onMouseDown={this.handleMouseDown}
-        onMouseUp={this.handleMouseUp}
-      />
-    );
+    const spoilerContent = { __html: emojify(status.get('spoiler_text')) };
+
+    if (status.get('spoiler_text').length > 0) {
+      const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
+
+      return (
+        <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
+          <p>
+            <span dangerouslySetInnerHTML={spoilerContent} /> <a onClick={this.handleSpoilerClick}>{toggleText}</a>
+          </p>
+
+          <div style={{ display: hidden ? 'none' : 'block' }} dangerouslySetInnerHTML={content} />
+        </div>
+      );
+    } else {
+      return (
+        <div
+          className='status__content'
+          style={{ cursor: 'pointer' }}
+          onMouseDown={this.handleMouseDown}
+          onMouseUp={this.handleMouseUp}
+          dangerouslySetInnerHTML={content}
+        />
+      );
+    }
   },
 
 });
diff --git a/app/assets/javascripts/components/features/compose/components/compose_form.jsx b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
index 84d273299..48363a968 100644
--- a/app/assets/javascripts/components/features/compose/components/compose_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/compose_form.jsx
@@ -155,7 +155,7 @@ const ComposeForm = React.createClass({
 
         <div style={{ marginTop: '10px', overflow: 'hidden' }}>
           <div style={{ float: 'right' }}><Button text={intl.formatMessage(messages.publish)} onClick={this.handleSubmit} disabled={disabled} /></div>
-          <div style={{ float: 'right', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={this.props.spoiler ? (this.props.spoiler_text + "\n" + this.props.text) : this.props.text} /></div>
+          <div style={{ float: 'right', marginRight: '16px', lineHeight: '36px' }}><CharacterCounter max={500} text={[this.props.spoiler_text, this.props.text].join('')} /></div>
           <UploadButtonContainer style={{ paddingTop: '4px' }} />
         </div>
 
diff --git a/app/assets/javascripts/components/features/compose/components/upload_form.jsx b/app/assets/javascripts/components/features/compose/components/upload_form.jsx
index 8a14dda69..94c94b4b7 100644
--- a/app/assets/javascripts/components/features/compose/components/upload_form.jsx
+++ b/app/assets/javascripts/components/features/compose/components/upload_form.jsx
@@ -12,7 +12,8 @@ const UploadForm = React.createClass({
   propTypes: {
     media: ImmutablePropTypes.list.isRequired,
     is_uploading: React.PropTypes.bool,
-    onRemoveFile: React.PropTypes.func.isRequired
+    onRemoveFile: React.PropTypes.func.isRequired,
+    intl: React.PropTypes.object.isRequired
   },
 
   mixins: [PureRenderMixin],
diff --git a/app/assets/javascripts/components/reducers/compose.jsx b/app/assets/javascripts/components/reducers/compose.jsx
index 1c6c3d4f4..d3a84842f 100644
--- a/app/assets/javascripts/components/reducers/compose.jsx
+++ b/app/assets/javascripts/components/reducers/compose.jsx
@@ -96,68 +96,68 @@ const insertSuggestion = (state, position, token, completion) => {
 
 export default function compose(state = initialState, action) {
   switch(action.type) {
-    case STORE_HYDRATE:
-      return state.merge(action.state.get('compose'));
-    case COMPOSE_MOUNT:
-      return state.set('mounted', true);
-    case COMPOSE_UNMOUNT:
-      return state.set('mounted', false);
-    case COMPOSE_SENSITIVITY_CHANGE:
-      return state.set('sensitive', action.checked);
-    case COMPOSE_SPOILERNESS_CHANGE:
-      return state.set('spoiler', action.checked);
-    case COMPOSE_SPOILER_TEXT_CHANGE:
-      return state.set('spoiler_text', action.text);
-    case COMPOSE_VISIBILITY_CHANGE:
-      return state.set('private', action.checked);
-    case COMPOSE_LISTABILITY_CHANGE:
-      return state.set('unlisted', action.checked);
-    case COMPOSE_CHANGE:
-      return state.set('text', action.text);
-    case COMPOSE_REPLY:
-      return state.withMutations(map => {
-        map.set('in_reply_to', action.status.get('id'));
-        map.set('text', statusToTextMentions(state, action.status));
-      });
-    case COMPOSE_REPLY_CANCEL:
-      return state.withMutations(map => {
-        map.set('in_reply_to', null);
-        map.set('text', '');
-      });
-    case COMPOSE_SUBMIT_REQUEST:
-      return state.set('is_submitting', true);
-    case COMPOSE_SUBMIT_SUCCESS:
-      return clearAll(state);
-    case COMPOSE_SUBMIT_FAIL:
-      return state.set('is_submitting', false);
-    case COMPOSE_UPLOAD_REQUEST:
-      return state.withMutations(map => {
-        map.set('is_uploading', true);
-        map.set('fileDropDate', new Date());
-      });
-    case COMPOSE_UPLOAD_SUCCESS:
-      return appendMedia(state, Immutable.fromJS(action.media));
-    case COMPOSE_UPLOAD_FAIL:
-      return state.set('is_uploading', false);
-    case COMPOSE_UPLOAD_UNDO:
-      return removeMedia(state, action.media_id);
-    case COMPOSE_UPLOAD_PROGRESS:
-      return state.set('progress', Math.round((action.loaded / action.total) * 100));
-    case COMPOSE_MENTION:
-      return state.update('text', text => `${text}@${action.account.get('acct')} `);
-    case COMPOSE_SUGGESTIONS_CLEAR:
-      return state.update('suggestions', Immutable.List(), list => list.clear()).set('suggestion_token', null);
-    case COMPOSE_SUGGESTIONS_READY:
-      return state.set('suggestions', Immutable.List(action.accounts.map(item => item.id))).set('suggestion_token', action.token);
-    case COMPOSE_SUGGESTION_SELECT:
-      return insertSuggestion(state, action.position, action.token, action.completion);
-    case TIMELINE_DELETE:
-      if (action.id === state.get('in_reply_to')) {
-        return state.set('in_reply_to', null);
-      } else {
-        return state;
-      }
-    default:
+  case STORE_HYDRATE:
+    return state.merge(action.state.get('compose'));
+  case COMPOSE_MOUNT:
+    return state.set('mounted', true);
+  case COMPOSE_UNMOUNT:
+    return state.set('mounted', false);
+  case COMPOSE_SENSITIVITY_CHANGE:
+    return state.set('sensitive', action.checked);
+  case COMPOSE_SPOILERNESS_CHANGE:
+    return (action.checked ? state : state.set('spoiler_text', '')).set('spoiler', action.checked);
+  case COMPOSE_SPOILER_TEXT_CHANGE:
+    return state.set('spoiler_text', action.text);
+  case COMPOSE_VISIBILITY_CHANGE:
+    return state.set('private', action.checked);
+  case COMPOSE_LISTABILITY_CHANGE:
+    return state.set('unlisted', action.checked);
+  case COMPOSE_CHANGE:
+    return state.set('text', action.text);
+  case COMPOSE_REPLY:
+    return state.withMutations(map => {
+      map.set('in_reply_to', action.status.get('id'));
+      map.set('text', statusToTextMentions(state, action.status));
+    });
+  case COMPOSE_REPLY_CANCEL:
+    return state.withMutations(map => {
+      map.set('in_reply_to', null);
+      map.set('text', '');
+    });
+  case COMPOSE_SUBMIT_REQUEST:
+    return state.set('is_submitting', true);
+  case COMPOSE_SUBMIT_SUCCESS:
+    return clearAll(state);
+  case COMPOSE_SUBMIT_FAIL:
+    return state.set('is_submitting', false);
+  case COMPOSE_UPLOAD_REQUEST:
+    return state.withMutations(map => {
+      map.set('is_uploading', true);
+      map.set('fileDropDate', new Date());
+    });
+  case COMPOSE_UPLOAD_SUCCESS:
+    return appendMedia(state, Immutable.fromJS(action.media));
+  case COMPOSE_UPLOAD_FAIL:
+    return state.set('is_uploading', false);
+  case COMPOSE_UPLOAD_UNDO:
+    return removeMedia(state, action.media_id);
+  case COMPOSE_UPLOAD_PROGRESS:
+    return state.set('progress', Math.round((action.loaded / action.total) * 100));
+  case COMPOSE_MENTION:
+    return state.update('text', text => `${text}@${action.account.get('acct')} `);
+  case COMPOSE_SUGGESTIONS_CLEAR:
+    return state.update('suggestions', Immutable.List(), list => list.clear()).set('suggestion_token', null);
+  case COMPOSE_SUGGESTIONS_READY:
+    return state.set('suggestions', Immutable.List(action.accounts.map(item => item.id))).set('suggestion_token', action.token);
+  case COMPOSE_SUGGESTION_SELECT:
+    return insertSuggestion(state, action.position, action.token, action.completion);
+  case TIMELINE_DELETE:
+    if (action.id === state.get('in_reply_to')) {
+      return state.set('in_reply_to', null);
+    } else {
       return state;
+    }
+  default:
+    return state;
   }
 };
diff --git a/app/assets/javascripts/extras.jsx b/app/assets/javascripts/extras.jsx
index 5784d17c2..5738863dd 100644
--- a/app/assets/javascripts/extras.jsx
+++ b/app/assets/javascripts/extras.jsx
@@ -14,16 +14,6 @@ $(() => {
     }
   });
 
-  $.each($('.spoiler'), (_, content) => {
-    $(content).on('click', e => {
-      var hasClass = $(content).hasClass('spoiler-on');
-      if (hasClass || e.target === content) {
-        e.preventDefault();
-        $(content).siblings(".spoiler").andSelf().toggleClass('spoiler-on', !hasClass);
-      }
-    });
-  });
-
   $('.media-spoiler').on('click', e => {
     $(e.target).hide();
   });
diff --git a/app/assets/stylesheets/stream_entries.scss b/app/assets/stylesheets/stream_entries.scss
index ccae88ec7..2d3cb1436 100644
--- a/app/assets/stylesheets/stream_entries.scss
+++ b/app/assets/stylesheets/stream_entries.scss
@@ -249,6 +249,7 @@
       padding: 5px;
       border-radius: 100px;
       color: rgba($color5, 0.8);
+      z-index: 1;
     }
   }
 
@@ -263,6 +264,7 @@
     flex-direction: column;
     text-align: center;
     transition: all 100ms linear;
+    z-index: 2;
 
     &:hover {
       background: darken($color3, 5%);
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 09d5a82fa..4b095a570 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -57,7 +57,12 @@ class Api::V1::StatusesController < ApiController
   end
 
   def create
-    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids], sensitive: params[:sensitive], spoiler: params[:spoiler], spoiler_text: params[:spoiler_text], visibility: params[:visibility], application: doorkeeper_token.application)
+    @status = PostStatusService.new.call(current_user.account, params[:status], params[:in_reply_to_id].blank? ? nil : Status.find(params[:in_reply_to_id]), media_ids: params[:media_ids],
+                                                                                                                                                             sensitive: params[:sensitive],
+                                                                                                                                                             spoiler_text: params[:spoiler_text],
+                                                                                                                                                             visibility: params[:visibility],
+                                                                                                                                                             application: doorkeeper_token.application)
+
     render action: :show
   end
 
diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index 7547e77e4..f17b4cc72 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -41,8 +41,10 @@ module AtomBuilderHelper
     xml['activity'].send('verb', TagManager::VERBS[verb])
   end
 
-  def content(xml, content)
-    xml.content({ type: 'html' }, content) unless content.blank?
+  def content(xml, content, warning = nil)
+    extra = { type: 'html' }
+    extra[:warning] = warning unless warning.blank?
+    xml.content(extra, content) unless content.blank?
   end
 
   def title(xml, title)
@@ -153,12 +155,20 @@ module AtomBuilderHelper
     portable_contact xml, account
   end
 
+  def rich_content(xml, activity)
+    if activity.is_a?(Status)
+      content xml, conditionally_formatted(activity), activity.spoiler_text
+    else
+      content xml, conditionally_formatted(activity)
+    end
+  end
+
   def include_entry(xml, stream_entry)
     unique_id      xml, stream_entry.created_at, stream_entry.activity_id, stream_entry.activity_type
     published_at   xml, stream_entry.created_at
     updated_at     xml, stream_entry.updated_at
     title          xml, stream_entry.title
-    content        xml, conditionally_formatted(stream_entry.activity)
+    rich_content   xml, stream_entry.activity
     verb           xml, stream_entry.verb
     link_self      xml, account_stream_entry_url(stream_entry.account, stream_entry, format: 'atom')
     link_alternate xml, account_stream_entry_url(stream_entry.account, stream_entry)
@@ -207,7 +217,6 @@ module AtomBuilderHelper
           end
 
           category(xml, 'nsfw') if stream_entry.target.sensitive?
-          category(xml, 'spoiler') if stream_entry.target.spoiler?
         end
       end
     end
@@ -229,7 +238,6 @@ module AtomBuilderHelper
     end
 
     category(xml, 'nsfw') if stream_entry.activity.sensitive?
-    category(xml, 'spoiler') if stream_entry.activity.spoiler?
   end
 
   private
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 72cd3d234..ff2a16f1b 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -14,15 +14,7 @@ class Formatter
 
     html = status.text
     html = encode(html)
-
-    if (status.spoiler?)
-      spoilerhtml = status.spoiler_text
-      spoilerhtml = encode(spoilerhtml)
-      html = wrap_spoilers(html, spoilerhtml)
-    else
-      html = simple_format(html, sanitize: false)
-    end
-
+    html = simple_format(html, {}, sanitize: false)
     html = html.gsub(/\n/, '')
     html = link_urls(html)
     html = link_mentions(html, status.mentions)
@@ -51,13 +43,6 @@ class Formatter
     HTMLEntities.new.encode(html)
   end
 
-  def wrap_spoilers(html, spoilerhtml)
-    spoilerhtml = simple_format(spoilerhtml, {class: "spoiler-helper"}, {sanitize: false})
-    html = simple_format(html, {class: ["spoiler", "spoiler-on"]}, {sanitize: false})
-
-    spoilerhtml + html
-  end
-
   def link_urls(html)
     html.gsub(URI.regexp(%w(http https))) do |match|
       link_html(match)
diff --git a/app/lib/status_length_validator.rb b/app/lib/status_length_validator.rb
new file mode 100644
index 000000000..55135a598
--- /dev/null
+++ b/app/lib/status_length_validator.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class StatusLengthValidator < ActiveModel::Validator
+  MAX_CHARS = 500
+
+  def validate(status)
+    return unless status.local? && !status.reblog?
+    status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.length > MAX_CHARS
+  end
+end
diff --git a/app/models/status.rb b/app/models/status.rb
index 42abe92e5..651d0dbc9 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -28,9 +28,8 @@ class Status < ApplicationRecord
 
   validates :account, presence: true
   validates :uri, uniqueness: true, unless: 'local?'
-  validates :text, presence: true, if: proc { |s| s.local? && !s.reblog? }
+  validates :text, presence: true, unless: 'reblog?'
   validates_with StatusLengthValidator
-  validates :text, presence: true, if: proc { |s| !s.local? && !s.reblog? }
   validates :reblog, uniqueness: { scope: :account, message: 'of status already exists' }, if: 'reblog?'
 
   default_scope { order('id desc') }
@@ -176,6 +175,7 @@ class Status < ApplicationRecord
 
   before_validation do
     text.strip!
+    spoiler_text&.strip!
 
     self.reblog                 = reblog.reblog if reblog? && reblog.reblog?
     self.in_reply_to_account_id = (thread.account_id == account_id && thread.reply? ? thread.in_reply_to_account_id : thread.account_id) if reply?
diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb
index 2779b79b5..005e5acea 100644
--- a/app/services/fetch_link_card_service.rb
+++ b/app/services/fetch_link_card_service.rb
@@ -9,7 +9,7 @@ class FetchLinkCardService < BaseService
 
     response = http_client.get(url)
 
-    return if response.code != 200
+    return if response.code != 200 || response.mime_type != 'text/html'
 
     page = Nokogiri::HTML(response.to_s)
     card = PreviewCard.where(status: status).first_or_initialize(status: status, url: url)
@@ -18,6 +18,8 @@ class FetchLinkCardService < BaseService
     card.description = meta_property(page, 'og:description') || meta_property(page, 'description')
     card.image       = URI.parse(meta_property(page, 'og:image')) if meta_property(page, 'og:image')
 
+    return if card.title.blank?
+
     card.save_with_optional_image!
   end
 
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index ef8aa4a91..91b654603 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -8,18 +8,16 @@ class PostStatusService < BaseService
   # @param [Hash] options
   # @option [Boolean] :sensitive
   # @option [String] :visibility
-  # @option [Boolean] :spoiler
   # @option [String] :spoiler_text
   # @option [Enumerable] :media_ids Optional array of media IDs to attach
   # @option [Doorkeeper::Application] :application
   # @return [Status]
   def call(account, text, in_reply_to = nil, options = {})
-    status = account.statuses.create!(text:        text,
-                                      thread:      in_reply_to,
-                                      sensitive:   options[:sensitive],
-                                      spoiler:   options[:spoiler],
-                                      spoiler_text:   options[:spoiler_text],
-                                      visibility:  options[:visibility],
+    status = account.statuses.create!(text: text,
+                                      thread: in_reply_to,
+                                      sensitive: options[:sensitive],
+                                      spoiler_text: options[:spoiler_text],
+                                      visibility: options[:visibility],
                                       application: options[:application])
 
     attach_media(status, options[:media_ids])
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 84273680d..4576b4321 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -103,6 +103,7 @@ class ProcessFeedService < BaseService
         url: url(entry),
         account: account,
         text: content(entry),
+        spoiler_text: content_warning(entry),
         created_at: published(entry)
       )
 
@@ -223,6 +224,10 @@ class ProcessFeedService < BaseService
       xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS).content
     end
 
+    def content_warning(xml = @xml)
+      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['warning']
+    end
+
     def published(xml = @xml)
       xml.at_xpath('./xmlns:published', xmlns: TagManager::XMLNS).content
     end
diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb
index 9da7ef74e..617a38159 100644
--- a/app/services/process_hashtags_service.rb
+++ b/app/services/process_hashtags_service.rb
@@ -9,6 +9,5 @@ class ProcessHashtagsService < BaseService
     end
 
     status.update(sensitive: true) if tags.include?('nsfw')
-    status.update(spoiler: true) if tags.include?('spoiler')
   end
 end
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
deleted file mode 100644
index 5491d3d5f..000000000
--- a/app/validators/status_length_validator.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class StatusLengthValidator < ActiveModel::Validator
-  def validate(status)
-    if status.local? && !status.reblog?
-      combinedText = status.text
-      if (status.spoiler? && status.spoiler_text.present?)
-        combinedText = status.spoiler_text + "\n" + status.text
-      end
-
-      maxChars = 500
-      unless combinedText.length <= maxChars
-        status.errors[:text] << "is too long (maximum is #{maxChars})"
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/app/views/api/v1/statuses/_show.rabl b/app/views/api/v1/statuses/_show.rabl
index 8b54d5852..7309a78b8 100644
--- a/app/views/api/v1/statuses/_show.rabl
+++ b/app/views/api/v1/statuses/_show.rabl
@@ -1,4 +1,4 @@
-attributes :id, :created_at, :in_reply_to_id, :sensitive, :spoiler, :visibility
+attributes :id, :created_at, :in_reply_to_id, :sensitive, :spoiler_text, :visibility
 
 node(:uri)              { |status| TagManager.instance.uri_for(status) }
 node(:content)          { |status| Formatter.instance.format(status) }
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index bc09d3597..6ee8c9e5b 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -7,7 +7,10 @@
       %strong.p-name.emojify= display_name(status.account)
       %span.p-nickname= acct(status.account)
 
-  .status__content.e-content.p-name.emojify= Formatter.instance.format(status)
+  .status__content.e-content.p-name.emojify<
+    - unless status.spoiler_text.blank?
+      %p= status.spoiler_text
+    = Formatter.instance.format(status)
 
   - unless status.media_attachments.empty?
     - if status.media_attachments.first.video?
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index eba2f9ac4..95f90abd9 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -12,7 +12,10 @@
         %strong.p-name.emojify= display_name(status.account)
         %span.p-nickname= acct(status.account)
 
-  .status__content.e-content.p-name.emojify= Formatter.instance.format(status)
+  .status__content.e-content.p-name.emojify<
+    - unless status.spoiler_text.blank?
+      %p= status.spoiler_text
+    = Formatter.instance.format(status)
 
   - unless status.media_attachments.empty?
     .status__attachments
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f7d7ed729..831fdbc7a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -93,6 +93,8 @@ en:
     back: Back to Mastodon
     edit_profile: Edit profile
     preferences: Preferences
+  statuses:
+    over_character_limit: character limit of %{max} exceeded
   stream_entries:
     click_to_show: Click to show
     favourited: favourited a post by
diff --git a/db/migrate/20170112041538_add_spoiler_to_statuses.rb b/db/migrate/20170112041538_add_spoiler_to_statuses.rb
deleted file mode 100644
index 3b46433f5..000000000
--- a/db/migrate/20170112041538_add_spoiler_to_statuses.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddSpoilerToStatuses < ActiveRecord::Migration[5.0]
-  def change
-    add_column :statuses, :spoiler, :boolean, default: false
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index f228da01e..0edd68605 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -173,19 +173,6 @@ ActiveRecord::Schema.define(version: 20170123203248) do
     t.index ["status_id"], name: "index_preview_cards_on_status_id", unique: true, using: :btree
   end
 
-  create_table "pubsubhubbub_subscriptions", force: :cascade do |t|
-    t.string   "topic",      default: "",    null: false
-    t.string   "callback",   default: "",    null: false
-    t.string   "mode",       default: "",    null: false
-    t.string   "challenge",  default: "",    null: false
-    t.string   "secret"
-    t.boolean  "confirmed",  default: false, null: false
-    t.datetime "expires_at",                 null: false
-    t.datetime "created_at",                 null: false
-    t.datetime "updated_at",                 null: false
-    t.index ["topic", "callback"], name: "index_pubsubhubbub_subscriptions_on_topic_and_callback", unique: true, using: :btree
-  end
-
   create_table "settings", force: :cascade do |t|
     t.string   "var",        null: false
     t.text     "value"
@@ -208,8 +195,6 @@ ActiveRecord::Schema.define(version: 20170123203248) do
     t.boolean  "sensitive",              default: false
     t.integer  "visibility",             default: 0,     null: false
     t.integer  "in_reply_to_account_id"
-    t.string   "conversation_uri"
-    t.boolean  "spoiler",                default: false
     t.text     "spoiler_text",           default: ""
     t.integer  "application_id"
     t.index ["account_id"], name: "index_statuses_on_account_id", using: :btree
-- 
cgit 


From 10ffd455a8f5b423624a3d5696043efa07eccf03 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 25 Jan 2017 01:48:46 +0100
Subject: Fix #522 - prevent blocked users from reblogging

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

(limited to 'app/services')

diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index 0cb51eecd..4ea0dbf6c 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -6,7 +6,9 @@ class ReblogService < BaseService
   # @param [Status] reblogged_status Status to be reblogged
   # @return [Status]
   def call(account, reblogged_status)
-    raise Mastodon::NotPermitted if reblogged_status.private_visibility?
+    reblogged_status = reblogged_status.reblog if reblogged_status.reblog?
+
+    raise Mastodon::NotPermitted if reblogged_status.private_visibility? || !reblogged_status.permitted?(account)
 
     reblog = account.statuses.create!(reblog: reblogged_status, text: '')
 
-- 
cgit 


From 3beb24ad5544723348d1e23a99c2b5ab1e26ae1f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 25 Jan 2017 16:53:30 +0100
Subject: Use <summary> to encode content warnings instead

---
 app/helpers/atom_builder_helper.rb   | 5 ++---
 app/services/post_status_service.rb  | 2 +-
 app/services/process_feed_service.rb | 2 +-
 docs/Extensions.md                   | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'app/services')

diff --git a/app/helpers/atom_builder_helper.rb b/app/helpers/atom_builder_helper.rb
index f17b4cc72..c08d80ea0 100644
--- a/app/helpers/atom_builder_helper.rb
+++ b/app/helpers/atom_builder_helper.rb
@@ -42,9 +42,8 @@ module AtomBuilderHelper
   end
 
   def content(xml, content, warning = nil)
-    extra = { type: 'html' }
-    extra[:warning] = warning unless warning.blank?
-    xml.content(extra, content) unless content.blank?
+    xml.summary(warning) unless warning.blank?
+    xml.content({ type: 'html' }, content) unless content.blank?
   end
 
   def title(xml, title)
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 91b654603..979941c84 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -16,7 +16,7 @@ class PostStatusService < BaseService
     status = account.statuses.create!(text: text,
                                       thread: in_reply_to,
                                       sensitive: options[:sensitive],
-                                      spoiler_text: options[:spoiler_text],
+                                      spoiler_text: options[:spoiler_text] || '',
                                       visibility: options[:visibility],
                                       application: options[:application])
 
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 4576b4321..626534176 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -225,7 +225,7 @@ class ProcessFeedService < BaseService
     end
 
     def content_warning(xml = @xml)
-      xml.at_xpath('./xmlns:content', xmlns: TagManager::XMLNS)['warning']
+      xml.at_xpath('./xmlns:summary', xmlns: TagManager::XMLNS)&.content || ''
     end
 
     def published(xml = @xml)
diff --git a/docs/Extensions.md b/docs/Extensions.md
index a082a777d..a3d64ebf1 100644
--- a/docs/Extensions.md
+++ b/docs/Extensions.md
@@ -12,6 +12,4 @@ Some functionality in Mastodon required some additions to the protocols to enabl
 
 2. Statuses can be marked as containing sensitive (or not safe for work) media. This is symbolized by a `<category term="nsfw" />` on the Atom entry
 
-3. Statuses can have a content warning (used e.g. for warning about spoilers in the text). It is stored in the `warning` attribute on the `<content />` tag of the Atom entry, e.g. `<content type="html" warning="This post talks about the ending to 6th sense">Lorem ipsum dolor sit amet</content>`
-
-4. Statuses that are intended to be listed publicly on e.g. "whole known network" or "public" timelines contain a `<link rel="mentioned" href="http://activityschema.org/collection/public" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"/>`. Conversely, statuses which do not contain that, are intended to be low key, unlisted
+3. Statuses that are intended to be listed publicly on e.g. "whole known network" or "public" timelines contain a `<link rel="mentioned" href="http://activityschema.org/collection/public" ostatus:object-type="http://activitystrea.ms/schema/1.0/collection"/>`. Conversely, statuses which do not contain that, are intended to be low key, unlisted
-- 
cgit