IIRR_15: Don't attempt to send the puzzle if the bot has been removed from the server

Author: ABizzinotto

app/jobs/daily_puzzle_job.rb

@@ -6,7 +6,7 @@ def perform
     puzzle = Puzzle.order("RANDOM()").first
     return unless puzzle
 
-    Server.all.each do |server|
+    Server.where(active: true).each do |server|
       channel = server.channel
       next unless channel
 
@@ -29,7 +29,7 @@ def puzzle_embed(puzzle)
     Discordrb::Webhooks::Embed.new(
       title: "Puzzle Time! 🧩",
       description: puzzle.question,
-      color: 0xe60000
+      color: 0x3498db # Blue color
     )
   end
 

app/lib/discord/events/server_create.rb

@@ -22,7 +22,7 @@ def handle(event)
           puts "No suitable channel found to add the bot to."
         end
 
-        create_server(server)
+        create_or_update_server(server)
       end
 
       private
@@ -42,16 +42,29 @@ def welcome_message(server_name)
 
       attr_reader :bot
 
-      def create_server(server)
-        # Only create a new record if it doesn't already exist
-        return if Server.exists?(server_id: server.id)
+      def create_or_update_server(server)
+        # Find or create the Server record
+        discord_server = Server.find_or_create_by(server_id: server.id) do |s|
+          s.name = server.name
+          s.active = true
+        end
 
-        # Create the new Server record
-        discord_server = Server.create!(
-          server_id: server.id,
-          name: server.name
-        )
+        # Update the server name if it changed
+        discord_server.update!(name: server.name, active: true)
+
+        # Update or create a system channel is one is set
         if server.system_channel
+          create_or_update_system_channel(discord_server)
+        end
+      end
+
+      def create_or_update_system_channel(discord_server)
+        if discord_server.channel
+          discord_server.channel.update!(
+            channel_id: server.system_channel.id,
+            name: server.system_channel.name
+          )
+        else
           discord_server.create_channel!(
             channel_id: server.system_channel.id,
             name: server.system_channel.name

app/lib/discord/events/server_delete.rb

@@ -0,0 +1,33 @@
+module Discord
+  module Events
+    # This class listens and handles the event triggered when the bot is removed from a server.
+    class ServerDelete
+      def initialize(bot)
+        @bot = bot
+      end
+
+      def listen
+        @bot.server_delete do |event|
+          handle(event)
+        end
+      end
+
+      def handle(event)
+        begin
+          server_id = event.server
+        rescue Discordrb::Errors::UnknownServer
+          # This error is expected when the bot is removed from a server
+          puts "Bot was removed from an unknown server"
+          return
+        end
+
+        server = Server.find_by(server_id: server_id)
+        server&.update!(active: false)
+      end
+
+      private
+
+      attr_reader :bot
+    end
+  end
+end

db/migrate/20250323023006_add_active_to_server.rb

@@ -0,0 +1,5 @@
+class AddActiveToServer < ActiveRecord::Migration[8.0]
+  def change
+    add_column :servers, :active, :boolean, default: true
+  end
+end