Merge main into remind-command branch

- Resolve conflict in plugin list (keep both quotes and remind)
- Rename 6_remind.sql to 7_remind.sql to avoid migration conflict

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: jaredledvina

.gitignore

@@ -1,6 +1,7 @@
 /target
 **/*.rs.bk
 /*.db
+/*.db-*
 /.env
 /.vscode
 /.direnv

.sqlx/query-759e79ffa0012e64f6bf96cbbbe5dfe27bd7c0b628bb0008f7db33ad3ef501c3.json

@@ -44,7 +44,7 @@
 
         devShells.default = pkgs.mkShell {
           nativeBuildInputs = [
-            (pkgs.rust-bin.stable."1.88.0".default.override {
+            (pkgs.rust-bin.stable."1.93.0".default.override {
               extensions = [ "rust-src" ];
             })
             pkgs.rust-analyzer

.sqlx/query-a6e6fa376094fe896748c3b19a90cd1f5245d0837a0436f4e4e5557bb35ad0da.json

@@ -0,0 +1,6 @@
+CREATE TABLE IF NOT EXISTS quotes (
+    nick text NOT NULL,
+    quote text NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_quotes_nick ON quotes(nick);

flake.lock

@@ -47,11 +47,13 @@ pub async fn load(bot: Arc<Client>) -> Result<Vec<PluginMetadata>> {
         "barista",
         "chance",
         "forecast",
+        "joke",
         "karma",
         "mention",
         "minecraft",
         "net_tools",
         "noaa",
+        "quotes",
         "remind",
         "riddle",
         "scryfall",
@@ -138,6 +140,10 @@ pub async fn load(bot: Arc<Client>) -> Result<Vec<PluginMetadata>> {
         ret.push(start_plugin::<plugins::NoaaPlugin>(&bot)?);
     }
 
+    if config.plugin_enabled("quotes") {
+        ret.push(start_plugin::<plugins::QuotesPlugin>(&bot)?);
+    }
+
     if config.plugin_enabled("riddle") {
         ret.push(start_plugin::<plugins::RiddlePlugin>(&bot)?);
     }
@@ -150,6 +156,10 @@ pub async fn load(bot: Arc<Client>) -> Result<Vec<PluginMetadata>> {
         ret.push(start_plugin::<plugins::IntrospectionPlugin>(&bot)?);
     }
 
+    if config.plugin_enabled("joke") {
+        ret.push(start_plugin::<plugins::JokePlugin>(&bot)?);
+    }
+
     if config.plugin_enabled("help") {
         ret.push(start_plugin::<plugins::HelpPlugin>(&bot)?);
     }

flake.nix

@@ -0,0 +1,108 @@
+use std::time::Duration;
+
+use serde::Deserialize;
+
+use crate::prelude::*;
+
+const API_BASE: &str = "https://v2.jokeapi.dev/joke";
+const CATEGORIES: &[&str] = &["any", "misc", "programming", "pun", "spooky", "christmas"];
+
+pub struct JokePlugin {
+    client: reqwest::Client,
+}
+
+#[derive(Deserialize)]
+struct JokeResponse {
+    error: bool,
+    #[serde(rename = "type")]
+    joke_type: String,
+    joke: Option<String>,
+    setup: Option<String>,
+    delivery: Option<String>,
+    message: Option<String>,
+}
+
+impl JokePlugin {
+    async fn fetch_joke(&self, category: &str) -> Result<JokeResponse> {
+        let url = format!("{}/{}?safe-mode", API_BASE, category);
+
+        let resp: JokeResponse = self
+            .client
+            .get(&url)
+            .send()
+            .await?
+            .error_for_status()?
+            .json()
+            .await?;
+
+        if resp.error {
+            return Err(format_err!(
+                "{}",
+                resp.message
+                    .unwrap_or_else(|| "Unknown API error".to_string())
+            ));
+        }
+
+        Ok(resp)
+    }
+
+    async fn handle_joke(&self, ctx: &Arc<Context>, arg: Option<&str>) -> Result<()> {
+        let category = arg.unwrap_or("Any");
+
+        let joke = self.fetch_joke(category).await?;
+
+        match joke.joke_type.as_str() {
+            "single" => {
+                if let Some(text) = joke.joke {
+                    ctx.reply(&text).await?;
+                }
+            }
+            "twopart" => {
+                if let (Some(setup), Some(delivery)) = (joke.setup, joke.delivery) {
+                    ctx.reply(&setup).await?;
+                    tokio::time::sleep(Duration::from_secs(3)).await;
+                    ctx.reply(&delivery).await?;
+                }
+            }
+            joke_type => return Err(format_err!("unexpected joke type {}", joke_type)),
+        }
+
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl Plugin for JokePlugin {
+    fn new_from_env() -> Result<Self> {
+        let client = reqwest::Client::builder()
+            .timeout(Duration::from_secs(5))
+            .build()?;
+        Ok(JokePlugin { client })
+    }
+
+    fn command_metadata(&self) -> Vec<CommandMetadata> {
+        vec![CommandMetadata {
+            name: "joke".to_string(),
+            short_help: format!(
+                "usage: joke [category]. Categories: {}",
+                CATEGORIES.join(", ")
+            ),
+            full_help: format!("Gets a random joke. Categories: {}", CATEGORIES.join(", ")),
+        }]
+    }
+
+    async fn run(self, bot: Arc<Client>) -> Result<()> {
+        let mut stream = bot.subscribe();
+
+        while let Ok(ctx) = stream.recv().await {
+            let res = match ctx.as_event() {
+                Ok(Event::Command("joke", arg)) => self.handle_joke(&ctx, arg).await,
+                _ => Ok(()),
+            };
+
+            crate::check_err(&ctx, res).await;
+        }
+
+        Err(format_err!("joke plugin lagged"))
+    }
+}

migrations/6_quotes.sql

@@ -31,6 +31,12 @@ pub use self::scryfall::ScryfallPlugin;
 mod introspection;
 pub use self::introspection::IntrospectionPlugin;
 
+mod joke;
+pub use self::joke::JokePlugin;
+
+mod quotes;
+pub use self::quotes::QuotesPlugin;
+
 mod help;
 pub use self::help::HelpPlugin;