diff --git a/app/controllers/feedback_messages_controller.rb b/app/controllers/feedback_messages_controller.rb index 77cda7f14..fcc7dfaf3 100644 --- a/app/controllers/feedback_messages_controller.rb +++ b/app/controllers/feedback_messages_controller.rb @@ -5,11 +5,12 @@ class FeedbackMessagesController < ApplicationController def create flash.clear @feedback_message = FeedbackMessage.new( - feedback_message_params.merge(reporter_id: current_user&.id)) + feedback_message_params.merge(reporter_id: current_user&.id), + ) if recaptcha_verified? && @feedback_message.save send_slack_message - NotifyMailer.new_report_email(@feedback_message).deliver if @feedback_message.reporter_id? - redirect_to @feedback_message.path + # NotifyMailer.new_report_email(@feedback_message).deliver if @feedback_message.reporter_id? + redirect_to "/feedback_messages" elsif feedback_message_params[:feedback_type] == "bug-reports" flash[:notice] = "Make sure the forms are filled 🤖 " render file: "public/500.html", status: 500, layout: false @@ -27,13 +28,14 @@ class FeedbackMessagesController < ApplicationController private def recaptcha_verified? - params["g-recaptcha-response"] && verify_recaptcha(secret_key: ApplicationConfig["RECAPTCHA_SECRET"]) + params["g-recaptcha-response"] && + verify_recaptcha(secret_key: ApplicationConfig["RECAPTCHA_SECRET"]) end def send_slack_message SlackBot.ping( generate_message, - channel: "#{feedback_message_params[:feedback_type]}", + channel: feedback_message_params[:feedback_type].to_s, username: "#{feedback_message_params[:feedback_type]}_bot", icon_emoji: ":#{emoji_for_feedback(feedback_message_params[:feedback_type])}:", ) diff --git a/app/views/feedback_messages/index.html.erb b/app/views/feedback_messages/index.html.erb index ee303236a..3b3296550 100644 --- a/app/views/feedback_messages/index.html.erb +++ b/app/views/feedback_messages/index.html.erb @@ -1,6 +1,6 @@
-

Thank you for your report. You can view the
status of your report here.

+

Thank you for your report.

Return to home page

diff --git a/config/routes.rb b/config/routes.rb index 9f30ede31..35c07e40d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,7 +78,7 @@ Rails.application.routes.draw do resources :comments, only: [:create,:update,:destroy] resources :users, only: [:update] resources :reactions, only: [:index, :create] - resources :feedback_messages, only: [:create] + resources :feedback_messages, only: [:create, :index] get "/reports/:slug", to: "feedback_messages#show" resources :organizations, only: [:update, :create] resources :followed_articles, only: [:index]