rename Discord to Bot (more accurate)

Author: Astavie

discord/partial_id/src/lib.rs

@@ -103,7 +103,7 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
         impl #impl_generics #ty #ty_generics
             #where_clause
         {
-            #vis async fn update(&mut self, client: &crate::request::Discord) -> crate::request::Result<()> {
+            #vis async fn update(&mut self, client: &crate::request::Bot) -> crate::request::Result<()> {
                 *self = crate::request::Request::request(crate::request::HttpRequest::get(crate::resource::Endpoint::uri(&self.id)), client).await?;
                 crate::request::Result::Ok(())
             }
@@ -112,12 +112,12 @@ pub fn derive_partial(input: proc_macro::TokenStream) -> proc_macro::TokenStream
         impl #impl_generics #partial_ty #ty_generics
             #where_clause
         {
-            #vis async fn update(&mut self, client: &crate::request::Discord) -> crate::request::Result<()> {
+            #vis async fn update(&mut self, client: &crate::request::Bot) -> crate::request::Result<()> {
                 let full: #ty = crate::request::Request::request(crate::request::HttpRequest::get(crate::resource::Endpoint::uri(&self.id)), client).await?;
                 *self = full.into();
                 crate::request::Result::Ok(())
             }
-            #vis async fn get_field<T>(&mut self, client: &crate::request::Discord, f: fn(&Self) -> &::core::option::Option<T>) -> crate::request::Result<&T> {
+            #vis async fn get_field<T>(&mut self, client: &crate::request::Bot, f: fn(&Self) -> &::core::option::Option<T>) -> crate::request::Result<&T> {
                 crate::request::Result::Ok(match f(self) {
                     ::core::option::Option::Some(_) => {
                         f(self).as_ref().unwrap()

discord/resource/src/lib.rs

@@ -39,7 +39,7 @@ fn resource_impl(attr: TokenStream, item: TokenStream) -> syn::Result<TokenStrea
     let return_type = params.result;
     let client_type = match params.client {
         Some(t) => t,
-        None => parse_quote!(crate::request::Discord),
+        None => parse_quote!(crate::request::Bot),
     };
 
     let result_type = parse_quote!(

discord/src/gateway.rs

@@ -21,7 +21,7 @@ use tokio_tungstenite::{connect_async, tungstenite::Message, MaybeTlsStream, Web
 use crate::request::Request;
 
 use super::request::{self, HttpRequest, RequestError};
-use super::{interaction::AnyInteraction, request::Discord};
+use super::{interaction::AnyInteraction, request::Bot};
 
 struct GatewayState {
     interval: Interval,
@@ -216,7 +216,7 @@ impl Stream for Gateway {
 const NAME: &str = env!("CARGO_PKG_NAME");
 
 impl Gateway {
-    pub async fn connect(client: &Discord) -> request::Result<Self> {
+    pub async fn connect(client: &Bot) -> request::Result<Self> {
         let GatewayResponse { url } = HttpRequest::get("/gateway").request(client).await?;
         let full_url = url + "/?v=10&encoding=json";
 

discord/src/request.rs

@@ -9,7 +9,7 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use tokio::{sync::Mutex, time::Instant};
 
 #[async_trait]
-pub trait Request<C = Discord>
+pub trait Request<C = Bot>
 where
     Self: Sized + Send,
     C: ?Sized + Sync,
@@ -20,7 +20,7 @@ where
     async fn request(self, client: &C) -> Result<Self::Output>;
 }
 
-pub struct HttpRequest<T, C = Discord>
+pub struct HttpRequest<T, C = Bot>
 where
     T: DeserializeOwned,
     C: Client + ?Sized,
@@ -138,7 +138,7 @@ struct DiscordRateLimits {
 }
 
 #[derive(Clone)]
-pub struct Discord {
+pub struct Bot {
     token: String,
     limits: Arc<Mutex<DiscordRateLimits>>,
 }
@@ -191,7 +191,7 @@ pub trait Client: Sync {
     }
 }
 
-impl Discord {
+impl Bot {
     pub fn new<S: Into<String>>(token: S) -> Self {
         Self {
             token: token.into(),
@@ -227,14 +227,14 @@ impl Discord {
 }
 
 #[async_trait]
-impl Client for Discord {
+impl Client for Bot {
     async fn request_weak<T: DeserializeOwned>(
         &self,
         method: Method,
         uri: &str,
         body: Option<&str>,
     ) -> Result<T> {
-        let bucket = Discord::get_bucket(uri);
+        let bucket = Bot::get_bucket(uri);
 
         // rate limits
         let now = {
@@ -244,7 +244,7 @@ impl Client for Discord {
             let mut time = me.retry_after.duration_since(now);
 
             // global rate limit
-            let global = Discord::bound_to_global_limit(uri);
+            let global = Bot::bound_to_global_limit(uri);
             if global && me.request_rate >= GLOBAL_RATE_LIMIT {
                 time = time.max(Duration::from_secs_f32(1.0 / GLOBAL_RATE_LIMIT));
             }

src/game/mod.rs

@@ -17,7 +17,7 @@ use discord::{
     message::{
         ActionRow, Author, CreateMessage, Embed, Field, Message, MessageResource, PatchMessage,
     },
-    request::{Discord, Result},
+    request::{Bot, Result},
     resource::Snowflake,
     user::User,
 };
@@ -271,7 +271,7 @@ pub trait Game: Logic<Return = ()> + Sized + 'static {
     async fn start(
         token: InteractionToken<ApplicationCommand>,
         user: User,
-        thread: Option<&Discord>,
+        thread: Option<&Bot>,
     ) -> Result<GameTask> {
         let me = Self::new(user);
 

src/main.rs

@@ -10,7 +10,7 @@ use discord::command::{Param, StringOption};
 use discord::interaction::{
     AnyInteraction, CreateReply, InteractionResource, MessageComponent, Webhook,
 };
-use discord::request::Discord;
+use discord::request::Bot;
 use discord::user::{self, User};
 use dotenv::dotenv;
 use futures_util::StreamExt;
@@ -29,7 +29,7 @@ use crate::cah::CAH;
 mod cah;
 mod game;
 
-async fn purge(commands: Commands, client: &Discord) -> Result<()> {
+async fn purge(commands: Commands, client: &Bot) -> Result<()> {
     if let Ok(commands) = commands.all(client).await {
         for command in commands {
             command.delete(client).await?;
@@ -38,11 +38,7 @@ async fn purge(commands: Commands, client: &Discord) -> Result<()> {
     Ok(())
 }
 
-async fn on_command(
-    i: AnyInteraction,
-    d: &mut InteractionDispatcher,
-    client: &Discord,
-) -> Result<()> {
+async fn on_command(i: AnyInteraction, d: &mut InteractionDispatcher, client: &Bot) -> Result<()> {
     match i {
         AnyInteraction::Command(command) => match command.data.name.as_str() {
             "ping" => {
@@ -108,7 +104,7 @@ async fn run() -> Result<()> {
     let token = env::var("CARDMASTER").expect("Bot token CARDMASTER must be set");
 
     // connect
-    let client = Discord::new(token);
+    let client = Bot::new(token);
     let application = application::Me.get(&client).await?;
 
     // list guilds