From 653d80ad25e87fca92979192e0dc886ad09a2c3b Mon Sep 17 00:00:00 2001
From: Stephen Leitnick <Sleitnick@users.noreply.github.com>
Date: Sat, 22 Mar 2025 18:43:26 -0400
Subject: [PATCH 1/5] Luau execution impl (#72)

* Luau execution impl

* Luau execution client impl

* Luau execution CLI stub

* Luau execution CLI

* Docs

* Log query params
---
 README.md                      |   2 +-
 docs/cli/cli-luau-execution.md |  54 +++++++
 mkdocs.yml                     |  11 +-
 src/cli/luau_execution_cli.rs  | 237 ++++++++++++++++++++++++++++
 src/cli/mod.rs                 |   5 +
 src/rbx/types.rs               |   6 +-
 src/rbx/v2/luau_execution.rs   | 272 +++++++++++++++++++++++++++++++++
 src/rbx/v2/mod.rs              |  83 ++++++++++
 8 files changed, 662 insertions(+), 8 deletions(-)
 create mode 100644 docs/cli/cli-luau-execution.md
 create mode 100644 src/cli/luau_execution_cli.rs
 create mode 100644 src/rbx/v2/luau_execution.rs

diff --git a/README.md b/README.md
index af24cad..31f0c3c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ Possible use-cases:
 | :white_check_mark: | User Notifications |
 | :white_check_mark: | User |
 | :x: | Creator Store |
-| :x: | Luau Execution |
+| :white_check_mark: | Luau Execution |
 
 - :white_check_mark: = Supported
 - :x: = Not yet supported
diff --git a/docs/cli/cli-luau-execution.md b/docs/cli/cli-luau-execution.md
new file mode 100644
index 0000000..48c926d
--- /dev/null
+++ b/docs/cli/cli-luau-execution.md
@@ -0,0 +1,54 @@
+# Luau Execution API
+
+# Execute Task
+Executes Luau code on Roblox.
+```
+Usage: rbxcloud luau execute [OPTIONS] --universe-id <UNIVERSE_ID> --place-id <PLACE_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>  Universe ID of the experience
+  -i, --place-id <PLACE_ID>        Place ID of the experience
+  -r, --version-id <VERSION_ID>    Version ID of the experience
+  -s, --script <SCRIPT>            Script source code
+  -f, --filepath <FILEPATH>        Script source code file
+  -t, --timeout <TIMEOUT>          Execution timeout
+  -p, --pretty                     Pretty-print the JSON response
+  -a, --api-key <API_KEY>          Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                       Print help
+```
+
+## Get Task Information
+Gets information on a previously executed task.
+
+```
+Usage: rbxcloud luau get-task [OPTIONS] --universe-id <UNIVERSE_ID> --place-id <PLACE_ID> --session-id <SESSION_ID> --task-id <TASK_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>  Universe ID of the experience
+  -i, --place-id <PLACE_ID>        Place ID of the experience
+  -r, --version-id <VERSION_ID>    Version ID of the experience
+  -s, --session-id <SESSION_ID>    Luau execution session ID
+  -t, --task-id <TASK_ID>          Luau execution task ID
+  -p, --pretty                     Pretty-print the JSON response
+  -a, --api-key <API_KEY>          Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                       Print help
+```
+
+## Get Task Logs
+Retrieves logs on a previously executed task.
+```
+Usage: rbxcloud.exe luau get-logs [OPTIONS] --universe-id <UNIVERSE_ID> --place-id <PLACE_ID> --session-id <SESSION_ID> --task-id <TASK_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>      Universe ID of the experience
+  -i, --place-id <PLACE_ID>            Place ID of the experience
+  -r, --version-id <VERSION_ID>        Version ID of the experience
+  -s, --session-id <SESSION_ID>        Luau execution session ID
+  -t, --task-id <TASK_ID>              Luau execution task ID
+  -m, --max-page-size <MAX_PAGE_SIZE>  Max page size
+  -n, --page-token <PAGE_TOKEN>        Next page token
+  -w, --view <VIEW>                    Log view type [possible values: flat, structured]
+  -p, --pretty                         Pretty-print the JSON response
+  -a, --api-key <API_KEY>              Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                           Print help
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index c9de1a0..1b2c5b0 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -8,16 +8,17 @@ nav:
   - Home: index.md
   - CLI:
     - Install: cli/cli-install.md
-    - Assets: cli/cli-assets.md
     - API Key: cli/cli-api-key.md
-    - Experience: cli/cli-experience.md
-    - Messaging: cli/cli-messaging.md
+    - Assets: cli/cli-assets.md
     - DataStore: cli/cli-datastore.md
-    - OrderedDataStore: cli/cli-ordered-datastore.md
+    - Experience: cli/cli-experience.md
     - Group: cli/cli-group.md
-    - Subscription: cli/cli-subscription.md
+    - Luau Execution: cli/cli-luau-execution.md
+    - Messaging: cli/cli-messaging.md
     - Notification: cli/cli-notification.md
+    - OrderedDataStore: cli/cli-ordered-datastore.md
     - Place: cli/cli-place.md
+    - Subscription: cli/cli-subscription.md
     - Universe: cli/cli-universe.md
     - User: cli/cli-user.md
   - Rust Lib:
diff --git a/src/cli/luau_execution_cli.rs b/src/cli/luau_execution_cli.rs
new file mode 100644
index 0000000..f8d5bdb
--- /dev/null
+++ b/src/cli/luau_execution_cli.rs
@@ -0,0 +1,237 @@
+use clap::{Args, Subcommand};
+use rbxcloud::rbx::{
+    types::{PlaceId, UniverseId},
+    v2::{luau_execution::LuauExecutionTaskLogView, Client},
+};
+use tokio::fs;
+
+#[derive(Debug, Subcommand)]
+pub enum LuauExecutionCommands {
+    /// Executes Luau code on Roblox
+    Execute {
+        /// Universe ID of the experience
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// Place ID of the experience
+        #[clap(short = 'i', long, value_parser)]
+        place_id: u64,
+
+        /// Version ID of the experience
+        #[clap(short = 'r', long, value_parser)]
+        version_id: Option<String>,
+
+        /// Script source code
+        #[clap(short, long, value_parser)]
+        script: Option<String>,
+
+        /// Script source code file
+        #[clap(short, long, value_parser)]
+        filepath: Option<String>,
+
+        /// Execution timeout
+        #[clap(short, long, value_parser)]
+        timeout: Option<String>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+
+    /// Gets information on a previously executed task
+    GetTask {
+        /// Universe ID of the experience
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// Place ID of the experience
+        #[clap(short = 'i', long, value_parser)]
+        place_id: u64,
+
+        /// Version ID of the experience
+        #[clap(short = 'r', long, value_parser)]
+        version_id: Option<String>,
+
+        /// Luau execution session ID
+        #[clap(short, long, value_parser)]
+        session_id: String,
+
+        /// Luau execution task ID
+        #[clap(short, long, value_parser)]
+        task_id: String,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+
+    /// Retrieves logs on a previously executed task
+    GetLogs {
+        /// Universe ID of the experience
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// Place ID of the experience
+        #[clap(short = 'i', long, value_parser)]
+        place_id: u64,
+
+        /// Version ID of the experience
+        #[clap(short = 'r', long, value_parser)]
+        version_id: Option<String>,
+
+        /// Luau execution session ID
+        #[clap(short, long, value_parser)]
+        session_id: String,
+
+        /// Luau execution task ID
+        #[clap(short, long, value_parser)]
+        task_id: String,
+
+        /// Max page size
+        #[clap(short, long, value_parser)]
+        max_page_size: Option<u32>,
+
+        /// Next page token
+        #[clap(short = 'n', long, value_parser)]
+        page_token: Option<String>,
+
+        /// Log view type
+        #[clap(short = 'w', long, value_enum)]
+        view: Option<LuauExecutionTaskLogView>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+}
+
+#[derive(Debug, Args)]
+pub struct Luau {
+    #[clap(subcommand)]
+    command: LuauExecutionCommands,
+}
+
+impl Luau {
+    pub async fn run(self) -> anyhow::Result<Option<String>> {
+        match self.command {
+            LuauExecutionCommands::Execute {
+                universe_id,
+                place_id,
+                version_id,
+                script,
+                filepath,
+                timeout,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+
+                let luau = client.luau(UniverseId(universe_id), PlaceId(place_id), version_id);
+
+                let mut script_source: Option<String> = None;
+                if script.is_some() {
+                    script_source = script;
+                }
+
+                if script_source.is_none() {
+                    if let Some(path) = filepath {
+                        let src_bytes = fs::read(path).await?;
+                        script_source = Some(String::from_utf8(src_bytes)?);
+                    }
+                }
+
+                let src = script_source.expect("script or filepath must be set");
+
+                let res = luau.create_task(src, timeout).await;
+                match res {
+                    Ok(data) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&data)?
+                        } else {
+                            serde_json::to_string(&data)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+
+            LuauExecutionCommands::GetTask {
+                universe_id,
+                place_id,
+                version_id,
+                session_id,
+                task_id,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+
+                let luau = client.luau(UniverseId(universe_id), PlaceId(place_id), version_id);
+
+                let res = luau.get_task(session_id, task_id).await;
+                match res {
+                    Ok(data) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&data)?
+                        } else {
+                            serde_json::to_string(&data)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+
+            LuauExecutionCommands::GetLogs {
+                universe_id,
+                place_id,
+                version_id,
+                session_id,
+                task_id,
+                max_page_size,
+                page_token,
+                view,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+
+                let luau = client.luau(UniverseId(universe_id), PlaceId(place_id), version_id);
+
+                let res = luau
+                    .get_logs(
+                        session_id,
+                        task_id,
+                        view.unwrap_or(LuauExecutionTaskLogView::Flat),
+                        max_page_size,
+                        page_token,
+                    )
+                    .await;
+                match res {
+                    Ok(data) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&data)?
+                        } else {
+                            serde_json::to_string(&data)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+        }
+    }
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 1c06e27..2ecaab5 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -2,6 +2,7 @@ mod assets_cli;
 mod datastore_cli;
 mod experience_cli;
 mod group_cli;
+mod luau_execution_cli;
 mod messaging_cli;
 mod notification_cli;
 mod ordered_datastore_cli;
@@ -11,6 +12,7 @@ mod universe_cli;
 mod user_cli;
 
 use clap::{Parser, Subcommand};
+use luau_execution_cli::Luau;
 use universe_cli::Universe;
 use user_cli::User;
 
@@ -47,6 +49,8 @@ pub enum Command {
     /// Access the Roblox Group API
     Group(Group),
 
+    Luau(Luau),
+
     /// Access the Roblox Subscription API
     Subscription(Subscription),
 
@@ -72,6 +76,7 @@ impl Cli {
             Command::Datastore(command) => command.run().await,
             Command::OrderedDatastore(command) => command.run().await,
             Command::Group(command) => command.run().await,
+            Command::Luau(command) => command.run().await,
             Command::Subscription(command) => command.run().await,
             Command::Notification(command) => command.run().await,
             Command::Place(command) => command.run().await,
diff --git a/src/rbx/types.rs b/src/rbx/types.rs
index aee3e99..81eea6c 100644
--- a/src/rbx/types.rs
+++ b/src/rbx/types.rs
@@ -1,9 +1,11 @@
+use serde::{Deserialize, Serialize};
+
 /// Represents the UniverseId of a Roblox experience.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct UniverseId(pub u64);
 
 /// Represents the PlaceId of a specific place within a Roblox experience.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct PlaceId(pub u64);
 
 // Number of items to return.
diff --git a/src/rbx/v2/luau_execution.rs b/src/rbx/v2/luau_execution.rs
new file mode 100644
index 0000000..eb29e01
--- /dev/null
+++ b/src/rbx/v2/luau_execution.rs
@@ -0,0 +1,272 @@
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+
+use crate::rbx::{
+    error::Error,
+    types::{PlaceId, UniverseId},
+    util::QueryString,
+};
+
+use super::http_err::handle_http_err;
+
+#[derive(Debug)]
+pub struct CreateLuauExecutionTaskParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: PlaceId,
+    pub version_id: Option<String>,
+    pub script: String,
+    pub timeout: Option<String>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct NewLuauExecutionSessionTask {
+    pub path: String,
+    pub user: String,
+    pub state: LuauExecutionState,
+    pub script: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct GetLuauExecutionSessionTaskParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: PlaceId,
+    pub version_id: Option<String>,
+    pub session_id: String,
+    pub task_id: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct GetLuauExecutionSessionTaskLogsParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: PlaceId,
+    pub version_id: Option<String>,
+    pub session_id: String,
+    pub task_id: String,
+    pub max_page_size: Option<u32>,
+    pub page_token: Option<String>,
+    pub view: LuauExecutionTaskLogView,
+}
+
+#[derive(Debug, Clone, Copy, clap::ValueEnum, Deserialize, Serialize)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum LuauExecutionTaskLogView {
+    Flat,
+    Structured,
+}
+
+impl std::fmt::Display for LuauExecutionTaskLogView {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
+        write!(
+            f,
+            "{}",
+            match self {
+                Self::Flat => "FLAT",
+                Self::Structured => "STRUCTURED",
+            }
+        )
+    }
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct LuauExecutionSessionTaskLogPage {
+    pub luau_execution_session_task_logs: Vec<LuauExecutionSessionTaskLog>,
+    pub next_page_token: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct LuauExecutionSessionTaskLog {
+    pub path: String,
+    pub messages: Vec<String>,
+    pub structured_messages: Vec<StructuredMessage>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct StructuredMessage {
+    pub message: String,
+    pub create_time: String,
+    pub message_type: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct LuauExecutionSessionTask {
+    pub path: String,
+    pub create_time: String,
+    pub update_time: String,
+    pub user: String,
+    pub state: LuauExecutionState,
+    pub output: LuauExecutionOutput,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct LuauExecutionOutput {
+    pub results: Vec<Value>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum LuauExecutionState {
+    StateUnspecified,
+    Queued,
+    Processing,
+    Cancelled,
+    Complete,
+    Failed,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+struct LuauExecutionInput {
+    pub script: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub timeout: Option<String>,
+}
+
+pub async fn create_luau_execution_task(
+    params: &CreateLuauExecutionTaskParams,
+) -> Result<NewLuauExecutionSessionTask, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(version_id) = &params.version_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/versions/{versionId}/luau-execution-session-tasks",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+			versionId = version_id,
+		)
+    } else {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/luau-execution-session-tasks",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+		)
+    };
+
+    let input = LuauExecutionInput {
+        script: params.script.clone(),
+        timeout: params.timeout.clone(),
+    };
+
+    let req_body = serde_json::to_string(&input)?;
+
+    let res = client
+        .post(url)
+        .header("x-api-key", &params.api_key)
+        .header("Content-Type", "application/json")
+        .body(req_body)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<NewLuauExecutionSessionTask>().await?;
+    Ok(body)
+}
+
+pub async fn get_luau_execution_task(
+    params: &GetLuauExecutionSessionTaskParams,
+) -> Result<LuauExecutionSessionTask, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(version_id) = &params.version_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/versions/{versionId}/luau-execution-sessions/{sessionId}/tasks/{taskId}",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+			versionId = version_id,
+			sessionId = &params.session_id,
+			taskId = &params.task_id,
+		)
+    } else {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/luau-execution-sessions/{sessionId}/tasks/{taskId}",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+			sessionId = &params.session_id,
+			taskId = &params.task_id,
+		)
+    };
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<LuauExecutionSessionTask>().await?;
+    Ok(body)
+}
+
+pub async fn get_luau_execution_task_logs(
+    params: &GetLuauExecutionSessionTaskLogsParams,
+) -> Result<LuauExecutionSessionTaskLogPage, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(version_id) = &params.version_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/versions/{versionId}/luau-execution-sessions/{sessionId}/tasks/{taskId}/logs",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+			versionId = version_id,
+			sessionId = &params.session_id,
+			taskId = &params.task_id,
+		)
+    } else {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/luau-execution-sessions/{sessionId}/tasks/{taskId}/logs",
+			universeId = &params.universe_id,
+			placeId = &params.place_id,
+			sessionId = &params.session_id,
+			taskId = &params.task_id,
+		)
+    };
+
+    let mut query: QueryString = vec![("view", params.view.to_string())];
+    if let Some(max_page_size) = params.max_page_size {
+        query.push(("maxPageSize", format!("{max_page_size}")));
+    }
+    if let Some(page_token) = &params.page_token {
+        query.push(("pageToken", page_token.clone()));
+    }
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .query(&query)
+        .send()
+        .await?;
+
+    println!("URL SENT: {}", res.url());
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<LuauExecutionSessionTaskLogPage>().await?;
+    Ok(body)
+}
diff --git a/src/rbx/v2/mod.rs b/src/rbx/v2/mod.rs
index 6c5d4d3..4ace408 100644
--- a/src/rbx/v2/mod.rs
+++ b/src/rbx/v2/mod.rs
@@ -2,6 +2,11 @@
 //!
 //! Most usage should go through the `Client` struct.
 
+use luau_execution::{
+    CreateLuauExecutionTaskParams, GetLuauExecutionSessionTaskLogsParams,
+    GetLuauExecutionSessionTaskParams, LuauExecutionSessionTask, LuauExecutionSessionTaskLogPage,
+    LuauExecutionTaskLogView, NewLuauExecutionSessionTask,
+};
 use place::{GetPlaceParams, PlaceInfo, UpdatePlaceInfo, UpdatePlaceParams};
 use universe::{
     GetUniverseParams, RestartUniverseServersParams, UniverseInfo, UpdateUniverseInfo,
@@ -23,6 +28,7 @@ use self::{
 };
 pub mod group;
 pub(crate) mod http_err;
+pub mod luau_execution;
 pub mod notification;
 pub mod place;
 pub mod subscription;
@@ -51,6 +57,13 @@ pub struct GroupClient {
     pub group_id: GroupId,
 }
 
+pub struct LuauExecutionClient {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: PlaceId,
+    pub version_id: Option<String>,
+}
+
 pub struct SubscriptionClient {
     pub api_key: String,
 }
@@ -123,6 +136,62 @@ impl GroupClient {
     }
 }
 
+impl LuauExecutionClient {
+    pub async fn create_task(
+        &self,
+        script: String,
+        timeout: Option<String>,
+    ) -> Result<NewLuauExecutionSessionTask, Error> {
+        luau_execution::create_luau_execution_task(&CreateLuauExecutionTaskParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id: self.place_id,
+            version_id: self.version_id.clone(),
+            script,
+            timeout,
+        })
+        .await
+    }
+
+    pub async fn get_task(
+        &self,
+        session_id: String,
+        task_id: String,
+    ) -> Result<LuauExecutionSessionTask, Error> {
+        luau_execution::get_luau_execution_task(&GetLuauExecutionSessionTaskParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id: self.place_id,
+            version_id: self.version_id.clone(),
+            session_id,
+            task_id,
+        })
+        .await
+    }
+
+    pub async fn get_logs(
+        &self,
+        session_id: String,
+        task_id: String,
+        view: LuauExecutionTaskLogView,
+        max_page_size: Option<u32>,
+        page_token: Option<String>,
+    ) -> Result<LuauExecutionSessionTaskLogPage, Error> {
+        luau_execution::get_luau_execution_task_logs(&GetLuauExecutionSessionTaskLogsParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id: self.place_id,
+            version_id: self.version_id.clone(),
+            session_id,
+            task_id,
+            view,
+            max_page_size,
+            page_token,
+        })
+        .await
+    }
+}
+
 impl SubscriptionClient {
     pub async fn get(
         &self,
@@ -256,6 +325,20 @@ impl Client {
         }
     }
 
+    pub fn luau(
+        &self,
+        universe_id: UniverseId,
+        place_id: PlaceId,
+        version_id: Option<String>,
+    ) -> LuauExecutionClient {
+        LuauExecutionClient {
+            api_key: self.api_key.clone(),
+            universe_id,
+            place_id,
+            version_id,
+        }
+    }
+
     pub fn subscription(&self) -> SubscriptionClient {
         SubscriptionClient {
             api_key: self.api_key.clone(),

From 42335adfa51b3b90bd859026b64e6253392f809c Mon Sep 17 00:00:00 2001
From: Stephen Leitnick <sleitnick@gmail.com>
Date: Sat, 22 Mar 2025 18:44:45 -0400
Subject: [PATCH 2/5] Bump version

---
 Cargo.lock              | 2 +-
 Cargo.toml              | 2 +-
 README.md               | 4 ++--
 docs/cli/cli-install.md | 4 ++--
 docs/lib/lib-install.md | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c254c95..0da2624 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -660,7 +660,7 @@ dependencies = [
 
 [[package]]
 name = "rbxcloud"
-version = "0.16.0"
+version = "0.17.0"
 dependencies = [
  "anyhow",
  "base64 0.22.0",
diff --git a/Cargo.toml b/Cargo.toml
index e042a3d..7e79edf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rbxcloud"
-version = "0.16.0"
+version = "0.17.0"
 description = "CLI and SDK for the Roblox Open Cloud APIs"
 authors = ["Stephen Leitnick"]
 license = "MIT"
diff --git a/README.md b/README.md
index 31f0c3c..cdb973f 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ The goal of this project is to support all API endpoints that Roblox provides.
 ### Aftman
 Run the `aftman add` command within your project directory. This will add `rbxcloud` to the project's `aftman.toml` file (or create one if it doesn't yet exist).
 ```sh
-$ aftman add Sleitnick/rbxcloud@0.16.0
+$ aftman add Sleitnick/rbxcloud@0.17.0
 ```
 
 ### From Release
@@ -62,7 +62,7 @@ The library built for the CLI tool is available to use directly in Rust projects
 To use `rbxcloud` in a Rust project, simply add `rbxcloud` to the `Cargo.toml` dependency list.
 ```toml
 [dependencies]
-rbxcloud = "0.16.0"
+rbxcloud = "0.17.0"
 ```
 
 Alternatively, use `cargo add`.
diff --git a/docs/cli/cli-install.md b/docs/cli/cli-install.md
index 4592638..7807ce4 100644
--- a/docs/cli/cli-install.md
+++ b/docs/cli/cli-install.md
@@ -7,7 +7,7 @@ There are a few different ways to install the `rbxcloud` CLI.
 ### [Aftman](https://github.com/LPGhatguy/aftman) <small>(Preferred)</small>
 Run the `aftman add` command within your project directory. This will add `rbxcloud` to the project's `aftman.toml` file (or create one if it doesn't yet exist).
 ```sh
-$ aftman add Sleitnick/rbxcloud@0.16.0
+$ aftman add Sleitnick/rbxcloud@0.17.0
 ```
 
 Next, run `aftman install` to install `rbxcloud`.
@@ -17,7 +17,7 @@ Add `rbxcloud` under the `[tools]` section of your `foreman.toml` file.
 ```toml
 # foreman.toml
 [tools]
-rbxcloud = { github = "Sleitnick/rbxcloud", version = "0.16.0" }
+rbxcloud = { github = "Sleitnick/rbxcloud", version = "0.17.0" }
 ```
 
 Next, run `foreman install` to install `rbxcloud`.
diff --git a/docs/lib/lib-install.md b/docs/lib/lib-install.md
index faab6ff..41b9ddb 100644
--- a/docs/lib/lib-install.md
+++ b/docs/lib/lib-install.md
@@ -5,7 +5,7 @@
 To use `rbxcloud` in a Rust project, simply add `rbxcloud` to the `Cargo.toml` dependency list.
 ```toml
 [dependencies]
-rbxcloud = "0.16.0"
+rbxcloud = "0.17.0"
 ```
 
 Alternatively, use `cargo add`.

From 3315e73092eb508a0d45690fd55172a28b15e32e Mon Sep 17 00:00:00 2001
From: Stephen Leitnick <Sleitnick@users.noreply.github.com>
Date: Sat, 22 Mar 2025 23:45:22 -0400
Subject: [PATCH 3/5] Inventory API (#73)

* Start inventory impl

* Collectible details

* Doc stub

* Inventory client

* Inventory CLI stub

* Inventory CLI impl

* Inventory CLI docs

* Serial number optional

* Remove print

* Clean up warnings
---
 README.md                    |   2 +-
 docs/cli/cli-inventory.md    |  17 ++++
 mkdocs.yml                   |   1 +
 src/cli/inventory_cli.rs     |  73 ++++++++++++++
 src/cli/mod.rs               |   6 ++
 src/rbx/types.rs             |   2 +-
 src/rbx/v2/inventory.rs      | 180 +++++++++++++++++++++++++++++++++++
 src/rbx/v2/luau_execution.rs |   2 -
 src/rbx/v2/mod.rs            |  33 ++++++-
 src/rbx/v2/place.rs          |   3 +-
 src/rbx/v2/universe.rs       |   3 +-
 11 files changed, 313 insertions(+), 9 deletions(-)
 create mode 100644 docs/cli/cli-inventory.md
 create mode 100644 src/cli/inventory_cli.rs
 create mode 100644 src/rbx/v2/inventory.rs

diff --git a/README.md b/README.md
index cdb973f..074a96e 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Possible use-cases:
 | :white_check_mark: | Places |
 | :x: | Instances |
 | :white_check_mark: | Subscriptions |
-| :x: | Inventory |
+| :white_check_mark: | Inventory |
 | :white_check_mark: | User Notifications |
 | :white_check_mark: | User |
 | :x: | Creator Store |
diff --git a/docs/cli/cli-inventory.md b/docs/cli/cli-inventory.md
new file mode 100644
index 0000000..c48f80a
--- /dev/null
+++ b/docs/cli/cli-inventory.md
@@ -0,0 +1,17 @@
+# Inventory API
+
+## List
+List inventory items for a given user.
+
+```
+Usage: rbxcloud inventory list [OPTIONS] --user-id <USER_ID> --api-key <API_KEY>
+
+Options:
+  -u, --user-id <USER_ID>              Roblox user ID
+  -p, --pretty                         Pretty-print the JSON response
+  -m, --max-page-size <MAX_PAGE_SIZE>  Max page size
+  -n, --page-token <PAGE_TOKEN>        Next page token
+  -f, --filter <FILTER>                Filter string
+  -a, --api-key <API_KEY>              Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                           Print help
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 1b2c5b0..6dca0a3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -13,6 +13,7 @@ nav:
     - DataStore: cli/cli-datastore.md
     - Experience: cli/cli-experience.md
     - Group: cli/cli-group.md
+    - Inventory: cli/cli-inventory.md
     - Luau Execution: cli/cli-luau-execution.md
     - Messaging: cli/cli-messaging.md
     - Notification: cli/cli-notification.md
diff --git a/src/cli/inventory_cli.rs b/src/cli/inventory_cli.rs
new file mode 100644
index 0000000..cb1c53c
--- /dev/null
+++ b/src/cli/inventory_cli.rs
@@ -0,0 +1,73 @@
+use clap::{Args, Subcommand};
+use rbxcloud::rbx::{types::RobloxUserId, v2::Client};
+
+#[derive(Debug, Subcommand)]
+pub enum InventoryCommands {
+    /// List inventory items for a given user
+    List {
+        /// Roblox user ID
+        #[clap(short, long, value_parser)]
+        user_id: u64,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Max page size
+        #[clap(short, long, value_parser)]
+        max_page_size: Option<u32>,
+
+        /// Next page token
+        #[clap(short = 'n', long, value_parser)]
+        page_token: Option<String>,
+
+        /// Filter string
+        #[clap(short, long, value_parser)]
+        filter: Option<String>,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+}
+
+#[derive(Debug, Args)]
+pub struct Inventory {
+    #[clap(subcommand)]
+    command: InventoryCommands,
+}
+
+impl Inventory {
+    pub async fn run(self) -> anyhow::Result<Option<String>> {
+        match self.command {
+            InventoryCommands::List {
+                user_id,
+                pretty,
+                max_page_size,
+                page_token,
+                filter,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+
+                let inventory = client.inventory();
+
+                let res = inventory
+                    .list_inventory_items(RobloxUserId(user_id), max_page_size, page_token, filter)
+                    .await;
+
+                match res {
+                    Ok(data) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&data)?
+                        } else {
+                            serde_json::to_string(&data)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+        }
+    }
+}
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 2ecaab5..18aba72 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -2,6 +2,7 @@ mod assets_cli;
 mod datastore_cli;
 mod experience_cli;
 mod group_cli;
+mod inventory_cli;
 mod luau_execution_cli;
 mod messaging_cli;
 mod notification_cli;
@@ -12,6 +13,7 @@ mod universe_cli;
 mod user_cli;
 
 use clap::{Parser, Subcommand};
+use inventory_cli::Inventory;
 use luau_execution_cli::Luau;
 use universe_cli::Universe;
 use user_cli::User;
@@ -46,6 +48,9 @@ pub enum Command {
     /// Access the Roblox OrderedDataStore API
     OrderedDatastore(OrderedDataStore),
 
+    /// Access the Roblox user inventory API
+    Inventory(Inventory),
+
     /// Access the Roblox Group API
     Group(Group),
 
@@ -76,6 +81,7 @@ impl Cli {
             Command::Datastore(command) => command.run().await,
             Command::OrderedDatastore(command) => command.run().await,
             Command::Group(command) => command.run().await,
+            Command::Inventory(command) => command.run().await,
             Command::Luau(command) => command.run().await,
             Command::Subscription(command) => command.run().await,
             Command::Notification(command) => command.run().await,
diff --git a/src/rbx/types.rs b/src/rbx/types.rs
index 81eea6c..13d0127 100644
--- a/src/rbx/types.rs
+++ b/src/rbx/types.rs
@@ -13,7 +13,7 @@ pub struct PlaceId(pub u64);
 pub struct ReturnLimit(pub u64);
 
 /// Represents a Roblox user's ID.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct RobloxUserId(pub u64);
 
 #[derive(Debug, Clone, Copy)]
diff --git a/src/rbx/v2/inventory.rs b/src/rbx/v2/inventory.rs
new file mode 100644
index 0000000..ace218a
--- /dev/null
+++ b/src/rbx/v2/inventory.rs
@@ -0,0 +1,180 @@
+use serde::{Deserialize, Serialize};
+
+use crate::rbx::{error::Error, types::RobloxUserId, util::QueryString};
+
+use super::http_err::handle_http_err;
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct ListInventoryItemsParams {
+    pub api_key: String,
+    pub user_id: RobloxUserId,
+    pub max_page_size: Option<u32>,
+    pub page_token: Option<String>,
+    pub filter: Option<String>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItems {
+    inventory_items: Vec<InventoryItem>,
+    next_page_token: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItem {
+    path: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    asset_details: Option<InventoryItemAssetDetails>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    badge_details: Option<InventoryItemBadgeDetails>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    game_pass_details: Option<InventoryItemGamePassDetails>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    private_server_details: Option<InventoryItemPrivateServerDetails>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    add_time: Option<String>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItemAssetDetails {
+    asset_id: String,
+    instance_id: String,
+    inventory_item_asset_type: InventoryItemAssetType,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    collectible_details: Option<InventoryItemCollectibleDetails>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItemBadgeDetails {
+    badge_id: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItemGamePassDetails {
+    game_pass_id: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItemPrivateServerDetails {
+    private_server_id: String,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct InventoryItemCollectibleDetails {
+    item_id: String,
+    instance_id: String,
+    instance_state: InventoryItemInstanceState,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    serial_number: Option<u64>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum InventoryItemInstanceState {
+    CollectibleItemInstanceStateUnspecified,
+    Available,
+    Hold,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "SCREAMING_SNAKE_CASE")]
+pub enum InventoryItemAssetType {
+    ClassicTshirt,
+    Audio,
+    Hat,
+    Model,
+    ClassicShirt,
+    ClassicPants,
+    Decal,
+    ClassicHead,
+    Face,
+    Gear,
+    Animation,
+    Torso,
+    RightArm,
+    LeftArm,
+    LeftLeg,
+    RightLeg,
+    Package,
+    Plugin,
+    MeshPart,
+    HairAccessory,
+    FaceAccessory,
+    NeckAccessory,
+    ShoulderAccessory,
+    FrontAccessory,
+    BackAccessory,
+    WaistAccessory,
+    ClimbAnimation,
+    DeathAnimation,
+    FallAnimation,
+    IdleAnimation,
+    JumpAnimation,
+    RunAnimation,
+    SwimAnimation,
+    WalkAnimation,
+    PoseAnimation,
+    EmoteAnimation,
+    Video,
+    TshirtAccessory,
+    ShirtAccessory,
+    PantsAccessory,
+    JacketAccessory,
+    SweaterAccessory,
+    ShortsAccessory,
+    LeftShoeAccessory,
+    RightShoeAccessory,
+    DressSkirtAccessory,
+    EyebrowAccessory,
+    EyelashAccessory,
+    MoodAnimation,
+    DynamicHead,
+    CreatedPlace,
+    PurchasedPlace,
+}
+
+pub async fn list_inventory_items(
+    params: &ListInventoryItemsParams,
+) -> Result<InventoryItems, Error> {
+    let client = reqwest::Client::new();
+
+    let url = format!(
+        "https://apis.roblox.com/cloud/v2/users/{userId}/inventory-items",
+        userId = params.user_id,
+    );
+
+    let mut query: QueryString = vec![];
+    if let Some(max_page_size) = params.max_page_size {
+        query.push(("maxPageSize", format!("{max_page_size}")));
+    }
+    if let Some(page_token) = &params.page_token {
+        query.push(("pageToken", page_token.clone()));
+    }
+    if let Some(filter) = &params.filter {
+        query.push(("filter", filter.clone()));
+    }
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .query(&query)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<InventoryItems>().await?;
+    Ok(body)
+}
diff --git a/src/rbx/v2/luau_execution.rs b/src/rbx/v2/luau_execution.rs
index eb29e01..62e275e 100644
--- a/src/rbx/v2/luau_execution.rs
+++ b/src/rbx/v2/luau_execution.rs
@@ -258,8 +258,6 @@ pub async fn get_luau_execution_task_logs(
         .send()
         .await?;
 
-    println!("URL SENT: {}", res.url());
-
     let status = res.status();
 
     if !status.is_success() {
diff --git a/src/rbx/v2/mod.rs b/src/rbx/v2/mod.rs
index 4ace408..54a4d9e 100644
--- a/src/rbx/v2/mod.rs
+++ b/src/rbx/v2/mod.rs
@@ -2,6 +2,7 @@
 //!
 //! Most usage should go through the `Client` struct.
 
+use inventory::{InventoryItems, ListInventoryItemsParams};
 use luau_execution::{
     CreateLuauExecutionTaskParams, GetLuauExecutionSessionTaskLogsParams,
     GetLuauExecutionSessionTaskParams, LuauExecutionSessionTask, LuauExecutionSessionTaskLogPage,
@@ -28,6 +29,7 @@ use self::{
 };
 pub mod group;
 pub(crate) mod http_err;
+pub mod inventory;
 pub mod luau_execution;
 pub mod notification;
 pub mod place;
@@ -57,6 +59,10 @@ pub struct GroupClient {
     pub group_id: GroupId,
 }
 
+pub struct InventoryClient {
+    pub api_key: String,
+}
+
 pub struct LuauExecutionClient {
     pub api_key: String,
     pub universe_id: UniverseId,
@@ -136,6 +142,25 @@ impl GroupClient {
     }
 }
 
+impl InventoryClient {
+    pub async fn list_inventory_items(
+        &self,
+        user_id: RobloxUserId,
+        max_page_size: Option<u32>,
+        page_token: Option<String>,
+        filter: Option<String>,
+    ) -> Result<InventoryItems, Error> {
+        inventory::list_inventory_items(&ListInventoryItemsParams {
+            api_key: self.api_key.clone(),
+            user_id,
+            max_page_size,
+            page_token,
+            filter,
+        })
+        .await
+    }
+}
+
 impl LuauExecutionClient {
     pub async fn create_task(
         &self,
@@ -270,7 +295,7 @@ impl UniverseClient {
             api_key: self.api_key.clone(),
             universe_id: self.universe_id,
             update_mask,
-            info: info,
+            info,
         })
         .await
     }
@@ -325,6 +350,12 @@ impl Client {
         }
     }
 
+    pub fn inventory(&self) -> InventoryClient {
+        InventoryClient {
+            api_key: self.api_key.clone(),
+        }
+    }
+
     pub fn luau(
         &self,
         universe_id: UniverseId,
diff --git a/src/rbx/v2/place.rs b/src/rbx/v2/place.rs
index 61c2e6c..745df49 100644
--- a/src/rbx/v2/place.rs
+++ b/src/rbx/v2/place.rs
@@ -83,8 +83,7 @@ pub async fn update_place(params: &UpdatePlaceParams) -> Result<PlaceInfo, Error
         placeId = &params.place_id,
     );
 
-    let mut query: QueryString = vec![];
-    query.push(("updateMask", params.update_mask.clone()));
+    let query: QueryString = vec![("updateMask", params.update_mask.clone())];
 
     let body = serde_json::to_string(&params.info)?;
 
diff --git a/src/rbx/v2/universe.rs b/src/rbx/v2/universe.rs
index f989b48..daf4a7e 100644
--- a/src/rbx/v2/universe.rs
+++ b/src/rbx/v2/universe.rs
@@ -158,8 +158,7 @@ pub async fn update_universe(params: &UpdateUniverseParams) -> Result<UniverseIn
         universeId = &params.universe_id,
     );
 
-    let mut query: QueryString = vec![];
-    query.push(("updateMask", params.update_mask.clone()));
+    let query: QueryString = vec![("updateMask", params.update_mask.clone())];
 
     let body = serde_json::to_string(&params.info)?;
     println!("body: {}", body);

From c904561f48ecb7b4d8169b6aec209890e0041508 Mon Sep 17 00:00:00 2001
From: Stephen Leitnick <Sleitnick@users.noreply.github.com>
Date: Sun, 23 Mar 2025 01:38:47 -0400
Subject: [PATCH 4/5] User Restriction (#62)

* User restriction API and client

* Readme

* User restriction CLI

* Small fixes

* DateTime timestamp

* Optional idempotency key
---
 Cargo.lock                      | 192 ++++++++++++++++++-
 Cargo.toml                      |   2 +
 README.md                       |   2 +
 src/cli/mod.rs                  |  12 +-
 src/cli/user_restriction_cli.rs | 278 ++++++++++++++++++++++++++++
 src/rbx/v2/mod.rs               | 104 +++++++++++
 src/rbx/v2/subscription.rs      |   2 +-
 src/rbx/v2/user_restriction.rs  | 315 ++++++++++++++++++++++++++++++++
 8 files changed, 897 insertions(+), 10 deletions(-)
 create mode 100644 src/cli/user_restriction_cli.rs
 create mode 100644 src/rbx/v2/user_restriction.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0da2624..1656899 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -17,6 +17,21 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "anstream"
 version = "0.6.13"
@@ -110,6 +125,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -143,6 +164,21 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "wasm-bindgen",
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "clap"
 version = "4.5.4"
@@ -189,6 +225,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -296,7 +338,19 @@ checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
@@ -439,6 +493,29 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "iana-time-zone"
+version = "0.1.60"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -482,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "lock_api"
@@ -550,10 +627,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.16.0"
@@ -640,6 +726,15 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.79"
@@ -658,14 +753,52 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha",
+ "rand_core",
+ "zerocopy",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.2",
+]
+
 [[package]]
 name = "rbxcloud"
 version = "0.17.0"
 dependencies = [
  "anyhow",
  "base64 0.22.0",
+ "chrono",
  "clap",
  "md-5",
+ "rand",
  "reqwest",
  "serde",
  "serde_json",
@@ -678,7 +811,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -733,7 +866,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom",
+ "getrandom 0.2.12",
  "libc",
  "spin",
  "untrusted",
@@ -1114,6 +1247,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.92"
@@ -1199,6 +1341,15 @@ dependencies = [
  "rustls-pki-types",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.4",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1341,6 +1492,35 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.7.0"
diff --git a/Cargo.toml b/Cargo.toml
index 7e79edf..359831d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,3 +18,5 @@ reqwest = { version = "0.12.2", default-features = false, features = ["rustls-tl
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 tokio = { version = "1.36.0", features = ["full"] }
+chrono = { version = "0.4.38", features = ["serde"] }
+rand = "0.9.0"
diff --git a/README.md b/README.md
index 074a96e..e8d1aad 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ Possible use-cases:
 
 | | API v2 |
 | -- | -- |
+| :x: | Data Stores |
 | :white_check_mark: | Groups |
 | :white_check_mark: | Universes |
 | :white_check_mark: | Places |
@@ -33,6 +34,7 @@ Possible use-cases:
 | :white_check_mark: | Inventory |
 | :white_check_mark: | User Notifications |
 | :white_check_mark: | User |
+| :white_check_mark: | User Restrictions |
 | :x: | Creator Store |
 | :white_check_mark: | Luau Execution |
 
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 18aba72..1a3ed0f 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -11,12 +11,14 @@ mod place_cli;
 mod subscription_cli;
 mod universe_cli;
 mod user_cli;
+mod user_restriction_cli;
 
 use clap::{Parser, Subcommand};
 use inventory_cli::Inventory;
 use luau_execution_cli::Luau;
 use universe_cli::Universe;
 use user_cli::User;
+use user_restriction_cli::UserRestriction;
 
 use self::{
     assets_cli::Assets, datastore_cli::DataStore, experience_cli::Experience, group_cli::Group,
@@ -26,13 +28,13 @@ use self::{
 
 #[derive(Debug, Parser)]
 #[clap(name = "rbxcloud", version)]
-pub struct Cli {
+pub(crate) struct Cli {
     #[clap(subcommand)]
     pub command: Command,
 }
 
 #[derive(Debug, Subcommand)]
-pub enum Command {
+pub(crate) enum Command {
     /// Access the Roblox Assets API
     Assets(Assets),
 
@@ -70,10 +72,13 @@ pub enum Command {
 
     /// Access the Roblox User API
     User(User),
+
+    /// Access to the Roblox User Restriction API
+    UserRestriction(UserRestriction),
 }
 
 impl Cli {
-    pub async fn run(self) -> anyhow::Result<Option<String>> {
+    pub(crate) async fn run(self) -> anyhow::Result<Option<String>> {
         match self.command {
             Command::Assets(command) => command.run().await,
             Command::Experience(command) => command.run().await,
@@ -88,6 +93,7 @@ impl Cli {
             Command::Place(command) => command.run().await,
             Command::Universe(command) => command.run().await,
             Command::User(command) => command.run().await,
+            Command::UserRestriction(command) => command.run().await,
         }
     }
 }
diff --git a/src/cli/user_restriction_cli.rs b/src/cli/user_restriction_cli.rs
new file mode 100644
index 0000000..d9f1014
--- /dev/null
+++ b/src/cli/user_restriction_cli.rs
@@ -0,0 +1,278 @@
+use clap::{Args, Subcommand};
+use rbxcloud::rbx::{
+    types::{PlaceId, RobloxUserId, UniverseId},
+    v2::{Client, UserRestrictionParams},
+};
+
+#[derive(Debug, Subcommand)]
+pub(crate) enum UserRestrictionCommands {
+    /// Get user restriction information
+    Get {
+        /// Universe ID
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// User ID
+        #[clap(short = 'U', long, value_parser)]
+        user_id: u64,
+
+        /// Place ID
+        #[clap(short = 'P', long, value_parser)]
+        place_id: Option<u64>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+
+    /// Update user restriction information
+    Update {
+        /// Universe ID
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// User ID
+        #[clap(short = 'U', long, value_parser)]
+        user_id: u64,
+
+        /// Place ID
+        #[clap(short = 'P', long, value_parser)]
+        place_id: Option<u64>,
+
+        /// Restriction active
+        #[clap(short = 'A', long, value_parser)]
+        active: Option<bool>,
+
+        /// Restriction duration (seconds)
+        #[clap(short, long, value_parser)]
+        duration: Option<u64>,
+
+        /// Private reason
+        #[clap(short = 'r', long, value_parser)]
+        private_reason: Option<String>,
+
+        /// Display reason
+        #[clap(short = 'D', long, value_parser)]
+        display_reason: Option<String>,
+
+        /// Exclude alternate accounts
+        #[clap(short, long, value_parser)]
+        exclude_alts: Option<bool>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+
+    /// List user restrictions
+    List {
+        /// Universe ID
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// Place ID
+        #[clap(short = 'P', long, value_parser)]
+        place_id: Option<u64>,
+
+        /// Max page size
+        #[clap(short = 's', long, value_parser)]
+        page_size: Option<u32>,
+
+        /// Next page token
+        #[clap(short, long, value_parser)]
+        token: Option<String>,
+
+        /// Filter
+        #[clap(short, long, value_parser)]
+        filter: Option<String>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+
+    /// List user restriction logs
+    Logs {
+        /// Universe ID
+        #[clap(short, long, value_parser)]
+        universe_id: u64,
+
+        /// Place ID
+        #[clap(short = 'P', long, value_parser)]
+        place_id: Option<u64>,
+
+        /// Max page size
+        #[clap(short = 's', long, value_parser)]
+        page_size: Option<u32>,
+
+        /// Next page token
+        #[clap(short, long, value_parser)]
+        token: Option<String>,
+
+        /// Filter
+        #[clap(short, long, value_parser)]
+        filter: Option<String>,
+
+        /// Pretty-print the JSON response
+        #[clap(short, long, value_parser, default_value_t = false)]
+        pretty: bool,
+
+        /// Roblox Open Cloud API Key
+        #[clap(short, long, value_parser, env = "RBXCLOUD_API_KEY")]
+        api_key: String,
+    },
+}
+
+#[derive(Debug, Args)]
+pub(crate) struct UserRestriction {
+    #[clap(subcommand)]
+    command: UserRestrictionCommands,
+}
+
+impl UserRestriction {
+    pub(crate) async fn run(self) -> anyhow::Result<Option<String>> {
+        match self.command {
+            UserRestrictionCommands::Get {
+                universe_id,
+                user_id,
+                place_id,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+                let user_restriction_client = client.user_restriction(UniverseId(universe_id));
+                let res = user_restriction_client
+                    .get_user_restriction(
+                        RobloxUserId(user_id),
+                        place_id.and_then(|id| Some(PlaceId(id))),
+                    )
+                    .await;
+                match res {
+                    Ok(info) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&info)?
+                        } else {
+                            serde_json::to_string(&info)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+
+            UserRestrictionCommands::Update {
+                universe_id,
+                user_id,
+                place_id,
+                active,
+                duration,
+                private_reason,
+                display_reason,
+                exclude_alts,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+                let mut user_restriction_client = client.user_restriction(UniverseId(universe_id));
+                let res = user_restriction_client
+                    .update_user_restriction(&UserRestrictionParams {
+                        user_id: RobloxUserId(user_id),
+                        place_id: place_id.and_then(|id| Some(PlaceId(id))),
+                        active,
+                        duration,
+                        private_reason,
+                        display_reason,
+                        exclude_alt_accounts: exclude_alts,
+                    })
+                    .await;
+                match res {
+                    Ok(info) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&info)?
+                        } else {
+                            serde_json::to_string(&info)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+
+            UserRestrictionCommands::List {
+                universe_id,
+                place_id,
+                page_size,
+                token,
+                filter,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+                let user_restriction_client = client.user_restriction(UniverseId(universe_id));
+                let res = user_restriction_client
+                    .list_user_restrictions(
+                        place_id.and_then(|id| Some(PlaceId(id))),
+                        page_size,
+                        filter,
+                        token,
+                    )
+                    .await;
+                match res {
+                    Ok(info) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&info)?
+                        } else {
+                            serde_json::to_string(&info)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+
+            UserRestrictionCommands::Logs {
+                universe_id,
+                place_id,
+                page_size,
+                token,
+                filter,
+                pretty,
+                api_key,
+            } => {
+                let client = Client::new(&api_key);
+                let user_restriction_client = client.user_restriction(UniverseId(universe_id));
+                let res = user_restriction_client
+                    .list_user_restriction_logs(
+                        place_id.and_then(|id| Some(PlaceId(id))),
+                        page_size,
+                        filter,
+                        token,
+                    )
+                    .await;
+                match res {
+                    Ok(info) => {
+                        let r = if pretty {
+                            serde_json::to_string_pretty(&info)?
+                        } else {
+                            serde_json::to_string(&info)?
+                        };
+                        Ok(Some(r))
+                    }
+                    Err(err) => Err(anyhow::anyhow!(err)),
+                }
+            }
+        }
+    }
+}
diff --git a/src/rbx/v2/mod.rs b/src/rbx/v2/mod.rs
index 54a4d9e..303c1cb 100644
--- a/src/rbx/v2/mod.rs
+++ b/src/rbx/v2/mod.rs
@@ -9,6 +9,7 @@ use luau_execution::{
     LuauExecutionTaskLogView, NewLuauExecutionSessionTask,
 };
 use place::{GetPlaceParams, PlaceInfo, UpdatePlaceInfo, UpdatePlaceParams};
+use rand::{distr::Alphanumeric, Rng};
 use universe::{
     GetUniverseParams, RestartUniverseServersParams, UniverseInfo, UpdateUniverseInfo,
     UpdateUniverseParams,
@@ -17,6 +18,10 @@ use user::{
     GenerateUserThumbnailOperationResponse, GenerateUserThumbnailParams, GetUserParams,
     GetUserResponse, UserThumbnailFormat, UserThumbnailShape, UserThumbnailSize,
 };
+use user_restriction::{
+    GetUserRestrictionParams, ListUserRestrictionLogsParams, ListUserRestrictionsParams,
+    UpdateUserRestrictionParams, UserRestriction, UserRestrictionList, UserRestrictionLogsList,
+};
 
 use self::{
     group::{
@@ -36,6 +41,7 @@ pub mod place;
 pub mod subscription;
 pub mod universe;
 pub mod user;
+pub mod user_restriction;
 
 use crate::rbx::error::Error;
 
@@ -94,6 +100,21 @@ pub struct UserClient {
     pub api_key: String,
 }
 
+pub struct UserRestrictionClient {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+}
+
+pub struct UserRestrictionParams {
+    pub user_id: RobloxUserId,
+    pub place_id: Option<PlaceId>,
+    pub active: Option<bool>,
+    pub duration: Option<u64>,
+    pub private_reason: Option<String>,
+    pub display_reason: Option<String>,
+    pub exclude_alt_accounts: Option<bool>,
+}
+
 impl GroupClient {
     pub async fn get_info(&self) -> Result<GetGroupResponse, Error> {
         group::get_group(&GetGroupParams {
@@ -336,6 +357,82 @@ impl UserClient {
     }
 }
 
+impl UserRestrictionClient {
+    pub async fn list_user_restrictions(
+        &self,
+        place_id: Option<PlaceId>,
+        max_page_size: Option<u32>,
+        filter: Option<String>,
+        page_token: Option<String>,
+    ) -> Result<UserRestrictionList, Error> {
+        user_restriction::list_user_restrictions(&ListUserRestrictionsParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id,
+            max_page_size,
+            page_token,
+            filter,
+        })
+        .await
+    }
+
+    pub async fn get_user_restriction(
+        &self,
+        user_id: RobloxUserId,
+        place_id: Option<PlaceId>,
+    ) -> Result<UserRestriction, Error> {
+        user_restriction::get_user_restriction(&GetUserRestrictionParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id,
+            user_id,
+        })
+        .await
+    }
+
+    pub async fn update_user_restriction(
+        &mut self,
+        params: &UserRestrictionParams,
+    ) -> Result<UserRestriction, Error> {
+        let idempotency_key: String = rand::rng()
+            .sample_iter(&Alphanumeric)
+            .take(32)
+            .map(char::from)
+            .collect();
+        user_restriction::update_user_restriction(&UpdateUserRestrictionParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id: params.place_id,
+            user_id: params.user_id,
+            idempotency_key: Some(idempotency_key),
+            active: params.active,
+            duration: params.duration.and_then(|d| Some(format!("{}s", d))),
+            private_reason: params.private_reason.clone(),
+            display_reason: params.display_reason.clone(),
+            exclude_alt_accounts: params.exclude_alt_accounts,
+        })
+        .await
+    }
+
+    pub async fn list_user_restriction_logs(
+        &self,
+        place_id: Option<PlaceId>,
+        max_page_size: Option<u32>,
+        page_token: Option<String>,
+        filter: Option<String>,
+    ) -> Result<UserRestrictionLogsList, Error> {
+        user_restriction::list_user_restriction_logs(&ListUserRestrictionLogsParams {
+            api_key: self.api_key.clone(),
+            universe_id: self.universe_id,
+            place_id,
+            max_page_size,
+            page_token,
+            filter,
+        })
+        .await
+    }
+}
+
 impl Client {
     pub fn new(api_key: &str) -> Client {
         Client {
@@ -403,4 +500,11 @@ impl Client {
             api_key: self.api_key.clone(),
         }
     }
+
+    pub fn user_restriction(&self, universe_id: UniverseId) -> UserRestrictionClient {
+        UserRestrictionClient {
+            api_key: self.api_key.clone(),
+            universe_id,
+        }
+    }
 }
diff --git a/src/rbx/v2/subscription.rs b/src/rbx/v2/subscription.rs
index c3dee4e..8bd9e94 100644
--- a/src/rbx/v2/subscription.rs
+++ b/src/rbx/v2/subscription.rs
@@ -107,7 +107,7 @@ pub async fn get_subscription(
 
     let mut query: QueryString = vec![];
     if let Some(view) = &params.view {
-        query.push(("view", view.to_string()))
+        query.push(("view", view.to_string()));
     }
 
     let res = client
diff --git a/src/rbx/v2/user_restriction.rs b/src/rbx/v2/user_restriction.rs
new file mode 100644
index 0000000..ba8b978
--- /dev/null
+++ b/src/rbx/v2/user_restriction.rs
@@ -0,0 +1,315 @@
+use chrono::{DateTime, SecondsFormat, Utc};
+use serde::{Deserialize, Serialize};
+
+use crate::rbx::{
+    error::Error,
+    types::{PlaceId, RobloxUserId, UniverseId},
+    util::QueryString,
+};
+
+use super::http_err::handle_http_err;
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct GameJoinRestriction {
+    pub active: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub start_time: Option<DateTime<Utc>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub duration: Option<String>,
+    pub private_reason: String,
+    pub display_reason: String,
+    pub exclude_alt_accounts: bool,
+    pub inherited: bool,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct UserRestriction {
+    pub path: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub update_time: Option<DateTime<Utc>>,
+    pub user: String,
+    pub game_join_restriction: GameJoinRestriction,
+}
+
+pub struct UpdateUserRestrictionParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: Option<PlaceId>,
+    pub user_id: RobloxUserId,
+    pub idempotency_key: Option<String>,
+    pub active: Option<bool>,
+    pub duration: Option<String>,
+    pub private_reason: Option<String>,
+    pub display_reason: Option<String>,
+    pub exclude_alt_accounts: Option<bool>,
+}
+
+#[derive(Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+struct UpdateUserRestriction {
+    game_join_restriction: GameJoinRestriction,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct UserRestrictionList {
+    pub user_restrictions: Vec<UserRestriction>,
+    pub next_page_token: Option<String>,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct GameServerScript {
+    // empty
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub enum UserRestrictionModerator {
+    RobloxUser(String),
+    GameServerScript(GameServerScript),
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct UserRestrictionLog {
+    pub user: String,
+    pub place: String,
+    pub create_time: String,
+    pub active: bool,
+    pub start_time: String,
+    pub duration: String,
+    pub private_reason: String,
+    pub display_reason: String,
+    pub exclude_alt_accounts: bool,
+    pub moderator: UserRestrictionModerator,
+}
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct UserRestrictionLogsList {
+    pub logs: Vec<UserRestrictionLog>,
+    pub next_page_token: Option<String>,
+}
+
+pub struct GetUserRestrictionParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: Option<PlaceId>,
+    pub user_id: RobloxUserId,
+}
+
+pub struct ListUserRestrictionsParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: Option<PlaceId>,
+    pub max_page_size: Option<u32>,
+    pub page_token: Option<String>,
+    pub filter: Option<String>,
+}
+
+pub struct ListUserRestrictionLogsParams {
+    pub api_key: String,
+    pub universe_id: UniverseId,
+    pub place_id: Option<PlaceId>,
+    pub max_page_size: Option<u32>,
+    pub page_token: Option<String>,
+    pub filter: Option<String>,
+}
+
+pub async fn get_user_restriction(
+    params: &GetUserRestrictionParams,
+) -> Result<UserRestriction, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(place_id) = params.place_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/user-restrictions/{user}",
+			universeId = &params.universe_id,
+			placeId = &place_id,
+			user = &params.user_id,
+		)
+    } else {
+        format!(
+            "https://apis.roblox.com/cloud/v2/universes/{universeId}/user-restrictions/{user}",
+            universeId = &params.universe_id,
+            user = &params.user_id,
+        )
+    };
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<UserRestriction>().await?;
+    Ok(body)
+}
+
+pub async fn list_user_restrictions(
+    params: &ListUserRestrictionsParams,
+) -> Result<UserRestrictionList, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(place_id) = params.place_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/user-restrictions",
+			universeId = &params.universe_id,
+			placeId = &place_id,
+		)
+    } else {
+        format!(
+            "https://apis.roblox.com/cloud/v2/universes/{universeId}/user-restrictions",
+            universeId = &params.universe_id,
+        )
+    };
+
+    let mut query: QueryString = vec![];
+    if let Some(max_page_size) = &params.max_page_size {
+        query.push(("maxPageSize", max_page_size.to_string()));
+    }
+    if let Some(page_token) = &params.page_token {
+        query.push(("pageToken", page_token.to_string()));
+    }
+    if let Some(filter) = &params.filter {
+        query.push(("filter", filter.to_string()));
+    }
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .query(&query)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<UserRestrictionList>().await?;
+    Ok(body)
+}
+
+pub async fn update_user_restriction(
+    params: &UpdateUserRestrictionParams,
+) -> Result<UserRestriction, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(place_id) = params.place_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/user-restrictions/{user}",
+			universeId = &params.universe_id,
+			placeId = &place_id,
+			user = &params.user_id,
+		)
+    } else {
+        format!(
+            "https://apis.roblox.com/cloud/v2/universes/{universeId}/user-restrictions/{user}",
+            universeId = &params.universe_id,
+            user = &params.user_id,
+        )
+    };
+
+    let timestamp = Utc::now();
+
+    let mut query: QueryString = vec![("updateMask", "gameJoinRestriction".to_string())];
+
+    if let Some(idempotency_key) = &params.idempotency_key {
+        query.push(("idempotencyKey.key", idempotency_key.to_string()));
+        query.push((
+            "idempotencyKey.firstSent",
+            timestamp.to_rfc3339_opts(SecondsFormat::Millis, true),
+        ));
+    }
+
+    let body = serde_json::to_string(&UpdateUserRestriction {
+        game_join_restriction: GameJoinRestriction {
+            active: params.active.unwrap_or(false),
+            start_time: Some(timestamp),
+            duration: params.duration.clone(),
+            private_reason: params.private_reason.clone().unwrap_or("".into()),
+            display_reason: params.display_reason.clone().unwrap_or("".into()),
+            exclude_alt_accounts: params.exclude_alt_accounts.unwrap_or(false),
+            inherited: false,
+        },
+    })?;
+
+    let res = client
+        .patch(url)
+        .header("x-api-key", &params.api_key)
+        .header("Content-Type", "application/json")
+        .query(&query)
+        .body(body)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<UserRestriction>().await?;
+    Ok(body)
+}
+
+pub async fn list_user_restriction_logs(
+    params: &ListUserRestrictionLogsParams,
+) -> Result<UserRestrictionLogsList, Error> {
+    let client = reqwest::Client::new();
+
+    let url = if let Some(place_id) = params.place_id {
+        format!(
+			"https://apis.roblox.com/cloud/v2/universes/{universeId}/places/{placeId}/user-restrictions:listLogs",
+			universeId = &params.universe_id,
+			placeId = &place_id,
+		)
+    } else {
+        format!(
+            "https://apis.roblox.com/cloud/v2/universes/{universeId}/user-restrictions:listLogs",
+            universeId = &params.universe_id,
+        )
+    };
+
+    let mut query: QueryString = vec![];
+    if let Some(max_page_size) = &params.max_page_size {
+        query.push(("maxPageSize", max_page_size.to_string()));
+    }
+    if let Some(page_token) = &params.page_token {
+        query.push(("pageToken", page_token.to_string()));
+    }
+    if let Some(filter) = &params.filter {
+        query.push(("filter", filter.to_string()));
+    }
+
+    let res = client
+        .get(url)
+        .header("x-api-key", &params.api_key)
+        .query(&query)
+        .send()
+        .await?;
+
+    let status = res.status();
+
+    if !status.is_success() {
+        let code = status.as_u16();
+        return handle_http_err(code);
+    }
+
+    let body = res.json::<UserRestrictionLogsList>().await?;
+    Ok(body)
+}

From 5d410b0923e19b1a30dd439ff731814b835a3b52 Mon Sep 17 00:00:00 2001
From: Stephen Leitnick <sleitnick@gmail.com>
Date: Sun, 23 Mar 2025 01:47:19 -0400
Subject: [PATCH 5/5] Docs

---
 docs/cli/cli-luau-execution.md   |  2 +-
 docs/cli/cli-user-restriction.md | 66 ++++++++++++++++++++++++++++++++
 mkdocs.yml                       |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 docs/cli/cli-user-restriction.md

diff --git a/docs/cli/cli-luau-execution.md b/docs/cli/cli-luau-execution.md
index 48c926d..94ebba4 100644
--- a/docs/cli/cli-luau-execution.md
+++ b/docs/cli/cli-luau-execution.md
@@ -37,7 +37,7 @@ Options:
 ## Get Task Logs
 Retrieves logs on a previously executed task.
 ```
-Usage: rbxcloud.exe luau get-logs [OPTIONS] --universe-id <UNIVERSE_ID> --place-id <PLACE_ID> --session-id <SESSION_ID> --task-id <TASK_ID> --api-key <API_KEY>
+Usage: rbxcloud luau get-logs [OPTIONS] --universe-id <UNIVERSE_ID> --place-id <PLACE_ID> --session-id <SESSION_ID> --task-id <TASK_ID> --api-key <API_KEY>
 
 Options:
   -u, --universe-id <UNIVERSE_ID>      Universe ID of the experience
diff --git a/docs/cli/cli-user-restriction.md b/docs/cli/cli-user-restriction.md
new file mode 100644
index 0000000..e38d323
--- /dev/null
+++ b/docs/cli/cli-user-restriction.md
@@ -0,0 +1,66 @@
+# User Restriction API
+
+## Get
+Get user restriction information.
+```
+Usage: rbxcloud user-restriction get [OPTIONS] --universe-id <UNIVERSE_ID> --user-id <USER_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>  Universe ID
+  -U, --user-id <USER_ID>          User ID
+  -P, --place-id <PLACE_ID>        Place ID
+  -p, --pretty                     Pretty-print the JSON response
+  -a, --api-key <API_KEY>          Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                       Print help
+```
+
+## Update
+Update user restriction information.
+```
+Usage: rbxcloud user-restriction update [OPTIONS] --universe-id <UNIVERSE_ID> --user-id <USER_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>        Universe ID
+  -U, --user-id <USER_ID>                User ID
+  -P, --place-id <PLACE_ID>              Place ID
+  -A, --active <ACTIVE>                  Restriction active [possible values: true, false]
+  -d, --duration <DURATION>              Restriction duration (seconds)
+  -r, --private-reason <PRIVATE_REASON>  Private reason
+  -D, --display-reason <DISPLAY_REASON>  Display reason
+  -e, --exclude-alts <EXCLUDE_ALTS>      Exclude alternate accounts [possible values: true, false]
+  -p, --pretty                           Pretty-print the JSON response
+  -a, --api-key <API_KEY>                Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                             Print help
+```
+
+## List
+List user restrictions.
+```
+Usage: rbxcloud user-restriction list [OPTIONS] --universe-id <UNIVERSE_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>  Universe ID
+  -P, --place-id <PLACE_ID>        Place ID
+  -s, --page-size <PAGE_SIZE>      Max page size
+  -t, --token <TOKEN>              Next page token
+  -f, --filter <FILTER>            Filter
+  -p, --pretty                     Pretty-print the JSON response
+  -a, --api-key <API_KEY>          Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                       Print help
+```
+
+## Logs
+List user restriction logs.
+```
+Usage: rbxcloud user-restriction logs [OPTIONS] --universe-id <UNIVERSE_ID> --api-key <API_KEY>
+
+Options:
+  -u, --universe-id <UNIVERSE_ID>  Universe ID
+  -P, --place-id <PLACE_ID>        Place ID
+  -s, --page-size <PAGE_SIZE>      Max page size
+  -t, --token <TOKEN>              Next page token
+  -f, --filter <FILTER>            Filter
+  -p, --pretty                     Pretty-print the JSON response
+  -a, --api-key <API_KEY>          Roblox Open Cloud API Key [env: RBXCLOUD_API_KEY=]
+  -h, --help                       Print help
+```
diff --git a/mkdocs.yml b/mkdocs.yml
index 1b2c5b0..6661c06 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -21,6 +21,7 @@ nav:
     - Subscription: cli/cli-subscription.md
     - Universe: cli/cli-universe.md
     - User: cli/cli-user.md
+    - User Restriction: cli/cli-user-restriction.md
   - Rust Lib:
     - Install: lib/lib-install.md