From b60456105d2c60403a4a08bfba1bbfab94f03f03 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 30 Oct 2025 20:49:55 -0400 Subject: [PATCH] refactor --- .../src/recipes/upload_image_and_generate_video.rs | 4 ++-- .../grok_client/src/requests/media_list/mod.rs | 0 .../_metadata/create_media_curl_request.txt | 0 .../_metadata/create_media_notes.txt | 0 .../_metadata/create_media_post_response.json | 0 ...ate_video_from_generated_image_curl_request.txt | 0 ...nerate_video_from_generated_image_response.json | 0 .../oct_30_rust_response_from_file_upload.json | 0 .../create_media_post/grok_create_media_post.rs | 4 ++-- .../{ => media_posts}/create_media_post/mod.rs | 0 .../{ => media_posts}/create_media_post/request.rs | 0 .../create_media_post/response.rs | 0 .../_metadata/favorite_media_curl_request.txt | 0 .../like_media_post}/grok_like_media.rs | 14 +++++++------- .../like_media_post}/mod.rs | 0 .../like_media_post}/request.rs | 0 .../firefox_media_post_list_curl_request.txt | 0 .../_metadata/oct_30_media_post_list_response.json | 0 .../_metadata/older}/media_list_request_curl.txt | 0 .../media_list_request_page2_cursor_curl.txt | 0 .../_metadata/older}/media_list_response.json | 0 .../older}/media_list_response_empty.json | 0 .../list_media_posts}/grok_list_media_posts.rs | 4 ++-- .../list_media_posts}/mod.rs | 0 .../list_media_posts}/request.rs | 0 .../list_media_posts}/response.rs | 0 .../grok_client/src/requests/media_posts/mod.rs | 3 +++ crates/api_clients/grok_client/src/requests/mod.rs | 4 +--- 28 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 crates/api_clients/grok_client/src/requests/media_list/mod.rs rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/create_media_curl_request.txt (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/create_media_notes.txt (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/create_media_post_response.json (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/_metadata/oct_30_rust_response_from_file_upload.json (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/grok_create_media_post.rs (96%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/mod.rs (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/request.rs (100%) rename crates/api_clients/grok_client/src/requests/{ => media_posts}/create_media_post/response.rs (100%) rename crates/api_clients/grok_client/src/requests/{like_media => media_posts/like_media_post}/_metadata/favorite_media_curl_request.txt (100%) rename crates/api_clients/grok_client/src/requests/{like_media => media_posts/like_media_post}/grok_like_media.rs (98%) rename crates/api_clients/grok_client/src/requests/{like_media => media_posts/like_media_post}/mod.rs (100%) rename crates/api_clients/grok_client/src/requests/{like_media => media_posts/like_media_post}/request.rs (100%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/_metadata/firefox_media_post_list_curl_request.txt (100%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/_metadata/oct_30_media_post_list_response.json (100%) rename crates/api_clients/grok_client/src/requests/{media_list/metadata => media_posts/list_media_posts/_metadata/older}/media_list_request_curl.txt (100%) rename crates/api_clients/grok_client/src/requests/{media_list/metadata => media_posts/list_media_posts/_metadata/older}/media_list_request_page2_cursor_curl.txt (100%) rename crates/api_clients/grok_client/src/requests/{media_list/metadata => media_posts/list_media_posts/_metadata/older}/media_list_response.json (100%) rename crates/api_clients/grok_client/src/requests/{media_list/metadata => media_posts/list_media_posts/_metadata/older}/media_list_response_empty.json (100%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/grok_list_media_posts.rs (97%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/mod.rs (100%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/request.rs (100%) rename crates/api_clients/grok_client/src/requests/{media_post_list => media_posts/list_media_posts}/response.rs (100%) create mode 100644 crates/api_clients/grok_client/src/requests/media_posts/mod.rs diff --git a/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs b/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs index 66b3d346e0..d3b8582aaf 100644 --- a/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs +++ b/crates/api_clients/grok_client/src/recipes/upload_image_and_generate_video.rs @@ -4,8 +4,8 @@ use crate::datatypes::api::post_id::PostId; use crate::datatypes::file_upload_spec::FileUploadSpec; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::create_media_post::grok_create_media_post::{GrokCreateMediaPost, MediaPostType}; -use crate::requests::like_media::grok_like_media::GrokLikeMediaPost; +use crate::requests::media_posts::create_media_post::grok_create_media_post::{GrokCreateMediaPost, MediaPostType}; +use crate::requests::media_posts::like_media_post::grok_like_media::GrokLikeMediaPost; use crate::requests::upload_file::grok_upload_file::GrokUploadFile; use crate::requests::video_chat::grok_video_gen_chat_conversation::{GrokVideoGenChatConversationBuilder, VideoMediaPostType}; use crate::utils::user_and_file_id_to_image_url::user_and_file_id_to_image_url; diff --git a/crates/api_clients/grok_client/src/requests/media_list/mod.rs b/crates/api_clients/grok_client/src/requests/media_list/mod.rs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_curl_request.txt b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_curl_request.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_curl_request.txt rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_curl_request.txt diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_notes.txt b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_notes.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_notes.txt rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_notes.txt diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_response.json b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_response.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_response.json rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_response.json diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_curl_request.txt diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/create_media_post_to_generate_video_from_generated_image_response.json diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/_metadata/oct_30_rust_response_from_file_upload.json b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/oct_30_rust_response_from_file_upload.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/_metadata/oct_30_rust_response_from_file_upload.json rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/_metadata/oct_30_rust_response_from_file_upload.json diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/grok_create_media_post.rs similarity index 96% rename from crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/grok_create_media_post.rs index 8e725820ca..a0ce3d97de 100644 --- a/crates/api_clients/grok_client/src/requests/create_media_post/grok_create_media_post.rs +++ b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/grok_create_media_post.rs @@ -5,8 +5,8 @@ use crate::datatypes::api::user_id::UserId; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::create_media_post::request::CreateMediaPostWireRequest; -use crate::requests::create_media_post::response::CreateMediaPostRawResponse; +use crate::requests::media_posts::create_media_post::request::CreateMediaPostWireRequest; +use crate::requests::media_posts::create_media_post::response::CreateMediaPostRawResponse; use crate::requests::upload_file::grok_upload_file::{GrokUploadFile, GrokUploadFileResponse}; use crate::utils::user_and_file_id_to_image_url::user_and_file_id_to_image_url; use log::{error, info}; diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/mod.rs b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/mod.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/mod.rs rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/mod.rs diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/request.rs b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/request.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/request.rs rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/request.rs diff --git a/crates/api_clients/grok_client/src/requests/create_media_post/response.rs b/crates/api_clients/grok_client/src/requests/media_posts/create_media_post/response.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/create_media_post/response.rs rename to crates/api_clients/grok_client/src/requests/media_posts/create_media_post/response.rs diff --git a/crates/api_clients/grok_client/src/requests/like_media/_metadata/favorite_media_curl_request.txt b/crates/api_clients/grok_client/src/requests/media_posts/like_media_post/_metadata/favorite_media_curl_request.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/like_media/_metadata/favorite_media_curl_request.txt rename to crates/api_clients/grok_client/src/requests/media_posts/like_media_post/_metadata/favorite_media_curl_request.txt diff --git a/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs b/crates/api_clients/grok_client/src/requests/media_posts/like_media_post/grok_like_media.rs similarity index 98% rename from crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs rename to crates/api_clients/grok_client/src/requests/media_posts/like_media_post/grok_like_media.rs index 86cb725123..20aeabf9af 100644 --- a/crates/api_clients/grok_client/src/requests/like_media/grok_like_media.rs +++ b/crates/api_clients/grok_client/src/requests/media_posts/like_media_post/grok_like_media.rs @@ -1,9 +1,15 @@ use crate::client::browser_user_agents::FIREFOX_143_MAC_USER_AGENT; +use crate::datatypes::api::baggage::Baggage; +use crate::datatypes::api::file_id::FileId; +use crate::datatypes::api::sentry_trace::SentryTrace; +use crate::datatypes::api::svg_path_data::SvgPathData; +use crate::datatypes::api::verification_token::VerificationToken; +use crate::datatypes::api::xsid_numbers::XsidNumbers; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; use crate::requests::index_page::signature::generate_xsid::{generate_xsid, GenerateXsidArgs}; -use crate::requests::like_media::request::LikeMediaWireRequest; +use crate::requests::media_posts::like_media_post::request::LikeMediaWireRequest; use crate::requests::upload_file::grok_upload_file::{GrokUploadFile, GrokUploadFileResponse}; use crate::utils::user_and_file_id_to_image_url::user_and_file_id_to_image_url; use log::{error, info, warn}; @@ -12,12 +18,6 @@ use uuid::Uuid; use wreq::header::{ACCEPT, ACCEPT_ENCODING, ACCEPT_LANGUAGE, CACHE_CONTROL, CONNECTION, CONTENT_TYPE, COOKIE, ORIGIN, PRAGMA, REFERER, TE, USER_AGENT}; use wreq::Client; use wreq_util::Emulation; -use crate::datatypes::api::baggage::Baggage; -use crate::datatypes::api::file_id::FileId; -use crate::datatypes::api::sentry_trace::SentryTrace; -use crate::datatypes::api::svg_path_data::SvgPathData; -use crate::datatypes::api::verification_token::VerificationToken; -use crate::datatypes::api::xsid_numbers::XsidNumbers; const LIKE_MEDIA_POST_URL: &str = "https://grok.com/rest/media/post/like"; diff --git a/crates/api_clients/grok_client/src/requests/like_media/mod.rs b/crates/api_clients/grok_client/src/requests/media_posts/like_media_post/mod.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/like_media/mod.rs rename to crates/api_clients/grok_client/src/requests/media_posts/like_media_post/mod.rs diff --git a/crates/api_clients/grok_client/src/requests/like_media/request.rs b/crates/api_clients/grok_client/src/requests/media_posts/like_media_post/request.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/like_media/request.rs rename to crates/api_clients/grok_client/src/requests/media_posts/like_media_post/request.rs diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/_metadata/firefox_media_post_list_curl_request.txt b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/firefox_media_post_list_curl_request.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_post_list/_metadata/firefox_media_post_list_curl_request.txt rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/firefox_media_post_list_curl_request.txt diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/_metadata/oct_30_media_post_list_response.json b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/oct_30_media_post_list_response.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_post_list/_metadata/oct_30_media_post_list_response.json rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/oct_30_media_post_list_response.json diff --git a/crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_request_curl.txt b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_request_curl.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_request_curl.txt rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_request_curl.txt diff --git a/crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_request_page2_cursor_curl.txt b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_request_page2_cursor_curl.txt similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_request_page2_cursor_curl.txt rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_request_page2_cursor_curl.txt diff --git a/crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_response.json b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_response.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_response.json rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_response.json diff --git a/crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_response_empty.json b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_response_empty.json similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_list/metadata/media_list_response_empty.json rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/_metadata/older/media_list_response_empty.json diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/grok_list_media_posts.rs b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/grok_list_media_posts.rs similarity index 97% rename from crates/api_clients/grok_client/src/requests/media_post_list/grok_list_media_posts.rs rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/grok_list_media_posts.rs index 62ff8f631c..7c78ecbc28 100644 --- a/crates/api_clients/grok_client/src/requests/media_post_list/grok_list_media_posts.rs +++ b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/grok_list_media_posts.rs @@ -5,8 +5,8 @@ use crate::datatypes::api::user_id::UserId; use crate::error::grok_client_error::GrokClientError; use crate::error::grok_error::GrokError; use crate::error::grok_generic_api_error::GrokGenericApiError; -use crate::requests::media_post_list::request::{FilterData, MediaPostListRawRequest}; -use crate::requests::media_post_list::response::{PostItem, PostListRawResponse}; +use crate::requests::media_posts::list_media_posts::request::{FilterData, MediaPostListRawRequest}; +use crate::requests::media_posts::list_media_posts::response::{PostItem, PostListRawResponse}; use crate::requests::upload_file::grok_upload_file::{GrokUploadFile, GrokUploadFileResponse}; use crate::utils::user_and_file_id_to_image_url::user_and_file_id_to_image_url; use log::{error, info}; diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/mod.rs b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/mod.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_post_list/mod.rs rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/mod.rs diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/request.rs b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/request.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_post_list/request.rs rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/request.rs diff --git a/crates/api_clients/grok_client/src/requests/media_post_list/response.rs b/crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/response.rs similarity index 100% rename from crates/api_clients/grok_client/src/requests/media_post_list/response.rs rename to crates/api_clients/grok_client/src/requests/media_posts/list_media_posts/response.rs diff --git a/crates/api_clients/grok_client/src/requests/media_posts/mod.rs b/crates/api_clients/grok_client/src/requests/media_posts/mod.rs new file mode 100644 index 0000000000..4e09b02490 --- /dev/null +++ b/crates/api_clients/grok_client/src/requests/media_posts/mod.rs @@ -0,0 +1,3 @@ +pub mod create_media_post; +pub mod like_media_post; +pub mod list_media_posts; diff --git a/crates/api_clients/grok_client/src/requests/mod.rs b/crates/api_clients/grok_client/src/requests/mod.rs index 18714cde96..6d779c8694 100644 --- a/crates/api_clients/grok_client/src/requests/mod.rs +++ b/crates/api_clients/grok_client/src/requests/mod.rs @@ -1,8 +1,6 @@ -pub mod create_media_post; pub mod download_file; pub mod image_websocket; pub mod index_page; -pub mod like_media; +pub mod media_posts; pub mod upload_file; pub mod video_chat; -mod media_post_list;