From 16079b4db56f3b88c671ae4d4b363189dae211e3 Mon Sep 17 00:00:00 2001 From: KMY Date: Tue, 21 Mar 2023 11:12:33 +0900 Subject: [PATCH] Add status expiration --- app/models/concerns/account_associations.rb | 1 + app/models/scheduled_expiration_status.rb | 36 +++++++++++++++++++ app/models/status.rb | 1 + app/services/delete_account_service.rb | 2 ++ app/services/post_status_service.rb | 1 + .../update_status_expiration_service.rb | 19 ++++++++++ app/services/update_status_service.rb | 5 +++ app/workers/remove_expired_status_worker.rb | 16 +++++++++ .../scheduler/scheduled_statuses_scheduler.rb | 11 ++++++ ...18_create_scheduled_expiration_statuses.rb | 14 ++++++++ db/schema.rb | 15 +++++++- 11 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 app/models/scheduled_expiration_status.rb create mode 100644 app/services/update_status_expiration_service.rb create mode 100644 app/workers/remove_expired_status_worker.rb create mode 100644 db/migrate/20230320234918_create_scheduled_expiration_statuses.rb diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 3435f7a9e5..b76892a9d6 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -19,6 +19,7 @@ module AccountAssociations has_many :notifications, inverse_of: :account, dependent: :destroy has_many :conversations, class_name: 'AccountConversation', dependent: :destroy, inverse_of: :account has_many :scheduled_statuses, inverse_of: :account, dependent: :destroy + has_many :scheduled_expiration_statuses, inverse_of: :account, dependent: :destroy # Pinned statuses has_many :status_pins, inverse_of: :account, dependent: :destroy diff --git a/app/models/scheduled_expiration_status.rb b/app/models/scheduled_expiration_status.rb new file mode 100644 index 0000000000..aff27765a8 --- /dev/null +++ b/app/models/scheduled_expiration_status.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +# == Schema Information +# +# Table name: scheduled_expiration_statuses +# +# id :bigint(8) not null, primary key +# account_id :bigint(8) +# status_id :bigint(8) not null +# scheduled_at :datetime +# created_at :datetime not null +# updated_at :datetime not null +# + +class ScheduledExpirationStatus < ApplicationRecord + include Paginable + + TOTAL_LIMIT = 300 + DAILY_LIMIT = 25 + + belongs_to :account, inverse_of: :scheduled_expiration_statuses + belongs_to :status, inverse_of: :scheduled_expiration_status + + validate :validate_total_limit + validate :validate_daily_limit + + private + + def validate_total_limit + errors.add(:base, I18n.t('scheduled_expiration_statuses.over_total_limit', limit: TOTAL_LIMIT)) if account.scheduled_expiration_statuses.count >= TOTAL_LIMIT + end + + def validate_daily_limit + errors.add(:base, I18n.t('scheduled_expiration_statuses.over_daily_limit', limit: DAILY_LIMIT)) if account.scheduled_expiration_statuses.where('scheduled_at::date = ?::date', scheduled_at).count >= DAILY_LIMIT + end +end diff --git a/app/models/status.rb b/app/models/status.rb index 05791b9f7d..f2f71f5415 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -81,6 +81,7 @@ class Status < ApplicationRecord has_one :status_stat, inverse_of: :status has_one :poll, inverse_of: :status, dependent: :destroy has_one :trend, class_name: 'StatusTrend', inverse_of: :status + has_one :scheduled_expiration_status, inverse_of: :status, dependent: :destroy validates :uri, uniqueness: true, presence: true, unless: :local? validates :text, presence: true, unless: -> { with_media? || reblog? } diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb index 035d5d5079..bd606b2afa 100644 --- a/app/services/delete_account_service.rb +++ b/app/services/delete_account_service.rb @@ -26,6 +26,7 @@ class DeleteAccountService < BaseService passive_relationships report_notes scheduled_statuses + scheduled_expiration_statuses status_pins ).freeze @@ -51,6 +52,7 @@ class DeleteAccountService < BaseService notifications owned_lists scheduled_statuses + scheduled_expiration_statuses status_pins ) diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index f9349670d9..370992304f 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -116,6 +116,7 @@ class PostStatusService < BaseService end def postprocess_status! + UpdateStatusExpirationService.new.call(@status) process_hashtags_service.call(@status) Trends.tags.register(@status) LinkCrawlWorker.perform_async(@status.id) diff --git a/app/services/update_status_expiration_service.rb b/app/services/update_status_expiration_service.rb new file mode 100644 index 0000000000..ab0f2735f0 --- /dev/null +++ b/app/services/update_status_expiration_service.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class UpdateStatusExpirationService < BaseService + SCAN_EXPIRATION_RE = /#exp((\d.\d|\d)+)([dms]+)/ + + def call(status) + existing_expiration = ScheduledExpirationStatus.find_by(status: status) + existing_expiration.destroy! if existing_expiration + + expiration = status.text.scan(SCAN_EXPIRATION_RE).first + return if !expiration + + expiration_num = expiration[0].to_f + expiration_option = expiration[1] + + expired_at = Time.now.utc + (expiration_option == 'd' ? expiration_num.days : expiration_option == 's' ? expiration_num.seconds : expiration_num.minutes) + ScheduledExpirationStatus.create!(account: status.account, status: status, scheduled_at: expired_at) + end +end diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb index 2022d73932..d461d60abf 100644 --- a/app/services/update_status_service.rb +++ b/app/services/update_status_service.rb @@ -30,6 +30,7 @@ class UpdateStatusService < BaseService update_media_attachments! if @options.key?(:media_ids) update_poll! if @options.key?(:poll) update_immediate_attributes! + update_expiration! create_edit! unless @options[:no_history] end @@ -122,6 +123,10 @@ class UpdateStatusService < BaseService @status.save! end + def update_expiration! + UpdateStatusExpirationService.new.call(@status) + end + def reset_preview_card! return unless @status.text_previously_changed? diff --git a/app/workers/remove_expired_status_worker.rb b/app/workers/remove_expired_status_worker.rb new file mode 100644 index 0000000000..b86a4b65e2 --- /dev/null +++ b/app/workers/remove_expired_status_worker.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +class RemoveExpiredStatusWorker + include Sidekiq::Worker + + sidekiq_options lock: :until_executed + + def perform(scheduled_expiration_status_id) + scheduled_expiration_status = ScheduledExpirationStatus.find(scheduled_expiration_status_id) + scheduled_expiration_status.destroy! + + RemoveStatusService.new.call(scheduled_expiration_status.status) + rescue ActiveRecord::RecordNotFound, ActiveRecord::RecordInvalid + true + end +end diff --git a/app/workers/scheduler/scheduled_statuses_scheduler.rb b/app/workers/scheduler/scheduled_statuses_scheduler.rb index 3bf6300b3c..fddf964e4c 100644 --- a/app/workers/scheduler/scheduled_statuses_scheduler.rb +++ b/app/workers/scheduler/scheduled_statuses_scheduler.rb @@ -7,6 +7,7 @@ class Scheduler::ScheduledStatusesScheduler def perform publish_scheduled_statuses! + unpublish_expired_statuses! publish_scheduled_announcements! unpublish_expired_announcements! end @@ -19,10 +20,20 @@ class Scheduler::ScheduledStatusesScheduler end end + def unpublish_expired_statuses! + expired_statuses.find_each do |expired_status| + RemoveExpiredStatusWorker.perform_at(expired_status.scheduled_at, expired_status.id) + end + end + def due_statuses ScheduledStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET) end + def expired_statuses + ScheduledExpirationStatus.where('scheduled_at <= ?', Time.now.utc + PostStatusService::MIN_SCHEDULE_OFFSET) + end + def publish_scheduled_announcements! due_announcements.find_each do |announcement| PublishScheduledAnnouncementWorker.perform_at(announcement.scheduled_at, announcement.id) diff --git a/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb b/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb new file mode 100644 index 0000000000..9fa1e634f8 --- /dev/null +++ b/db/migrate/20230320234918_create_scheduled_expiration_statuses.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +class CreateScheduledExpirationStatuses < ActiveRecord::Migration[6.1] + def change + create_table :scheduled_expiration_statuses do |t| + t.belongs_to :account, foreign_key: { on_delete: :cascade } + t.belongs_to :status, null: false, foreign_key: { on_delete: :cascade } + t.datetime :scheduled_at, index: true + + t.datetime :created_at, null: false + t.datetime :updated_at, null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index df73b75825..fa8a541745 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_03_14_121142) do +ActiveRecord::Schema.define(version: 2023_03_20_234918) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -844,6 +844,17 @@ ActiveRecord::Schema.define(version: 2023_03_14_121142) do t.datetime "updated_at", null: false end + create_table "scheduled_expiration_statuses", force: :cascade do |t| + t.bigint "account_id" + t.bigint "status_id", null: false + t.datetime "scheduled_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["account_id"], name: "index_scheduled_expiration_statuses_on_account_id" + t.index ["scheduled_at"], name: "index_scheduled_expiration_statuses_on_scheduled_at" + t.index ["status_id"], name: "index_scheduled_expiration_statuses_on_status_id" + end + create_table "scheduled_statuses", force: :cascade do |t| t.bigint "account_id" t.datetime "scheduled_at" @@ -1222,6 +1233,8 @@ ActiveRecord::Schema.define(version: 2023_03_14_121142) do add_foreign_key "reports", "accounts", column: "assigned_account_id", on_delete: :nullify add_foreign_key "reports", "accounts", column: "target_account_id", name: "fk_eb37af34f0", on_delete: :cascade add_foreign_key "reports", "accounts", name: "fk_4b81f7522c", on_delete: :cascade + add_foreign_key "scheduled_expiration_statuses", "accounts", on_delete: :cascade + add_foreign_key "scheduled_expiration_statuses", "statuses", on_delete: :cascade add_foreign_key "scheduled_statuses", "accounts", on_delete: :cascade add_foreign_key "session_activations", "oauth_access_tokens", column: "access_token_id", name: "fk_957e5bda89", on_delete: :cascade add_foreign_key "session_activations", "users", name: "fk_e5fda67334", on_delete: :cascade