edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

Merge branch 'master' into rails-7

Browse Source
This commit is contained in:
Earlopain 2022-10-30 18:19:22 +01:00
commit 4c34904642
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/artist.rb
View File

@ -11,7 +11,7 @@ class Artist < ApplicationRecord
validate :validate_user_can_edit?
validate :user_not_limited
validates :name, tag_name: true, uniqueness: true, on: :create
validates :group_name, length: { maximum: 100 }
validates :name, :group_name, length: { maximum: 100 }
after_save :log_changes
after_save :create_version
after_save :categorize_tag
@ -53,7 +53,6 @@ class Artist < ApplicationRecord
MAX_URLS_PER_ARTIST = 25
module ClassMethods
# Subdomains are automatically included. e.g., "twitter.com" matches "www.twitter.com",
# "mobile.twitter.com" and any other subdomain of "twitter.com".
SITE_BLACKLIST = [
@ -272,7 +271,7 @@ class Artist < ApplicationRecord
def normalize_other_names
self.other_names = other_names.map { |x| Artist.normalize_name(x) }.uniq
self.other_names -= [name]
self.other_names = other_names[0..25]
self.other_names = other_names[0..25].map { |other_name| other_name[0..99] }
end
end