a40efc6bbd
* Refactoring questions asked of user In this pull request, I'm extracting and normalizing role-based questions asked of the user. Prior to this commit, our codebase has asked two very similar questions of our user model: - `user.has_role?(:admin)` - `user.admin?` In asking `has_role?(:admin)` we are relying on implementation details of the rolify gem. In addition, the `has_role?` question asked throughout controllers or views means that it's harder to create hieararchies of permissions. In favoring `user.admin?` as our question, we can use that indirection as an opportunity to discuss and decide "Should someone with the `:super_admin` role be `user.admin? == true`?" The details of this commit is to do three primary things: 1. Ask the `has_role?` questions in "one place" in the code (e.g. the `Authorizer` module) 2. Extract the role based questions that are on the `User` model and provde backwards compatable delegation. 3. Structure the code so that it's harder to accidentally call `user.has_role?` (e.g., make `User#has_role?` and `User#has_any_role?` private). This is related to #15624 and the updates are informed by discussion in PR #15691. This commit supplants #15691. * Refactoring the liquid tag policy tests * Fixing typo * Bump for travis
67 lines
2.3 KiB
Ruby
67 lines
2.3 KiB
Ruby
class ModerationsController < ApplicationController
|
|
after_action :verify_authorized
|
|
|
|
JSON_OPTIONS = {
|
|
only: %i[id title published_at cached_tag_list path],
|
|
include: {
|
|
user: { only: %i[username name path articles_count id] }
|
|
}
|
|
}.freeze
|
|
|
|
def index
|
|
skip_authorization
|
|
return unless current_user&.trusted?
|
|
|
|
articles = Article.published
|
|
.order(published_at: :desc).limit(70)
|
|
articles = articles.cached_tagged_with(params[:tag]) if params[:tag].present?
|
|
if params[:state] == "new-authors"
|
|
articles = articles.where("nth_published_by_author > 0 AND nth_published_by_author < 4 AND published_at > ?",
|
|
7.days.ago)
|
|
end
|
|
@articles = articles.includes(:user).to_json(JSON_OPTIONS)
|
|
@tag = Tag.find_by(name: params[:tag]) || not_found if params[:tag].present?
|
|
@current_user_tags = current_user.moderator_for_tags
|
|
end
|
|
|
|
def article
|
|
load_article
|
|
render template: "moderations/mod"
|
|
end
|
|
|
|
def comment
|
|
authorize(User, :moderation_routes?)
|
|
@moderatable = Comment.find(params[:id_code].to_i(26))
|
|
render template: "moderations/mod"
|
|
end
|
|
|
|
def actions_panel
|
|
load_article
|
|
tag_mod_tag_ids = @tag_moderator_tags.ids
|
|
has_room_for_tags = @moderatable.tag_list.size < 4
|
|
has_no_relevant_adjustments = @adjustments.pluck(:tag_id).intersection(tag_mod_tag_ids).size.zero?
|
|
can_be_adjusted = @moderatable.tags.ids.intersection(tag_mod_tag_ids).size.positive?
|
|
|
|
@should_show_adjust_tags = tag_mod_tag_ids.size.positive? &&
|
|
((has_room_for_tags && has_no_relevant_adjustments) ||
|
|
(!has_room_for_tags && has_no_relevant_adjustments && can_be_adjusted))
|
|
|
|
render template: "moderations/actions_panel"
|
|
end
|
|
|
|
private
|
|
|
|
def load_article
|
|
authorize(User, :moderation_routes?)
|
|
|
|
@tag_adjustment = TagAdjustment.new
|
|
@moderatable = Article.find_by(slug: params[:slug])
|
|
not_found unless @moderatable
|
|
@tag_moderator_tags = Tag.with_role(:tag_moderator, current_user)
|
|
@adjustments = TagAdjustment.where(article_id: @moderatable.id)
|
|
@already_adjusted_tags = @adjustments.map(&:tag_name).join(", ")
|
|
@allowed_to_adjust = @moderatable.instance_of?(Article) && (
|
|
current_user.super_admin? || @tag_moderator_tags.any?)
|
|
@hidden_comments = @moderatable.comments.where(hidden_by_commentable_user: true)
|
|
end
|
|
end
|