From: Andy Allan Date: Wed, 11 Apr 2018 01:54:04 +0000 (+0800) Subject: Merge branch 'master' into moderation X-Git-Tag: live~2984^2~11 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7dbf8d83369cb73929080c4ba23fdd7dcd0184df?hp=fc90b7358124ce9017a94b3f6e4a779fbc28c71c Merge branch 'master' into moderation --- diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2c8d29eb8..5846de44f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -67,7 +67,7 @@ Metrics/AbcSize: # Offense count: 41 # Configuration parameters: CountComments, ExcludedMethods. Metrics/BlockLength: - Max: 240 + Max: 250 # Offense count: 12 # Configuration parameters: CountBlocks. diff --git a/Gemfile b/Gemfile index 09c662e4a..a9a6cb4b6 100644 --- a/Gemfile +++ b/Gemfile @@ -70,6 +70,9 @@ gem "omniauth-windowslive" # Markdown formatting support gem "redcarpet" +# For status transitions of Issues +gem "aasm" + # Load libxml support for XML parsing and generation gem "libxml-ruby", ">= 2.0.5", :require => "libxml" diff --git a/Gemfile.lock b/Gemfile.lock index e4448fddc..d1a9a0dd2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,6 +2,7 @@ GEM remote: https://rubygems.org/ specs: SystemTimer (1.2.3) + aasm (4.1.0) actioncable (5.1.5) actionpack (= 5.1.5) nio4r (~> 2.0) @@ -354,6 +355,7 @@ PLATFORMS DEPENDENCIES SystemTimer (>= 1.1.3) + aasm actionpack-page_caching annotate autoprefixer-rails diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 0a5d9164e..50b38e7a3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -2822,3 +2822,59 @@ input.richtext_title[type="text"] { display: none; } } + +.read-reports { + background: #eee; + opacity: 0.7; +} + +.report-related-block { + display:inline-block; +} + +.report-block { + width:475px; + float:left; + margin-right:100px; +} + +.related-reports { + width: 280px; + float: right; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +} + +.issue-comments { + width:475px; +} + +.issues-list { + td:nth-child(2) { + white-space: nowrap; + } +} + +.report-disclaimer { + background: #fff1f0; + color: #d85030; + border-color: rgba(216, 80, 48, 0.3); + padding: 10px 20px; + margin-bottom: $lineheight; + + ul { + padding-left: $lineheight; + margin-bottom: 0; + + li { + list-style: disc; + } + } +} diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb new file mode 100644 index 000000000..42ae850ba --- /dev/null +++ b/app/controllers/issue_comments_controller.rb @@ -0,0 +1,37 @@ +class IssueCommentsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + before_action :check_permission + + def create + @issue = Issue.find(params[:issue_id]) + comment = @issue.comments.build(issue_comment_params) + comment.user = current_user + comment.save! + notice = t("issues.comment.comment_created") + reassign_issue(@issue) if params[:reassign] + redirect_to @issue, :notice => notice + end + + private + + def issue_comment_params + params.require(:issue_comment).permit(:body) + end + + def check_permission + unless current_user.administrator? || current_user.moderator? + flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin") + redirect_to root_path + end + end + + # This sort of assumes there are only two roles + def reassign_issue(issue) + role = (Issue::ASSIGNED_ROLES - [issue.assigned_role]).first + issue.assigned_role = role + issue.save! + end +end diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb new file mode 100644 index 000000000..6f4667a30 --- /dev/null +++ b/app/controllers/issues_controller.rb @@ -0,0 +1,91 @@ +class IssuesController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + before_action :check_permission + before_action :find_issue, :only => [:show, :resolve, :reopen, :ignore] + + def index + @title = t ".title" + + @issue_types = [] + @issue_types.concat %w[Note] if current_user.moderator? + @issue_types.concat %w[DiaryEntry DiaryComment User] if current_user.administrator? + + @users = User.joins(:roles).where(:user_roles => { :role => current_user.roles.map(&:role) }).distinct + @issues = Issue.where(:assigned_role => current_user.roles.map(&:role)) + + # If search + if params[:search_by_user] && params[:search_by_user].present? + @find_user = User.find_by(:display_name => params[:search_by_user]) + if @find_user + @issues = @issues.where(:reported_user_id => @find_user.id) + else + notice = t("issues.index.user_not_found") + end + end + + @issues = @issues.where(:status => params[:status][0]) if params[:status] && params[:status][0].present? + + @issues = @issues.where(:reportable_type => params[:issue_type][0]) if params[:issue_type] && params[:issue_type][0].present? + + if params[:last_updated_by] && params[:last_updated_by][0].present? + last_updated_by = params[:last_updated_by][0].to_s == "nil" ? nil : params[:last_updated_by][0].to_i + @issues = @issues.where(:updated_by => last_updated_by) + end + + redirect_to issues_path, :notice => notice if notice + end + + def show + @read_reports = @issue.read_reports + @unread_reports = @issue.unread_reports + @comments = @issue.comments + @related_issues = @issue.reported_user.issues.where(:assigned_role => current_user.roles.map(&:role)) if @issue.reported_user + @new_comment = IssueComment.new(:issue => @issue) + end + + # Status Transistions + def resolve + if @issue.resolve + @issue.save! + redirect_to @issue, :notice => t("issues.resolved") + else + render :show + end + end + + def ignore + if @issue.ignore + @issue.updated_by = current_user.id + @issue.save! + redirect_to @issue, :notice => t("issues.ignored") + else + render :show + end + end + + def reopen + if @issue.reopen + @issue.updated_by = current_user.id + @issue.save! + redirect_to @issue, :notice => t("issues.reopened") + else + render :show + end + end + + private + + def find_issue + @issue = Issue.find(params[:id]) + end + + def check_permission + unless current_user.administrator? || current_user.moderator? + flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_admin") + redirect_to root_path + end + end +end diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb new file mode 100644 index 000000000..8a1bed508 --- /dev/null +++ b/app/controllers/reports_controller.rb @@ -0,0 +1,42 @@ +class ReportsController < ApplicationController + layout "site" + + before_action :authorize_web + before_action :require_user + + def new + if required_new_report_params_present? + @report = Report.new + @report.issue = Issue.find_or_initialize_by(create_new_report_params) + else + redirect_to root_path, :notice => t("reports.new.missing_params") + end + end + + def create + @report = current_user.reports.new(report_params) + @report.issue = Issue.find_or_initialize_by(:reportable_id => params[:report][:issue][:reportable_id], :reportable_type => params[:report][:issue][:reportable_type]) + + if @report.save + @report.issue.save + @report.issue.reopen! unless @report.issue.open? + redirect_to helpers.reportable_url(@report.issue.reportable), :notice => t("issues.create.successful_report") + else + redirect_to new_report_path(:reportable_type => @report.issue.reportable_type, :reportable_id => @report.issue.reportable_id), :notice => t("issues.create.provide_details") + end + end + + private + + def required_new_report_params_present? + create_new_report_params["reportable_id"].present? && create_new_report_params["reportable_type"].present? + end + + def create_new_report_params + params.permit(:reportable_id, :reportable_type) + end + + def report_params + params[:report].permit(:details, :category) + end +end diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb new file mode 100644 index 000000000..3c13c6536 --- /dev/null +++ b/app/helpers/issues_helper.rb @@ -0,0 +1,27 @@ +module IssuesHelper + def reportable_url(reportable) + case reportable + when DiaryEntry + url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id) + when User + url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name) + when DiaryComment + url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}") + when Note + url_for(:controller => :browse, :action => :note, :id => reportable.id) + end + end + + def reportable_title(reportable) + case reportable + when DiaryEntry + reportable.title + when User + reportable.display_name + when DiaryComment + "#{reportable.diary_entry.title}, Comment id ##{reportable.id}" + when Note + "Note ##{reportable.id}" + end + end +end diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb new file mode 100644 index 000000000..70c9adac6 --- /dev/null +++ b/app/helpers/reports_helper.rb @@ -0,0 +1,5 @@ +module ReportsHelper + def report_link(name, reportable) + link_to name, new_report_url(:reportable_id => reportable.id, :reportable_type => reportable.class.name) + end +end diff --git a/app/models/issue.rb b/app/models/issue.rb new file mode 100644 index 000000000..27c0a7cc9 --- /dev/null +++ b/app/models/issue.rb @@ -0,0 +1,102 @@ +# == Schema Information +# +# Table name: issues +# +# id :integer not null, primary key +# reportable_type :string not null +# reportable_id :integer not null +# reported_user_id :integer +# status :enum default(NULL), not null +# assigned_role :enum not null +# resolved_at :datetime +# resolved_by :integer +# updated_by :integer +# reports_count :integer default(0) +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_issues_on_reportable_type_and_reportable_id (reportable_type,reportable_id) +# index_issues_on_reported_user_id (reported_user_id) +# index_issues_on_updated_by (updated_by) +# +# Foreign Keys +# +# issues_reported_user_id_fkey (reported_user_id => users.id) +# issues_resolved_by_fkey (resolved_by => users.id) +# issues_updated_by_fkey (updated_by => users.id) +# + +class Issue < ActiveRecord::Base + belongs_to :reportable, :polymorphic => true + belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id + belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by + belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by + + has_many :reports, :dependent => :destroy + has_many :comments, :class_name => "IssueComment", :dependent => :destroy + + validates :reportable_id, :uniqueness => { :scope => [:reportable_type] } + + ASSIGNED_ROLES = %w[administrator moderator].freeze + validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES + + before_validation :set_default_assigned_role + before_validation :set_reported_user + + scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) } + + def read_reports + resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil + end + + def unread_reports + resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports + end + + include AASM + aasm :column => :status, :no_direct_assignment => true do + state :open, :initial => true + state :ignored + state :resolved + + event :ignore do + transitions :from => :open, :to => :ignored + end + + event :resolve do + transitions :from => :open, :to => :resolved + after do + self.resolved_at = Time.now.getutc + end + end + + event :reopen do + transitions :from => :resolved, :to => :open + transitions :from => :ignored, :to => :open + end + end + + private + + def set_reported_user + self.reported_user = case reportable.class.name + when "User" + reportable + when "Note" + reportable.author + else + reportable.user + end + end + + def set_default_assigned_role + if assigned_role.blank? + self.assigned_role = case reportable + when Note then "moderator" + else "administrator" + end + end + end +end diff --git a/app/models/issue_comment.rb b/app/models/issue_comment.rb new file mode 100644 index 000000000..3a5894cb3 --- /dev/null +++ b/app/models/issue_comment.rb @@ -0,0 +1,30 @@ +# == Schema Information +# +# Table name: issue_comments +# +# id :integer not null, primary key +# issue_id :integer not null +# user_id :integer not null +# body :text not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_issue_comments_on_issue_id (issue_id) +# index_issue_comments_on_user_id (user_id) +# +# Foreign Keys +# +# issue_comments_issue_id_fkey (issue_id => issues.id) +# issue_comments_user_id_fkey (user_id => users.id) +# + +class IssueComment < ActiveRecord::Base + belongs_to :issue + belongs_to :user + + validates :body, :presence => true + validates :user, :presence => true + validates :issue, :presence => true +end diff --git a/app/models/report.rb b/app/models/report.rb new file mode 100644 index 000000000..63296a094 --- /dev/null +++ b/app/models/report.rb @@ -0,0 +1,42 @@ +# == Schema Information +# +# Table name: reports +# +# id :integer not null, primary key +# issue_id :integer not null +# user_id :integer not null +# details :text not null +# category :string not null +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_reports_on_issue_id (issue_id) +# index_reports_on_user_id (user_id) +# +# Foreign Keys +# +# reports_issue_id_fkey (issue_id => issues.id) +# reports_user_id_fkey (user_id => users.id) +# + +class Report < ActiveRecord::Base + belongs_to :issue, :counter_cache => true + belongs_to :user + + validates :issue, :presence => true + validates :user, :presence => true + validates :details, :presence => true + validates :category, :presence => true + + def self.categories_for(reportable) + case reportable.class.name + when "DiaryEntry" then %w[spam offensive threat other] + when "DiaryComment" then %w[spam offensive threat other] + when "User" then %w[spam offensive threat vandal other] + when "Note" then %w[spam personal abusive other] + else %w[other] + end + end +end diff --git a/app/models/user.rb b/app/models/user.rb index da3964142..2a0a5ab45 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -75,6 +75,11 @@ class User < ActiveRecord::Base has_many :roles, :class_name => "UserRole" + has_many :issues, :class_name => "Issue", :foreign_key => :reported_user_id + has_many :issue_comments + + has_many :reports + scope :visible, -> { where(:status => %w[pending active confirmed]) } scope :active, -> { where(:status => %w[active confirmed]) } scope :identifiable, -> { where(:data_public => true) } diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb index 1bacd27d6..fa9e88628 100644 --- a/app/views/browse/note.html.erb +++ b/app/views/browse/note.html.erb @@ -23,6 +23,10 @@

<%= t "javascripts.notes.show.anonymous_warning" %>

<% end -%> + <% if current_user && current_user != @note.author %> +

<%= report_link(t(".report"), @note) %>

+ <% end %> + <% if @note_comments.length > 1 %>