CAH setup done

Author: Astavie

.gitignore

@@ -2,3 +2,4 @@
 .envrc
 .direnv
 .env
+cards

Cargo.lock

@@ -6,6 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+serde = { version = "1.0.126", features = ["derive"] }
+serde_json = "1.0.96"
 tokio = { version = "1.27.0", features = ["full"] }
 dotenv_codegen = "0.15.0"
 async-trait = "0.1.68"

Cargo.toml

@@ -49,7 +49,36 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
             }
         } else {
             quote! {
-                #ident: Some(src.#ident)
+                #ident: ::core::option::Option::Some(src.#ident)
+            }
+        }
+    });
+
+    let get_field = fields.iter().map(|(vis, ident, ty)| {
+        if ident.to_string() == "id" {
+            quote!{}
+        } else {
+            let get_ident = Ident::new(&format!("get_{}", ident), Span::call_site());
+            let get_ident_mut = Ident::new(&format!("get_{}_mut", ident), Span::call_site());
+            quote! {
+                #vis async fn #get_ident(&mut self, client: &crate::request::Discord) -> crate::request::Result<&#ty> {
+                    crate::request::Result::Ok(match self.#ident {
+                        ::core::option::Option::Some(ref v) => v,
+                        ::core::option::Option::None => {
+                            crate::resource::Updatable::update(self, client).await?;
+                            self.#ident.as_ref().unwrap()
+                        }
+                    })
+                }
+                #vis async fn #get_ident_mut(&mut self, client: &crate::request::Discord) -> crate::request::Result<&mut #ty> {
+                    crate::request::Result::Ok(match self.#ident {
+                        ::core::option::Option::Some(ref mut v) => v,
+                        ::core::option::Option::None => {
+                            crate::resource::Updatable::update(self, client).await?;
+                            self.#ident.as_mut().unwrap()
+                        }
+                    })
+                }
             }
         }
     });
@@ -64,7 +93,7 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
             #(#field_var),*
         }
 
-        impl #impl_generics From<#ty #ty_generics> for #partial_ident #ty_generics
+        impl #impl_generics ::core::convert::From<#ty #ty_generics> for #partial_ident #ty_generics
             #where_clause
         {
             fn from(src: #ty #ty_generics) -> #partial_ident #ty_generics {
@@ -73,6 +102,12 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
                 }
             }
         }
+
+        impl #impl_generics #partial_ident #ty_generics
+            #where_clause
+        {
+            #(#get_field)*
+        }
     };
     tokens.into()
 }

discord/partial_id/src/lib.rs

@@ -1,3 +1,6 @@
+use std::fmt::{Display, Formatter};
+use std::write;
+
 use async_trait::async_trait;
 use partial_id::Partial;
 use serde::Deserialize;
@@ -17,10 +20,16 @@ pub struct Channel {
     pub id: Snowflake<Channel>,
 }
 
+impl Display for Snowflake<Channel> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> ::std::fmt::Result {
+        write!(f, "<#{}>", self.as_int())
+    }
+}
+
 impl Endpoint for Snowflake<Channel> {
     type Result = Channel;
     fn uri(&self) -> String {
-        format!("/channels/{}", self)
+        format!("/channels/{}", self.as_int())
     }
 }
 
@@ -33,7 +42,6 @@ pub trait ChannelResource: Resource<Endpoint = Snowflake<Channel>> {
         let msg = f(CreateMessage::default());
         Request::post(format!("{}/messages", self.endpoint().uri()), &msg)
     }
-
     async fn send_message(
         &self,
         client: &Discord,

discord/src/channel.rs

@@ -159,10 +159,11 @@ impl Endpoint for Commands {
         if let Some(guild) = self.guild_id {
             format!(
                 "/applications/{}/guilds/{}/commands",
-                self.application_id, guild
+                self.application_id.as_int(),
+                guild.as_int()
             )
         } else {
-            format!("/applications/{}/commands", self.application_id)
+            format!("/applications/{}/commands", self.application_id.as_int())
         }
     }
 }
