Fix API and clippy warnings

[lemmy.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 3cdab3ec7ce5c1dda5b8efd232d84af2e7e10923..7f241733b74e40b4344f14411621d77c0c00a463 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,10 +9,11 @@ use diesel::{
 };
 use lemmy_api::match_websocket_operation;
 use lemmy_api_common::blocking;
+use lemmy_api_crud::match_websocket_operation_crud;
 use lemmy_apub::activity_queue::create_activity_queue;
 use lemmy_db_queries::get_database_url_from_env;
 use lemmy_routes::{feeds, images, nodeinfo, webfinger};
-use lemmy_server::{code_migrations::run_advanced_migrations, scheduled_tasks};
+use lemmy_server::{api_routes, code_migrations::run_advanced_migrations, scheduled_tasks};
 use lemmy_utils::{
   rate_limit::{rate_limiter::RateLimiter, RateLimit},
   settings::structs::Settings,
@@ -70,6 +71,7 @@ async fn main() -> Result<(), LemmyError> {
     pool.clone(),
     rate_limiter.clone(),
     |c, i, o, d| Box::pin(match_websocket_operation(c, i, o, d)),
+    |c, i, o, d| Box::pin(match_websocket_operation_crud(c, i, o, d)),
     Client::default(),
     activity_queue.clone(),
   )
@@ -88,8 +90,8 @@ async fn main() -> Result<(), LemmyError> {
       .wrap(middleware::Logger::default())
       .data(context)
       // The routes
-      .configure(|cfg| lemmy_api_crud::routes::config(cfg, &rate_limiter))
-      .configure(|cfg| lemmy_api::routes::config(cfg, &rate_limiter))
+      .configure(|cfg| api_routes::config(cfg, &rate_limiter))
+      .configure(lemmy_websocket::routes::config)
       .configure(lemmy_apub::routes::config)
       .configure(feeds::config)
       .configure(|cfg| images::config(cfg, &rate_limiter))