@@ -162,6 +170,18 @@ class StatusHeader extends ImmutablePureComponent {
+ {
+ !!status.get('expires_at') &&
+
+
+
+
+
+
+ }
+
{
!!status.get('group') &&
diff --git a/app/javascript/gabsocial/constants.js b/app/javascript/gabsocial/constants.js
index a46848ee..b835fecf 100644
--- a/app/javascript/gabsocial/constants.js
+++ b/app/javascript/gabsocial/constants.js
@@ -30,6 +30,7 @@ export const POPOVER_PROFILE_OPTIONS = 'PROFILE_OPTIONS'
export const POPOVER_SEARCH = 'SEARCH'
export const POPOVER_SIDEBAR_MORE = 'SIDEBAR_MORE'
export const POPOVER_STATUS_OPTIONS = 'STATUS_OPTIONS'
+export const POPOVER_STATUS_EXPIRATION_OPTIONS = 'STATUS_EXPIRATION_OPTIONS'
export const POPOVER_STATUS_VISIBILITY = 'STATUS_VISIBILITY'
export const POPOVER_USER_INFO = 'USER_INFO'
export const POPOVER_VIDEO_STATS = 'VIDEO_STATS'
@@ -111,4 +112,11 @@ export const NOTIFICATION_FILTERS = [
export const GAB_COM_INTRODUCE_YOURSELF_GROUP_ID = '12'
-export const MIN_ACCOUNT_CREATED_AT_ONBOARDING = 1594789200000 // 2020-07-15
\ No newline at end of file
+export const MIN_ACCOUNT_CREATED_AT_ONBOARDING = 1594789200000 // 2020-07-15
+
+export const STATUS_EXPIRATION_OPTION_5_MINUTES = '5-minutes'
+export const STATUS_EXPIRATION_OPTION_60_MINUTES = '60-minutes'
+export const STATUS_EXPIRATION_OPTION_6_HOURS = '6-hours'
+export const STATUS_EXPIRATION_OPTION_24_HOURS = '24-hours'
+export const STATUS_EXPIRATION_OPTION_3_DAYS = '3-days'
+export const STATUS_EXPIRATION_OPTION_7_DAYS = '7-days'
\ No newline at end of file
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index 30a36987..49e25ab1 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -21,6 +21,7 @@ import PollButton from './poll_button'
import PollForm from './poll_form'
import SchedulePostButton from './schedule_post_button'
import SpoilerButton from './spoiler_button'
+import ExpiresPostButton from './expires_post_button'
import RichTextEditorButton from './rich_text_editor_button'
import StatusContainer from '../../../containers/status_container'
import StatusVisibilityButton from './status_visibility_button'
@@ -484,10 +485,15 @@ class ComposeForm extends ImmutablePureComponent {
{
- !hidePro &&
+ !hidePro && !edit &&
}
+ {
+ !hidePro && !edit &&
+
+ }
+
{
!hidePro &&
diff --git a/app/javascript/gabsocial/features/compose/components/expires_post_button.js b/app/javascript/gabsocial/features/compose/components/expires_post_button.js
new file mode 100644
index 00000000..71f0dc6b
--- /dev/null
+++ b/app/javascript/gabsocial/features/compose/components/expires_post_button.js
@@ -0,0 +1,78 @@
+import { injectIntl, defineMessages } from 'react-intl'
+import { openModal } from '../../../actions/modal'
+import { openPopover } from '../../../actions/popover'
+import { me } from '../../../initial_state'
+import { POPOVER_STATUS_EXPIRATION_OPTIONS } from '../../../constants'
+import ComposeExtraButton from './compose_extra_button'
+
+const messages = defineMessages({
+ expires: { id: 'expiration.title', defaultMessage: 'Add status expiration' },
+})
+
+const mapStateToProps = (state) => ({
+ hasScheduledAt: !!state.getIn(['compose', 'scheduled_at']),
+ active: !!state.getIn(['compose', 'expires_at']) || state.getIn(['popover', 'popoverType']) === POPOVER_STATUS_EXPIRATION_OPTIONS,
+ isPro: state.getIn(['accounts', me, 'is_pro']),
+})
+
+const mapDispatchToProps = (dispatch) => ({
+ onOpenExpirationPopover(targetRef) {
+ dispatch(openPopover(POPOVER_STATUS_EXPIRATION_OPTIONS, {
+ targetRef,
+ }))
+ },
+ onOpenProUpgradeModal() {
+ dispatch(openModal('PRO_UPGRADE'))
+ },
+})
+
+export default
+@injectIntl
+@connect(mapStateToProps, mapDispatchToProps)
+class ExpiresPostButton extends PureComponent {
+
+ static propTypes = {
+ active: PropTypes.bool.isRequired,
+ intl: PropTypes.object.isRequired,
+ isPro: PropTypes.bool,
+ hasScheduledAt: PropTypes.bool,
+ onOpenProUpgradeModal: PropTypes.func.isRequired,
+ onOpenExpirationPopover: PropTypes.func.isRequired,
+ small: PropTypes.bool,
+ }
+
+ handleToggle = () => {
+ if (!this.props.isPro) {
+ this.props.onOpenProUpgradeModal()
+ } else {
+ this.props.onOpenExpirationPopover(this.button)
+ }
+ }
+
+ setButton = (n) => {
+ this.button = n
+ }
+
+ render () {
+ const {
+ active,
+ intl,
+ hasScheduledAt,
+ small,
+ } = this.props
+
+ if (hasScheduledAt) return null
+
+ return (
+
+ )
+ }
+
+}
diff --git a/app/javascript/gabsocial/features/compose/components/schedule_post_button.js b/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
index 410dbc04..4a1936ac 100644
--- a/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
+++ b/app/javascript/gabsocial/features/compose/components/schedule_post_button.js
@@ -11,6 +11,7 @@ const messages = defineMessages({
})
const mapStateToProps = (state) => ({
+ hasExpiresAt: !!state.getIn(['compose', 'expires_at']),
active: !!state.getIn(['compose', 'scheduled_at']) || state.getIn(['popover', 'popoverType']) === 'DATE_PICKER',
isPro: state.getIn(['accounts', me, 'is_pro']),
})
@@ -34,12 +35,13 @@ const mapDispatchToProps = (dispatch) => ({
export default
@injectIntl
@connect(mapStateToProps, mapDispatchToProps)
-class SchedulePostDropdown extends PureComponent {
+class SchedulePostButton extends PureComponent {
static propTypes = {
active: PropTypes.bool.isRequired,
intl: PropTypes.object.isRequired,
isPro: PropTypes.bool,
+ hasExpiresAt: PropTypes.bool,
onOpenProUpgradeModal: PropTypes.func.isRequired,
onOpenDatePickerPopover: PropTypes.func.isRequired,
onCloseDatePickerPopover: PropTypes.func.isRequired,
@@ -62,9 +64,12 @@ class SchedulePostDropdown extends PureComponent {
const {
active,
intl,
+ hasExpiresAt,
small,
} = this.props
+ if (hasExpiresAt) return null
+
return (
poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
case COMPOSE_SCHEDULED_AT_CHANGE:
return state.set('scheduled_at', action.date);
+ case COMPOSE_EXPIRES_AT_CHANGE:
+ return state.set('expires_at', action.value);
case COMPOSE_RICH_TEXT_EDITOR_CONTROLS_VISIBILITY:
return state.withMutations(map => {
map.set('rte_controls_visible', action.open || !state.get('rte_controls_visible'));
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index ca8f669b..6e86dd9b 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -4,7 +4,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
attributes :id, :created_at, :revised_at, :in_reply_to_id, :in_reply_to_account_id,
:sensitive, :spoiler_text, :visibility, :language,
:uri, :url, :replies_count, :reblogs_count,
- :favourites_count, :quote_of_id
+ :favourites_count, :quote_of_id, :expires_at
attribute :favourited, if: :current_user?
attribute :reblogged, if: :current_user?
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 52e1cf73..e35b11a1 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -16,6 +16,7 @@ class PostStatusService < BaseService
# @option [String] :spoiler_text
# @option [String] :language
# @option [String] :scheduled_at
+ # @option [String] :expires_at
# @option [Hash] :poll Optional poll to attach
# @option [Enumerable] :media_ids Optional array of media IDs to attach
# @option [Doorkeeper::Application] :application
@@ -55,6 +56,7 @@ class PostStatusService < BaseService
@text = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
@visibility = @options[:visibility] || @account.user&.setting_default_privacy
@visibility = :unlisted if @visibility == :public && @account.silenced?
+ @expires_at = @options[:expires_at]&.to_datetime if @account.is_pro
@scheduled_at = @options[:scheduled_at]&.to_datetime
@scheduled_at = nil if scheduled_in_the_past?
rescue ArgumentError
@@ -98,6 +100,7 @@ class PostStatusService < BaseService
DistributionWorker.perform_async(@status.id)
# Pubsubhubbub::DistributionWorker.perform_async(@status.stream_entry.id)
# ActivityPub::DistributionWorker.perform_async(@status.id)
+ ExpiringStatusWorker.perform_at(@status.expires_at, @status.id) if @status.expires_at && @account.is_pro
PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
end
@@ -177,6 +180,7 @@ class PostStatusService < BaseService
{
text: @text,
markdown: @markdown,
+ expires_at: @expires_at,
group_id: @options[:group_id],
quote_of_id: @options[:quote_of_id],
media_attachments: @media || [],
diff --git a/app/workers/expiring_status_worker.rb b/app/workers/expiring_status_worker.rb
new file mode 100644
index 00000000..28c618c0
--- /dev/null
+++ b/app/workers/expiring_status_worker.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ExpiringStatusWorker
+ include Sidekiq::Worker
+
+ sidekiq_options unique: :until_executed
+
+ def perform(status_id)
+ status = Status.find(status_id)
+ RemovalWorker.perform_async(status.id)
+ rescue ActiveRecord::RecordNotFound
+ true
+ end
+end