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
104 lines
2.8 KiB
Ruby
104 lines
2.8 KiB
Ruby
class UploadsController < ApplicationController
|
|
before_action :member_only, except: [:index, :show]
|
|
respond_to :html, :xml, :json, :js
|
|
|
|
def new
|
|
@upload = Upload.new
|
|
@upload_notice_wiki = WikiPage.titled(Danbooru.config.upload_notice_wiki_page).first
|
|
if params[:url]
|
|
download = Downloads::File.new(params[:url])
|
|
@normalized_url, _, _ = download.before_download(params[:url], {})
|
|
@post = find_post_by_url(@normalized_url)
|
|
|
|
begin
|
|
@source = Sources::Site.new(params[:url], :referer_url => params[:ref])
|
|
@remote_size = download.size
|
|
rescue Exception
|
|
end
|
|
end
|
|
respond_with(@upload)
|
|
end
|
|
|
|
def batch
|
|
@source = Sources::Site.new(params[:url], :referer_url => params[:ref])
|
|
@source.get
|
|
@urls = @source.image_urls
|
|
end
|
|
|
|
def image_proxy
|
|
resp = ImageProxy.get_image(params[:url])
|
|
send_data resp.body, :type => resp.content_type, :disposition => "inline"
|
|
end
|
|
|
|
def index
|
|
@search = Upload.search(search_params)
|
|
@uploads = @search.paginate(params[:page], :limit => params[:limit])
|
|
respond_with(@uploads) do |format|
|
|
format.xml do
|
|
render :xml => @uploads.to_xml(:root => "uploads")
|
|
end
|
|
end
|
|
end
|
|
|
|
def show
|
|
@upload = Upload.find(params[:id])
|
|
respond_with(@upload) do |format|
|
|
format.html do
|
|
if @upload.is_completed? && @upload.post_id
|
|
redirect_to(post_path(@upload.post_id))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def create
|
|
@upload = Upload.create(upload_params)
|
|
|
|
if @upload.errors.empty?
|
|
post = @upload.process!
|
|
|
|
if post.present? && post.valid? && post.warnings.any?
|
|
flash[:notice] = post.warnings.full_messages.join(".\n \n")
|
|
end
|
|
end
|
|
|
|
save_recent_tags
|
|
respond_with(@upload)
|
|
end
|
|
|
|
def update
|
|
@upload = Upload.find(params[:id])
|
|
@upload.process!
|
|
respond_with(@upload)
|
|
end
|
|
|
|
private
|
|
|
|
def find_post_by_url(normalized_url)
|
|
if normalized_url.nil?
|
|
Post.where("SourcePattern(lower(posts.source)) = ?", params[:url]).first
|
|
else
|
|
Post.where("SourcePattern(lower(posts.source)) IN (?)", [params[:url], @normalized_url]).first
|
|
end
|
|
end
|
|
|
|
def save_recent_tags
|
|
if @upload
|
|
tags = Tag.scan_tags(@upload.tag_string)
|
|
tags = (TagAlias.to_aliased(tags) + Tag.scan_tags(cookies[:recent_tags])).compact.uniq.slice(0, 30)
|
|
cookies[:recent_tags] = tags.join(" ")
|
|
cookies[:recent_tags_with_categories] = Tag.categories_for(tags).to_a.flatten.join(" ")
|
|
end
|
|
end
|
|
|
|
def upload_params
|
|
permitted_params = %i[
|
|
file source tag_string rating status parent_id artist_commentary_title
|
|
artist_commentary_desc include_artist_commentary referer_url
|
|
md5_confirmation as_pending
|
|
]
|
|
|
|
params.require(:upload).permit(permitted_params)
|
|
end
|
|
end
|