Merge upstream (#81)

2017-07-15 14:33:15 -07:00
parent 08d021916d 695439775e
commit 09cfc079b0
213 changed files with 2714 additions and 1364 deletions
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -21,6 +21,7 @@ class PostStatusService < BaseService

    media  = validate_media!(options[:media_ids])
    status = nil
+
    ApplicationRecord.transaction do
      status = account.statuses.create!(text: text,
                                        thread: in_reply_to,
@@ -31,6 +32,7 @@ class PostStatusService < BaseService
                                        application: options[:application])
      attach_media(status, media)
    end
+
    process_mentions_service.call(status)
    process_hashtags_service.call(status)