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

Merge branch 'master' into glitch-soc/master

Browse Source 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
This commit is contained in:
Thibaut Girka
2018-05-09 17:43:30 +02:00
parent 143878d9da ac788ad47e
commit 1c9c0167b7
145 changed files with 3052 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/post_status_service.rb
View File

@ -31,12 +31,12 @@ class PostStatusService < BaseService
sensitive: (options[:sensitive].nil? ? account.user&.setting_default_sensitive : options[:sensitive]),
spoiler_text: options[:spoiler_text] || '',
visibility: options[:visibility] || account.user&.setting_default_privacy,
language: LanguageDetector.instance.detect(text, account),
language: language_from_option(options[:language]) || LanguageDetector.instance.detect(text, account),
application: options[:application])
end
process_mentions_service.call(status)
process_hashtags_service.call(status)
process_mentions_service.call(status)
LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
DistributionWorker.perform_async(status.id)
@ -68,6 +68,10 @@ class PostStatusService < BaseService
media
end
def language_from_option(str)
ISO_639.find(str)&.alpha2
end
def process_mentions_service
ProcessMentionsService.new
end