Merge Dev changes into main

Cargo.toml

@@ -50,7 +50,7 @@ thiserror = "1.0.47"
 jsonwebtoken = "8.3.0"
 log = "0.4.20"
 async-trait = "0.1.73"
-chorus-macros = { path = "chorus-macros", version = "0.1.0" }
+chorus-macros = "0.2.0"
 
 [dev-dependencies]
 tokio = { version = "1.32.0", features = ["full"] }

chorus-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chorus-macros"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "AGPL-3.0"
 description = "Macros for the chorus crate."

chorus-macros/src/lib.rs

@@ -37,6 +37,25 @@ pub fn jsonfield_macro_derive(input: TokenStream) -> TokenStream {
     .into()
 }
 
+#[proc_macro_derive(SourceUrlField)]
+pub fn source_url_macro_derive(input: TokenStream) -> TokenStream {
+    let ast: syn::DeriveInput = syn::parse(input).unwrap();
+
+    let name = &ast.ident;
+    // No need for macro hygiene, we're only using this in chorus
+    quote! {
+        impl SourceUrlField for #name {
+            fn get_source_url(&self) -> String {
+                self.source_url.clone()
+            }
+            fn set_source_url(&mut self, url: String) {
+                self.source_url = url;
+            }
+        }
+    }
+    .into()
+}
+
 #[proc_macro_attribute]
 pub fn observe_option(_args: TokenStream, input: TokenStream) -> TokenStream {
     input

src/gateway.rs

@@ -5,7 +5,7 @@ use crate::gateway::events::Events;
 use crate::types::{
     self, AutoModerationRule, AutoModerationRuleUpdate, Channel, ChannelCreate, ChannelDelete,
     ChannelUpdate, Composite, Guild, GuildRoleCreate, GuildRoleUpdate, JsonField, RoleObject,
-    Snowflake, ThreadUpdate, UpdateMessage, WebSocketEvent,
+    Snowflake, SourceUrlField, ThreadUpdate, UpdateMessage, WebSocketEvent,
 };
 use async_trait::async_trait;
 use std::any::Any;
@@ -343,6 +343,7 @@ pub struct Gateway {
     websocket_receive: SplitStream<WebSocketStream<MaybeTlsStream<TcpStream>>>,
     kill_send: tokio::sync::broadcast::Sender<()>,
     store: Arc<Mutex<HashMap<Snowflake, Arc<RwLock<ObservableObject>>>>>,
+    url: String,
 }
 
 impl Gateway {
@@ -406,6 +407,7 @@ impl Gateway {
             websocket_receive,
             kill_send: kill_send.clone(),
             store: store.clone(),
+            url: websocket_url.clone(),
         };
 
         // Now we can continuously check for messages in a different task, since we aren't going to receive another hello
@@ -534,6 +536,7 @@ impl Gateway {
                                                     let downcasted = unsafe { Arc::from_raw(ptr as *const RwLock<$update_type>).clone() };
                                                     drop(inner_object);
                                                     message.set_json(json.to_string());
+                                                    message.set_source_url(self.url.clone());
                                                     message.update(downcasted.clone());
                                                 } else {
                                                     warn!("Received {} for {}, but it has been observed to be a different type!", $name, id)
@@ -914,7 +917,7 @@ impl<T: WebSocketEvent> GatewayEvent<T> {
     }
 }
 
-mod events {
+pub mod events {
     use super::*;
 
     #[derive(Default, Debug)]

src/instance.rs

@@ -15,7 +15,7 @@ use crate::types::types::subconfigs::limits::rates::RateLimits;
 use crate::types::{GeneralConfiguration, Limit, LimitType, User, UserSettings};
 use crate::UrlBundle;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 /// The [`Instance`]; what you will be using to perform all sorts of actions on the Spacebar server.
 /// If `limits_information` is `None`, then the instance will not be rate limited.
 pub struct Instance {
@@ -25,7 +25,7 @@ pub struct Instance {
     pub client: Client,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct LimitsInformation {
     pub ratelimits: HashMap<LimitType, Limit>,
     pub configuration: RateLimits,