From b1a219552e935d0c988e1f20b9fdceeb042d2c2d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 4 Nov 2022 16:08:29 +0100 Subject: [PATCH] Fix featured tags not saving preferred casing (#19732) --- app/models/featured_tag.rb | 25 ++++++++----------- config/locales/simple_form.en.yml | 2 +- ...0221104133904_add_name_to_featured_tags.rb | 5 ++++ db/schema.rb | 3 ++- 4 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 db/migrate/20221104133904_add_name_to_featured_tags.rb diff --git a/app/models/featured_tag.rb b/app/models/featured_tag.rb index d4ed743025..78185b2a99 100644 --- a/app/models/featured_tag.rb +++ b/app/models/featured_tag.rb @@ -10,13 +10,16 @@ # last_status_at :datetime # created_at :datetime not null # updated_at :datetime not null +# name :string # class FeaturedTag < ApplicationRecord belongs_to :account, inverse_of: :featured_tags belongs_to :tag, inverse_of: :featured_tags, optional: true # Set after validation - validate :validate_tag_name, on: :create + validates :name, presence: true, format: { with: /\A(#{Tag::HASHTAG_NAME_RE})\z/i }, on: :create + + validate :validate_tag_uniqueness, on: :create validate :validate_featured_tags_limit, on: :create before_validation :strip_name @@ -26,18 +29,14 @@ class FeaturedTag < ApplicationRecord scope :by_name, ->(name) { joins(:tag).where(tag: { name: HashtagNormalizer.new.normalize(name) }) } - delegate :display_name, to: :tag - - attr_writer :name - LIMIT = 10 def sign? true end - def name - tag_id.present? ? tag.name : @name + def display_name + attributes['name'] || tag.display_name end def increment(timestamp) @@ -51,13 +50,11 @@ class FeaturedTag < ApplicationRecord private def strip_name - return unless defined?(@name) - - @name = @name&.strip&.gsub(/\A#/, '') + self.name = name&.strip&.gsub(/\A#/, '') end def set_tag - self.tag = Tag.find_or_create_by_names(@name)&.first + self.tag = Tag.find_or_create_by_names(name)&.first end def reset_data @@ -69,9 +66,7 @@ class FeaturedTag < ApplicationRecord errors.add(:base, I18n.t('featured_tags.errors.limit')) if account.featured_tags.count >= LIMIT end - def validate_tag_name - errors.add(:name, :blank) if @name.blank? - errors.add(:name, :invalid) unless @name.match?(/\A(#{Tag::HASHTAG_NAME_RE})\z/i) - errors.add(:name, :taken) if FeaturedTag.by_name(@name).where(account_id: account_id).exists? + def validate_tag_uniqueness + errors.add(:name, :taken) if FeaturedTag.by_name(name).where(account_id: account_id).exists? end end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 64281d7b74..6edf7b4e9e 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -67,7 +67,7 @@ en: domain: This can be the domain name that shows up in the e-mail address or the MX record it uses. They will be checked upon sign-up. with_dns_records: An attempt to resolve the given domain's DNS records will be made and the results will also be blocked featured_tag: - name: 'You might want to use one of these:' + name: 'Here are some of the hashtags you used the most recently:' filters: action: Chose which action to perform when a post matches the filter actions: diff --git a/db/migrate/20221104133904_add_name_to_featured_tags.rb b/db/migrate/20221104133904_add_name_to_featured_tags.rb new file mode 100644 index 0000000000..7c8c8ebfbc --- /dev/null +++ b/db/migrate/20221104133904_add_name_to_featured_tags.rb @@ -0,0 +1,5 @@ +class AddNameToFeaturedTags < ActiveRecord::Migration[6.1] + def change + add_column :featured_tags, :name, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 12ec37c111..09d07fcca6 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: 2022_11_01_190723) do +ActiveRecord::Schema.define(version: 2022_11_04_133904) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -442,6 +442,7 @@ ActiveRecord::Schema.define(version: 2022_11_01_190723) do t.datetime "last_status_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "name" t.index ["account_id", "tag_id"], name: "index_featured_tags_on_account_id_and_tag_id", unique: true t.index ["tag_id"], name: "index_featured_tags_on_tag_id" end