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
109 lines
2.9 KiB
Ruby
109 lines
2.9 KiB
Ruby
class ArtistVersion < ApplicationRecord
|
|
belongs_to_updater
|
|
belongs_to :artist
|
|
delegate :visible?, :to => :artist
|
|
|
|
module SearchMethods
|
|
def for_user(user_id)
|
|
where("updater_id = ?", user_id)
|
|
end
|
|
|
|
def updater_name(name)
|
|
where("updater_id = (select _.id from users _ where lower(_.name) = ?)", name.mb_chars.downcase)
|
|
end
|
|
|
|
def search(params)
|
|
q = super
|
|
|
|
if params[:name].present?
|
|
q = q.where("name like ? escape E'\\\\'", params[:name].to_escaped_for_sql_like)
|
|
end
|
|
|
|
if params[:updater_name].present?
|
|
q = q.updater_name(params[:updater_name])
|
|
end
|
|
|
|
if params[:updater_id].present?
|
|
q = q.where(updater_id: params[:updater_id].split(",").map(&:to_i))
|
|
end
|
|
|
|
if params[:artist_id].present?
|
|
q = q.where(artist_id: params[:artist_id].split(",").map(&:to_i))
|
|
end
|
|
|
|
if params[:is_active] == "true"
|
|
q = q.where("is_active = true")
|
|
elsif params[:is_active] == "false"
|
|
q = q.where("is_active = false")
|
|
end
|
|
|
|
if params[:is_banned] == "true"
|
|
q = q.where("is_banned = true")
|
|
elsif params[:is_banned] == "false"
|
|
q = q.where("is_banned = false")
|
|
end
|
|
|
|
params[:order] ||= params.delete(:sort)
|
|
if params[:order] == "name"
|
|
q = q.order("artist_versions.name").default_order
|
|
else
|
|
q = q.apply_default_order(params)
|
|
end
|
|
|
|
q
|
|
end
|
|
end
|
|
|
|
extend SearchMethods
|
|
|
|
def url_array
|
|
url_string.to_s.scan(/\S+/)
|
|
end
|
|
|
|
def other_names_array
|
|
other_names.to_s.scan(/\S+/)
|
|
end
|
|
|
|
def urls_diff(version)
|
|
latest_urls = artist.url_array || []
|
|
new_urls = url_array
|
|
old_urls = version.present? ? version.url_array : []
|
|
|
|
latest_urls = latest_urls.map {|url| ArtistUrl.legacy_normalize(url)}
|
|
new_urls = new_urls.map {|url| ArtistUrl.legacy_normalize(url)}
|
|
old_urls = old_urls.map {|url| ArtistUrl.legacy_normalize(url)}
|
|
|
|
added_urls = new_urls - old_urls
|
|
removed_urls = old_urls - new_urls
|
|
|
|
return {
|
|
:added_urls => added_urls,
|
|
:removed_urls => removed_urls,
|
|
:obsolete_added_urls => added_urls - latest_urls,
|
|
:obsolete_removed_urls => removed_urls & latest_urls,
|
|
:unchanged_urls => new_urls & old_urls,
|
|
}
|
|
end
|
|
|
|
def other_names_diff(version)
|
|
latest_names = artist.other_names_array || []
|
|
new_names = other_names_array
|
|
old_names = version.present? ? version.other_names_array : []
|
|
|
|
added_names = new_names - old_names
|
|
removed_names = old_names - new_names
|
|
|
|
return {
|
|
:added_names => added_names,
|
|
:removed_names => removed_names,
|
|
:obsolete_added_names => added_names - latest_names,
|
|
:obsolete_removed_names => removed_names & latest_names,
|
|
:unchanged_names => new_names & old_names,
|
|
}
|
|
end
|
|
|
|
def previous
|
|
ArtistVersion.where("artist_id = ? and created_at < ?", artist_id, created_at).order("created_at desc").first
|
|
end
|
|
end
|