<%= @reasons.count %> <%= "filter".pluralize(@reasons.count) %> have caught From f7c3960f568da8ec0768475ea14eb838332d5268 Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:48:45 -0400 Subject: [PATCH 07/14] Remove obsolete full_dump() --- app/models/application_record.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 9a5bb7efd..75bb99744 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -69,14 +69,4 @@ def self.mass_habtm(join_table, first_type, second_type, record_pairs) def self.fields(*names) names.map { |n| "#{table_name}.#{n}" } end - - def self.full_dump - username = Rails.configuration.database_configuration[Rails.env]['username'] - password = Rails.configuration.database_configuration[Rails.env]['password'] - host = Rails.configuration.database_configuration[Rails.env]['host'] - `#{Rails.root}/dump/dump.sh "#{username}" "#{password}" "#{host}"` - - Dump.destroy_all - Dump.create file: File.open(Dir.glob('dumps/*')[0]) - end end From 6275377c3260e243ad34c068ca7fc8f782aca646 Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Sun, 6 Sep 2020 21:53:26 -0400 Subject: [PATCH 08/14] Remove more obsolete/never used methods --- app/models/application_record.rb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 75bb99744..31c31111c 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -3,11 +3,6 @@ class ApplicationRecord < ActiveRecord::Base self.abstract_class = true - def self.fuzzy_search(term, **cols) - sanitized = sanitize_for_search term, **cols - select(Arel.sql("`#{table_name}`.*, #{sanitized} AS search_score")) - end - def self.match_search(term, with_search_score: true, **cols) sanitized = sanitize_for_search term, **cols if with_search_score @@ -37,15 +32,6 @@ def self.sanitize_for_search(term, **cols) ActiveRecord::Base.send(:sanitize_sql_array, ["MATCH (#{cols}) AGAINST (? IN BOOLEAN MODE)", term]) end - # From http://stackoverflow.com/questions/6591722/how-to-generate-fixtures-based-on-my-development-database - def dump_fixture - fixture_file = "#{Rails.root}/test/fixtures/#{self.class.table_name}.yml" - File.open(fixture_file, 'a') do |f| - f.puts({ "#{self.class.table_name.singularize}_#{id}" => attributes } - .to_yaml.sub!(/---\s?/, "\n")) - end - end - def self.sanitize_like(unsafe, *args) sanitize_sql_like unsafe, *args end From 7f42342548be8360169195ca62aa0731720ed15f Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 09:52:07 -0400 Subject: [PATCH 09/14] More dead code --- app/models/post.rb | 4 ---- app/models/reason.rb | 5 ----- app/models/user.rb | 9 --------- 3 files changed, 18 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index aa21e9504..0909beb3d 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -230,10 +230,6 @@ def deleted? deletion_logs.where(is_deleted: true).any? end - def conflicted? - is_tp && (is_fp || is_naa) - end - def stack_id native_id end diff --git a/app/models/reason.rb b/app/models/reason.rb index 046491ed6..735ff4ca9 100644 --- a/app/models/reason.rb +++ b/app/models/reason.rb @@ -39,9 +39,4 @@ def both_percentage count.to_f / posts.count end - - # Attempt to use cached post_count if it's available (included in the dashboard/index query) - def fast_post_count - try(:post_count) || posts.count - end end diff --git a/app/models/user.rb b/app/models/user.rb index 023889457..f25b06436 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -238,10 +238,6 @@ def spam_flag(post, dry_run = false) flag :spam, post, dry_run end - def abusive_flag(post, dry_run = false) - flag :abusive, post, dry_run - end - def other_flag(post, comment) flag :other, post, false, comment: comment end @@ -259,11 +255,6 @@ def add_pinned_role(name) end end - # rubocop:disable Style/PredicateName - def has_pinned_role?(role) - UsersRole.where(user: self, role: Role.find_by(name: role), pinned: true).exists? - end - def can_use_regex_search? (has_role? :reviewer) || moderator_sites.any? end From 9ee05ddc165b1a9e89392b503551ad28b13a64aa Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 10:06:41 -0400 Subject: [PATCH 10/14] Remove indistinguishable 'pinned' roles --- app/controllers/admin_controller.rb | 6 +----- app/javascript/admin.js | 19 ------------------- app/models/user.rb | 9 --------- db/migrate/20200906202319_drop_table_dumps.rb | 4 +++- .../20200906202320_remove_api_token_legacy.rb | 6 ++++-- .../20200907140530_remove_pinned_role.rb | 7 +++++++ 6 files changed, 15 insertions(+), 36 deletions(-) create mode 100644 db/migrate/20200907140530_remove_pinned_role.rb diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 6d6f812d6..bcb0f7f20 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -61,11 +61,7 @@ def update_permissions return end - if params[:pinned] - User.find(params[:user_id]).add_pinned_role params[:role] - else - User.find(params[:user_id]).add_role params[:role] - end + User.find(params[:user_id]).add_role params[:role] else User.find(params[:user_id]).remove_role params[:role] end diff --git a/app/javascript/admin.js b/app/javascript/admin.js index 15614c752..8d9a0e4fc 100644 --- a/app/javascript/admin.js +++ b/app/javascript/admin.js @@ -45,25 +45,6 @@ onLoad(() => { }); }); - $('input.pin-checkbox').change(function () { - const $this = $(this); - $this.disabled = true; - $.ajax({ - type: 'put', - data: { - permitted: $this.is(':checked'), - pinned: true, - user_id: $this.data('user-id'), - role: $this.data('role') - }, - dataType: 'json', - url: '/admin/permissions/update', - success() { - $this.disabled = false; - } - }); - }); - $('input.trust-checkbox').change(function () { const $this = $(this); $this.disabled = true; diff --git a/app/models/user.rb b/app/models/user.rb index f25b06436..6d44803d8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -246,15 +246,6 @@ def moderator? moderator_sites.any? end - def add_pinned_role(name) - role = Role.find_by name: name - if UsersRole.where(user: self, role: role).exists? - UsersRole.where(user: self, role: role).order(:user_id).last.update(pinned: true) - else - UsersRole.create(user: self, role: role, pinned: true) - end - end - def can_use_regex_search? (has_role? :reviewer) || moderator_sites.any? end diff --git a/db/migrate/20200906202319_drop_table_dumps.rb b/db/migrate/20200906202319_drop_table_dumps.rb index 85d3da04c..abf0a6d45 100644 --- a/db/migrate/20200906202319_drop_table_dumps.rb +++ b/db/migrate/20200906202319_drop_table_dumps.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true class DropTableDumps < ActiveRecord::Migration[5.2] - execute 'DROP TABLE dumps' + def change + execute 'DROP TABLE dumps' + end end diff --git a/db/migrate/20200906202320_remove_api_token_legacy.rb b/db/migrate/20200906202320_remove_api_token_legacy.rb index 733a2cf65..30ef9ba0f 100644 --- a/db/migrate/20200906202320_remove_api_token_legacy.rb +++ b/db/migrate/20200906202320_remove_api_token_legacy.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class RemoveAPITokenLegacy < ActiveRecord::Migration[5.2] - remove_column :users, :encrypted_api_token_legacy - remove_column :users, :token_migrated_legacy + def change + remove_column :users, :encrypted_api_token_legacy + remove_column :users, :token_migrated_legacy + end end diff --git a/db/migrate/20200907140530_remove_pinned_role.rb b/db/migrate/20200907140530_remove_pinned_role.rb new file mode 100644 index 000000000..2ffd94339 --- /dev/null +++ b/db/migrate/20200907140530_remove_pinned_role.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemovePinnedRole < ActiveRecord::Migration[5.2] + def change + remove_column :users_roles, :pinned + end +end From e0fbd0da235fe79b8f3cb1b6a149519308c3022a Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 10:11:42 -0400 Subject: [PATCH 11/14] Revert "Remove non-existent "search reason"" This reverts commit 7998d3d8657cbf51b42a83d2381d50f754a05959. --- app/views/dashboard/index.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb index 2c426dd3a..cf5bdf9cd 100644 --- a/app/views/dashboard/index.html.erb +++ b/app/views/dashboard/index.html.erb @@ -1,3 +1,9 @@ +
+<%= @reasons.count %> <%= "filter".pluralize(@reasons.count) %> have caught From fbe154ee53f06673bd47d3d9525dda608a6317f9 Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 10:18:50 -0400 Subject: [PATCH 12/14] Remove obsolete dump script --- dump/dump.sh | 19 ------------------- dump/redact.sql | 21 --------------------- 2 files changed, 40 deletions(-) delete mode 100755 dump/dump.sh delete mode 100644 dump/redact.sql diff --git a/dump/dump.sh b/dump/dump.sh deleted file mode 100755 index fc72ad53f..000000000 --- a/dump/dump.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -e - -METASMOKE_ROOT=/var/railsapps/metasmoke -timestamp=$(date +%s) -filename=dump_metasmoke_clean-$timestamp.sql.gz -username=$1 -password=$2 -host=$3 - -echo "CREATE DATABASE dump_metasmoke" | mysql -h $host -u $username --password=$password -mysqldump -h $host -u $username --password=$password metasmoke | mysql -h $host -u $username --password=$password dump_metasmoke; -mysql -h $host -u $username --password=$password dump_metasmoke < $METASMOKE_ROOT/current/dump/redact.sql -mysqldump -h $host -u $username --password=$password dump_metasmoke | gzip > $METASMOKE_ROOT/shared/dumps/$filename -echo "DROP DATABASE dump_metasmoke;" | mysql -h $host -u $username --password=$password - -# Remove old dumps -ls -d $METASMOKE_ROOT/shared/dumps/* | grep -v $filename | xargs rm diff --git a/dump/redact.sql b/dump/redact.sql deleted file mode 100644 index 3810a1c3e..000000000 --- a/dump/redact.sql +++ /dev/null @@ -1,21 +0,0 @@ -# Necessary for TRUNCATE calls to work properly. -SET FOREIGN_KEY_CHECKS=0; - -DROP TABLE `ar_internal_metadata`; -TRUNCATE TABLE `api_tokens`; -UPDATE `api_keys` SET `key` = ''; -UPDATE `audits` SET `remote_address` = ''; -TRUNCATE TABLE `emails_preferences`; -TRUNCATE TABLE `emails_addressees`; -TRUNCATE TABLE `flags`; -UPDATE `smoke_detectors` SET `access_token` = ''; -UPDATE `users` SET - `email` = CONCAT(`id`, '@metasmoke.fake'), - `encrypted_password` = '', - `reset_password_token` = '', - `reset_password_sent_at` = NULL, - `encrypted_api_token_legacy` = '', - `two_factor_token` = NULL, - `enabled_2fa` = NULL, - `salt` = NULL, - `iv` = NULL; From 060efe2dd50679196a65e7ca104d01ce2dbc50f1 Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 10:41:48 -0400 Subject: [PATCH 13/14] Not to delete some methods --- app/models/post.rb | 4 ++++ app/models/user.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/models/post.rb b/app/models/post.rb index 0909beb3d..aa21e9504 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -230,6 +230,10 @@ def deleted? deletion_logs.where(is_deleted: true).any? end + def conflicted? + is_tp && (is_fp || is_naa) + end + def stack_id native_id end diff --git a/app/models/user.rb b/app/models/user.rb index 6d44803d8..54f39af61 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -238,6 +238,10 @@ def spam_flag(post, dry_run = false) flag :spam, post, dry_run end + def abusive_flag(post, dry_run = false) + flag :abusive, post, dry_run + end + def other_flag(post, comment) flag :other, post, false, comment: comment end From 37636be1a214b4662de09bce7039329833984648 Mon Sep 17 00:00:00 2001 From: user12986714 <65436504+user12986714@users.noreply.github.com> Date: Mon, 7 Sep 2020 10:44:37 -0400 Subject: [PATCH 14/14] Not to delete dump_fixture() --- app/models/application_record.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 31c31111c..99579a766 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -32,6 +32,15 @@ def self.sanitize_for_search(term, **cols) ActiveRecord::Base.send(:sanitize_sql_array, ["MATCH (#{cols}) AGAINST (? IN BOOLEAN MODE)", term]) end + # From http://stackoverflow.com/questions/6591722/how-to-generate-fixtures-based-on-my-development-database + def dump_fixture + fixture_file = "#{Rails.root}/test/fixtures/#{self.class.table_name}.yml" + File.open(fixture_file, 'a') do |f| + f.puts({ "#{self.class.table_name.singularize}_#{id}" => attributes } + .to_yaml.sub!(/---\s?/, "\n")) + end + end + def self.sanitize_like(unsafe, *args) sanitize_sql_like unsafe, *args end