Update to twilight 0.17

randomairborne · randomairborne · commit a913edc67673 · 2026-02-02T01:24:18.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xpd-cleanup/Cargo.toml b/xpd-cleanup/Cargo.toml
@@ -16,4 +16,4 @@ xpd-common = { workspace = true }
 # db interaction
 sqlx = { version = "0.8", features = ["postgres", "macros", "runtime-tokio", "tls-rustls"] }
 xpd-database = { workspace = true }
-twilight-model = "0.16"
+twilight-model = "0.17"
diff --git a/xpd-common/Cargo.toml b/xpd-common/Cargo.toml
@@ -12,9 +12,9 @@ build = "build.rs"
 
 [dependencies]
 # twilight
-twilight-gateway = { version = "0.16", default-features = false }
-twilight-cache-inmemory = "0.16"
-twilight-model = "0.16"
+twilight-gateway = { version = "0.17", default-features = false }
+twilight-cache-inmemory = "0.17"
+twilight-model = "0.17"
 
 # serialize / deserialize
 serde = { version = "1", features = ["derive"] }
diff --git a/xpd-database/Cargo.toml b/xpd-database/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2024"
 [dependencies]
 # misc
 sqlx = { version = "0.8", features = ["postgres", "tls-rustls", "runtime-tokio"] }
-twilight-model = "0.16"
+twilight-model = "0.17"
 tokio-stream = "0.1"
 tracing = "0.1"
 futures-core = "0.3"
diff --git a/xpd-gateway/Cargo.toml b/xpd-gateway/Cargo.toml
@@ -12,11 +12,12 @@ build = "build.rs"
 
 [dependencies]
 # twilight
-twilight-gateway = { version = "0.16", features = ["rustls-native-roots", "rustls-aws_lc_rs", "twilight-http", "zlib-stock"], default-features = false }
-twilight-http = { version = "0.16", features = ["hickory", "rustls-native-roots", "rustls-aws_lc_rs"] }
-twilight-cache-inmemory = "0.16"
-twilight-validate = "0.16"
-twilight-model = "0.16"
+twilight-gateway = { version = "0.17", features = ["rustls-native-roots", "twilight-http"], default-features = false }
+twilight-http = { version = "0.17", features = ["hickory", "rustls-native-roots"] }
+twilight-cache-inmemory = "0.17"
+twilight-validate = "0.17"
+twilight-model = "0.17"
+rustls = "0.23"
 
 # datafetchers
 reqwest = { version = "0.12", features = ["json", "rustls-tls-native-roots", "hickory-dns"], default-features = false }
