Merge remote-tracking branch 'origin/main' into livekit

crates/delta/src/util/ratelimiter.rs

@@ -235,7 +235,7 @@ impl<'r> FromRequest<'r> for Ratelimiter {
 
         match ratelimiter {
             Ok(ratelimiter) => Outcome::Success(*ratelimiter),
-            Err(ratelimiter) => Outcome::Failure((Status::TooManyRequests, *ratelimiter)),
+            Err(ratelimiter) => Outcome::Error((Status::TooManyRequests, *ratelimiter)),
         }
     }
 }
@@ -264,7 +264,7 @@ impl Fairing for RatelimitFairing {
 
     async fn on_request(&self, request: &mut Request<'_>, _: &mut Data<'_>) {
         use rocket::outcome::Outcome;
-        if let Outcome::Failure(_) = request.guard::<Ratelimiter>().await {
+        if let Outcome::Error(_) = request.guard::<Ratelimiter>().await {
             info!(
                 "User rate-limited on route {}! (IP = {:?})",
                 request.uri(),
@@ -278,7 +278,7 @@ impl Fairing for RatelimitFairing {
 
     async fn on_response<'r>(&self, request: &'r Request<'_>, response: &mut Response<'r>) {
         let guard = request.guard::<Ratelimiter>().await;
-        let (Outcome::Success(ratelimiter) | Outcome::Failure((_, ratelimiter))) = guard else {
+        let (Outcome::Success(ratelimiter) | Outcome::Error((_, ratelimiter))) = guard else {
             unreachable!()
         };
         let Ratelimiter {
@@ -293,7 +293,7 @@ impl Fairing for RatelimitFairing {
         response.set_raw_header("X-RateLimit-Remaining", remaining.to_string());
         response.set_raw_header("X-RateLimit-Reset-After", reset.to_string());
 
-        if guard.is_failure() {
+        if guard.is_error() {
             response.set_status(Status::TooManyRequests);
         }
     }
@@ -313,7 +313,7 @@ impl<'r> FromRequest<'r> for RatelimitInformation {
     async fn from_request(request: &'r rocket::Request<'_>) -> Outcome<Self, Self::Error> {
         let info = match request.guard::<Ratelimiter>().await {
             Outcome::Success(ratelimiter) => RatelimitInformation::Success(ratelimiter),
-            Outcome::Failure((_, ratelimiter)) => RatelimitInformation::Failure {
+            Outcome::Error((_, ratelimiter)) => RatelimitInformation::Failure {
                 retry_after: ratelimiter.reset,
             },
             _ => unreachable!(),

crates/delta/src/util/test.rs

@@ -5,7 +5,7 @@ use authifier::{
 use futures::StreamExt;
 use rand::Rng;
 use redis_kiss::redis::aio::PubSub;
-use revolt_database::{events::client::EventV1, Database, User};
+use revolt_database::{events::client::EventV1, Database, User, AMQP};
 use revolt_models::v0;
 use rocket::local::asynchronous::Client;
 
@@ -13,13 +13,14 @@ pub struct TestHarness {
     pub client: Client,
     authifier: Authifier,
     pub db: Database,
+    pub amqp: AMQP,
     sub: PubSub,
     event_buffer: Vec<(String, EventV1)>,
 }
 
 impl TestHarness {
     pub async fn new() -> TestHarness {
-        dotenv::dotenv().ok();
+        let config = revolt_config::config().await;
 
         let client = Client::tracked(crate::web().await)
             .await
@@ -43,10 +44,25 @@ impl TestHarness {
             .expect("`Authifier`")
             .clone();
 
+        let connection = amqprs::connection::Connection::open(
+            &amqprs::connection::OpenConnectionArguments::new(
+                &config.rabbit.host,
+                config.rabbit.port,
+                &config.rabbit.username,
+                &config.rabbit.password,
+            ),
+        )
+        .await
+        .unwrap();
+        let channel = connection.open_channel(None).await.unwrap();
+
+        let amqp = AMQP::new(connection, channel);
+
         TestHarness {
             client,
             authifier,
             db,
+            amqp,
             sub,
             event_buffer: vec![],
         }