diff --git a/werewolves-macros/src/lib.rs b/werewolves-macros/src/lib.rs
index 302e810..6de2c02 100644
--- a/werewolves-macros/src/lib.rs
+++ b/werewolves-macros/src/lib.rs
@@ -24,7 +24,6 @@ use proc_macro2::Span;
use quote::{ToTokens, quote};
use syn::{parse::Parse, parse_macro_input};
-use crate::ref_and_mut::RefAndMut;
mod all;
mod checks;
diff --git a/werewolves-proto/src/character.rs b/werewolves-proto/src/character.rs
index 35c6b36..d98fc88 100644
--- a/werewolves-proto/src/character.rs
+++ b/werewolves-proto/src/character.rs
@@ -13,7 +13,6 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
use core::{
- fmt::Display,
num::NonZeroU8,
ops::{Deref, Not},
};
@@ -30,7 +29,7 @@ use crate::{
message::{CharacterIdentity, Identification, PublicIdentity, night::ActionPrompt},
player::{PlayerId, RoleChange},
role::{
- Alignment, HunterMut, HunterRef, Killer, KillingWolfOrder, MAPLE_WOLF_ABSTAIN_LIMIT,
+ Alignment, Killer, KillingWolfOrder, MAPLE_WOLF_ABSTAIN_LIMIT,
Powerful, PreviousGuardianAction, Role, RoleTitle,
},
team::Team,
diff --git a/werewolves-proto/src/error.rs b/werewolves-proto/src/error.rs
index fdcb5c5..8be8bd9 100644
--- a/werewolves-proto/src/error.rs
+++ b/werewolves-proto/src/error.rs
@@ -236,7 +236,7 @@ impl axum::response::IntoResponse for ServerError {
fn into_response(self) -> axum::response::Response {
use axum::{Json, http::StatusCode};
- use crate::cbor::Cbor;
+
(
match self {
diff --git a/werewolves-proto/src/game/night.rs b/werewolves-proto/src/game/night.rs
index 65fc557..71e782c 100644
--- a/werewolves-proto/src/game/night.rs
+++ b/werewolves-proto/src/game/night.rs
@@ -29,13 +29,12 @@ use crate::{
error::GameError,
game::{
GameTime, Village,
- kill::{self, KillOutcome},
night::changes::{ChangesLookup, NightChange},
},
message::{
- dead::{DeadChat, DeadChatMessage},
+ dead::DeadChat,
night::{
- ActionPrompt, ActionPromptTitle, ActionResponse, ActionResult, ActionType, Visits,
+ ActionPrompt, ActionPromptTitle, ActionResponse, ActionResult, Visits,
},
},
role::RoleTitle,
diff --git a/werewolves-proto/src/game/night/changes.rs b/werewolves-proto/src/game/night/changes.rs
index 7699f70..d758247 100644
--- a/werewolves-proto/src/game/night/changes.rs
+++ b/werewolves-proto/src/game/night/changes.rs
@@ -12,7 +12,7 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-use core::{num::NonZeroU8, ops::Not};
+use core::ops::Not;
use super::Result;
use serde::{Deserialize, Serialize};
diff --git a/werewolves-proto/src/game/night/process.rs b/werewolves-proto/src/game/night/process.rs
index 949d405..edafd01 100644
--- a/werewolves-proto/src/game/night/process.rs
+++ b/werewolves-proto/src/game/night/process.rs
@@ -15,17 +15,14 @@
use core::num::NonZeroU8;
use crate::{
- aura::{Aura, AuraTitle},
+ aura::Aura,
bag::DrunkRoll,
diedto::DiedTo,
error::GameError,
game::night::{
ActionComplete, CurrentResult, Night, NightState, ResponseOutcome, changes::NightChange,
},
- message::{
- CharacterIdentity,
- night::{ActionPrompt, ActionResponse, ActionResult, ActionType},
- },
+ message::night::{ActionPrompt, ActionResponse, ActionResult},
player::Protection,
role::{
Alignment, AlignmentEq, Killer, Powerful, PreviousGuardianAction, RoleBlock, RoleTitle,
diff --git a/werewolves-proto/src/game/village/apply.rs b/werewolves-proto/src/game/village/apply.rs
index 52ddb28..b515e98 100644
--- a/werewolves-proto/src/game/village/apply.rs
+++ b/werewolves-proto/src/game/village/apply.rs
@@ -15,7 +15,7 @@
use core::{num::NonZeroU8, ops::Not};
use crate::{
- aura::{Aura, AuraTitle},
+ aura::Aura,
diedto::DiedTo,
error::GameError,
game::{
diff --git a/werewolves/build.rs b/werewolves/build.rs
index f6d8125..960dede 100644
--- a/werewolves/build.rs
+++ b/werewolves/build.rs
@@ -1,6 +1,6 @@
use std::{
fs::File,
- io::{Read, Write},
+ io::Write,
};
const STYLESHEET_PATH: &str = "../style/faction.scss";
diff --git a/werewolves/src/app.rs b/werewolves/src/app.rs
index 9cfeecf..a2d7e3d 100644
--- a/werewolves/src/app.rs
+++ b/werewolves/src/app.rs
@@ -20,7 +20,7 @@ use leptos_router::{
components::{ProtectedRoute, Route, Router, Routes},
path,
};
-use leptos_use::storage::{UseStorageOptions, use_local_storage, use_local_storage_with_options};
+use leptos_use::storage::use_local_storage;
use reactive_stores::Store;
use serde::{Deserialize, Serialize};
@@ -29,8 +29,8 @@ use crate::{
components::Nav,
pages::{GamePage, Main, NotFound, Signin, Signup, UserSettings},
storage::{
- LocalStorage, SessionStorage, Stored,
- user::{AuthContext, AuthContextStoreFields, PasswordlessUser, UserSession, UserToken},
+ Stored,
+ user::{AuthContext, AuthContextStoreFields},
},
},
state::{InitOrUpdateStore, SessionState},
diff --git a/werewolves/src/app/pages/game.rs b/werewolves/src/app/pages/game.rs
index 6ae1bd6..bc4e072 100644
--- a/werewolves/src/app/pages/game.rs
+++ b/werewolves/src/app/pages/game.rs
@@ -2,23 +2,19 @@ pub mod big;
mod host;
mod player;
-use codee::{HybridEncoder, binary::MsgpackSerdeCodec};
+use codee::binary::MsgpackSerdeCodec;
use leptos::prelude::*;
use leptos_router::hooks;
use leptos_use::{
- ReconnectLimit, UseEventSourceOptions, UseEventSourceReturn, UseWebSocketOptions,
- UseWebSocketReturn, core::ConnectionReadyState, use_event_source,
- use_event_source_with_options, use_websocket, use_websocket_with_options,
+ ReconnectLimit, UseWebSocketOptions,
+ UseWebSocketReturn, core::ConnectionReadyState, use_websocket_with_options,
};
use reactive_stores::Store;
use werewolves_proto::message::{
ClientMessage,
- host::{HostMessage, ServerToHostMessage},
-};
-use werewolves_proto::{
- cbor_leptos::CborEncoding,
- message::{IntoClientResponse, WrappedServerMessage},
+ host::HostMessage,
};
+use werewolves_proto::message::{IntoClientResponse, WrappedServerMessage};
use crate::{
ConsoleLogError,
diff --git a/werewolves/src/app/pages/game/host/players.rs b/werewolves/src/app/pages/game/host/players.rs
index ea992f2..eb1bcf0 100644
--- a/werewolves/src/app/pages/game/host/players.rs
+++ b/werewolves/src/app/pages/game/host/players.rs
@@ -1,8 +1,5 @@
-use leptos::{ev::MouseEvent, prelude::*};
-use werewolves_proto::{
- message::{Identification, PlayerState, PublicIdentity},
- player::PlayerId,
-};
+use leptos::prelude::*;
+use werewolves_proto::message::{Identification, PlayerState};
use crate::app::components::{Equals, IdentificationInline, Sample, TutorialBox};
diff --git a/werewolves/src/app/pages/game/host/settings.rs b/werewolves/src/app/pages/game/host/settings.rs
index 8a19a3f..e2b64b7 100644
--- a/werewolves/src/app/pages/game/host/settings.rs
+++ b/werewolves/src/app/pages/game/host/settings.rs
@@ -1,13 +1,13 @@
use core::ops::Not;
-use std::{collections::HashMap, sync::Arc};
+use std::collections::HashMap;
use convert_case::{Case, Casing};
use leptos::{ev::MouseEvent, prelude::*};
use werewolves_proto::{
aura::AuraTitle,
game::{Category, GameSettings, SetupSlot},
- message::{PlayerState, host::HostMessage},
- role::{Role, RoleTitle},
+ message::PlayerState,
+ role::RoleTitle,
};
use crate::app::{
diff --git a/werewolves/src/app/pages/game/player.rs b/werewolves/src/app/pages/game/player.rs
index bb05911..c6f73ef 100644
--- a/werewolves/src/app/pages/game/player.rs
+++ b/werewolves/src/app/pages/game/player.rs
@@ -2,19 +2,16 @@ werewolves_macros::include_path!("werewolves/src/app/pages/game/player");
use core::{
hash::Hash,
- num::{self, NonZeroU8},
- ops::{Deref, Not},
+ num::NonZeroU8,
+ ops::Deref,
};
use std::collections::HashSet;
use convert_case::{Case, Casing};
-use leptos::{
- ev::{Event, MouseEvent, SubmitEvent, Targeted},
- prelude::*,
-};
+use leptos::prelude::*;
use werewolves_proto::{
message::{
- ClientDeadChat, ClientMessage, ServerToClientMessage as Srv2Client, UpdateSelf,
+ ClientDeadChat, ClientMessage, ServerToClientMessage as Srv2Client,
dead::DeadChatMessage,
},
role::RoleTitle,
diff --git a/werewolves/src/app/pages/signin.rs b/werewolves/src/app/pages/signin.rs
index 51cf0df..8370445 100644
--- a/werewolves/src/app/pages/signin.rs
+++ b/werewolves/src/app/pages/signin.rs
@@ -3,12 +3,12 @@ use core::ops::Not;
use chrono::Utc;
use gloo::history::History;
use leptos::{ev::MouseEvent, prelude::*};
-use werewolves_proto::player::{Password, Session, Username};
+use werewolves_proto::player::{Password, Username};
use crate::{
app::{
components::ErrorBox,
- storage::user::{AuthContext, PasswordlessUser, UserSession, UserToken},
+ storage::user::{AuthContext, UserToken},
},
auth::Signin,
};
diff --git a/werewolves/src/app/pages/signup.rs b/werewolves/src/app/pages/signup.rs
index 8410f01..3da3105 100644
--- a/werewolves/src/app/pages/signup.rs
+++ b/werewolves/src/app/pages/signup.rs
@@ -3,25 +3,21 @@ use core::ops::Not;
use chrono::Utc;
use gloo::history::History;
use leptos::{
- ev::{Event, MouseEvent},
+ ev::MouseEvent,
prelude::*,
};
-use leptos_meta::*;
use rand::distr::SampleString;
use reactive_stores::Store;
use werewolves_proto::{
cbor_leptos::CborPost,
error::ServerError,
- player::{Password, PlayerId, Session, Username},
+ player::{Password, PlayerId, Username},
};
use crate::{
app::{
components::{ErrorBox, input::TextInput},
- storage::{
- LocalStorage,
- user::{AuthContext, AuthContextStoreFields, PasswordlessUser, UserSession, UserToken},
- },
+ storage::user::{AuthContext, AuthContextStoreFields, PasswordlessUser, UserToken},
},
auth::Signin,
db::AppState,
diff --git a/werewolves/src/app/storage/mod.rs b/werewolves/src/app/storage/mod.rs
index 6ac2086..05e9bc4 100644
--- a/werewolves/src/app/storage/mod.rs
+++ b/werewolves/src/app/storage/mod.rs
@@ -4,7 +4,7 @@ use core::fmt::Debug;
use gloo::storage::Storage;
use leptos::{
- prelude::{ArcReadSignal, ArcWriteSignal, Effect, Signal, WriteSignal},
+ prelude::{Signal, WriteSignal},
server::codee::string::JsonSerdeCodec,
};
use serde::{Serialize, de::DeserializeOwned};
diff --git a/werewolves/src/app/storage/user.rs b/werewolves/src/app/storage/user.rs
index a3ddbf9..0a84e6c 100644
--- a/werewolves/src/app/storage/user.rs
+++ b/werewolves/src/app/storage/user.rs
@@ -1,9 +1,6 @@
use chrono::{DateTime, Utc};
-use leptos::{
- prelude::{Action, ArcRwSignal, Get, GetUntracked, Set},
- server::codee::string::JsonSerdeCodec,
-};
-use reactive_stores::{Field, Patch, Store};
+use leptos::prelude::{Action, Get, Set};
+use reactive_stores::Store;
use serde::{Deserialize, Serialize};
use werewolves_proto::{
limited::FixedLenString,
diff --git a/werewolves/src/db/user.rs b/werewolves/src/db/user.rs
index 722c291..0c78a20 100644
--- a/werewolves/src/db/user.rs
+++ b/werewolves/src/db/user.rs
@@ -13,7 +13,7 @@ use werewolves_proto::{
error::{DatabaseError, ServerError},
limited::FixedLenString,
player::{Password, ProfileUpdate, Session},
- token::{self, TOKEN_LEN},
+ token::{self},
};
use crate::db::DatabaseResult;
diff --git a/werewolves/src/main.rs b/werewolves/src/main.rs
index d416897..4f5aabf 100644
--- a/werewolves/src/main.rs
+++ b/werewolves/src/main.rs
@@ -9,19 +9,13 @@ mod ssr {
use axum::{
body::Body,
- extract::{FromRef, State},
- http::{HeaderMap, HeaderValue, Request, StatusCode, Uri, header},
+ extract::State,
+ http::{Request, Uri, header},
response::{IntoResponse, Response},
};
use futures::StreamExt;
- use leptos::{
- IntoView,
- config::LeptosOptions,
- prelude::{Render, RenderHtml},
- server_fn::codec::IntoRes,
- tachys::ssr::StreamBuilder,
- };
- use leptos_axum::{LeptosRoutes, ResponseOptions};
+ use leptos::prelude::RenderHtml;
+
use werewolves::db::AppState;
pub async fn server_fn_handler(
@@ -38,7 +32,7 @@ mod ssr {
}
pub async fn handle_http_static(
- uri: Uri,
+ _uri: Uri,
state: State,
req: Request,
) -> Response {
diff --git a/werewolves/src/server/game_connection.rs b/werewolves/src/server/game_connection.rs
index 511eeee..0423b4c 100644
--- a/werewolves/src/server/game_connection.rs
+++ b/werewolves/src/server/game_connection.rs
@@ -14,20 +14,18 @@
// along with this program. If not, see .
use core::{net::SocketAddr, str::FromStr};
-use anyhow::anyhow;
use axum::{
- extract::{ConnectInfo, Path, State, WebSocketUpgrade, ws::WebSocket},
+ extract::{ConnectInfo, Path, State, WebSocketUpgrade},
response::Response,
};
use axum_extra::{
TypedHeader,
- headers::{self, Authorization, authorization::Bearer},
+ headers::{self},
};
-use codee::{Decoder, HybridDecoder, HybridEncoder};
+use codee::HybridDecoder;
use colored::Colorize;
use futures::FutureExt;
use uuid::Uuid;
-use werewolves_proto::{error::GameError, message::ServerToClientMessage};
use werewolves_proto::{
error::ServerError, game::GameId, message::WrappedServerMessage, token::TokenString,
};
diff --git a/werewolves/src/server/mod.rs b/werewolves/src/server/mod.rs
index 186adde..ec77628 100644
--- a/werewolves/src/server/mod.rs
+++ b/werewolves/src/server/mod.rs
@@ -11,7 +11,6 @@ pub mod runner;
use core::{
fmt::Display,
hash::BuildHasherDefault,
- sync::atomic::{AtomicUsize, Ordering},
};
use std::{
collections::{HashMap, HashSet},
@@ -24,7 +23,7 @@ use axum_extra::headers;
use colored::Colorize;
use tokio::{
sync::{
- Mutex, RwLock,
+ RwLock,
broadcast::{self, Receiver, Sender},
mpsc::{self, UnboundedSender},
},
diff --git a/werewolves/src/server/player.rs b/werewolves/src/server/player.rs
index e42d70a..744be65 100644
--- a/werewolves/src/server/player.rs
+++ b/werewolves/src/server/player.rs
@@ -12,29 +12,15 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see .
-use core::{net::SocketAddr, time::Duration};
-use std::sync::Arc;
+use core::time::Duration;
use anyhow::anyhow;
-use axum::{
- extract::{
- ConnectInfo, Path, State, WebSocketUpgrade,
- ws::{self, Message, WebSocket},
- },
- response::Response,
-};
-use axum_extra::{
- TypedHeader,
- headers::{Authorization, authorization::Bearer},
-};
+use axum::extract::ws::{self, Message, WebSocket};
use chrono::Utc;
use codee::{HybridDecoder, HybridEncoder};
-use colored::Colorize;
use tokio::sync::{broadcast::Receiver, mpsc::UnboundedSender};
use werewolves_proto::{
LogError,
- error::ServerError,
- game::GameId,
loc,
message::{IntoClientResponse, WrappedServerMessage},
};
@@ -45,10 +31,7 @@ use werewolves_proto::{
use crate::{
db::{Database, user::User},
- server::{
- XForwardedFor,
- runner::{ClientUpdate, HostOrClientMessage, IdentifiedClientMessage},
- },
+ server::runner::{ClientUpdate, IdentifiedClientMessage},
};
pub async fn player_handler(
diff --git a/werewolves/src/server/qr.rs b/werewolves/src/server/qr.rs
index d1c9d9d..08df296 100644
--- a/werewolves/src/server/qr.rs
+++ b/werewolves/src/server/qr.rs
@@ -4,7 +4,6 @@ use axum::{
response::IntoResponse,
};
use fast_qr::convert::{Builder, Shape, svg::SvgBuilder};
-use tower_http::normalize_path::NormalizePath;
const DEFAULT_BASE_URL: &str = "https://wolf.emilis.dev/";
pub const BASE_URL: &str = const {