It is now possible to report comments

* Renamed PostReport to Report
* Added report button to SPV
* Updated rspec

refs diaspora/diaspora#4732
refs diaspora/diaspora#4710
refs diaspora/diaspora#4711
refs diaspora/diaspora#4517

app/views/post_report/index.html.haml

-.span-24
-  = render :partial => 'admins/admin_bar'
-
-.span-24.last
-  %h1
-    = t('post_report.title')
-  %div#post_report
-    - @post_report.each do |report|
-      %div.content
-        %span
-          = raw t('post_report.post_label', title: link_to(post_page_title(Post.find_by_id(report.post_id)), post_path(report.post_id)))
-        %span
-          = raw t('post_report.reported_label', person: link_to(report.user_id, user_profile_path(report.user_id)))
-        %span
-          = t('post_report.reason_label', text: report.text)
-      %div.options
-        %span
-          = link_to t('post_report.review_link'), post_report_path(report.post_id), method: :put
-        %span
-          = link_to t('post_report.delete_link'), post_report_path(report.post_id), method: :delete
-      %div.clear

app/views/post_report/post_report_email.markerb

-<%= t('notifier.post_report_email.body') %>
-

app/views/report/index.html.haml

+.span-24
+  = render :partial => 'admins/admin_bar'
+
+.span-24.last
+  %h1
+    = t('report.title')
+  %div#report
+    - @report.each do |r|
+      %div.content
+        %span
+          = report_content(r.post_id, r.post_type)
+        %span
+          = raw t('report.reported_label', person: link_to(r.user_id, user_profile_path(r.user_id)))
+        %span
+          = t('report.reason_label', text: r.text)
+      %div.options
+        %span
+          = link_to t('report.review_link'), report_path(r.post_id, :type => r.post_type), method: :put
+        %span
+          = link_to t('report.delete_link'), report_path(r.post_id, :type => r.post_type), method: :delete
+      %div.clear

app/views/report/report_email.markerb

+<%= t('notifier.report_email.body', url: resource[:url], type: resource[:type], id: resource[:id]) %>
+

app/workers/mail/post_report_worker.rb → app/workers/mail/report_worker.rb

 module Workers
   module Mail
-    class PostReportWorker < Base
+    class ReportWorker < Base
       sidekiq_options queue: :mail
 
-      def perform
-        PostReportMailer.new_report
+      def perform(type, id)
+        ReportMailer.new_report(type, id)
       end
     end
   end

config/locales/diaspora/en.yml

@@ -99,7 +99,7 @@ en:
       user_search: "User Search"
       weekly_user_stats: "Weekly User Stats"
       pod_stats: "Pod Stats"
-      post_report: "Reported Posts"
+      report: "Reports"
       correlations: "Correlations"
       sidekiq_monitor: "Sidekiq monitor"
     correlations:
@@ -736,9 +736,23 @@ en:
     confirm_email:
         subject: "Please activate your new email address %{unconfirmed_email}"
         click_link: "To activate your new email address %{unconfirmed_email}, please follow this link:"
-    post_report_email:
-        subject: "A new post was marked as offensive"
-        body: "Please review as soon as possible!"
+    report_email:
+        subject: "A new %{type} was marked as offensive"
+        body: |-
+          Hello,
+
+          the %{type} with ID %{id} was marked as offensive.
+
+          [%{url}][1]
+
+          Please review as soon as possible!
+
+
+          Cheers,
+
+          The diaspora* email robot!
+
+          [1]: %{url}
     accept_invite: "Accept Your diaspora* invite!"
     invited_you: "%{name} invited you to diaspora*"
     invite:
@@ -868,9 +882,10 @@ en:
         other: "%{count} photos by %{author}"
       reshare_by: "Reshare by %{author}"
 
-  post_report:
-    title: "Marked Reports Overview"
+  report:
+    title: "Reports Overview"
     post_label: "<b>Post</b>: %{title}"
+    comment_label: "<b>Comment</b>:<br>%{data}"
     reported_label: "<b>Reported by</b> %{person}"
     reason_label: "Reason: %{text}"
     review_link: "Mark as reviewed"

config/locales/javascript/javascript.en.yml

@@ -6,11 +6,11 @@
 en:
   javascripts:
     confirm_dialog: "Are you sure?"
-    post_report_prompt: "Please enter a reason:"
-    post_report_prompt_default: "offensive content"
+    report_prompt: "Please enter a reason:"
+    report_prompt_default: "offensive content"
     delete: "Delete"
     ignore: "Ignore"
-    post_report: "Report"
+    report: "Report"
     ignore_user: "Ignore this user?"
     and: "and"
     comma: ","

config/routes.rb

@@ -5,7 +5,7 @@
 require 'sidekiq/web'
 
 Diaspora::Application.routes.draw do
-  resources :post_report, :except => [:edit]
+  resources :report, :except => [:edit, :new]
 
   if Rails.env.production?
     mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'

db/migrate/20140121132816_add_post_type_to_post_report.rb

+class AddPostTypeToPostReport < ActiveRecord::Migration
+  def change
+    add_column :post_reports, :post_type, :string, :null => false, :after => :post_id
+  end
+end

db/migrate/20140214104217_rename_post_report_to_report.rb

+class RenamePostReportToReport < ActiveRecord::Migration
+  def self.up
+    rename_table :post_reports, :reports
+  end
+  def self.down
+    rename_table :reports, :post_reports
+  end
+end

