Review corrections

Author: arkirchner

app/mailers/report_mailer.rb

@@ -6,6 +6,6 @@ class ReportMailer < ApplicationMailer
   def report_content
     @reported_content = params.fetch(:reported_content)
 
-    mail(subject: "Spam Report: A #{@reported_content.class.name} on CodeOcean has been marked as inappropriate.")
+    mail(subject: I18n.t('report_mailer.report_content.subject', content_name: @reported_content.model_name.human))
   end
 end

app/policies/report_policy.rb

@@ -2,16 +2,24 @@
 
 class ReportPolicy < ApplicationPolicy
   def show?
-    reciever_awalible? && @user
+    receiver_available? && reportable_content? && reports_other_user?
   end
 
   def create?
-    reciever_awalible? && @user && [RequestForComment, Comment].include?(@record.class)
+    receiver_available? && reportable_content? && reports_other_user?
   end
 
   private
 
-  def reciever_awalible?
+  def reportable_content?
+    [RequestForComment, Comment].include?(@record.class)
+  end
+
+  def reports_other_user?
+    @record.user != @user
+  end
+
+  def receiver_available?
     ReportMailer.default_params.fetch(:to).present?
   end
 end

app/views/report_mailer/report_content.text.erb

@@ -1,15 +1,21 @@
-The following content has been reported as inappropriate:
+<%= t('.prolog') %>
 
 <% case @reported_content %>
   <% when Comment %>
     <%= @reported_content.text %>
+
+    <%= t('.take_action') %>
+
+    <%= rails_admin.show_url(
+          model_name: 'comment',
+          id: @reported_content.id) %>
   <% when RequestForComment %>
     <%= @reported_content.question %>
+
+    <%= t('.take_action') %>
+
+    <%= request_for_comment_url(@reported_content) %>
   <% else %>
     <% raise("Unexpected reported content: #{@reported_content.class.name}") %>
 <% end %>
 
-Please take action on the admin page if required.
-<%= rails_admin.show_url(
-      model_name: @reported_content.class.name.underscore,
-      id: @reported_content.id) %>

app/views/reports/_button.html.slim

@@ -1,4 +1,4 @@
-- if policy(:report).show?
+- if policy(:report, reported_content).show?
   = button_to t('reports.report'), reports_path,
       params: {global_content_id: reported_content.to_global_id},
       data: {confirm: t('reports.confirm')},

config/locales/de/report.yml

@@ -4,3 +4,8 @@ de:
     confirm: Möchten Sie diesen Inhalt melden?
     report: melden
     reported: Vielen Dank, dass Sie uns auf dieses Problem aufmerksam gemacht haben. Wir werden uns in Kürze darum kümmern.
+  report_mailer:
+    report_content:
+      subject: "Spam Report: A %{content_name} on CodeOcean has been marked as inappropriate."
+      prolog: "Die folgenden Inhalte wurden als unangemessen gemeldet:"
+      take_action: Bitte ergreifen Sie gegebenenfalls Maßnahmen.

config/locales/en/report.yml

@@ -4,3 +4,8 @@ en:
     confirm: Do you want to report this content?
     report: report
     reported: Thank you for letting us know about this issue. We look into the matter shorty.
+  report_mailer:
+    report_content:
+      subject: "Spam Report: A %{content_name} on CodeOcean has been marked as inappropriate."
+      prolog: "The following content has been reported as inappropriate:"
+      take_action: Please take action if required.

config/routes.rb

@@ -150,6 +150,8 @@
 
   match '/forgot_password', as: 'forgot_password', to: 'internal_users#forgot_password', via: %i[get post]
 
+  resources :reports, only: :create
+
   resources :sessions, only: %i[create destroy new]
   resources :webauthn_credential_authentication, only: %i[new create]
 
@@ -196,8 +198,6 @@
   get 'service-worker', to: 'rails/pwa#service_worker', as: :pwa_service_worker, defaults: {format: :js}
   get 'manifest(.:file_extension)', to: 'rails/pwa#manifest', as: :pwa_manifest, defaults: {format: :webmanifest}, format: false, constraints: {file_extension: %w[json webmanifest]}
 
-  resources :reports, only: :create
-
   # Defines the root path route ("/")
   root to: 'application#welcome'
 end

docs/LOCAL_SETUP.md

@@ -158,9 +158,6 @@ do
     cp config/$f.example config/$f
   fi
 done
-
-sed -i.bak 's/^# - [email protected]/- [email protected]/' config/code_ocean.yml
-rm config/code_ocean.yml.bak
 ```
 
 Then, you should check all config files manually and adjust settings where necessary for your environment.

spec/mailers/report_mailer_spec.rb

@@ -12,7 +12,7 @@
       let(:reported_content) { create(:rfc, question: 'Inappropriate content for RfC.') }
 
       it 'sets the correct subject' do
-        expect(mail.subject).to eq('Spam Report: A RequestForComment on CodeOcean has been marked as inappropriate.')
+        expect(mail.subject).to eq(I18n.t('report_mailer.report_content.subject', content_name: RequestForComment.model_name.human ))
       end
 
       it 'includes the reported content' do
@@ -25,7 +25,7 @@
     end
 
     it 'sets the correct subject' do
-      expect(mail.subject).to eq('Spam Report: A Comment on CodeOcean has been marked as inappropriate.')
+      expect(mail.subject).to eq(I18n.t('report_mailer.report_content.subject', content_name: Comment.model_name.human ))
     end
 
     it 'sets the correct receiver' do

spec/policies/report_policy_spec.rb

@@ -19,6 +19,12 @@
 
       expect(policy).not_to permit(user, Comment.new)
     end
+    
+    it 'dose not allow reports of your own content' do
+      user = build_stubbed(:external_user)
+
+      expect(policy).not_to permit(user, Comment.new(user: user))
+    end
   end
 
   permissions(:create?) do
@@ -28,6 +34,14 @@
       end
     end
 
+    it 'allows reports on RfCs and Comments' do
+      user = build_stubbed(:external_user)
+
+      expect(policy).to permit(user, Comment.new)
+      expect(policy).to permit(user, RequestForComment.new)
+      expect(policy).not_to permit(user, ExternalUser.new)
+    end
+
     it 'dose not allow reports when no report email is configured' do
       user = build_stubbed(:external_user)
 
@@ -36,12 +50,10 @@
       expect(policy).not_to permit(user, Comment.new)
     end
 
-    it 'allows reports on RfCs and Comments' do
+    it 'dose not allow reports of your own content' do
       user = build_stubbed(:external_user)
 
-      expect(policy).to permit(user, Comment.new)
-      expect(policy).to permit(user, RequestForComment.new)
-      expect(policy).not_to permit(user, ExternalUser.new)
+      expect(policy).not_to permit(user, Comment.new(user: user))
     end
   end
 end