diff --git a/app/controllers/feedback_messages_controller.rb b/app/controllers/feedback_messages_controller.rb index 635ea3508..7af125c16 100644 --- a/app/controllers/feedback_messages_controller.rb +++ b/app/controllers/feedback_messages_controller.rb @@ -10,9 +10,6 @@ class FeedbackMessagesController < ApplicationController if recaptcha_verified? && @feedback_message.save send_slack_message 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 else flash[:notice] = "Make sure the forms are filled 🤖 " @previous_message = feedback_message_params[:message] @@ -61,8 +58,6 @@ class FeedbackMessagesController < ApplicationController case feedback_type when "abuse-reports" "cry" - when "bug-reports" - "face_with_head_bandage" else "robot_face" end diff --git a/app/helpers/feedback_messages_helper.rb b/app/helpers/feedback_messages_helper.rb index e680f17a2..b57f27dd3 100644 --- a/app/helpers/feedback_messages_helper.rb +++ b/app/helpers/feedback_messages_helper.rb @@ -1,51 +1,49 @@ module FeedbackMessagesHelper def offender_email_details body = <<~HEREDOC - Hi [*USERNAME*], + Hi, - All dev.to members are expected to help foster a welcoming environment for the community and abide by our terms and conditions of use. It's been brought to our attention that you may have violated our code of conduct. If this behavior continues, we will need to ban your posting privileges on dev.to. + All DEV members are expected to help foster a welcoming environment for the community. It's been brought to our attention that you have violated our code of conduct and/or terms of use. If this behavior continues, we will need to ban your posting privileges on dev.to. If you think there's been a mistake, please reply to this email and we'll sort it out. Thanks, - dev.to team + DEV team HEREDOC { - subject: "DEV Report Status Update", + subject: "DEV Code of Conduct Violation", body: body }.freeze end def reporter_email_details body = <<~HEREDOC - Hi [*USERNAME*], + Hi!, - We wanted to say thank you for flagging a [*comment/post*] that was in violation of the dev.to code of conduct and terms of service. Your action has helped us continue our work of fostering an open and welcoming community. + We wanted to say thank you for flagging content that may be in violation of the DEV code of conduct and/or terms of use. We'll be looking into your report. - We've also removed the offending posts and reached out to the offender(s). + Thank you for the support. - Thanks again for being a great part of the community. - - PBJ + DEV Team HEREDOC { - subject: "dev.to Status Update", + subject: "DEV Report", body: body }.freeze end def affected_email_details body = <<~HEREDOC - Hi [*USERNAME*], + Hi, - We noticed some comments (made by others) on your [*post/comment*] that violated the dev.to code of conduct. We want you to know that we have zero tolerance for such behavior, and have removed the offending posts and reached out to the offender(s). + We noticed some comments (made by others) on your post that violated the DEV code of conduct and/or terms of use. We want you to know that we have zero tolerance for such behavior and are taking appropriate action. Thanks for being awesome and please don't hesitate to email us with any questions. We welcome all feedback and ideas as we continue our work of fostering an open and welcoming community. - PBJ + DEV Team HEREDOC { - subject: "Courtesy Notice from dev.to", + subject: "Courtesy Notice from DEV", body: body }.freeze end diff --git a/app/views/internal/feedback_messages/_feedback_message.html.erb b/app/views/internal/feedback_messages/_feedback_message.html.erb index 29223b8e2..e7bc02510 100644 --- a/app/views/internal/feedback_messages/_feedback_message.html.erb +++ b/app/views/internal/feedback_messages/_feedback_message.html.erb @@ -211,13 +211,6 @@ return } - if(emailBody.includes("[*") || emailBody.includes("*]")) { - alert.style.display = 'inline-block'; - alert.classList.add("alert-warning"); - alert.innerHTML = "Username or (comment/post) wasn't changed!" - return - } - var formData = new FormData(); formData.append('feedback_message_id', id); formData.append('email_to', emailToAddress); diff --git a/app/views/internal/feedback_messages/index.html.erb b/app/views/internal/feedback_messages/index.html.erb index 5e96661b9..11b4c2c93 100644 --- a/app/views/internal/feedback_messages/index.html.erb +++ b/app/views/internal/feedback_messages/index.html.erb @@ -1,46 +1,41 @@ <%= render "style" %> -

- ">Abuse Reports | - ">Bug Reports -
+

+ Abuse Reports - ">Open/Unresolved | ">Resolved | ">Invalid -

- -

<%= @feedback_type.titleize %>

+ +
<%= paginate @feedback_messages %> - <% if @feedback_type == "abuse-reports" %> - <% @vomits.each do |reaction| %> - <% next unless reaction.user && reaction.reactable %> -
-
- 🤢 @<%= reaction.user.username %> -
-
"> - <%= reaction.reactable_type %>: <%= reaction.reactable.title %> -
- <% if params[:status] == "Open" || params[:status].blank? %> -
- <%= form_for [:internal, reaction] do |f| %> - <%= f.hidden_field :status, value: "confirmed" %> - <%= f.submit "CONFIRMED", class: "btn btn-success btn-lg" %> - <% end %> -
-
- <%= form_for [:internal, reaction] do |f| %> - <%= f.hidden_field :status, value: "invalid" %> - <%= f.submit "INVALID", class: "btn btn-danger btn-lg" %> - <% end %> -
- <% end %> + <% @vomits.each do |reaction| %> + <% next unless reaction.user && reaction.reactable %> +
+
+ 🤢 @<%= reaction.user.username %>
- <% end %> +
"> + <%= reaction.reactable_type %>: <%= reaction.reactable.title %> +
+ <% if params[:status] == "Open" || params[:status].blank? %> +
+ <%= form_for [:internal, reaction] do |f| %> + <%= f.hidden_field :status, value: "confirmed" %> + <%= f.submit "CONFIRMED", class: "btn btn-success btn-lg" %> + <% end %> +
+
+ <%= form_for [:internal, reaction] do |f| %> + <%= f.hidden_field :status, value: "invalid" %> + <%= f.submit "INVALID", class: "btn btn-danger btn-lg" %> + <% end %> +
+ <% end %> +
<% end %> - +
<% @feedback_messages.each do |feedback_message| %> <%= form_for [:internal, feedback_message] do |f| %> <%= render "feedback_message", f: f, feedback_message: feedback_message %> diff --git a/public/500.html b/public/500.html index b8fdfd518..510a75872 100644 --- a/public/500.html +++ b/public/500.html @@ -55,7 +55,7 @@ - +
@@ -64,20 +64,7 @@

500 Error

It's not you, it's me.

-
- - - - -
- -
-
-
- -
-
- +

Sorry you're hitting this page.
Please help us by submitting a bug report.
Thank you!

diff --git a/public/revised500.html b/public/revised500.html deleted file mode 100644 index 866b61e40..000000000 --- a/public/revised500.html +++ /dev/null @@ -1,185 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - -
- -
- 500 error -
- -
-
-

500:Internal Server Error

-

Oops, this isn't where you were trying to go...

- -
Don't worry though, you can return to our homepage by clicking here. - -
-
- -
But perhaps this is an opportunity, would you like to:
- -
-
    -
  1. - Explore some great articles the DEV community has written about errors. -
    2. -
  2. - Learn more about HTTP errors. -
    3. -
  3. - Bravely help us debug this error. -
    4. -
-
-
- -
- -
- - -
- -
- -
- -
-
- -
-
- -