+`;
+
+ const toggleFlagUserModal = () => {
+ const modalContainer = document.querySelector('.flag-user-modal-container');
+ modalContainer.classList.toggle('hidden');
+
+ if (!modalContainer.classList.contains('hidden')) {
+ window.scrollTo(0, 0);
+ document.querySelector('body').style.height = '100vh';
+ document.querySelector('body').style.overflowY = 'hidden';
+ } else {
+ document.querySelector('body').style.height = 'inherit';
+ document.querySelector('body').style.overflowY = 'inherit';
+ }
+ };
+
+ const modContainer = document.getElementById('mod-container');
+ document.querySelector(
+ '.flag-user-modal-container',
+ ).innerHTML = flagUserModalHTML;
+ modContainer.addEventListener('load', () => {
+ modContainer.contentWindow.document
+ .getElementById('open-flag-user-modal')
+ .addEventListener('click', toggleFlagUserModal);
+ });
+
+ // Event listeners to Close the Modal
+ const closeModalElements = Array.from(
+ document.querySelectorAll(
+ '.crayons-modal__overlay, .modal-header-close-icon, #cancel-flag-user-action',
+ ),
+ );
+
+ closeModalElements.forEach((element) => {
+ element.addEventListener('click', toggleFlagUserModal);
+ });
+
+ document
+ .getElementById('confirm-flag-user-action')
+ .addEventListener('click', async (e) => {
+ e.preventDefault();
+ const vomitAllOption = document.getElementById('vomit-all');
+
+ if (vomitAllOption.checked) {
+ const body = JSON.stringify({
+ reactable_type: vomitAllOption.dataset.reactableType,
+ category: vomitAllOption.dataset.category,
+ reactable_id: vomitAllOption.dataset.reactableId,
+ });
+
+ try {
+ const response = await request('/reactions', {
+ method: 'POST',
+ body,
+ });
+
+ const outcome = await response.json();
+
+ if (outcome.result === 'create') {
+ // eslint-disable-next-line no-restricted-globals
+ top.addSnackbarItem({
+ message: 'All posts by this author will be less visible.',
+ addCloseButton: true,
+ });
+ } else if (outcome.result === null) {
+ // eslint-disable-next-line no-restricted-globals
+ top.addSnackbarItem({
+ message:
+ "It seems you've already reduced the vibilsity of this author's posts.",
+ addCloseButton: true,
+ });
+ } else {
+ // eslint-disable-next-line no-restricted-globals
+ top.addSnackbarItem({
+ message: `Response from server: ${JSON.stringify(outcome)}`,
+ addCloseButton: true,
+ });
+ }
+ } catch (error) {
+ // eslint-disable-next-line no-restricted-globals
+ top.addSnackbarItem({ message: error, addCloseButton: true });
+ }
+ } else {
+ // eslint-disable-next-line no-restricted-globals
+ top.addSnackbarItem({
+ message: 'No selection made!',
+ addCloseButton: true,
+ });
+ }
+ toggleFlagUserModal();
+ });
+}
diff --git a/app/models/negative_reaction.rb b/app/models/privileged_reaction.rb
similarity index 84%
rename from app/models/negative_reaction.rb
rename to app/models/privileged_reaction.rb
index 29332d43f..8bc3a3580 100644
--- a/app/models/negative_reaction.rb
+++ b/app/models/privileged_reaction.rb
@@ -1,4 +1,4 @@
-class NegativeReaction < ApplicationRecord
+class PrivilegedReaction < ApplicationRecord
resourcify
# This class exists to take advantage of Rolify for limiting authorization
# on internal reports.
diff --git a/app/models/reaction.rb b/app/models/reaction.rb
index 93c5d30fc..bab1a92d9 100644
--- a/app/models/reaction.rb
+++ b/app/models/reaction.rb
@@ -4,7 +4,7 @@ class Reaction < ApplicationRecord
SEARCH_SERIALIZER = Search::ReactionSerializer
SEARCH_CLASS = Search::Reaction
- CATEGORIES = %w[like readinglist unicorn thinking hands thumbsdown vomit].freeze
+ CATEGORIES = %w[like readinglist unicorn thinking hands thumbsup thumbsdown vomit].freeze
PUBLIC_CATEGORIES = %w[like readinglist unicorn thinking hands].freeze
REACTABLE_TYPES = %w[Comment Article User].freeze
STATUSES = %w[valid invalid confirmed archived].freeze
@@ -161,6 +161,7 @@ class Reaction < ApplicationRecord
BASE_POINTS = {
"vomit" => -50.0,
+ "thumbsup" => 5.0,
"thumbsdown" => -10.0
}.freeze
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index a9469d207..b806eeb0b 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -122,7 +122,7 @@ class UserPolicy < ApplicationPolicy
end
def moderation_routes?
- user.has_role?(:trusted) && !user.banned
+ (user.has_role?(:trusted) || minimal_admin?) && !user.banned
end
def permitted_attributes
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index b20c10151..82ce52013 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -1,7 +1,11 @@
<% title @article.title_with_query_preamble(user_signed_in?) %>
<%= render "shared/webcomponents_loader_script" %>
-<%= javascript_packs_with_chunks_tag "clipboardCopy", "webShare", "articlePage", defer: true %>
+<% if user_signed_in? %>
+ <%= javascript_packs_with_chunks_tag "clipboardCopy", "webShare", "articlePage", "articleModerationTools", defer: true %>
+<% else %>
+ <%= javascript_packs_with_chunks_tag "clipboardCopy", "webShare", "articlePage", defer: true %>
+<% end %>
<% cache("content-related-optional-scripts-#{@article.id}-#{@article.updated_at}-#{internal_navigation?}-#{user_signed_in?}", expires_in: 30.hours) do %>
<% if @article.processed_html.include? "ltag_gist-liquid-tag" %>
@@ -224,6 +228,10 @@
<% end %>
<% end %>
+
+
+
+
<% cache("article-show-scripts", expires_in: 8.hours) do %>
diff --git a/config/routes.rb b/config/routes.rb
index a0c7b0093..9a378ad4b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,7 +55,7 @@ Rails.application.routes.draw do
resources :pages, only: %i[index new create edit update destroy]
resources :mods, only: %i[index update]
resources :moderator_actions, only: %i[index]
- resources :negative_reactions, only: %i[index]
+ resources :privileged_reactions, only: %i[index]
resources :permissions, only: %i[index]
resources :podcasts, only: %i[index edit update destroy] do
member do
@@ -450,6 +450,7 @@ Rails.application.routes.draw do
get "/:username/:slug/:view" => "stories#show",
:constraints => { view: /moderate/ }
get "/:username/:slug/mod" => "moderations#article"
+ get "/:username/:slug/actions_panel" => "moderations#actions_panel"
get "/:username/:slug/manage" => "articles#manage"
get "/:username/:slug/edit" => "articles#edit"
get "/:username/:slug/delete_confirm" => "articles#delete_confirm"
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index a79284b6f..aab13abb8 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -22,7 +22,7 @@ environment.splitChunks((config) => {
__dirname,
'../../app/javascript/crayons',
) /* global __dirname */,
- '@utilities': path.resolve(__dirname, '../../app/javascript/utlities'),
+ '@utilities': path.resolve(__dirname, '../../app/javascript/utilities'),
},
},
optimization: {
diff --git a/db/schema.rb b/db/schema.rb
index 83674b310..f3eb9cc83 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
diff --git a/docs/backend/metrics.md b/docs/backend/metrics.md
index 299816647..b94083a37 100644
--- a/docs/backend/metrics.md
+++ b/docs/backend/metrics.md
@@ -7,9 +7,9 @@ title: Tracking Metrics
We track point-in-time data by sending data points to Datadog using
[Statdsd](https://github.com/DataDog/dogstatsd-ruby).
-Currently, we run a daily metric fetching job in `fetch.rake` which is called via
-the Heroku scheduler. If we wanted to do other frequencies like hourly, etc. we
-could add similar tasks.
+Currently, we run a daily metric fetching job in `fetch.rake` which is called
+via the Heroku scheduler. If we wanted to do other frequencies like hourly, etc.
+we could add similar tasks.
The rake task calls `Metrics::RecordDailyUsageWorker.perform_async`, which
performs algorithms to come up with data points to send, for example:
@@ -22,8 +22,8 @@ If you want to create a new periodic data send, follow this pattern to do so.
## Vendor-Agnostic
-While we currently are not vendor-agnostic in how we do this (Heroku/Datadog), it
-is set up in a way that could become so in the future. The main pattern is
+While we currently are not vendor-agnostic in how we do this (Heroku/Datadog),
+it is set up in a way that could become so in the future. The main pattern is
`Every x minutes/hours/etc. send aggregate data to warehouse where it can be examined on a timeseries basis`.
This could, in the future, be bundled right into the platform using an open
source timeseries database and data visualization.
diff --git a/jsconfig.json b/jsconfig.json
index 0630b5585..da867fcd6 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -3,7 +3,7 @@
"baseUrl": "./",
"paths": {
"@crayons/*": ["app/javascript/crayons/*"],
- "@utilities/*": ["app/javascript/utlities/*"]
+ "@utilities/*": ["app/javascript/utilities/*"]
}
},
"exclude": ["node_modules", "**/node_modules/*"]
diff --git a/spec/policies/user_policy_spec.rb b/spec/policies/user_policy_spec.rb
index 5c5ed450b..b1752232d 100644
--- a/spec/policies/user_policy_spec.rb
+++ b/spec/policies/user_policy_spec.rb
@@ -38,4 +38,16 @@ RSpec.describe UserPolicy, type: :policy do
it { is_expected.to forbid_actions(%i[moderation_routes]) }
end
+
+ context "when the user is an admin" do
+ let(:user) { build(:user, :admin) }
+
+ it { is_expected.to permit_actions(%i[moderation_routes]) }
+ end
+
+ context "when the user is a super admin" do
+ let(:user) { build(:user, :super_admin) }
+
+ it { is_expected.to permit_actions(%i[moderation_routes]) }
+ end
end
diff --git a/spec/requests/internal/negative_reactions_spec.rb b/spec/requests/internal/privileged_reactions_spec.rb
similarity index 85%
rename from spec/requests/internal/negative_reactions_spec.rb
rename to spec/requests/internal/privileged_reactions_spec.rb
index 3c4890d88..38f86ab19 100644
--- a/spec/requests/internal/negative_reactions_spec.rb
+++ b/spec/requests/internal/privileged_reactions_spec.rb
@@ -1,6 +1,6 @@
require "rails_helper"
-RSpec.describe "/internal/negative_reactions", type: :request do
+RSpec.describe "/internal/privileged_reactions", type: :request do
context "when the user is not an admin" do
let(:user) { create(:user) }
@@ -10,7 +10,7 @@ RSpec.describe "/internal/negative_reactions", type: :request do
it "blocks the request" do
expect do
- get "/internal/negative_reactions"
+ get "/internal/privileged_reactions"
end.to raise_error(Pundit::NotAuthorizedError)
end
end
@@ -38,13 +38,13 @@ RSpec.describe "/internal/negative_reactions", type: :request do
it "does not block the request" do
expect do
- get "/internal/negative_reactions"
+ get "/internal/privileged_reactions"
end.not_to raise_error
end
- describe "GETS /internal/negative_reactions" do
+ describe "GETS /internal/privileged_reactions" do
it "renders to appropriate page" do
- get "/internal/negative_reactions"
+ get "/internal/privileged_reactions"
expect(response.body).to include(CGI.escapeHTML(moderator.username)).
and include(CGI.escapeHTML(user_reaction.reactable.username)).
and include(CGI.escapeHTML(comment_reaction.reactable.user.username)).
diff --git a/spec/requests/moderations_spec.rb b/spec/requests/moderations_spec.rb
index 1c7fc13e0..2c00f861e 100644
--- a/spec/requests/moderations_spec.rb
+++ b/spec/requests/moderations_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
RSpec.shared_examples "an elevated privilege required request" do |path|
context "when not logged-in" do
- it "does not grant acesss", proper_status: true do
+ it "does not grant access", proper_status: true do
get path
expect(response).to have_http_status(:not_found)
end
@@ -27,17 +27,18 @@ RSpec.shared_examples "an elevated privilege required request" do |path|
end
RSpec.describe "Moderations", type: :request do
- let(:user) { create(:user, :trusted) }
+ let(:trusted_user) { create(:user, :trusted) }
let(:article) { create(:article) }
let(:comment) { create(:comment, commentable: article) }
let(:dev_account) { create(:user) }
it_behaves_like "an elevated privilege required request", "/username/random-article/mod"
it_behaves_like "an elevated privilege required request", "/username/comment/1/mod"
+ it_behaves_like "an elevated privilege required request", "/username/random-article/actions_panel"
context "when user is trusted" do
before do
- sign_in user
+ sign_in trusted_user
allow(User).to receive(:dev_account).and_return(dev_account)
end
@@ -52,7 +53,7 @@ RSpec.describe "Moderations", type: :request do
end
it "grants access to /mod index" do
- create(:rating_vote, article: article, user: user)
+ create(:rating_vote, article: article, user: trusted_user)
get "/mod"
expect(response).to have_http_status(:ok)
end
@@ -69,12 +70,69 @@ RSpec.describe "Moderations", type: :request do
expect(response.body).to include("#" + article.tags.first.name.titleize)
end
- it "returns not found for inapprpriate tags" do
+ it "returns not found for inappropriate tags" do
expect { get "/mod/dsdsdsweweedsdseweww" }.to raise_exception(ActiveRecord::RecordNotFound)
end
it "renders not_found when an article can't be found" do
- expect { get "/#{user.username}/dsdsdsweweedsdseweww/mod/" }.to raise_exception(ActiveRecord::RecordNotFound)
+ expect { get "/#{trusted_user.username}/dsdsdsweweedsdseweww/mod/" }.to raise_exception(ActiveRecord::RecordNotFound)
+ end
+ end
+
+ describe "actions_panel" do
+ context "when the user is a tag moderator" do
+ it "shows the option to remove the tag when the article has the tag" do
+ tag_mod = create(:user, :tag_moderator)
+ tag_mod.add_role :trusted
+ tag = tag_mod.roles.find_by(name: "tag_moderator").resource
+ article = create(:article, tags: tag)
+ sign_in tag_mod
+
+ get "#{article.path}/actions_panel"
+ expect(response.body).to include "circle centered-icon adjustment-icon subtract"
+ end
+ end
+
+ it "shows the option to add the tag when the article has the tag" do
+ tag_mod = create(:user, :tag_moderator)
+ tag_mod.add_role :trusted
+ article = create(:article, tags: "javascript, cool, beans")
+ sign_in tag_mod
+
+ get "#{article.path}/actions_panel"
+ expect(response.body).to include "circle centered-icon adjustment-icon plus"
+ end
+ end
+
+ context "when the user is trusted" do
+ before do
+ sign_in trusted_user
+ get "#{article.path}/actions_panel"
+ end
+
+ it "does not show the adjust tags options" do
+ expect(response.body).not_to include "other-things-btn adjust-tags"
+ end
+
+ it "shows the experience level option" do
+ expect(response.body).to include "other-things-btn set-experience"
+ end
+ end
+
+ context "when the user is an admin" do
+ before do
+ admin = create(:user, :admin)
+ sign_in admin
+ article = create(:article, tags: "javascript, cool, beans")
+ get "#{article.path}/actions_panel"
+ end
+
+ it "shows the admin add tag option if the article has room for a tag" do
+ expect(response.body).to include "admin-add-tag"
+ end
+
+ it "shows the option to remove tags" do
+ expect(response.body).to include "circle centered-icon adjustment-icon subtract"
end
end
end