From 9f5c8644d060b462395135bf7ea2a48f831e129d Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 11 Jan 2022 10:34:31 +0800 Subject: [PATCH] DEV: Remove stale ignored_columns from models. --- app/models/badge.rb | 3 --- app/models/category.rb | 5 ----- app/models/directory_column.rb | 2 -- app/models/email_token.rb | 3 --- app/models/embeddable_host.rb | 3 --- app/models/invite.rb | 6 ------ app/models/post.rb | 5 ----- app/models/topic.rb | 5 ----- app/models/topic_timer.rb | 4 ---- app/models/topic_user.rb | 4 ---- app/models/upload.rb | 4 ---- app/models/user_api_key.rb | 4 ---- app/models/user_stat.rb | 3 --- 13 files changed, 51 deletions(-) diff --git a/app/models/badge.rb b/app/models/badge.rb index af0c054d66a..ed97216c782 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -1,9 +1,6 @@ # frozen_string_literal: true class Badge < ActiveRecord::Base - # TODO: Drop in July 2021 - self.ignored_columns = %w{image} - include GlobalPath include HasSanitizableFields diff --git a/app/models/category.rb b/app/models/category.rb index ad5a662a356..57a15bc62d8 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -5,11 +5,6 @@ class Category < ActiveRecord::Base 'none' ] - # TODO(2020-11-18): remove - self.ignored_columns = %w{ - suppress_from_latest - } - include Searchable include Positionable include HasCustomFields diff --git a/app/models/directory_column.rb b/app/models/directory_column.rb index 3a290432c2f..aa4324345a3 100644 --- a/app/models/directory_column.rb +++ b/app/models/directory_column.rb @@ -2,8 +2,6 @@ class DirectoryColumn < ActiveRecord::Base - # TODO(2021-06-18): Remove automatic column - self.ignored_columns = ["automatic"] self.inheritance_column = nil enum type: { automatic: 0, user_field: 1, plugin: 2 }, _scopes: false diff --git a/app/models/email_token.rb b/app/models/email_token.rb index 1178352523a..77156125e53 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -35,9 +35,6 @@ class EmailToken < ActiveRecord::Base end end - # TODO(2022-01-01): Remove - self.ignored_columns = %w{token} - def self.scopes @scopes ||= Enum.new( signup: 1, diff --git a/app/models/embeddable_host.rb b/app/models/embeddable_host.rb index 212348bc3d1..6b2d2a9b4bd 100644 --- a/app/models/embeddable_host.rb +++ b/app/models/embeddable_host.rb @@ -10,9 +10,6 @@ class EmbeddableHost < ActiveRecord::Base self.host.sub!(/\/.*$/, '') end - # TODO(2021-07-23): Remove - self.ignored_columns = ["path_whitelist"] - def self.record_for_url(uri) if uri.is_a?(String) diff --git a/app/models/invite.rb b/app/models/invite.rb index 52c0a97b425..ff4a4521e1d 100644 --- a/app/models/invite.rb +++ b/app/models/invite.rb @@ -8,12 +8,6 @@ class Invite < ActiveRecord::Base include RateLimiter::OnCreateRecord include Trashable - # TODO(2021-05-22): remove - self.ignored_columns = %w{ - user_id - redeemed_at - } - BULK_INVITE_EMAIL_LIMIT = 200 DOMAIN_REGEX = /\A(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)+([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])\z/ diff --git a/app/models/post.rb b/app/models/post.rb index 04df7e932fc..5db38ad4a7c 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -10,11 +10,6 @@ class Post < ActiveRecord::Base include HasCustomFields include LimitedEdit - self.ignored_columns = [ - "avg_time", # TODO(2021-01-04): remove - "image_url" # TODO(2021-06-01): remove - ] - cattr_accessor :plugin_permitted_create_params, :plugin_permitted_update_params self.plugin_permitted_create_params = {} self.plugin_permitted_update_params = {} diff --git a/app/models/topic.rb b/app/models/topic.rb index 1a6948c6cc6..751a82a5327 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -11,11 +11,6 @@ class Topic < ActiveRecord::Base include LimitedEdit extend Forwardable - self.ignored_columns = [ - "avg_time", # TODO(2021-01-04): remove - "image_url" # TODO(2021-06-01): remove - ] - def_delegator :featured_users, :user_ids, :featured_user_ids def_delegator :featured_users, :choose, :feature_topic_users diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb index 2a9a690adef..5e80b5d4edd 100644 --- a/app/models/topic_timer.rb +++ b/app/models/topic_timer.rb @@ -3,10 +3,6 @@ class TopicTimer < ActiveRecord::Base MAX_DURATION_MINUTES = 20.years.to_i / 60 - self.ignored_columns = [ - "duration" # TODO(2021-06-01): remove - ] - include Trashable belongs_to :user diff --git a/app/models/topic_user.rb b/app/models/topic_user.rb index 4f6b7853dde..dcb0f294164 100644 --- a/app/models/topic_user.rb +++ b/app/models/topic_user.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class TopicUser < ActiveRecord::Base - self.ignored_columns = [ - :highest_seen_post_number # Remove after 01 Jan 2022 - ] - belongs_to :user belongs_to :topic diff --git a/app/models/upload.rb b/app/models/upload.rb index d0611ba84af..29c2b5d60c2 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -3,10 +3,6 @@ require "digest/sha1" class Upload < ActiveRecord::Base - self.ignored_columns = [ - "verified" # TODO(2020-12-10): remove - ] - include ActionView::Helpers::NumberHelper include HasUrl diff --git a/app/models/user_api_key.rb b/app/models/user_api_key.rb index d0238781bc7..f20e75c575f 100644 --- a/app/models/user_api_key.rb +++ b/app/models/user_api_key.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true class UserApiKey < ActiveRecord::Base - self.ignored_columns = [ - "scopes" # TODO(2020-12-18): remove - ] - REVOKE_MATCHER = RouteMatcher.new(actions: "user_api_keys#revoke", methods: :post, params: [:id]) belongs_to :user diff --git a/app/models/user_stat.rb b/app/models/user_stat.rb index 7d0093eeadc..89abd01e0ce 100644 --- a/app/models/user_stat.rb +++ b/app/models/user_stat.rb @@ -4,9 +4,6 @@ class UserStat < ActiveRecord::Base belongs_to :user after_save :trigger_badges - # TODO(2021-05-13): Remove - self.ignored_columns = ["topic_reply_count"] - def self.ensure_consistency!(last_seen = 1.hour.ago) reset_bounce_scores update_distinct_badge_count