This commit is contained in:
Edgar 2023-10-03 12:22:50 +02:00
parent f41fd89d8c
commit 3f7d9a202f
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
2 changed files with 12 additions and 12 deletions

View file

@ -5,7 +5,7 @@ use std::{
time::Duration,
};
use axum::{routing::get, Router, response::Html};
use axum::{response::Html, routing::get, Router};
use http::Method;
use reqwest::Client;
use sqlx::{postgres::PgPoolOptions, PgPool};
@ -21,7 +21,7 @@ use tokio::{
use tower_http::{
cors::{self, CorsLayer},
timeout::TimeoutLayer,
trace::{TraceLayer, DefaultMakeSpan},
trace::{DefaultMakeSpan, TraceLayer},
};
use tracing::{error, info};
@ -124,10 +124,10 @@ async fn run() -> anyhow::Result<()> {
address
);*/
events.push((
MasterEvent::ClientJoined(
(*player).clone(),
server.clone(),
),
MasterEvent::ClientJoined {
client: (*player).clone(),
server: server.clone(),
},
now,
));
} else {
@ -140,10 +140,10 @@ async fn run() -> anyhow::Result<()> {
);
*/
events.push((
MasterEvent::ClientLeft(
(*player).clone(),
server.clone(),
),
MasterEvent::ClientLeft {
client: (*player).clone(),
server: server.clone(),
},
now,
));
}

View file

@ -77,8 +77,8 @@ pub struct ServerListMap {
#[derive(Debug, Serialize, Clone)]
pub enum MasterEvent {
ClientJoined(Client, Arc<Server>),
ClientLeft(Client, Arc<Server>),
ClientJoined { client: Client, server: Arc<Server> },
ClientLeft { client: Client, server: Arc<Server> },
ServerWentOnline(Arc<Server>),
ServerWentOffline(Arc<Server>),
}