Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00
parent 60ff086960 fbe7756da6
commit aa2bf07281
51 changed files with 926 additions and 447 deletions
--- a/app/controllers/shares_controller.rb
+++ b/app/controllers/shares_controller.rb
@ -15,13 +15,14 @@ class SharesController < ApplicationController
  private

  def initial_state_params
+    text = [params[:title], params[:text], params[:url]].compact.join(' ')
    {
      settings: Web::Setting.find_by(user: current_user)&.data || {},
      push_subscription: current_account.user.web_push_subscription(current_session),
      current_account: current_account,
      token: current_session.token,
      admin: Account.find_local(Setting.site_contact_username),
-      text: params[:text],
+      text: text,
    }
  end