marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Statuses: set `local_only` flag from the `PostStatusService`. Default to `en` locale for statuses.

staging
multiple creatures 2019-05-09 09:58:37 -05:00
parent 540728e063
commit edfabe44da
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/status.rb
View File

@ -569,8 +569,6 @@ class Status < ApplicationRecord
def set_locality
if account.domain.nil? && !attribute_changed?(:local_only)
self.local_only = marked_local_only?
self.local_only ||= account.user.setting_always_local
self.local_only ||= reply? && Status.where(id: in_reply_to_id, local_only: true).exists?
end
end

11
app/services/post_status_service.rb
View File

@ -13,6 +13,7 @@ class PostStatusService < BaseService
# @option [Tag] :tags Optional tags to include
# @option [Boolean] :sensitive
# @option [String] :visibility
# @option [Boolean] :local_only
# @option [String] :sharekey
# @option [String] :spoiler_text
# @option [String] :language
@ -28,6 +29,7 @@ class PostStatusService < BaseService
@text = @options[:text] || ''
@in_reply_to = @options[:thread]
@tags = @options[:tags]
@local_only = @options[:local_only]
return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
@ -58,11 +60,13 @@ class PostStatusService < BaseService
@visibility = @options[:visibility] || @account.user&.setting_default_privacy
@visibility = :unlisted if @visibility == :public && @account.silenced?
if @in_reply_to.present?
if @in_reply_to.present? && @in_reply_to.visibility.present?
v = %w(public unlisted private direct limited)
@visibility = @in_reply_to.visibility if v.index(@visibility) < v.index(@in_reply_to.visibility)
@visibility = @in_reply_to.visibility if @visibility.nil? || v.index(@visibility) < v.index(@in_reply_to.visibility)
end
@local_only = true if @account.user_always_local? || @in_reply_to&.local_only
@scheduled_at = @options[:scheduled_at]&.to_datetime
@scheduled_at = nil if scheduled_in_the_past?
rescue ArgumentError
@ -175,8 +179,9 @@ class PostStatusService < BaseService
sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
spoiler_text: @options[:spoiler_text] || '',
visibility: @visibility,
local_only: @local_only,
sharekey: @sharekey,
language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || nil,
language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || 'en',
application: @options[:application],
content_type: @options[:content_type] || @account.user&.setting_default_content_type,
}.compact