rename app
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
[package]
|
||||
name = "wyd-server"
|
||||
name = "friendolls-server"
|
||||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
publish = false
|
||||
@@ -13,4 +13,4 @@ futures-util = "0.3"
|
||||
image = { version = "0.25", default-features = false, features = ["jpeg", "webp"] }
|
||||
serde_json = "1"
|
||||
uuid = { version = "1", features = ["v4"] }
|
||||
wyd-common = { path = "../src-common" }
|
||||
friendolls-common = { path = "../src-common" }
|
||||
|
||||
@@ -12,7 +12,7 @@ async fn main() -> std::io::Result<()> {
|
||||
.merge(network::routes())
|
||||
.fallback((StatusCode::NOT_FOUND, "not found"));
|
||||
|
||||
println!("wyd-server listening on http://{bind_addr}");
|
||||
println!("friendolls-server listening on http://{bind_addr}");
|
||||
|
||||
axum::serve(listener, app).await
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ use base64::Engine;
|
||||
use base64::engine::general_purpose::STANDARD;
|
||||
use tokio::sync::mpsc;
|
||||
use uuid::Uuid;
|
||||
use wyd_common::{
|
||||
use friendolls_common::{
|
||||
InteractionContent, InteractionDeliveryStatus, MAX_IMAGE_DIMENSION,
|
||||
MAX_INTERACTION_PAYLOAD_BYTES, ServerMessage, interaction_bytes,
|
||||
};
|
||||
@@ -102,7 +102,7 @@ mod tests {
|
||||
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
|
||||
use ed25519_dalek::{Signer, SigningKey};
|
||||
use image::{Rgb, RgbImage};
|
||||
use wyd_common::{MAX_TEXT_CHARS, Profile};
|
||||
use friendolls_common::{MAX_TEXT_CHARS, Profile};
|
||||
|
||||
use super::*;
|
||||
use crate::network::Client;
|
||||
|
||||
@@ -10,10 +10,10 @@ use axum::routing::get;
|
||||
use base64::Engine;
|
||||
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
|
||||
use ed25519_dalek::{Signature, Verifier, VerifyingKey};
|
||||
use friendolls_common::{ClientMessage, Profile, ServerMessage, message_bytes, register_bytes};
|
||||
use futures_util::{SinkExt, StreamExt};
|
||||
use tokio::sync::{Mutex, mpsc};
|
||||
use uuid::Uuid;
|
||||
use wyd_common::{ClientMessage, Profile, ServerMessage, message_bytes, register_bytes};
|
||||
|
||||
mod interactions;
|
||||
mod presence;
|
||||
@@ -50,7 +50,7 @@ async fn connected(mut socket: WebSocket, clients: Clients) {
|
||||
if send(
|
||||
&mut socket,
|
||||
&ServerMessage::Challenge {
|
||||
version: wyd_common::VERSION,
|
||||
version: friendolls_common::VERSION,
|
||||
challenge: challenge.clone(),
|
||||
},
|
||||
)
|
||||
@@ -74,7 +74,7 @@ async fn connected(mut socket: WebSocket, clients: Clients) {
|
||||
if profile
|
||||
.skin_hash
|
||||
.as_deref()
|
||||
.is_some_and(|hash| !wyd_common::is_skin_hash(hash))
|
||||
.is_some_and(|hash| !friendolls_common::is_skin_hash(hash))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -335,7 +335,7 @@ fn verify(key: &VerifyingKey, bytes: &[u8], signature: &str) -> bool {
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use ed25519_dalek::{Signer, SigningKey};
|
||||
use wyd_common::friends_bytes;
|
||||
use friendolls_common::friends_bytes;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use axum::extract::ws::Message;
|
||||
use friendolls_common::{ServerMessage, friends_bytes};
|
||||
use tokio::sync::mpsc;
|
||||
use uuid::Uuid;
|
||||
use wyd_common::{ServerMessage, friends_bytes};
|
||||
|
||||
use super::{Clients, are_mutual_friends, verify};
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use axum::extract::ws::Message;
|
||||
use tokio::sync::mpsc;
|
||||
use uuid::Uuid;
|
||||
use wyd_common::{Profile, ServerMessage, profile_bytes};
|
||||
use friendolls_common::{Profile, ServerMessage, profile_bytes};
|
||||
|
||||
use super::{Client, Clients, verify};
|
||||
|
||||
@@ -23,7 +23,7 @@ pub(super) async fn update(
|
||||
|| profile
|
||||
.skin_hash
|
||||
.as_deref()
|
||||
.is_some_and(|hash| !wyd_common::is_skin_hash(hash))
|
||||
.is_some_and(|hash| !friendolls_common::is_skin_hash(hash))
|
||||
|| !verify(&client.key, &profile_bytes(&profile), signature)
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use axum::extract::ws::Message;
|
||||
use friendolls_common::{MAX_SKIN_B64_SIZE, ServerMessage};
|
||||
use uuid::Uuid;
|
||||
use wyd_common::{MAX_SKIN_B64_SIZE, ServerMessage};
|
||||
|
||||
use super::{Clients, are_mutual_friends};
|
||||
|
||||
@@ -110,8 +110,8 @@ mod tests {
|
||||
use base64::Engine;
|
||||
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
|
||||
use ed25519_dalek::SigningKey;
|
||||
use friendolls_common::Profile;
|
||||
use tokio::sync::mpsc;
|
||||
use wyd_common::Profile;
|
||||
|
||||
use super::*;
|
||||
use crate::network::Client;
|
||||
|
||||
Reference in New Issue
Block a user