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

Remove text requirement when media attached from statuses (#6672)

Browse Source
This commit is contained in:
Eugen Rochko
2018-03-07 08:28:52 +01:00
committed by GitHub
parent e26d5ca923
commit cfa9b6e13a
8 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/services/post_status_service.rb
View File

@ -21,17 +21,17 @@ class PostStatusService < BaseService
media = validate_media!(options[:media_ids])
status = nil
text = options.delete(:spoiler_text) if text.blank? && options[:spoiler_text].present?
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)
@ -64,11 +64,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