mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 08:38:05 +00:00
d4dccd17ae
Merge pull request 'Adding unique ap_ids. Fixes #1100' (#90) from unique_ap_ids into activity-sender Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/90 Adding back in on_conflict. Trying to add back in the on_conflict_do_nothing. Trying to reduce delay time. Removing createFakes. Removing some unit tests. Adding comment jest timeout. Fixing tests again. Fixing tests again. Merge branch 'activity-sender' into unique_ap_ids_2 Replace actix client with reqwest to speed up federation tests Trying to fix tests again. Fixing unit tests. Fixing some broken unit tests, not done yet. Adding uniques. Adding unique ap_ids. Fixes #1100 use proper sql functionality for upsert added logging in fetcher, replace post/comment::create with upsert no need to do an actual update in post/comment::upsert Merge branch 'main' into activity-sender implement upsert for user/community reuse http client got it working attempt to use background-jobs crate rewrite with proper error handling and less boilerplate remove do_send, dont return errors from activity_sender WIP: implement ActivitySender actor Co-authored-by: dessalines <dessalines@noreply.yerbamate.dev> Co-authored-by: Dessalines <tyhou13@gmx.com> Co-authored-by: Felix Ableitner <me@nutomic.com> Reviewed-on: https://yerbamate.dev/LemmyNet/lemmy/pulls/89
145 lines
3.7 KiB
Rust
145 lines
3.7 KiB
Rust
#[macro_use]
|
|
extern crate diesel_migrations;
|
|
#[macro_use]
|
|
pub extern crate lazy_static;
|
|
|
|
use actix::prelude::*;
|
|
use actix_web::{
|
|
body::Body,
|
|
dev::{Service, ServiceRequest, ServiceResponse},
|
|
http::{
|
|
header::{CACHE_CONTROL, CONTENT_TYPE},
|
|
HeaderValue,
|
|
},
|
|
*,
|
|
};
|
|
use diesel::{
|
|
r2d2::{ConnectionManager, Pool},
|
|
PgConnection,
|
|
};
|
|
use lemmy_db::get_database_url_from_env;
|
|
use lemmy_server::{
|
|
apub::activity_queue::create_activity_queue,
|
|
blocking,
|
|
code_migrations::run_advanced_migrations,
|
|
rate_limit::{rate_limiter::RateLimiter, RateLimit},
|
|
routes::*,
|
|
websocket::server::*,
|
|
LemmyContext,
|
|
LemmyError,
|
|
};
|
|
use lemmy_utils::{settings::Settings, CACHE_CONTROL_REGEX};
|
|
use reqwest::Client;
|
|
use std::sync::Arc;
|
|
use tokio::sync::Mutex;
|
|
|
|
lazy_static! {
|
|
// static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 365 * 24 * 60 * 60);
|
|
// Test out 1 hour here, this is breaking some things
|
|
static ref CACHE_CONTROL_VALUE: String = format!("public, max-age={}", 60 * 60);
|
|
}
|
|
|
|
embed_migrations!();
|
|
|
|
#[actix_rt::main]
|
|
async fn main() -> Result<(), LemmyError> {
|
|
env_logger::init();
|
|
let settings = Settings::get();
|
|
|
|
// Set up the r2d2 connection pool
|
|
let db_url = match get_database_url_from_env() {
|
|
Ok(url) => url,
|
|
Err(_) => settings.get_database_url(),
|
|
};
|
|
let manager = ConnectionManager::<PgConnection>::new(&db_url);
|
|
let pool = Pool::builder()
|
|
.max_size(settings.database.pool_size)
|
|
.build(manager)
|
|
.unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
|
|
|
|
// Run the migrations from code
|
|
blocking(&pool, move |conn| {
|
|
embedded_migrations::run(conn)?;
|
|
run_advanced_migrations(conn)?;
|
|
Ok(()) as Result<(), LemmyError>
|
|
})
|
|
.await??;
|
|
|
|
// Set up the rate limiter
|
|
let rate_limiter = RateLimit {
|
|
rate_limiter: Arc::new(Mutex::new(RateLimiter::default())),
|
|
};
|
|
|
|
println!(
|
|
"Starting http server at {}:{}",
|
|
settings.bind, settings.port
|
|
);
|
|
|
|
let activity_queue = create_activity_queue();
|
|
let chat_server = ChatServer::startup(
|
|
pool.clone(),
|
|
rate_limiter.clone(),
|
|
Client::default(),
|
|
activity_queue.clone(),
|
|
)
|
|
.start();
|
|
|
|
// Create Http server with websocket support
|
|
HttpServer::new(move || {
|
|
let context = LemmyContext::create(
|
|
pool.clone(),
|
|
chat_server.to_owned(),
|
|
Client::default(),
|
|
activity_queue.to_owned(),
|
|
);
|
|
let settings = Settings::get();
|
|
let rate_limiter = rate_limiter.clone();
|
|
App::new()
|
|
.wrap_fn(add_cache_headers)
|
|
.wrap(middleware::Logger::default())
|
|
.data(context)
|
|
// The routes
|
|
.configure(|cfg| api::config(cfg, &rate_limiter))
|
|
.configure(federation::config)
|
|
.configure(feeds::config)
|
|
.configure(|cfg| images::config(cfg, &rate_limiter))
|
|
.configure(index::config)
|
|
.configure(nodeinfo::config)
|
|
.configure(webfinger::config)
|
|
// static files
|
|
.service(actix_files::Files::new(
|
|
"/static",
|
|
settings.front_end_dir.to_owned(),
|
|
))
|
|
.service(actix_files::Files::new(
|
|
"/docs",
|
|
settings.front_end_dir + "/documentation",
|
|
))
|
|
})
|
|
.bind((settings.bind, settings.port))?
|
|
.run()
|
|
.await?;
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn add_cache_headers<S>(
|
|
req: ServiceRequest,
|
|
srv: &mut S,
|
|
) -> impl Future<Output = Result<ServiceResponse, Error>>
|
|
where
|
|
S: Service<Request = ServiceRequest, Response = ServiceResponse<Body>, Error = Error>,
|
|
{
|
|
let fut = srv.call(req);
|
|
async move {
|
|
let mut res = fut.await?;
|
|
if let Some(content_type) = res.headers().get(CONTENT_TYPE) {
|
|
if CACHE_CONTROL_REGEX.is_match(content_type.to_str().unwrap()) {
|
|
let header_val = HeaderValue::from_static(&CACHE_CONTROL_VALUE);
|
|
res.headers_mut().insert(CACHE_CONTROL, header_val);
|
|
}
|
|
}
|
|
Ok(res)
|
|
}
|
|
}
|