tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jenkins
2018-03-09 00:17:17 +00:00
parent 43a9a781a4 ff44b2e92d
commit 447d7e6127
206 changed files with 2401 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/post_status_service.rb
View File

@ -21,17 +21,18 @@ class PostStatusService < BaseService
media = validate_media!(options[:media_ids])
status = nil
text = options.delete(:spoiler_text) if text.blank? && options[:spoiler_text].present?
text = '.' if text.blank? && !media.empty?
ApplicationRecord.transaction do
status = account.statuses.create!(text: text,
media_attachments: media || [],
thread: in_reply_to,
sensitive: options[:sensitive],
spoiler_text: options[:spoiler_text] || '',
visibility: options[:visibility] || account.user&.setting_default_privacy,
language: LanguageDetector.instance.detect(text, account),
application: options[:application])
attach_media(status, media)
end
process_mentions_service.call(status)
@ -67,11 +68,6 @@ class PostStatusService < BaseService
media
end
def attach_media(status, media)
return if media.nil?
media.update(status_id: status.id)
end
def process_mentions_service
ProcessMentionsService.new
end