autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add default federation option to settings

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-10-01 19:32:47 +02:00
parent 9d6e005849
commit d42a06fc74
11 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/services/post_status_service.rb
View File

@ -32,7 +32,7 @@ class PostStatusService < BaseService
visibility: options[:visibility] || account.user&.setting_default_privacy,
language: language_from_option(options[:language]) || account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(text, account),
application: options[:application],
local_only: local_only_option(options[:local_only], in_reply_to))
local_only: local_only_option(options[:local_only], in_reply_to, account.user&.setting_default_federation))
end
process_hashtags_service.call(status)
@ -58,8 +58,9 @@ class PostStatusService < BaseService
private
def local_only_option(local_only, in_reply_to)
def local_only_option(local_only, in_reply_to, federation_setting)
return in_reply_to&.local_only? if local_only.nil? # XXX temporary, just until clients implement to avoid leaking local_only posts
return federation_setting if local_only.nil?
local_only
end