Cache & Optimize Woodpecker CI (#3450)

[lemmy.git] / crates / apub / src / objects / mod.rs

diff --git a/crates/apub/src/objects/mod.rs b/crates/apub/src/objects/mod.rs
index 58e1f23f55e5c0298adccf225e36dbbdf6b4f5cf..b3653172ac5242a7cb255408a33baf0abce194e1 100644 (file)
--- a/crates/apub/src/objects/mod.rs
+++ b/crates/apub/src/objects/mod.rs
@@ -1,5 +1,5 @@
 use crate::protocol::Source;
-use activitypub_federation::deser::values::MediaTypeMarkdownOrHtml;
+use activitypub_federation::protocol::values::MediaTypeMarkdownOrHtml;
 use anyhow::anyhow;
 use html2md::parse_html;
 use lemmy_utils::{error::LemmyError, settings::structs::Settings};
@@ -54,16 +54,14 @@ pub(crate) fn verify_is_remote_object(id: &Url, settings: &Settings) -> Result<(
 
 #[cfg(test)]
 pub(crate) mod tests {
-  use actix::Actor;
+  #![allow(clippy::unwrap_used)]
+  #![allow(clippy::indexing_slicing)]
+
+  use activitypub_federation::config::{Data, FederationConfig};
   use anyhow::anyhow;
-  use lemmy_api_common::{
-    context::LemmyContext,
-    request::build_user_agent,
-    websocket::chat_server::ChatServer,
-  };
+  use lemmy_api_common::{context::LemmyContext, request::build_user_agent};
   use lemmy_db_schema::{source::secret::Secret, utils::build_db_pool_for_tests};
   use lemmy_utils::{
-    error::LemmyError,
     rate_limit::{RateLimitCell, RateLimitConfig},
     settings::SETTINGS,
   };
@@ -87,10 +85,7 @@ pub(crate) mod tests {
   }
 
   // TODO: would be nice if we didnt have to use a full context for tests.
-  pub(crate) async fn init_context() -> LemmyContext {
-    async fn x() -> Result<String, LemmyError> {
-      Ok(String::new())
-    }
+  pub(crate) async fn init_context() -> Data<LemmyContext> {
     // call this to run migrations
     let pool = build_db_pool_for_tests().await;
 
@@ -109,24 +104,13 @@ pub(crate) mod tests {
     let rate_limit_config = RateLimitConfig::builder().build();
     let rate_limit_cell = RateLimitCell::new(rate_limit_config).await;
 
-    let chat_server = ChatServer::startup(
-      pool.clone(),
-      |_, _, _, _| Box::pin(x()),
-      |_, _, _, _| Box::pin(x()),
-      |_, _, _, _| Box::pin(x()),
-      client.clone(),
-      settings.clone(),
-      secret.clone(),
-      rate_limit_cell.clone(),
-    )
-    .start();
-    LemmyContext::create(
-      pool,
-      chat_server,
-      client,
-      settings,
-      secret,
-      rate_limit_cell.clone(),
-    )
+    let context = LemmyContext::create(pool, client, secret, rate_limit_cell.clone());
+    let config = FederationConfig::builder()
+      .domain("example.com")
+      .app_data(context)
+      .build()
+      .await
+      .unwrap();
+    config.to_request_data()
   }
 }