hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix outdated iso-639 reference in update status service (#17496)

signup-info-prompt
Eugen Rochko 2022-02-10 03:09:44 +01:00 committed by GitHub
parent 63002cde03
commit 1bfcb75105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/update_status_service.rb
View File

@ -2,6 +2,7 @@
class UpdateStatusService < BaseService class UpdateStatusService < BaseService
include Redisable include Redisable
include LanguagesHelper
# @param [Status] status # @param [Status] status
# @param [Integer] account_id # @param [Integer] account_id
@ -95,16 +96,12 @@ class UpdateStatusService < BaseService
@status.text = @options[:text].presence || @options.delete(:spoiler_text) || '' @status.text = @options[:text].presence || @options.delete(:spoiler_text) || ''
@status.spoiler_text = @options[:spoiler_text] || '' @status.spoiler_text = @options[:spoiler_text] || ''
@status.sensitive = @options[:sensitive] || @options[:spoiler_text].present? @status.sensitive = @options[:sensitive] || @options[:spoiler_text].present?
@status.language = language_from_option || @status.language @status.language = valid_locale_or_nil(@options[:language] || @status.language || @status.account.user&.preferred_posting_language || I18n.default_locale)
@status.edited_at = Time.now.utc @status.edited_at = Time.now.utc
@status.save! @status.save!
end end
def language_from_option
ISO_639.find(@options[:language])&.alpha2
end
def reset_preview_card! def reset_preview_card!
return unless @status.text_previously_changed? return unless @status.text_previously_changed?