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

fix delayed roars mentions bug, increase delay to 1 minute, include local only prop

staging
multiple creatures 2019-07-29 17:40:44 -05:00
parent 6fa955e8a1
commit 9d55cfc6ad
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/post_status_service.rb
View File

@ -59,14 +59,15 @@ class PostStatusService < BaseService
else
return unless process_status!
if @options[:delayed] || @account&.user&.delayed_roars?
delay_until = Time.now.utc + 30.seconds
delay_until = Time.now.utc + 1.minute
opts = {
visibility: @visibility,
local_only: @local_only,
federate: @options[:federate],
distribute: @options[:distribute],
nocrawl: @options[:nocrawl],
nomentions: @options[:nomentions],
delete_after: @delete_after.nil? ? nil : @delete_after + 30.seconds,
delete_after: @delete_after.nil? ? nil : @delete_after + 1.minute,
}.compact
PostStatusWorker.perform_at(delay_until, @status.id, opts)
@ -165,7 +166,7 @@ class PostStatusService < BaseService
return false if @status.destroyed?
process_hashtags_service.call(@status, @tags, @preloaded_tags)
process_mentions_service.call(@status) unless @delayed || @options[:nomentions]
process_mentions_service.call(@status) unless @options[:delayed] || @options[:nomentions]
return true
end

7
app/workers/post_status_worker.rb
View File

@ -9,10 +9,9 @@ class PostStatusWorker
status = Status.find(status_id)
return false if status.destroyed?
if options[:visibility]
status.visibility = options[:visibility]
status.save!
end
status.visibility = options[:visibility] if options[:visibility]
status.local_only = options[:local_only] if options[:local_only]
status.save!
process_mentions_service.call(status) unless options[:nomentions]

2
config/locales/simple_form.en.yml
View File

@ -118,7 +118,7 @@ en:
setting_default_language: Posting language
setting_default_privacy: Post privacy
setting_roar_lifespan: Auto-delete new roars after
setting_delayed_roars: Delayed publishing of roars for proofreading (30 secs)
setting_delayed_roars: Delayed publishing of roars for proofreading (1 min)
setting_default_local: Default to Monsterpit-only roars (in Glitch flavour)
setting_always_local: Don't send your roars outside Monsterpit
setting_rawr_federated: Show raw world timeline (may contain offensive content!)