luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-21 14:23:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix duplicate featured tags (#19403)

Browse source 
* Fix duplicate featured tags

* Add unique tag name validator

* Fix error message
This commit is contained in:
Takeshi Umeda 2022-10-22 21:30:59 +09:00 committed by GitHub
parent 1d34eff63f
commit 53e86747e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/featured_tag.rb
View file

@ -60,5 +60,6 @@ class FeaturedTag < ApplicationRecord
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?
end
end

19
db/migrate/20221021055441_add_index_featured_tags_on_account_id_and_tag_id.rb Normal file
View file

@ -0,0 +1,19 @@
class AddIndexFeaturedTagsOnAccountIdAndTagId < ActiveRecord::Migration[6.1]
disable_ddl_transaction!
def up
duplicates = FeaturedTag.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM featured_tags GROUP BY account_id, tag_id HAVING count(*) > 1').to_ary
duplicates.each do |row|
FeaturedTag.where(id: row['ids'].split(',')[0...-1]).destroy_all
end
add_index :featured_tags, [:account_id, :tag_id], unique: true, algorithm: :concurrently
remove_index :featured_tags, [:account_id], algorithm: :concurrently
end
def down
add_index :featured_tags, [:account_id], algorithm: :concurrently
remove_index :featured_tags, [:account_id, :tag_id], unique: true, algorithm: :concurrently
end
end

4
db/schema.rb
View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2022_10_12_181003) do
ActiveRecord::Schema.define(version: 2022_10_21_055441) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -442,7 +442,7 @@ ActiveRecord::Schema.define(version: 2022_10_12_181003) do
t.datetime "last_status_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["account_id"], name: "index_featured_tags_on_account_id"
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