jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

controllers: standardize request format checks.

Browse Source
This commit is contained in:
evazion
2020-02-14 17:28:25 -06:00
parent c0cca18091
commit 1e426a50f7
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/comments_controller.rb
View File

@@ -7,9 +7,9 @@ class CommentsController < ApplicationController
def index def index
params[:group_by] ||= "comment" if params[:search].present? params[:group_by] ||= "comment" if params[:search].present?
if params[:group_by] == "comment" || request.format == Mime::Type.lookup("application/atom+xml") if params[:group_by] == "comment" || request.format.atom?
index_by_comment index_by_comment
elsif request.format == Mime::Type.lookup("text/javascript") elsif request.format.js?
index_for_post index_for_post
else else
index_by_post index_by_post

4
app/controllers/forum_topics_controller.rb
View File

@@ -20,7 +20,7 @@ class ForumTopicsController < ApplicationController
def index def index
params[:search] ||= {} params[:search] ||= {}
params[:search][:order] ||= "sticky" if request.format == Mime::Type.lookup("text/html") params[:search][:order] ||= "sticky" if request.format.html?
params[:limit] ||= 40 params[:limit] ||= 40
@forum_topics = ForumTopic.paginated_search(params).includes(model_includes(params)) @forum_topics = ForumTopic.paginated_search(params).includes(model_includes(params))
@@ -29,7 +29,7 @@ class ForumTopicsController < ApplicationController
end end
def show def show
if request.format == Mime::Type.lookup("text/html") if request.format.html?
@forum_topic.mark_as_read!(CurrentUser.user) @forum_topic.mark_as_read!(CurrentUser.user)
end end
@forum_posts = ForumPost.search(:topic_id => @forum_topic.id).reorder("forum_posts.id").paginate(params[:page]) @forum_posts = ForumPost.search(:topic_id => @forum_topic.id).reorder("forum_posts.id").paginate(params[:page])

2
app/controllers/posts_controller.rb
View File

@@ -21,7 +21,7 @@ class PostsController < ApplicationController
def show def show
@post = Post.find(params[:id]) @post = Post.find(params[:id])
if request.format == Mime::Type.lookup("text/html") if request.format.html?
@comments = @post.comments @comments = @post.comments
@comments = @comments.includes(:creator) @comments = @comments.includes(:creator)
@comments = @comments.includes(:votes) if CurrentUser.is_member? @comments = @comments.includes(:votes) if CurrentUser.is_member?