fix delayed roars mentions bug, increase delay to 1 minute, include local only prop
parent
6fa955e8a1
commit
9d55cfc6ad
|
@ -59,14 +59,15 @@ class PostStatusService < BaseService
|
||||||
else
|
else
|
||||||
return unless process_status!
|
return unless process_status!
|
||||||
if @options[:delayed] || @account&.user&.delayed_roars?
|
if @options[:delayed] || @account&.user&.delayed_roars?
|
||||||
delay_until = Time.now.utc + 30.seconds
|
delay_until = Time.now.utc + 1.minute
|
||||||
opts = {
|
opts = {
|
||||||
visibility: @visibility,
|
visibility: @visibility,
|
||||||
|
local_only: @local_only,
|
||||||
federate: @options[:federate],
|
federate: @options[:federate],
|
||||||
distribute: @options[:distribute],
|
distribute: @options[:distribute],
|
||||||
nocrawl: @options[:nocrawl],
|
nocrawl: @options[:nocrawl],
|
||||||
nomentions: @options[:nomentions],
|
nomentions: @options[:nomentions],
|
||||||
delete_after: @delete_after.nil? ? nil : @delete_after + 30.seconds,
|
delete_after: @delete_after.nil? ? nil : @delete_after + 1.minute,
|
||||||
}.compact
|
}.compact
|
||||||
|
|
||||||
PostStatusWorker.perform_at(delay_until, @status.id, opts)
|
PostStatusWorker.perform_at(delay_until, @status.id, opts)
|
||||||
|
@ -165,7 +166,7 @@ class PostStatusService < BaseService
|
||||||
return false if @status.destroyed?
|
return false if @status.destroyed?
|
||||||
|
|
||||||
process_hashtags_service.call(@status, @tags, @preloaded_tags)
|
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
|
return true
|
||||||
end
|
end
|
||||||
|
|
|
@ -9,10 +9,9 @@ class PostStatusWorker
|
||||||
status = Status.find(status_id)
|
status = Status.find(status_id)
|
||||||
return false if status.destroyed?
|
return false if status.destroyed?
|
||||||
|
|
||||||
if options[:visibility]
|
status.visibility = options[:visibility] if options[:visibility]
|
||||||
status.visibility = options[:visibility]
|
status.local_only = options[:local_only] if options[:local_only]
|
||||||
status.save!
|
status.save!
|
||||||
end
|
|
||||||
|
|
||||||
process_mentions_service.call(status) unless options[:nomentions]
|
process_mentions_service.call(status) unless options[:nomentions]
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ en:
|
||||||
setting_default_language: Posting language
|
setting_default_language: Posting language
|
||||||
setting_default_privacy: Post privacy
|
setting_default_privacy: Post privacy
|
||||||
setting_roar_lifespan: Auto-delete new roars after
|
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_default_local: Default to Monsterpit-only roars (in Glitch flavour)
|
||||||
setting_always_local: Don't send your roars outside Monsterpit
|
setting_always_local: Don't send your roars outside Monsterpit
|
||||||
setting_rawr_federated: Show raw world timeline (may contain offensive content!)
|
setting_rawr_federated: Show raw world timeline (may contain offensive content!)
|
||||||
|
|
Loading…
Reference in New Issue