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
119 lines
3.2 KiB
Ruby
119 lines
3.2 KiB
Ruby
class CommentsController < ApplicationController
|
|
respond_to :html, :xml, :json
|
|
before_action :member_only, :except => [:index, :search, :show]
|
|
skip_before_action :api_check
|
|
|
|
def index
|
|
if params[:group_by] == "comment" || request.format == Mime::Type.lookup("application/atom+xml")
|
|
index_by_comment
|
|
elsif request.format == Mime::Type.lookup("text/javascript")
|
|
index_for_post
|
|
else
|
|
index_by_post
|
|
end
|
|
end
|
|
|
|
def search
|
|
end
|
|
|
|
def new
|
|
redirect_to comments_path
|
|
end
|
|
|
|
def update
|
|
@comment = Comment.find(params[:id])
|
|
check_privilege(@comment)
|
|
@comment.update(comment_params(:update))
|
|
respond_with(@comment, :location => post_path(@comment.post_id))
|
|
end
|
|
|
|
def create
|
|
@comment = Comment.create(comment_params(:create))
|
|
respond_with(@comment) do |format|
|
|
format.html do
|
|
if @comment.post.nil?
|
|
redirect_to comments_path, notice: @comment.errors.full_messages.join("; ")
|
|
elsif @comment.errors.any?
|
|
redirect_to post_path(@comment.post), :notice => @comment.errors.full_messages.join("; ")
|
|
else
|
|
redirect_to post_path(@comment.post), :notice => "Comment posted"
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def edit
|
|
@comment = Comment.find(params[:id])
|
|
check_privilege(@comment)
|
|
respond_with(@comment)
|
|
end
|
|
|
|
def show
|
|
@comment = Comment.find(params[:id])
|
|
respond_with(@comment, methods: [:quoted_response])
|
|
end
|
|
|
|
def destroy
|
|
@comment = Comment.find(params[:id])
|
|
check_privilege(@comment)
|
|
@comment.delete!
|
|
respond_with(@comment) do |format|
|
|
format.js
|
|
end
|
|
end
|
|
|
|
def undelete
|
|
@comment = Comment.find(params[:id])
|
|
check_privilege(@comment)
|
|
@comment.undelete!
|
|
respond_with(@comment) do |format|
|
|
format.js
|
|
end
|
|
end
|
|
|
|
private
|
|
def index_for_post
|
|
@post = Post.find(params[:post_id])
|
|
@comments = @post.comments
|
|
@comments = @comments.visible(CurrentUser.user) unless params[:include_below_threshold]
|
|
render :action => "index_for_post"
|
|
end
|
|
|
|
def index_by_post
|
|
@posts = Post.where("last_comment_bumped_at IS NOT NULL").tag_match(params[:tags]).reorder("last_comment_bumped_at DESC NULLS LAST").paginate(params[:page], :limit => 5, :search_count => params[:search])
|
|
@posts.each # hack to force rails to eager load
|
|
respond_with(@posts) do |format|
|
|
format.xml do
|
|
render :xml => @posts.to_xml(:root => "posts")
|
|
end
|
|
end
|
|
end
|
|
|
|
def index_by_comment
|
|
@comments = Comment.search(search_params).paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
|
|
respond_with(@comments) do |format|
|
|
format.atom do
|
|
@comments = @comments.includes(:post, :creator).load
|
|
end
|
|
format.xml do
|
|
render :xml => @comments.to_xml(:root => "comments")
|
|
end
|
|
end
|
|
end
|
|
|
|
def check_privilege(comment)
|
|
if !comment.editable_by?(CurrentUser.user)
|
|
raise User::PrivilegeError
|
|
end
|
|
end
|
|
|
|
def comment_params(context)
|
|
permitted_params = %i[body]
|
|
permitted_params += %i[post_id do_not_bump_post] if context == :create
|
|
permitted_params += %i[is_deleted] if context == :update
|
|
permitted_params += %i[is_sticky] if CurrentUser.is_moderator?
|
|
|
|
params.require(:comment).permit(permitted_params)
|
|
end
|
|
end
|