post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Fix editing status expiration

Browse source
This commit is contained in:
KMY 2023-03-21 12:23:53 +09:00
parent d9123e21ba
commit 16965de945
2 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -8,17 +8,6 @@ import classNames from 'classnames';
import Icon from 'mastodon/components/icon'; import Icon from 'mastodon/components/icon';
const messages = defineMessages({ const messages = defineMessages({
public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
public_long: { id: 'privacy.public.long', defaultMessage: 'Visible for all' },
unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Unlisted' },
unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Visible for all, but opted-out of discovery features' },
public_unlisted_short: { id: 'privacy.public_unlisted.short', defaultMessage: 'Public unlisted' },
public_unlisted_long: { id: 'privacy.public_unlisted.long', defaultMessage: 'Visible for all without GTL' },
private_short: { id: 'privacy.private.short', defaultMessage: 'Followers only' },
private_long: { id: 'privacy.private.long', defaultMessage: 'Visible for followers only' },
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Mentioned people only' },
direct_long: { id: 'privacy.direct.long', defaultMessage: 'Visible for mentioned users only' },
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' }, add_expiration: { id: 'status.expiration.add', defaultMessage: 'Set status expiration' },
}); });

3
app/services/update_status_expiration_service.rb
View file

@ -12,8 +12,9 @@ class UpdateStatusExpirationService < BaseService
expiration_num = expiration[0].to_f expiration_num = expiration[0].to_f
expiration_option = expiration[1] expiration_option = expiration[1]
base_time = status.created_at || Time.now.utc
expired_at = Time.now.utc + (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) ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at)
end end
end end