<% if report.unresolved? %>
-
- <%= l(report.created_at, format: "%b. %-d, %Y · %-l:%M%P ") %>
-
+
+ <%= l(report.created_at, format: "%b. %-d, %Y · %-l:%M%P ") %>
+
+ <% elsif report.spam? %>
+
+ (SPAM) <%= l(report.created_at, format: "%b. %-d, %Y · %-l:%M%P ") %>
+
<% elsif report.dismissed %>
<%= l(report.updated_at, format: "%b. %-d, %Y") %> ·
diff --git a/app/views/reports/_show_spam.html.erb b/app/views/reports/_show_spam.html.erb
new file mode 100644
index 00000000..3b65d090
--- /dev/null
+++ b/app/views/reports/_show_spam.html.erb
@@ -0,0 +1,28 @@
+
+
Spam Badge
+
+
+ Spam <%= l(@report.created_at, format: "%b. %-d, %Y · %-l:%M%P") %>
+
+ <%= render(partial: "reports/watchable_toggle")%>
+
+
+<%= render(partial: "reports/identifiers") %>
+<%= render(partial: "reports/materials") %>
+<%= render(partial: "reports/associated_pledge") %>
+
+
+ <% if @pledge %>
+ <%= link_to("Revoke", new_report_revocation_path(@report, back: request.fullpath), class: 'revoke-button button') %>
+ <%= link_to("Warn", new_report_warning_path(@report, back: request.fullpath), class: 'warn-button button') %>
+ <%= link_to("Unspam", new_report_warning_path(@report, back: request.fullpath), class: 'warn-button button') %>
+ <% end %>
+ <%= link_to("Dismiss", dismiss_report_path(@report), method: :post, class: 'dismiss-button button') %>
+ <%= link_to("Unspam", unspam_report_path(@report), method: :post, class: 'warn-button button') %>
+ <%= link_to('Back', params[:back].present? ? params[:back] : reports_path, class: "back-button mini button") %>
+
+
+<%= render(partial: "reports/reporter_details") %>
+<%= render(partial: "reports/related_spam") %>
+<%= render(partial: "reports/related_reports") %>
+<%= render(partial: "reports/comments")%>
diff --git a/app/views/reports/_show_unresolved.html.erb b/app/views/reports/_show_unresolved.html.erb
index 061df200..d3bb7525 100644
--- a/app/views/reports/_show_unresolved.html.erb
+++ b/app/views/reports/_show_unresolved.html.erb
@@ -11,6 +11,8 @@
<%= render(partial: "reports/materials") %>
<%= render(partial: "reports/associated_pledge") %>
+ <%= link_to("Spam", spam_report_path(@report), method: :post, class: 'revoke-button button') %>
+
<% if @pledge %>
<%= link_to("Revoke", new_report_revocation_path(@report, back: request.fullpath), class: 'revoke-button button') %>
<%= link_to("Warn", new_report_warning_path(@report, back: request.fullpath), class: 'warn-button button') %>
diff --git a/app/views/reports/show.html.erb b/app/views/reports/show.html.erb
index 44077167..ce766c6d 100644
--- a/app/views/reports/show.html.erb
+++ b/app/views/reports/show.html.erb
@@ -9,6 +9,8 @@
<%= render(partial: "reports/show_warned") %>
<% elsif @report.revoked? %>
<%= render(partial: "reports/show_revoked") %>
+ <% elsif @report.spam? %>
+ <%= render(partial: "reports/show_spam") %>
<% end %>
diff --git a/config/.tool-versions b/config/.tool-versions
new file mode 100644
index 00000000..7f44804c
--- /dev/null
+++ b/config/.tool-versions
@@ -0,0 +1 @@
+ruby 2.6.3
diff --git a/config/routes.rb b/config/routes.rb
index f2442d7a..37af190b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,6 +32,8 @@
post :undismiss
post :watch
post :unwatch
+ post :unspam
+ post :spam
end
resources :warnings, only: [ :new, :create ]
resources :revocations, only: [ :new, :create ]
diff --git a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb b/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
index 7715639f..438139ae 100644
--- a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
+++ b/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
@@ -1,5 +1,5 @@
class ChangeDesiredOutcomeToRecommendedResponse < ActiveRecord::Migration[6.0]
def change
- rename_column :reports, :desired_outcome, :recommended_response
+ #rename_column :reports, :desired_outcome, :recommended_response
end
end
diff --git a/db/migrate/20240401033626_add_spam_to_reports.rb b/db/migrate/20240401033626_add_spam_to_reports.rb
new file mode 100644
index 00000000..d7894e87
--- /dev/null
+++ b/db/migrate/20240401033626_add_spam_to_reports.rb
@@ -0,0 +1,5 @@
+class AddSpamToReports < ActiveRecord::Migration[6.1]
+ def change
+ add_column :reports, :spam, :boolean, default: false
+ end
+end
diff --git a/db/migrate/20240510134850_create_spam_reports.rb b/db/migrate/20240510134850_create_spam_reports.rb
new file mode 100644
index 00000000..d0b59e83
--- /dev/null
+++ b/db/migrate/20240510134850_create_spam_reports.rb
@@ -0,0 +1,12 @@
+class CreateSpamReports < ActiveRecord::Migration[6.1]
+ def change
+ create_table :spam_reports do |t|
+ t.text :description
+
+ t.references :report1, null: false, foreign_key: { to_table: :reports }
+ t.references :report2, null: false, foreign_key: { to_table: :reports }
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 20d54e42..d0ecb8a2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,9 +10,9 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2024_01_10_174212) do
+ActiveRecord::Schema.define(version: 2024_05_10_134850) do
- create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
t.bigint "record_id", null: false
@@ -22,7 +22,7 @@
t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
end
- create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "key", null: false
t.string "filename", null: false
t.string "content_type"
@@ -34,7 +34,7 @@
t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
end
- create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.bigint "blob_id", null: false
t.string "variation_digest", null: false
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
@@ -57,7 +57,7 @@
t.string "mixer"
end
- create_table "ahoy_events", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "ahoy_events", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.bigint "visit_id"
t.bigint "user_id"
t.string "name"
@@ -68,7 +68,7 @@
t.index ["visit_id"], name: "index_ahoy_events_on_visit_id"
end
- create_table "ahoy_visits", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "ahoy_visits", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "visit_token"
t.string "visitor_token"
t.bigint "user_id"
@@ -96,7 +96,7 @@
t.index ["visitor_token", "started_at"], name: "index_ahoy_visits_on_visitor_token_and_started_at"
end
- create_table "badge_activations", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "badge_activations", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "twitch_username"
t.integer "twitch_id"
t.datetime "activated_on"
@@ -105,7 +105,7 @@
t.datetime "updated_at", precision: 6, null: false
end
- create_table "comments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "comments", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.integer "commenter_id"
t.integer "commentable_id"
t.string "commentable_type"
@@ -115,7 +115,7 @@
t.datetime "updated_at", precision: 6, null: false
end
- create_table "concerns", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "concerns", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "concerning_player_id"
t.string "concerning_player_id_type"
t.text "background"
@@ -190,6 +190,7 @@
t.integer "reported_twitch_id"
t.integer "incident_stream_twitch_id"
t.bigint "ahoy_visit_id"
+ t.boolean "spam", default: false
t.index ["ahoy_visit_id"], name: "index_reports_on_ahoy_visit_id"
t.index ["reported_twitch_id"], name: "index_reports_on_reported_twitch_id"
t.index ["reporter_email"], name: "index_reports_on_reporter_email"
@@ -207,6 +208,16 @@
t.index ["reviewer_id"], name: "index_revocations_on_reviewer_id"
end
+ create_table "spam_reports", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
+ t.text "description"
+ t.bigint "report1_id", null: false
+ t.bigint "report2_id", null: false
+ t.datetime "created_at", precision: 6, null: false
+ t.datetime "updated_at", precision: 6, null: false
+ t.index ["report1_id"], name: "index_spam_reports_on_report1_id"
+ t.index ["report2_id"], name: "index_spam_reports_on_report2_id"
+ end
+
create_table "stories", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "headline"
t.text "description"
@@ -218,7 +229,7 @@
t.datetime "published_on"
end
- create_table "survey_invites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "survey_invites", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "email"
t.string "survey_code"
t.string "surveyable_type"
@@ -229,7 +240,7 @@
t.datetime "updated_at", precision: 6, null: false
end
- create_table "twitch_tokens", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "twitch_tokens", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "access_token"
t.integer "expires_in"
t.datetime "created_at", precision: 6, null: false
@@ -271,7 +282,7 @@
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
end
- create_table "verifications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "verifications", charset: "utf8mb4", collation: "utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "first_name"
t.string "last_name"
t.string "email"
@@ -308,4 +319,6 @@
add_foreign_key "conduct_warnings", "users", column: "reviewer_id"
add_foreign_key "reports", "users", column: "reviewer_id"
add_foreign_key "revocations", "users", column: "reviewer_id"
+ add_foreign_key "spam_reports", "reports", column: "report1_id"
+ add_foreign_key "spam_reports", "reports", column: "report2_id"
end
diff --git a/db/test_data.rb b/db/test_data.rb
new file mode 100644
index 00000000..4d7b30a5
--- /dev/null
+++ b/db/test_data.rb
@@ -0,0 +1,74 @@
+# Create Reports for testing the check_report_matches functionality
+
+# Constants
+reporter_email = "test@example.com"
+reported_twitch_id = "123456789"
+reported_twitch_name = "pcalle2"
+incident_occurred = "pcalle2"
+incident_stream = "pcalle2"
+incident_stream_twitch_id = "123"
+
+# Report 1: Exact Match within Time Window
+Report.create(
+ reporter_email: reporter_email,
+ reported_twitch_id: reported_twitch_id,
+ incident_description: "Report about an issue",
+ recommended_response: "Immediate action required",
+ reported_twitch_name: reported_twitch_name,
+ incident_occurred: incident_occurred,
+ incident_stream_twitch_id: incident_stream_twitch_id,
+ incident_stream: incident_stream,
+ created_at: 1.hour.ago
+)
+
+# Report 2: Match with slightly different descriptions and responses
+Report.create(
+ reporter_email: reporter_email,
+ reported_twitch_id: reported_twitch_id,
+ incident_description: "Detailed report about an issue",
+ recommended_response: "Immediate action needed",
+ reported_twitch_name: reported_twitch_name,
+ incident_occurred: incident_occurred,
+ incident_stream_twitch_id: incident_stream_twitch_id,
+ incident_stream: incident_stream,
+ created_at: 1.hour.ago
+)
+
+# Report 3: Outside Time Window
+Report.create(
+ reporter_email: reporter_email,
+ reported_twitch_id: reported_twitch_id,
+ incident_description: "Old report about an unrelated issue",
+ recommended_response: "Review later",
+ reported_twitch_name: reported_twitch_name,
+ incident_occurred: incident_occurred,
+ incident_stream_twitch_id: incident_stream_twitch_id,
+ incident_stream: incident_stream,
+ created_at: 3.days.ago
+)
+
+# Report 4: No similarity in description or response
+Report.create(
+ reporter_email: reporter_email,
+ reported_twitch_id: reported_twitch_id,
+ incident_description: "Unrelated issue report",
+ recommended_response: '', # No recommended response
+ reported_twitch_name: reported_twitch_name,
+ incident_occurred: incident_occurred,
+ incident_stream_twitch_id: incident_stream_twitch_id,
+ incident_stream: incident_stream,
+ created_at: 30.minutes.ago
+)
+
+# Report 5: Report with nil recommended_response matching another nil
+Report.create(
+ reporter_email: reporter_email,
+ reported_twitch_id: reported_twitch_id,
+ incident_description: "Issue report with no response recommended",
+ recommended_response: "",
+ reported_twitch_name: reported_twitch_name,
+ incident_occurred: incident_occurred,
+ incident_stream_twitch_id: incident_stream_twitch_id,
+ incident_stream: incident_stream,
+ created_at: 2.hours.ago
+)
diff --git a/lib/tasks/mock_spam.rake b/lib/tasks/mock_spam.rake
new file mode 100644
index 00000000..e4edb815
--- /dev/null
+++ b/lib/tasks/mock_spam.rake
@@ -0,0 +1,7 @@
+namespace :db do
+ desc "Load custom seed data"
+ task :load_custom_data => :environment do
+ load Rails.root.join('db', 'test_data.rb')
+ end
+ end
+
\ No newline at end of file
diff --git a/test/fixtures/spam_reports.yml b/test/fixtures/spam_reports.yml
new file mode 100644
index 00000000..49d5c0ac
--- /dev/null
+++ b/test/fixtures/spam_reports.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ description: MyText
+ report1: one
+ report2: one
+
+two:
+ description: MyText
+ report1: two
+ report2: two
diff --git a/test/models/spam_report_test.rb b/test/models/spam_report_test.rb
new file mode 100644
index 00000000..1566db2f
--- /dev/null
+++ b/test/models/spam_report_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class SpamReportTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end