db/schema.rb

@@ -410,6 +410,18 @@ ActiveRecord::Schema.define(:version => 20140308154022) do
 
   add_index "rails_admin_histories", ["item", "table", "month", "year"], :name => "index_rails_admin_histories"
 
+  create_table "reports", :force => true do |t|
+    t.integer  "post_id",                       :null => false
+    t.string   "post_type",                     :null => false
+    t.string   "user_id"
+    t.boolean  "reviewed",   :default => false
+    t.text     "text"
+    t.datetime "created_at",                    :null => false
+    t.datetime "updated_at",                    :null => false
+  end
+
+  add_index "reports", ["post_id"], :name => "index_post_reports_on_post_id"
+
   create_table "roles", :force => true do |t|
     t.integer  "person_id"
     t.string   "name"

spec/controllers/post_report_controller_spec.rb → spec/controllers/report_controller_spec.rb

 require 'spec_helper'
 
-describe PostReportController do
+describe ReportController do
   before do
     sign_in alice
     @message = alice.post(:status_message, :text => "hey", :to => alice.aspects.first.id)
+    @comment = alice.comment!(@message, "flying pigs, everywhere")
   end
 
   describe '#index' do
@@ -26,32 +27,61 @@ describe PostReportController do
   end
 
   describe '#create' do
-    context 'report offensive content' do
+    let(:comment_hash) {
+      {:text    =>"facebook, is that you?",
+       :post_id =>"#{@post.id}"}
+    }
+
+    context 'report offensive post' do
       it 'succeeds' do
-        put :create, :post_id => @message.id, :text => 'offensive content'
+        put :create, :id => @message.id, :type => 'post', :text => 'offensive content'
         response.status.should == 200
-        PostReport.exists?(:post_id => @message.id).should be_true
+        Report.exists?(:post_id => @message.id, :post_type => 'post').should be_true
+      end
+    end
+    context 'report offensive comment' do
+      it 'succeeds' do
+        put :create, :id => @comment.id, :type => 'comment', :text => 'offensive content'
+        response.status.should == 200
+        Report.exists?(:post_id => @comment.id, :post_type => 'comment').should be_true
       end
     end
   end
 
   describe '#update' do
-    context 'mark report as user' do
+    context 'mark post report as user' do
+      it 'is behind redirect_unless_admin' do
+        put :update, :id => @message.id, :type => 'post'
+        response.should redirect_to stream_path
+        Report.where(:reviewed => false, :post_id => @message.id, :post_type => 'post').should be_true
+      end
+    end
+    context 'mark comment report as user' do
       it 'is behind redirect_unless_admin' do
-        put :update, :id => @message.id
+        put :update, :id => @comment.id, :type => 'comment'
         response.should redirect_to stream_path
-        PostReport.where(:reviewed => false, :post_id => @message.id).should be_true
+        Report.where(:reviewed => false, :post_id => @comment.id, :post_type => 'comment').should be_true
       end
     end
 
-    context 'mark report as admin' do
+    context 'mark post report as admin' do
       before do
         Role.add_admin(alice.person)
       end
       it 'succeeds' do
-        put :update, :id => @message.id
+        put :update, :id => @message.id, :type => 'post'
         response.status.should == 302
-        PostReport.where(:reviewed => true, :post_id => @message.id).should be_true
+        Report.where(:reviewed => true, :post_id => @message.id, :post_type => 'post').should be_true
+      end
+    end
+    context 'mark comment report as admin' do
+      before do
+        Role.add_admin(alice.person)
+      end
+      it 'succeeds' do
+        put :update, :id => @comment.id, :type => 'comment'
+        response.status.should == 302
+        Report.where(:reviewed => true, :post_id => @comment.id, :post_type => 'comment').should be_true
       end
     end
   end
@@ -59,9 +89,16 @@ describe PostReportController do
   describe '#destroy' do
     context 'destroy post as user' do
       it 'is behind redirect_unless_admin' do
-        delete :destroy, :id => @message.id
+        delete :destroy, :id => @message.id, :type => 'post'
         response.should redirect_to stream_path
-        PostReport.where(:reviewed => false, :post_id => @message.id).should be_true
+        Report.where(:reviewed => false, :post_id => @message.id, :post_type => 'post').should be_true
+      end
+    end
+    context 'destroy comment as user' do
+      it 'is behind redirect_unless_admin' do
+        delete :destroy, :id => @comment.id, :type => 'comment'
+        response.should redirect_to stream_path
+        Report.where(:reviewed => false, :post_id => @comment.id, :post_type => 'comment').should be_true
       end
     end
 
@@ -70,9 +107,19 @@ describe PostReportController do
         Role.add_admin(alice.person)
       end
       it 'succeeds' do
-        delete :destroy, :id => @message.id
+        delete :destroy, :id => @message.id, :type => 'post'
+        response.status.should == 302
+        Report.where(:reviewed => true, :post_id => @message.id, :post_type => 'post').should be_true
+      end
+    end
+    context 'destroy comment as admin' do
+      before do
+        Role.add_admin(alice.person)
+      end
+      it 'succeeds' do
+        delete :destroy, :id => @comment.id, :type => 'comment'
         response.status.should == 302
-        PostReport.where(:reviewed => true, :post_id => @message.id).should be_true
+        Report.where(:reviewed => true, :post_id => @comment.id, :post_type => 'comment').should be_true
       end
     end
   end