flexbox vertical stretch" data-url="<%= report_path(report, back: request.fullpath) %>">
+
+
<%= report.reported_twitch_name %>
+
+
<%= l(report.created_at, format: "%b. %-d, %Y · %-l:%M%P ") %>
+ <% if report.revoked %>
+
Revoked
+ <% elsif report.warned %>
+
Warned
+ <% elsif report.dismissed %>
+
Dismissed
+ <% else %>
+
Unresolved
+ <% end %>
+
+
+
flexbox vertical stretch" data-url="<%= report_path(report, back: request.fullpath) %>">
-
<%= report.reported_twitch_name %>
+
+
+ <% if report.pledge %>
+ <% if report.pledge.reports.size > 1 %>
+ <%= report.pledge.reports.size %>
+ <% end %>
+ <% end %>
+
+
<%= report.reported_twitch_name %>
+
<%= l(report.created_at, format: "%b. %-d, %Y · %-l:%M%P ") %>
-
- Keybot says: <%= @message %>
+ <% if @other_reports.present? %>
+
+
Other reports<%= @other_reports.present? ? "(#{@other_reports.count})" : ''%>
+
<%= render(partial: "reports/other_report_row", collection: @other_reports, as: :report) %>
+
+ <% end %>
+
+ Keybot says: <%= @message %>
+
<% if @report.dismissed %>
@@ -19,7 +27,7 @@
<% elsif @report.warned %>
Warned
<% elsif @report.revoked %>
-
Revoked
+
Revoked
<% else %>
<% if @pledge %>
<%= link_to("Revoke", new_report_revocation_path(@report, back: request.fullpath), class: 'revoke-button button') %>
diff --git a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb b/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
deleted file mode 100644
index 7715639f..00000000
--- a/db/migrate/20190904053235_change_desired_outcome_to_recommended_response.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ChangeDesiredOutcomeToRecommendedResponse < ActiveRecord::Migration[6.0]
- def change
- rename_column :reports, :desired_outcome, :recommended_response
- end
-end
diff --git a/db/migrate/20220608232140_add_twitch_id_to_reports.rb b/db/migrate/20220608232140_add_twitch_id_to_reports.rb
new file mode 100644
index 00000000..823e27f3
--- /dev/null
+++ b/db/migrate/20220608232140_add_twitch_id_to_reports.rb
@@ -0,0 +1,5 @@
+class AddTwitchIdToReports < ActiveRecord::Migration[6.0]
+ def change
+ add_column :reports, :twitch_id, :integer
+ end
+end
diff --git a/db/migrate/20220610194809_add_reports_count_to_pledge.rb b/db/migrate/20220610194809_add_reports_count_to_pledge.rb
new file mode 100644
index 00000000..80beb155
--- /dev/null
+++ b/db/migrate/20220610194809_add_reports_count_to_pledge.rb
@@ -0,0 +1,5 @@
+class AddReportsCountToPledge < ActiveRecord::Migration[6.0]
+ def change
+ add_column :pledges, :reports_count, :integer
+ end
+end
diff --git a/db/migrate/20220610201940_reset_all_pledge_cache_counters.rb b/db/migrate/20220610201940_reset_all_pledge_cache_counters.rb
new file mode 100644
index 00000000..d76834dc
--- /dev/null
+++ b/db/migrate/20220610201940_reset_all_pledge_cache_counters.rb
@@ -0,0 +1,12 @@
+class ResetAllPledgeCacheCounters < ActiveRecord::Migration[6.0]
+ def up
+ Pledge.all.each do |pledge|
+ Pledge.reset_counters(pledge.id, :reports)
+ end
+ end
+
+ def down
+ # no rollback needed
+ end
+
+end
diff --git a/db/schema.rb b/db/schema.rb
index baa309b8..a7594843 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_02_23_190839) do
+ActiveRecord::Schema.define(version: 2022_06_10_201940) do
create_table "affiliates", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "name"
@@ -55,6 +55,7 @@
t.datetime "twitch_authed_on"
t.integer "referrer_id"
t.integer "referrals_count", default: 0
+ t.integer "reports_count"
end
create_table "reports", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
@@ -72,6 +73,7 @@
t.boolean "dismissed", default: false
t.boolean "warned", default: false
t.boolean "revoked", default: false
+ t.integer "twitch_id"
t.index ["reviewer_id"], name: "index_reports_on_reviewer_id"
end
@@ -96,7 +98,7 @@
t.datetime "published_on"
end
- create_table "twitch_tokens", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci", force: :cascade do |t|
+ create_table "twitch_tokens", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci", force: :cascade do |t|
t.string "access_token"
t.integer "expires_in"
t.datetime "created_at", precision: 6, null: false
diff --git a/lib/tasks/reports.rake b/lib/tasks/reports.rake
new file mode 100644
index 00000000..f16da7c0
--- /dev/null
+++ b/lib/tasks/reports.rake
@@ -0,0 +1,34 @@
+# This task looks up twitch ID for all of
+# the existing reports. This task should be
+# ran once after staging implementation of twitch_id
+# lookup at the time of report submittion.
+# The search is thorough twitch API and
+# is based on the twitch username
+# that was reported. This task will ignore
+# reports that have twitch_id already.
+
+namespace :reports do
+
+ desc "Looks up twtich ID for all existing reports"
+
+ task :twitch_id_lookup => :environment do
+
+ puts "Looking up twtich ID for existing reports..."
+
+ Report.where(twitch_id: nil).each do |report| #.where(twitch_id: nil)
+ # Check if reported_twitch_name exists on Twitch
+ response = HTTParty.get(URI.escape("#{ENV['TWITCH_API_BASE_URL']}/users?login=#{report.reported_twitch_name}"), headers: {"Client-ID": ENV['TWITCH_CLIENT_ID'], "Authorization": "Bearer #{TwitchToken.first.valid_token!}"})
+
+ puts response.headers["ratelimit-remaining"]
+ puts "Updating ID:#{report.id} (#{report.reported_twitch_name})"
+
+ if response["data"].blank?
+ report.update_attribute(:twitch_id, nil)
+ else
+ report.update_attribute(:twitch_id, response["data"][0]["id"])
+ end
+ end
+
+ end
+
+end
diff --git a/lib/tasks/reports_counter.rake b/lib/tasks/reports_counter.rake
new file mode 100644
index 00000000..58363cd0
--- /dev/null
+++ b/lib/tasks/reports_counter.rake
@@ -0,0 +1,19 @@
+# This task resets the reports_count of existing pledges by reflecting
+# the existing reports in the database. This task should be run
+# after the rake task "reports:twitch_id_lookup" is run,
+# because it looks up using twitch_id as a key
+
+namespace :pledges do
+
+ desc "Reset the reports_count for existing pledges"
+
+ task :reset_reports_count => :environment do
+
+ puts "Resetting reports_coun for existing pledges..."
+
+ Pledge.where.not(twitch_id: nil).each do |pledge|
+ puts "Updating ID:#{pledge.id} (#{pledge.twitch_display_name})"
+ Pledge.reset_counters(pledge.id, :reports)
+ end
+ end
+end