Merge pull request #10 from ombulabs/iirr-22-qa-feedback

IIRR-22: Improvements

Author: ABizzinotto

app/jobs/daily_puzzle_job.rb

@@ -2,7 +2,7 @@ class DailyPuzzleJob < ApplicationJob
   queue_as :default
 
   def perform
-    puzzle = Puzzle.where(sent: false).order("RANDOM()").first
+    puzzle = Puzzle.where(sent_at: nil).order("RANDOM()").first
     return unless puzzle
 
     Server.where(active: true).each do |server|
@@ -21,7 +21,7 @@ def perform
       )
     end
 
-    puzzle.update!(sent: true)
+    puzzle.update!(sent_at: Time.current)
   end
 
   private

app/jobs/weekly_leaderboard_job.rb

@@ -7,32 +7,47 @@ def perform
 
     leaderboard_data = Answer
       .where(created_at: start_time..end_time, is_correct: true)
-      .group(:user_id)
+      .group(:server_id, :user_id)
       .order(Arel.sql("COUNT(*) DESC"))
       .count
 
     return if leaderboard_data.empty?
+    leaderboard_by_server = leaderboard_data.group_by { |(server_id, _), _| server_id }
 
     Server.all.each do |server|
       channel = server.channel
+      next unless channel
+
+      server_leaderboard = leaderboard_by_server[server.id]
+      next unless server_leaderboard.present?
+
+      leaderboard = server_leaderboard.map { |(_server_id, user_id), count| [ user_id, count ] }.to_h
+
       bot.send_message(
         channel.channel_id,
         "",
         false,
-        leaderboard_embed(leaderboard_data),
+        leaderboard_embed(leaderboard),
         nil,
         nil,
         nil,
-        nil) if channel
+        nil
+      )
     end
   end
 
   private
 
   def leaderboard_embed(leaderboard_data)
+    description =
+      if leaderboard_data.size > 10
+        "Here are the top 10 players from this week's competition!"
+      else
+        "Here are the top players from this week's competition!"
+      end
     embed = Discordrb::Webhooks::Embed.new(
       title: "🏆 Weekly Leaderboard 🏆",
-      description: "Here are the top 10 players from this week's competition!",
+      description: description,
       color: 0xFFD700 # Gold color
     )
 

app/lib/discord/events/puzzle_answer.rb

@@ -28,7 +28,7 @@ def handle(event)
 
 
         # Check if the user has already answered this puzzle
-        existing_answer = Answer.find_by(puzzle_id: puzzle.id, user_id: user.id)
+        existing_answer = Answer.find_by(puzzle_id: puzzle.id, user_id: user.id, server_id: event.server.id)
         if existing_answer
           # If the user has already answered, prevent them from changing their answer
           event.respond(
@@ -38,10 +38,13 @@ def handle(event)
           return
         end
 
+        server = Server.find_or_initialize_by(server_id: event.server.id)
+
         # Create the answer record
         answer = Answer.create!(
           puzzle_id: puzzle.id,
           user_id: user.id,
+          server_id: server.id,
           choice: answer, # 'ruby' or 'rails'
           is_correct: puzzle.answer.to_s == answer # Correct answer check
         )
@@ -57,12 +60,16 @@ def handle(event)
       private
 
       def answer_embed(answer, puzzle)
-        Discordrb::Webhooks::Embed.new(
+        embed = Discordrb::Webhooks::Embed.new(
           title: answer.is_correct ? "Correct! 🎉" : "Incorrect 😢",
           description: puzzle.explanation,
-          color: 0xe60000,
+          color: answer.is_correct ? 0x00ff00 : 0xe60000,
           footer: Discordrb::Webhooks::EmbedFooter.new(text: "Your answer has been recorded, you cannot change it.")
         )
+        if puzzle.link
+          embed.add_field(name: "Learn more", value: puzzle.link, inline: false)
+        end
+        embed
       end
 
       def valid_puzzle_answer?(event)

app/lib/discord/events/set_channel.rb

@@ -32,6 +32,8 @@ def display_settings(event)
         content = <<~MSG
           Here you can configure the bot to suit the needs of the community!
 
+          ⚠️ If you set this to a private channel, make sure to give the bot access to it, otherwise it can't send messages.
+
           What's the best channel to send Ruby or Rails questions to?
         MSG
         channel_select = Discordrb::Components::View.new do |view|

db/migrate/20250325155028_change_sent_to_sent_at_in_puzzles.rb

@@ -0,0 +1,6 @@
+class ChangeSentToSentAtInPuzzles < ActiveRecord::Migration[8.0]
+  def change
+    remove_column :puzzles, :sent, :boolean
+    add_column :puzzles, :sent_at, :datetime
+  end
+end

db/migrate/20250325155848_add_server_to_answers.rb

@@ -0,0 +1,5 @@
+class AddServerToAnswers < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :answers, :server, null: false, foreign_key: true
+  end
+end

db/migrate/20250325170646_add_link_to_puzzles.rb

@@ -0,0 +1,5 @@
+class AddLinkToPuzzles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :puzzles, :link, :string
+  end
+end

db/schema.rb

@@ -1,7 +1,6 @@
 
 # db/seeds.rb
 
-
 # Create Puzzle records
 Puzzle.create!([
   { question: "Ruby or Rails provided this method? Array.new(5) { |i| i * 2 }", answer: :ruby, explanation: "`Array.new` is a core Ruby method that creates a new array with a specified size and optional block for initialization. This is part of Ruby’s core library." },
@@ -11,6 +10,9 @@
   { question: "Ruby or Rails provided this method? params[:id]", answer: :rails, explanation: "`params[:id]` is used in Rails to fetch query parameters or URL parameters in controller actions." }
 ])
 
+# Create a server
+Server.create!(server_id: 1179555097060061245, name: "OmbuTest")
+
 # Seed data for 10 users with answers
 users = [
   { user_id: 101, username: "user1", role: "member" },
@@ -33,6 +35,7 @@
     Answer.create!(
       user_id: user.id,
       puzzle_id: Puzzle.all.sample.id,
+      server_id: Server.first.id,
       choice: [ "ruby", "rails" ].sample,
       is_correct: [ true, false ].sample
     )