diff --git a/xpd-gateway/src/main.rs b/xpd-gateway/src/main.rs
@@ -35,6 +35,11 @@ async fn main() -> Result<(), SetupError> {
     tracing_subscriber::FmtSubscriber::builder()
         .with_env_filter(EnvFilter::from_default_env())
         .init();
+
+    rustls::crypto::aws_lc_rs::default_provider()
+        .install_default()
+        .unwrap();
+
     info!(
         version = xpd_common::CURRENT_GIT_SHA,
         "Starting experienced!"
diff --git a/xpd-listener/Cargo.toml b/xpd-listener/Cargo.toml
@@ -10,10 +10,10 @@ categories = ["games"]
 keywords = ["discord-bot", "mee6"]
 
 [dependencies]
-twilight-http = { version = "0.16", features = ["hickory", "rustls-native-roots", "rustls-aws_lc_rs"] }
-twilight-cache-inmemory = { version = "0.16", features = ["permission-calculator"] }
-twilight-gateway = { version = "0.16", default-features = false }
-twilight-model = "0.16"
+twilight-http = { version = "0.17", features = ["hickory", "rustls-native-roots"] }
+twilight-cache-inmemory = { version = "0.17", features = ["permission-calculator"] }
+twilight-gateway = { version = "0.17", default-features = false }
+twilight-model = "0.17"
 
 # tokio
 tokio-util = { version = "0.7", features = ["rt"] }
diff --git a/xpd-setcommands/Cargo.toml b/xpd-setcommands/Cargo.toml
@@ -10,7 +10,9 @@ xpd-slash-defs = { workspace = true }
 xpd-common = { workspace = true }
 tracing-subscriber = "0.3"
 
-twilight-http = { version = "0.16", features = ["hickory", "rustls-native-roots", "rustls-aws_lc_rs"] }
-twilight-model = "0.16"
+
+twilight-http = { version = "0.17", features = ["hickory", "rustls-native-roots"] }
+twilight-model = "0.17"
+rustls = "0.23"
 
 valk-utils = "0.1"
diff --git a/xpd-slash-defs/Cargo.toml b/xpd-slash-defs/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-twilight-interactions = "0.16"
-twilight-validate = "0.16"
-twilight-model = "0.16"
+twilight-interactions = "0.17"
+twilight-validate = "0.17"
+twilight-model = "0.17"
 
 xpd-rank-card = { workspace = true }
 xpd-common = { workspace = true }
diff --git a/xpd-slash/Cargo.toml b/xpd-slash/Cargo.toml
@@ -12,12 +12,12 @@ keywords = ["discord-bot", "mee6"]
 
 [dependencies]
 # twilight
-twilight-http = { version = "0.16", features = ["hickory", "rustls-native-roots", "rustls-aws_lc_rs"], default-features = false }
-twilight-cache-inmemory = { version = "0.16", features = ["permission-calculator"] }
-twilight-gateway = { version = "0.16", default-features = false }
-twilight-util = { version = "0.16", features = ["builder"] }
-twilight-interactions = "0.16"
-twilight-model = "0.16"
+twilight-http = { version = "0.17", features = ["hickory", "rustls-native-roots"], default-features = false }
+twilight-cache-inmemory = { version = "0.17", features = ["permission-calculator"] }
+twilight-gateway = { version = "0.17", default-features = false }
+twilight-util = { version = "0.17", features = ["builder"] }
+twilight-interactions = "0.17"
+twilight-model = "0.17"
 
 # tokio
 tokio = { version = "1", features = ["rt-multi-thread", "macros", "signal"] }
diff --git a/xpd-slash/src/dispatch.rs b/xpd-slash/src/dispatch.rs
@@ -98,7 +98,7 @@ pub async fn process(
             .await
         }
         InteractionData::ModalSubmit(mid) => {
-            process_modal_submit(mid, guild_id.ok_or(Error::NoGuildId)?, state).await
+            process_modal_submit(*mid, guild_id.ok_or(Error::NoGuildId)?, state).await
         }
         _ => Err(Error::NoInteractionData),
     }
diff --git a/xpd-slash/src/error.rs b/xpd-slash/src/error.rs
@@ -74,10 +74,10 @@ pub enum Error {
     PageDoesNotExist,
     #[error("This modal did not contain any action rows!")]
     NoModalActionRow,
-    #[error("This modal did not contain the required form field!")]
-    NoFormField,
-    #[error("This modal did not contain the required form data!")]
-    NoDestinationInComponent,
+    #[error("This modal did not contain the required form label!")]
+    NoFormLabel,
+    #[error("This modal did not contain the required form input element!")]
+    NoFormInput,
     #[error("HTTP body error!")]
     RawHttpBody,
     #[error("That would make this user's XP negative!")]
diff --git a/xpd-slash/src/leaderboard.rs b/xpd-slash/src/leaderboard.rs
@@ -2,13 +2,14 @@ use std::{convert::TryInto, fmt::Write};
 
 use twilight_model::{
     application::interaction::{
-        message_component::MessageComponentInteractionData, modal::ModalInteractionData,
+        message_component::MessageComponentInteractionData,
+        modal::{ModalInteractionComponent, ModalInteractionData, ModalInteractionLabel},
     },
     channel::{
         Message,
         message::{
             AllowedMentions, Component, EmojiReactionType, MessageFlags,
-            component::{ActionRow, Button, ButtonStyle, TextInput, TextInputStyle},
+            component::{ActionRow, Button, ButtonStyle, Label, TextInput, TextInputStyle},
         },
     },
     http::interaction::{InteractionResponse, InteractionResponseType},
@@ -102,6 +103,7 @@ async fn gen_leaderboard(
 
     let components = Component::ActionRow(ActionRow {
         components: components.to_vec(),
+        id: None,
     });
 
     Ok(XpdInteractionData::new()
@@ -121,6 +123,7 @@ fn control_options(zpage: i64, next_page_exists: bool) -> [Component; 5] {
             style: ButtonStyle::Secondary,
             url: None,
             sku_id: None,
+            id: None,
         },
         Button {
             custom_id: Some((zpage - 1).to_string()),
@@ -132,6 +135,7 @@ fn control_options(zpage: i64, next_page_exists: bool) -> [Component; 5] {
             style: ButtonStyle::Primary,
             url: None,
             sku_id: None,
+            id: None,
         },
         Button {
             custom_id: Some("jump_modal".to_string()),
@@ -141,6 +145,7 @@ fn control_options(zpage: i64, next_page_exists: bool) -> [Component; 5] {
             style: ButtonStyle::Primary,
             url: None,
             sku_id: None,
+            id: None,
         },
         Button {
             custom_id: Some((zpage + 1).to_string()),
@@ -152,6 +157,7 @@ fn control_options(zpage: i64, next_page_exists: bool) -> [Component; 5] {
             style: ButtonStyle::Primary,
             url: None,
             sku_id: None,
+            id: None,
         },
         Button {
             custom_id: Some("delete_leaderboard".to_string()),
@@ -163,6 +169,7 @@ fn control_options(zpage: i64, next_page_exists: bool) -> [Component; 5] {
             style: ButtonStyle::Danger,
             url: None,
             sku_id: None,
+            id: None,
         },
     ]
     .map(Component::Button)
@@ -174,13 +181,15 @@ pub async fn process_modal_submit(
     state: SlashState,
 ) -> Result<XpdInteractionResponse, Error> {
     // You can't get this modal unless you are the triggering user
-    let actions = data.components.first().ok_or(Error::NoModalActionRow)?;
-    let field = actions.components.first().ok_or(Error::NoFormField)?;
-    let choice: i64 = field
-        .value
-        .as_ref()
-        .ok_or(Error::NoDestinationInComponent)?
-        .parse()?;
+    let ModalInteractionComponent::Label(ModalInteractionLabel { id: _id, component }) =
+        data.components.first().ok_or(Error::NoModalActionRow)?
+    else {
+        return Err(Error::NoFormLabel);
+    };
+    let ModalInteractionComponent::TextInput(field) = component.as_ref() else {
+        return Err(Error::NoFormInput);
+    };
+    let choice: i64 = field.value.parse()?;
     let zpage = choice - 1;
     Ok(XpdInteractionResponse::new(
         InteractionResponseType::UpdateMessage,
@@ -206,27 +215,29 @@ pub async fn process_message_component(
         return Err(Error::NotYourLeaderboard);
     }
     match data.custom_id.as_str() {
-        "jump_modal" => {
-            let input = TextInput {
-                custom_id: "jump_modal_input".to_string(),
-                label: "Jump Destination".to_string(),
-                max_length: Some(8),
-                min_length: Some(1),
-                placeholder: Some("What page to jump to".to_string()),
-                required: Some(true),
-                style: TextInputStyle::Short,
-                value: None,
-            };
-            Ok(XpdInteractionResponse::new(
-                InteractionResponseType::Modal,
-                XpdInteractionData::new()
-                    .components([Component::ActionRow(ActionRow {
-                        components: vec![Component::TextInput(input)],
-                    })])
-                    .custom_id("jump_modal".to_string())
-                    .title("Go to page..".to_string()),
-            ))
-        }
+        "jump_modal" => Ok(XpdInteractionResponse::new(
+            InteractionResponseType::Modal,
+            XpdInteractionData::new()
+                .components([Component::Label(Label {
+                    id: None,
+                    label: "Jump Destination".into(),
+                    description: None,
+                    component: Box::new(Component::TextInput(TextInput {
+                        custom_id: "jump_modal_input".to_string(),
+                        #[expect(deprecated)]
+                        label: None,
+                        max_length: Some(8),
+                        min_length: Some(1),
+                        placeholder: Some("What page to jump to".to_string()),
+                        required: Some(true),
+                        style: TextInputStyle::Short,
+                        value: None,
+                        id: None,
+                    })),
+                })])
+                .custom_id("jump_modal".to_string())
+                .title("Go to page..".to_string()),
+        )),
         "delete_leaderboard" => {
             let deferred_update = InteractionResponse {
                 kind: InteractionResponseType::UpdateMessage,
diff --git a/xpd-slash/src/response.rs b/xpd-slash/src/response.rs
@@ -5,6 +5,7 @@ use twilight_model::{
         attachment::Attachment,
         interaction::{InteractionResponse, InteractionResponseData, InteractionResponseType},
     },
+    poll::Poll,
 };
 use twilight_util::builder::embed::EmbedBuilder;
 #[derive(Debug, Clone)]
@@ -51,6 +52,7 @@ pub struct XpdInteractionData {
     pub flags: Option<MessageFlags>,
     pub title: Option<String>,
     pub tts: Option<bool>,
+    pub poll: Option<Poll>,
     /// If this is set, the response will not be sent at all.
     pub inhibit: bool,
 }
@@ -239,6 +241,7 @@ impl From<XpdInteractionData> for InteractionResponseData {
             flags: value.flags,
             title: value.title,
             tts: value.tts,
+            poll: value.poll,
         }
     }
 }
@@ -256,6 +259,7 @@ impl From<InteractionResponseData> for XpdInteractionData {
             flags: value.flags,
             title: value.title,
             tts: value.tts,
+            poll: value.poll,
             inhibit: false,
         }
     }
diff --git a/xpd-util/Cargo.toml b/xpd-util/Cargo.toml
@@ -4,8 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-twilight-cache-inmemory = { version = "0.16", features = ["permission-calculator"] }
-twilight-model = "0.16"
+twilight-cache-inmemory = { version = "0.17", features = ["permission-calculator"] }
+twilight-model = "0.17"
 
 xpd-common = { workspace = true }
 
