From ce8635605c3be41ef0a20ade0e7a89b170bf7f04 Mon Sep 17 00:00:00 2001 From: Jeong Arm Date: Fri, 10 May 2019 05:03:03 +0900 Subject: [PATCH] Record deleted(by mod) status to prevent re-appear (#10732) * Record deleted(by mod) status to prevent re-appear * Move to Tombstone * Add missing migration script --- app/models/form/status_batch.rb | 1 + app/models/tombstone.rb | 11 ++++++----- .../20190509164208_add_by_moderator_to_tombstone.rb | 5 +++++ db/schema.rb | 5 +++-- 4 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 db/migrate/20190509164208_add_by_moderator_to_tombstone.rb diff --git a/app/models/form/status_batch.rb b/app/models/form/status_batch.rb index 8987280675..933dfdaca1 100644 --- a/app/models/form/status_batch.rb +++ b/app/models/form/status_batch.rb @@ -35,6 +35,7 @@ class Form::StatusBatch def delete_statuses Status.where(id: status_ids).reorder(nil).find_each do |status| RemovalWorker.perform_async(status.id) + Tombstone.find_or_create_by(uri: status.uri, account: status.account, by_moderator: true) log_action :destroy, status end diff --git a/app/models/tombstone.rb b/app/models/tombstone.rb index 997bb65fd0..bf666c43ac 100644 --- a/app/models/tombstone.rb +++ b/app/models/tombstone.rb @@ -4,11 +4,12 @@ # # Table name: tombstones # -# id :bigint(8) not null, primary key -# account_id :bigint(8) -# uri :string not null -# created_at :datetime not null -# updated_at :datetime not null +# id :bigint(8) not null, primary key +# account_id :bigint(8) +# uri :string not null +# created_at :datetime not null +# updated_at :datetime not null +# by_moderator :boolean # class Tombstone < ApplicationRecord diff --git a/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb new file mode 100644 index 0000000000..80c2448428 --- /dev/null +++ b/db/migrate/20190509164208_add_by_moderator_to_tombstone.rb @@ -0,0 +1,5 @@ +class AddByModeratorToTombstone < ActiveRecord::Migration[5.2] + def change + add_column :tombstones, :by_moderator, :boolean + end +end diff --git a/db/schema.rb b/db/schema.rb index 8613539d64..4dcbea4e75 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: 2019_04_20_025523) do +ActiveRecord::Schema.define(version: 2019_05_09_164208) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -382,9 +382,9 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do create_table "mutes", force: :cascade do |t| t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "hide_notifications", default: true, null: false t.bigint "account_id", null: false t.bigint "target_account_id", null: false - t.boolean "hide_notifications", default: true, null: false t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true t.index ["target_account_id"], name: "index_mutes_on_target_account_id" end @@ -676,6 +676,7 @@ ActiveRecord::Schema.define(version: 2019_04_20_025523) do t.string "uri", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "by_moderator" t.index ["account_id"], name: "index_tombstones_on_account_id" t.index ["uri"], name: "index_tombstones_on_uri" end