@@ -171,7 +172,7 @@ impl Endpoint for CommandIdentifier {
     type Result = Command;
     type Delete = ();
     fn uri(&self) -> String {
-        format!("{}/{}", self.command_pool.uri(), self.command_id)
+        format!("{}/{}", self.command_pool.uri(), self.command_id.as_int())
     }
 }
 

discord/src/command.rs

@@ -9,12 +9,13 @@ use super::resource::{Resource, Snowflake};
 #[derive(Debug, Deserialize)]
 pub struct Guild {
     pub id: Snowflake<Guild>,
+    pub name: String,
 }
 
 impl Endpoint for Snowflake<Guild> {
     type Result = Guild;
     fn uri(&self) -> String {
-        format!("/guilds/{}", self)
+        format!("/guilds/{}", self.as_int())
     }
 }
 

discord/src/guild.rs

@@ -127,7 +127,7 @@ impl Client for Webhook {
                 .header("Content-Type", "application/json")
                 .body(body.clone())
                 .unwrap();
-            println!("{}", request.body());
+            // println!("{}", request.body());
             isahc::send_async(request)
         } else {
             let request = http.body(()).unwrap();
@@ -148,7 +148,7 @@ impl Client for Webhook {
         }
 
         let string = response.text().await.unwrap();
-        println!("{}", string);
+        // println!("{}", string);
 
         if response.status().is_client_error() {
             return Err(RequestError::ClientError(response.status()));
@@ -175,7 +175,7 @@ impl<T: DropToken> InteractionToken<T> {
         let id = self.id;
         let token = mem::replace(&mut self.token, String::new());
         mem::forget(self); // do not run the destructor
-        format!("/interactions/{}/{}/callback", id, token)
+        format!("/interactions/{}/{}/callback", id.as_int(), token)
     }
 }
 
@@ -309,7 +309,7 @@ impl InteractionResponseIdentifier {
         let application_id = self.application_id;
         let token = self.token.clone();
         Request::post(
-            format!("/webhooks/{}/{}", self.application_id, self.token),
+            format!("/webhooks/{}/{}", self.application_id.as_int(), self.token),
             &reply,
         )
         .map(move |m: Message| {
@@ -342,12 +342,14 @@ impl Endpoint for InteractionResponseIdentifier {
         let id = self
             .message
             .as_ref()
-            .map(ToString::to_string)
+            .map(|id| id.as_int().to_string())
             .unwrap_or_else(|| "@original".to_owned());
 
         format!(
             "/webhooks/{}/{}/messages/{}",
-            self.application_id, self.token, id
+            self.application_id.as_int(),
+            self.token,
+            id
         )
     }
 }

discord/src/interaction.rs

@@ -212,7 +212,8 @@ pub trait MessageResource: Resource<Endpoint = MessageIdentifier> {
         Request::post(
             format!(
                 "/channels/{}/messages/{}/threads",
-                id.channel_id, id.message_id
+                id.channel_id.as_int(),
+                id.message_id.as_int()
             ),
             &CreateThread { name },
         )
@@ -230,7 +231,11 @@ impl Endpoint for MessageIdentifier {
     type Delete = ();
 
     fn uri(&self) -> String {
-        format!("/channels/{}/messages/{}", self.channel_id, self.message_id)
+        format!(
+            "/channels/{}/messages/{}",
+            self.channel_id.as_int(),
+            self.message_id.as_int()
+        )
     }
 }
 

discord/src/message.rs

@@ -280,7 +280,7 @@ impl Client for Discord {
                 .header("Content-Type", "application/json")
                 .body(body.clone())
                 .unwrap();
-            println!("{}", request.body());
+            // println!("{}", request.body());
             isahc::send_async(request)
         } else {
             let request = http.body(()).unwrap();
@@ -338,7 +338,7 @@ impl Client for Discord {
         }
 
         let string = response.text().await.unwrap();
-        println!("{}", string);
+        // println!("{}", string);
 
         if response.status().is_client_error() {
             return Err(RequestError::ClientError(response.status()));