abce4d2551
Fail loudly if we forget to whitelist a param instead of silently ignoring it. misc models: convert to strong params. artist commentaries: convert to strong params. * Disallow changing or setting post_id to a nonexistent post. artists: convert to strong params. * Disallow setting `is_banned` in create/update actions. Changing it this way instead of with the ban/unban actions would leave the artist in a partially banned state. bans: convert to strong params. * Disallow changing the user_id after the ban has been created. comments: convert to strong params. favorite groups: convert to strong params. news updates: convert to strong params. post appeals: convert to strong params. post flags: convert to strong params. * Disallow users from setting the `is_deleted` / `is_resolved` flags. ip bans: convert to strong params. user feedbacks: convert to strong params. * Disallow users from setting `disable_dmail_notification` when creating feedbacks. * Disallow changing the user_id after the feedback has been created. notes: convert to strong params. wiki pages: convert to strong params. * Also fix non-Builders being able to delete wiki pages. saved searches: convert to strong params. pools: convert to strong params. * Disallow setting `post_count` or `is_deleted` in create/update actions. janitor trials: convert to strong params. post disapprovals: convert to strong params. * Factor out quick-mod bar to shared partial. * Fix quick-mod bar to use `Post#is_approvable?` to determine visibility of Approve button. dmail filters: convert to strong params. password resets: convert to strong params. user name change requests: convert to strong params. posts: convert to strong params. users: convert to strong params. * Disallow setting password_hash, last_logged_in_at, last_forum_read_at, has_mail, and dmail_filter_attributes[user_id]. * Remove initialize_default_image_size (dead code). uploads: convert to strong params. * Remove `initialize_status` because status already defaults to pending in the database. tag aliases/implications: convert to strong params. tags: convert to strong params. forum posts: convert to strong params. * Disallow changing the topic_id after creating the post. * Disallow setting is_deleted (destroy/undelete actions should be used instead). * Remove is_sticky / is_locked (nonexistent attributes). forum topics: convert to strong params. * merges https://github.com/evazion/danbooru/tree/wip-rails-5.1 * lock pg gem to 0.21 (1.0.0 is incompatible with rails 5.1.4) * switch to factorybot and change all references Co-authored-by: r888888888 <r888888888@gmail.com> Co-authored-by: evazion <noizave@gmail.com> add diffs
100 lines
3.1 KiB
Ruby
100 lines
3.1 KiB
Ruby
class ArtistUrl < ApplicationRecord
|
|
before_save :initialize_normalized_url, on: [ :create ]
|
|
before_save :normalize
|
|
validates_presence_of :url
|
|
validate :validate_url_format
|
|
belongs_to :artist, :touch => true
|
|
|
|
def self.normalize(url)
|
|
if url.nil?
|
|
nil
|
|
else
|
|
url = url.gsub(/^https:\/\//, "http://")
|
|
url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2")
|
|
url = url.sub(%r!(http://seiga.nicovideo.jp/user/illust/\d+)\?.+!, '\1/')
|
|
url = url.sub(%r!^http://pictures.hentai-foundry.com//!, "http://pictures.hentai-foundry.com/")
|
|
|
|
# the strategy won't always work for twitter because it looks for a status
|
|
url = url.downcase if url =~ /https?:\/\/(?:mobile\.)?twitter\.com/
|
|
|
|
begin
|
|
url = Sources::Site.new(url).normalize_for_artist_finder!
|
|
rescue PixivApiClient::Error, Sources::Site::NoStrategyError
|
|
end
|
|
url = url.gsub(/\/+\Z/, "")
|
|
url + "/"
|
|
end
|
|
end
|
|
|
|
def self.legacy_normalize(url)
|
|
if url.nil?
|
|
nil
|
|
else
|
|
url = url.gsub(/^https:\/\//, "http://")
|
|
url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2")
|
|
url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img.pixiv.net")
|
|
url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://img.pixiv.net")
|
|
url = url.gsub(/\/+\Z/, "")
|
|
url + "/"
|
|
end
|
|
end
|
|
|
|
def self.normalize_for_search(url)
|
|
if url =~ /\.\w+\Z/ && url =~ /\w\/\w/
|
|
url = File.dirname(url)
|
|
end
|
|
|
|
url = url.gsub(/^https:\/\//, "http://")
|
|
url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2")
|
|
url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2")
|
|
url = url.gsub(/^http:\/\/img\d+\.pixiv\.net/, "http://img*.pixiv.net")
|
|
url = url.gsub(/^http:\/\/i\d+\.pixiv\.net\/img\d+/, "http://*.pixiv.net/img*")
|
|
end
|
|
|
|
def priority
|
|
if normalized_url =~ /pixiv\.net\/member\.php/
|
|
10
|
|
|
|
elsif normalized_url =~ /seiga\.nicovideo\.jp\/user\/illust/
|
|
10
|
|
|
|
elsif normalized_url =~ /twitter\.com/ && normalized_url !~ /status/
|
|
10
|
|
|
|
elsif normalized_url =~ /tumblr|patreon|deviantart|artstation/
|
|
20
|
|
|
|
else
|
|
100
|
|
end
|
|
end
|
|
|
|
def normalize
|
|
if !Sources::Site.new(normalized_url).normalized_for_artist_finder?
|
|
self.normalized_url = self.class.normalize(url)
|
|
end
|
|
rescue Sources::Site::NoStrategyError
|
|
self.normalized_url = self.class.normalize(url)
|
|
end
|
|
|
|
def initialize_normalized_url
|
|
self.normalized_url = url
|
|
end
|
|
|
|
def to_s
|
|
url
|
|
end
|
|
|
|
def validate_url_format
|
|
uri = Addressable::URI.parse(url)
|
|
errors[:url] << "must begin with http:// or https://" if !uri.scheme.in?(%w[http https])
|
|
rescue Addressable::URI::InvalidURIError => error
|
|
errors[:url] << "is malformed: #{error}"
|
|
end
|
|
end
|