gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'kb_development' into kb_migration

Browse source
This commit is contained in:
KMY 2023-03-22 22:50:45 +09:00
commit 4990a50874
7 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/concerns/account_limitable.rb
View file

@ -24,7 +24,7 @@ module AccountLimitable
end
def scope_status_mentioned(status)
status.active_mentions.where.joins(:account).merge(Account.local).select('account_id AS id').reorder(nil)
status.active_mentions.joins(:account).merge(Account.local).select('account_id AS id').reorder(nil)
end
# TODO: not work

9
app/services/update_status_expiration_service.rb
View file

@ -13,8 +13,13 @@ class UpdateStatusExpirationService < BaseService
expiration_num = expiration[1].to_f
expiration_option = expiration[2]
base_time = status.created_at || Time.now.utc
due = expiration_option == 'd' ? expiration_num.days :
expiration_option == 'h' ? expiration_num.hours :
expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes
expired_at = base_time + (expiration_option == 'd' ? expiration_num.days : expiration_option == 'h' ? expiration_num.hours : expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes)
ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
expired_at = base_time + due
expired_status = ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
RemoveExpiredStatusWorker.perform_at(expired_at, expired_status.id) if due < PostStatusService::MIN_SCHEDULE_OFFSET
end
end