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
123 lines
3.1 KiB
Ruby
123 lines
3.1 KiB
Ruby
class PoolVersion < ApplicationRecord
|
|
class Error < Exception ; end
|
|
|
|
belongs_to :pool
|
|
belongs_to_updater
|
|
|
|
module SearchMethods
|
|
def for_user(user_id)
|
|
where("updater_id = ?", user_id)
|
|
end
|
|
|
|
def search(params)
|
|
q = super
|
|
|
|
if params[:updater_id].present?
|
|
q = q.for_user(params[:updater_id].to_i)
|
|
end
|
|
|
|
if params[:updater_name].present?
|
|
q = q.where("updater_id = (select _.id from users _ where lower(_.name) = ?)", params[:updater_name].mb_chars.downcase)
|
|
end
|
|
|
|
if params[:pool_id].present?
|
|
q = q.where("pool_id = ?", params[:pool_id].to_i)
|
|
end
|
|
|
|
q.apply_default_order(params)
|
|
end
|
|
end
|
|
|
|
extend SearchMethods
|
|
|
|
def self.export_to_archives(starting_version_id = 0)
|
|
raise NotImplementedError.new("SQS URL not setup") if Danbooru.config.aws_sqs_archives_url.nil?
|
|
|
|
credentials = Aws::Credentials.new(
|
|
Danbooru.config.aws_access_key_id,
|
|
Danbooru.config.aws_secret_access_key
|
|
)
|
|
sqs = Aws::SQS::Client.new(
|
|
credentials: credentials,
|
|
region: Danbooru.config.aws_sqs_region
|
|
)
|
|
last_version_id = 0
|
|
|
|
where("id > ?", starting_version_id).find_each do |version|
|
|
last_version_id = version.id
|
|
|
|
json = {
|
|
id: version.id,
|
|
pool_id: version.pool_id,
|
|
post_ids: version.post_ids.scan(/\d+/).map(&:to_i),
|
|
updater_id: version.updater_id,
|
|
updater_ip_addr: version.updater_ip_addr.to_s,
|
|
created_at: version.created_at.try(:iso8601),
|
|
updated_at: version.updated_at.try(:iso8601),
|
|
description: version.pool.description,
|
|
name: version.name,
|
|
is_active: version.pool.is_active?,
|
|
is_deleted: version.pool.is_deleted?,
|
|
category: version.pool.category
|
|
}
|
|
msg = "add pool version\n#{json.to_json}"
|
|
sqs.send_message(
|
|
message_body: msg,
|
|
queue_url: Danbooru.config.aws_sqs_archives_url
|
|
)
|
|
end
|
|
|
|
puts "last version id: #{last_version_id}"
|
|
end
|
|
|
|
def pretty_name
|
|
name.tr("_", " ")
|
|
end
|
|
|
|
def post_id_array
|
|
@post_id_array ||= post_ids.scan(/\d+/).map(&:to_i)
|
|
end
|
|
|
|
def diff(version)
|
|
new_posts = post_id_array
|
|
old_posts = version.present? ? version.post_id_array : []
|
|
|
|
return {
|
|
:added_posts => array_difference_with_duplicates(new_posts, old_posts),
|
|
:removed_posts => array_difference_with_duplicates(old_posts, new_posts),
|
|
:unchanged_posts => array_intersect_with_duplicates(new_posts, old_posts)
|
|
}
|
|
end
|
|
|
|
def array_difference_with_duplicates(array, other_array)
|
|
new_array = array.dup
|
|
other_array.each do |id|
|
|
index = new_array.index(id)
|
|
if index
|
|
new_array.delete_at(index)
|
|
end
|
|
end
|
|
new_array
|
|
end
|
|
|
|
def array_intersect_with_duplicates(array, other_array)
|
|
other_array = other_array.dup
|
|
array.inject([]) do |intersect, id|
|
|
index = other_array.index(id)
|
|
if index
|
|
intersect << id
|
|
other_array.delete_at(index)
|
|
end
|
|
intersect
|
|
end
|
|
end
|
|
|
|
def changes
|
|
@changes ||= diff(previous)
|
|
end
|
|
|
|
def previous
|
|
PoolArchive.where(["pool_id = ? and updated_at < ?", pool_id, updated_at]).order("updated_at desc").first
|
|
end
|
|
end
|