Move code to generate apub urls into lemmy_api_common

[lemmy.git] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index 5d1a3a1a760d39057f579e836830e06fd31d9b93..e4b8e8e3293e9f86d4bcc589a66d6201b568ee4d 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,7 @@
 extern crate diesel_migrations;
 
 use actix::prelude::*;
-use actix_web::{web::Data, *};
+use actix_web::{middleware, web::Data, App, HttpServer, Result};
 use diesel_migrations::EmbeddedMigrations;
 use doku::json::{AutoComments, CommentsStyle, Formatting, ObjectsStyle};
 use lemmy_api::match_websocket_operation;
@@ -13,6 +13,8 @@ use lemmy_api_common::{
     check_private_instance_and_federation_enabled,
     local_site_rate_limit_to_rate_limit_config,
   },
+  websocket::chat_server::ChatServer,
+  LemmyContext,
 };
 use lemmy_api_crud::match_websocket_operation_crud;
 use lemmy_db_schema::{
@@ -29,20 +31,14 @@ use lemmy_server::{
 };
 use lemmy_utils::{
   error::LemmyError,
-  rate_limit::{rate_limiter::RateLimiter, RateLimit},
+  rate_limit::RateLimitCell,
   settings::{structs::Settings, SETTINGS},
 };
-use lemmy_websocket::{chat_server::ChatServer, LemmyContext};
 use reqwest::Client;
 use reqwest_middleware::ClientBuilder;
 use reqwest_retry::{policies::ExponentialBackoff, RetryTransientMiddleware};
 use reqwest_tracing::TracingMiddleware;
-use std::{
-  env,
-  sync::{Arc, Mutex},
-  thread,
-  time::Duration,
-};
+use std::{env, thread, time::Duration};
 use tracing_actix_web::TracingLogger;
 
 pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
@@ -107,13 +103,7 @@ async fn main() -> Result<(), LemmyError> {
   // Set up the rate limiter
   let rate_limit_config =
     local_site_rate_limit_to_rate_limit_config(&site_view.local_site_rate_limit);
-
-  // TODO this isn't live-updating
-  // https://github.com/LemmyNet/lemmy/issues/2508
-  let rate_limiter = RateLimit {
-    rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
-    rate_limit_config,
-  };
+  let rate_limit_cell = RateLimitCell::new(rate_limit_config).await;
 
   println!(
     "Starting http server at {}:{}",
@@ -144,12 +134,12 @@ async fn main() -> Result<(), LemmyError> {
 
   let chat_server = ChatServer::startup(
     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.clone(),
     settings.clone(),
     secret.clone(),
+    rate_limit_cell.clone(),
   )
   .start();
 
@@ -158,19 +148,19 @@ async fn main() -> Result<(), LemmyError> {
   HttpServer::new(move || {
     let context = LemmyContext::create(
       pool.clone(),
-      chat_server.to_owned(),
+      chat_server.clone(),
       client.clone(),
-      settings.to_owned(),
-      secret.to_owned(),
+      settings.clone(),
+      secret.clone(),
+      rate_limit_cell.clone(),
     );
-    let rate_limiter = rate_limiter.clone();
     App::new()
-      .wrap(actix_web::middleware::Logger::default())
+      .wrap(middleware::Logger::default())
       .wrap(TracingLogger::<QuieterRootSpanBuilder>::new())
       .app_data(Data::new(context))
-      .app_data(Data::new(rate_limiter.clone()))
+      .app_data(Data::new(rate_limit_cell.clone()))
       // The routes
-      .configure(|cfg| api_routes::config(cfg, &rate_limiter))
+      .configure(|cfg| api_routes::config(cfg, rate_limit_cell))
       .configure(|cfg| {
         if federation_enabled {
           lemmy_apub::http::routes::config(cfg);
@@ -178,7 +168,7 @@ async fn main() -> Result<(), LemmyError> {
         }
       })
       .configure(feeds::config)
-      .configure(|cfg| images::config(cfg, pictrs_client.clone(), &rate_limiter))
+      .configure(|cfg| images::config(cfg, pictrs_client.clone(), rate_limit_cell))
       .configure(nodeinfo::config)
   })
   .bind((settings_bind.bind, settings_bind.port))?