Compare commits

..

No commits in common. "a4bb3cfcca1547e75780f919322475b0093a89c6" and "0d79b42072e9e9c19f3e507dfca19f501cec7c8f" have entirely different histories.

9 changed files with 448 additions and 930 deletions

View file

@ -1,118 +0,0 @@
use crate::AppState;
use axum::extract::ws::{Message, WebSocket};
use futures_util::{SinkExt, StreamExt};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use tokio::sync::{RwLock, mpsc};
use uuid::Uuid;
#[derive(Default)]
pub struct ChatHub {
// user_id -> sender
clients: RwLock<HashMap<Uuid, mpsc::UnboundedSender<ServerEvent>>>,
}
#[derive(Serialize, Clone)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum ServerEvent {
MessageCreated {
channel_id: Uuid,
message: serde_json::Value,
},
DmCreated {
other_user_id: Uuid,
message: serde_json::Value,
},
UserPresence {
user_id: Uuid,
online: bool,
},
}
#[derive(Deserialize)]
#[serde(tag = "type", rename_all = "snake_case")]
enum ClientEvent {
// Currently no interactive client events for the general chat WS
Ping,
}
impl ChatHub {
pub async fn add_client(&self, user_id: Uuid, tx: mpsc::UnboundedSender<ServerEvent>) {
let mut clients = self.clients.write().await;
clients.insert(user_id, tx);
}
pub async fn remove_client(&self, user_id: Uuid) {
let mut clients = self.clients.write().await;
clients.remove(&user_id);
}
pub async fn get_online_users(&self) -> Vec<Uuid> {
let clients = self.clients.read().await;
clients.keys().cloned().collect()
}
pub async fn broadcast_all(&self, event: ServerEvent) {
let clients = self.clients.read().await;
for tx in clients.values() {
let _ = tx.send(event.clone());
}
}
pub async fn broadcast_to_user(&self, user_id: Uuid, event: ServerEvent) {
let clients = self.clients.read().await;
if let Some(tx) = clients.get(&user_id) {
let _ = tx.send(event);
}
}
pub async fn broadcast_to_many(&self, user_ids: Vec<Uuid>, event: ServerEvent) {
let clients = self.clients.read().await;
for user_id in user_ids {
if let Some(tx) = clients.get(&user_id) {
let _ = tx.send(event.clone());
}
}
}
}
pub async fn handle_socket(state: AppState, socket: WebSocket, user_id: Uuid) {
let (mut ws_sender, mut ws_receiver) = socket.split();
let (tx, mut rx) = mpsc::unbounded_channel::<ServerEvent>();
state.chat.add_client(user_id, tx).await;
state
.chat
.broadcast_all(ServerEvent::UserPresence {
user_id,
online: true,
})
.await;
let send_task = tokio::spawn(async move {
while let Some(event) = rx.recv().await {
let Ok(payload) = serde_json::to_string(&event) else {
continue;
};
if ws_sender.send(Message::Text(payload.into())).await.is_err() {
break;
}
}
});
while let Some(Ok(msg)) = ws_receiver.next().await {
if let Message::Close(_) = msg {
break;
}
}
send_task.abort();
state.chat.remove_client(user_id).await;
state
.chat
.broadcast_all(ServerEvent::UserPresence {
user_id,
online: false,
})
.await;
}

126
src/db.rs
View file

@ -1,18 +1,15 @@
use anyhow::{Result, anyhow}; use anyhow::{Result, anyhow};
use chrono::{Duration, Utc}; use chrono::{Duration, Utc};
use sea_orm::{ use sea_orm::{
ActiveModelTrait, ActiveValue::Set, ColumnTrait, Condition, DatabaseConnection, ActiveModelTrait, ActiveValue::Set, ColumnTrait, DatabaseConnection,
DatabaseTransaction, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect, Condition, DatabaseTransaction, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect,
TransactionTrait, sea_query::OnConflict, TransactionTrait, sea_query::OnConflict,
}; };
use uuid::Uuid; use uuid::Uuid;
use crate::{ use crate::{
entity::{channels, direct_messages, guild_members, guilds, invites, messages, users}, entity::{channels, direct_messages, guild_members, guilds, invites, messages, users},
models::{ models::{BasicUser, Channel, DmConversation, DmMessageWithAuthor, Guild, Invite, MessageWithAuthor, User},
BasicUser, Channel, DmConversation, DmMessageWithAuthor, Guild, Invite, MessageWithAuthor,
User,
},
}; };
pub const CHANNEL_KIND_TEXT: &str = "text"; pub const CHANNEL_KIND_TEXT: &str = "text";
@ -45,10 +42,7 @@ pub async fn upsert_user_from_oidc(
users::Column::DisplayName, users::Column::DisplayName,
users::Column::AvatarUrl, users::Column::AvatarUrl,
]) ])
.value( .value(users::Column::UpdatedAt, sea_orm::sea_query::Expr::current_timestamp())
users::Column::UpdatedAt,
sea_orm::sea_query::Expr::current_timestamp(),
)
.to_owned(), .to_owned(),
) )
.exec_with_returning(db) .exec_with_returning(db)
@ -81,15 +75,6 @@ pub async fn list_guild_members(db: &DatabaseConnection, guild_id: Uuid) -> Resu
.collect()) .collect())
} }
pub async fn list_guild_member_ids(db: &DatabaseConnection, guild_id: Uuid) -> Result<Vec<Uuid>> {
let rows = guild_members::Entity::find()
.filter(guild_members::Column::GuildId.eq(guild_id))
.all(db)
.await?;
Ok(rows.into_iter().map(|m| m.user_id).collect())
}
pub async fn list_guilds_for_user(db: &DatabaseConnection, user_id: Uuid) -> Result<Vec<Guild>> { pub async fn list_guilds_for_user(db: &DatabaseConnection, user_id: Uuid) -> Result<Vec<Guild>> {
let rows = guild_members::Entity::find() let rows = guild_members::Entity::find()
.filter(guild_members::Column::UserId.eq(user_id)) .filter(guild_members::Column::UserId.eq(user_id))
@ -103,11 +88,7 @@ pub async fn list_guilds_for_user(db: &DatabaseConnection, user_id: Uuid) -> Res
.collect()) .collect())
} }
pub async fn create_guild( pub async fn create_guild(db: &DatabaseConnection, owner_user_id: Uuid, name: &str) -> Result<Guild> {
db: &DatabaseConnection,
owner_user_id: Uuid,
name: &str,
) -> Result<Guild> {
let guild = guilds::Entity::insert(guilds::ActiveModel { let guild = guilds::Entity::insert(guilds::ActiveModel {
id: Set(Uuid::new_v4()), id: Set(Uuid::new_v4()),
name: Set(name.to_string()), name: Set(name.to_string()),
@ -123,12 +104,9 @@ pub async fn create_guild(
..Default::default() ..Default::default()
}) })
.on_conflict( .on_conflict(
OnConflict::columns([ OnConflict::columns([guild_members::Column::GuildId, guild_members::Column::UserId])
guild_members::Column::GuildId, .do_nothing()
guild_members::Column::UserId, .to_owned(),
])
.do_nothing()
.to_owned(),
) )
.exec(db) .exec(db)
.await?; .await?;
@ -198,12 +176,9 @@ pub async fn join_invite(db: &DatabaseConnection, code: &str, user_id: Uuid) ->
..Default::default() ..Default::default()
}) })
.on_conflict( .on_conflict(
OnConflict::columns([ OnConflict::columns([guild_members::Column::GuildId, guild_members::Column::UserId])
guild_members::Column::GuildId, .do_nothing()
guild_members::Column::UserId, .to_owned(),
])
.do_nothing()
.to_owned(),
) )
.exec(&txn) .exec(&txn)
.await?; .await?;
@ -240,18 +215,12 @@ pub async fn create_channel(
Ok(map_channel(channel)) Ok(map_channel(channel))
} }
pub async fn get_channel_by_id( pub async fn get_channel_by_id(db: &DatabaseConnection, channel_id: Uuid) -> Result<Option<Channel>> {
db: &DatabaseConnection,
channel_id: Uuid,
) -> Result<Option<Channel>> {
let row = channels::Entity::find_by_id(channel_id).one(db).await?; let row = channels::Entity::find_by_id(channel_id).one(db).await?;
Ok(row.map(map_channel)) Ok(row.map(map_channel))
} }
pub async fn list_channels_for_guild( pub async fn list_channels_for_guild(db: &DatabaseConnection, guild_id: Uuid) -> Result<Vec<Channel>> {
db: &DatabaseConnection,
guild_id: Uuid,
) -> Result<Vec<Channel>> {
let channels = channels::Entity::find() let channels = channels::Entity::find()
.filter(channels::Column::GuildId.eq(guild_id)) .filter(channels::Column::GuildId.eq(guild_id))
.order_by_asc(channels::Column::CreatedAt) .order_by_asc(channels::Column::CreatedAt)
@ -261,10 +230,7 @@ pub async fn list_channels_for_guild(
Ok(channels.into_iter().map(map_channel).collect()) Ok(channels.into_iter().map(map_channel).collect())
} }
pub async fn list_voice_channels_for_guild( pub async fn list_voice_channels_for_guild(db: &DatabaseConnection, guild_id: Uuid) -> Result<Vec<Channel>> {
db: &DatabaseConnection,
guild_id: Uuid,
) -> Result<Vec<Channel>> {
let channels = channels::Entity::find() let channels = channels::Entity::find()
.filter(channels::Column::GuildId.eq(guild_id)) .filter(channels::Column::GuildId.eq(guild_id))
.filter(channels::Column::Kind.eq(CHANNEL_KIND_VOICE)) .filter(channels::Column::Kind.eq(CHANNEL_KIND_VOICE))
@ -275,11 +241,7 @@ pub async fn list_voice_channels_for_guild(
Ok(channels.into_iter().map(map_channel).collect()) Ok(channels.into_iter().map(map_channel).collect())
} }
pub async fn is_member_of_guild( pub async fn is_member_of_guild(db: &DatabaseConnection, guild_id: Uuid, user_id: Uuid) -> Result<bool> {
db: &DatabaseConnection,
guild_id: Uuid,
user_id: Uuid,
) -> Result<bool> {
let count = guild_members::Entity::find() let count = guild_members::Entity::find()
.filter(guild_members::Column::GuildId.eq(guild_id)) .filter(guild_members::Column::GuildId.eq(guild_id))
.filter(guild_members::Column::UserId.eq(user_id)) .filter(guild_members::Column::UserId.eq(user_id))
@ -289,10 +251,7 @@ pub async fn is_member_of_guild(
Ok(count > 0) Ok(count > 0)
} }
pub async fn guild_id_for_channel( pub async fn guild_id_for_channel(db: &DatabaseConnection, channel_id: Uuid) -> Result<Option<Uuid>> {
db: &DatabaseConnection,
channel_id: Uuid,
) -> Result<Option<Uuid>> {
let guild_id = channels::Entity::find_by_id(channel_id) let guild_id = channels::Entity::find_by_id(channel_id)
.select_only() .select_only()
.column(channels::Column::GuildId) .column(channels::Column::GuildId)
@ -308,30 +267,18 @@ pub async fn create_message(
channel_id: Uuid, channel_id: Uuid,
author_user_id: Uuid, author_user_id: Uuid,
body: &str, body: &str,
) -> Result<MessageWithAuthor> { ) -> Result<()> {
let model = messages::Entity::insert(messages::ActiveModel { messages::Entity::insert(messages::ActiveModel {
id: Set(Uuid::new_v4()), id: Set(Uuid::new_v4()),
channel_id: Set(channel_id), channel_id: Set(channel_id),
author_user_id: Set(author_user_id), author_user_id: Set(author_user_id),
body: Set(body.to_string()), body: Set(body.to_string()),
..Default::default() ..Default::default()
}) })
.exec_with_returning(db) .exec(db)
.await?; .await?;
let user = users::Entity::find_by_id(author_user_id) Ok(())
.one(db)
.await?
.ok_or_else(|| anyhow!("author not found"))?;
Ok(MessageWithAuthor {
id: model.id,
channel_id: model.channel_id,
author_user_id: model.author_user_id,
author_display_name: user.display_name,
body: model.body,
created_at: model.created_at,
})
} }
pub async fn list_messages( pub async fn list_messages(
@ -370,30 +317,18 @@ pub async fn create_direct_message(
sender_user_id: Uuid, sender_user_id: Uuid,
recipient_user_id: Uuid, recipient_user_id: Uuid,
body: &str, body: &str,
) -> Result<DmMessageWithAuthor> { ) -> Result<()> {
let model = direct_messages::Entity::insert(direct_messages::ActiveModel { direct_messages::Entity::insert(direct_messages::ActiveModel {
id: Set(Uuid::new_v4()), id: Set(Uuid::new_v4()),
sender_user_id: Set(sender_user_id), sender_user_id: Set(sender_user_id),
recipient_user_id: Set(recipient_user_id), recipient_user_id: Set(recipient_user_id),
body: Set(body.to_string()), body: Set(body.to_string()),
..Default::default() ..Default::default()
}) })
.exec_with_returning(db) .exec(db)
.await?; .await?;
let user = users::Entity::find_by_id(sender_user_id) Ok(())
.one(db)
.await?
.ok_or_else(|| anyhow!("sender not found"))?;
Ok(DmMessageWithAuthor {
id: model.id,
author_user_id: model.sender_user_id,
recipient_user_id: model.recipient_user_id,
author_display_name: user.display_name,
body: model.body,
created_at: model.created_at,
})
} }
pub async fn list_direct_messages( pub async fn list_direct_messages(
@ -450,10 +385,7 @@ pub async fn list_direct_messages(
.collect()) .collect())
} }
pub async fn list_dm_conversations( pub async fn list_dm_conversations(db: &DatabaseConnection, current_user_id: Uuid) -> Result<Vec<DmConversation>> {
db: &DatabaseConnection,
current_user_id: Uuid,
) -> Result<Vec<DmConversation>> {
let rows = direct_messages::Entity::find() let rows = direct_messages::Entity::find()
.filter( .filter(
Condition::any() Condition::any()
@ -464,8 +396,7 @@ pub async fn list_dm_conversations(
.all(db) .all(db)
.await?; .await?;
let mut latest_by_peer = let mut latest_by_peer = std::collections::HashMap::<Uuid, chrono::DateTime<chrono::FixedOffset>>::new();
std::collections::HashMap::<Uuid, chrono::DateTime<chrono::FixedOffset>>::new();
for row in rows { for row in rows {
let peer_id = if row.sender_user_id == current_user_id { let peer_id = if row.sender_user_id == current_user_id {
row.recipient_user_id row.recipient_user_id
@ -565,10 +496,7 @@ fn validate_invite(invite: &invites::Model) -> Result<()> {
Ok(()) Ok(())
} }
async fn increment_invite_use_count( async fn increment_invite_use_count(txn: &DatabaseTransaction, invite: invites::Model) -> Result<()> {
txn: &DatabaseTransaction,
invite: invites::Model,
) -> Result<()> {
let next_count = invite.use_count + 1; let next_count = invite.use_count + 1;
let mut active: invites::ActiveModel = invite.into(); let mut active: invites::ActiveModel = invite.into();
active.use_count = Set(next_count); active.use_count = Set(next_count);

View file

@ -11,7 +11,7 @@ use uuid::Uuid;
use crate::{ use crate::{
AppState, AppState,
auth::{self, ApiError, AuthUser}, auth::{self, ApiError, AuthUser},
chat, db, voice, db, voice,
}; };
pub fn routes() -> Router<AppState> { pub fn routes() -> Router<AppState> {
@ -22,28 +22,17 @@ pub fn routes() -> Router<AppState> {
.route("/auth/logout", post(auth_logout)) .route("/auth/logout", post(auth_logout))
.route("/me", get(me)) .route("/me", get(me))
.route("/dms", get(list_dm_conversations)) .route("/dms", get(list_dm_conversations))
.route( .route("/dms/{other_user_id}/messages", get(list_dm_messages).post(send_dm_message))
"/dms/{other_user_id}/messages",
get(list_dm_messages).post(send_dm_message),
)
.route("/presence", get(presence_list))
.route("/rtc-config", get(rtc_config)) .route("/rtc-config", get(rtc_config))
.route("/guilds", get(list_guilds).post(create_guild)) .route("/guilds", get(list_guilds).post(create_guild))
.route("/guilds/{guild_id}/members", get(list_guild_members)) .route("/guilds/{guild_id}/members", get(list_guild_members))
.route("/guilds/{guild_id}/channels", get(list_channels)) .route("/guilds/{guild_id}/channels", get(list_channels))
.route( .route("/guilds/{guild_id}/voice-presence", get(guild_voice_presence))
"/guilds/{guild_id}/voice-presence",
get(guild_voice_presence),
)
.route("/guilds/{guild_id}/invites", post(create_invite)) .route("/guilds/{guild_id}/invites", post(create_invite))
.route("/invites/{code}/join", post(join_invite)) .route("/invites/{code}/join", post(join_invite))
.route("/channels", post(create_channel)) .route("/channels", post(create_channel))
.route( .route("/channels/{channel_id}/messages", get(list_messages).post(send_message))
"/channels/{channel_id}/messages",
get(list_messages).post(send_message),
)
.route("/channels/{channel_id}/voice/ws", get(voice_ws)) .route("/channels/{channel_id}/voice/ws", get(voice_ws))
.route("/ws", get(chat_ws))
} }
pub async fn health() -> &'static str { pub async fn health() -> &'static str {
@ -153,10 +142,7 @@ async fn auth_callback(
.map_err(|e| ApiError::bad_request(&format!("token exchange failed: {e}")))?; .map_err(|e| ApiError::bad_request(&format!("token exchange failed: {e}")))?;
if !token_res.status().is_success() { if !token_res.status().is_success() {
let text = token_res let text = token_res.text().await.unwrap_or_else(|_| "<no body>".to_string());
.text()
.await
.unwrap_or_else(|_| "<no body>".to_string());
return Err(ApiError::bad_request(&format!( return Err(ApiError::bad_request(&format!(
"token exchange returned non-success: {text}" "token exchange returned non-success: {text}"
))); )));
@ -176,10 +162,7 @@ async fn auth_callback(
.map_err(|e| ApiError::bad_request(&format!("userinfo request failed: {e}")))?; .map_err(|e| ApiError::bad_request(&format!("userinfo request failed: {e}")))?;
if !userinfo_res.status().is_success() { if !userinfo_res.status().is_success() {
let text = userinfo_res let text = userinfo_res.text().await.unwrap_or_else(|_| "<no body>".to_string());
.text()
.await
.unwrap_or_else(|_| "<no body>".to_string());
return Err(ApiError::bad_request(&format!( return Err(ApiError::bad_request(&format!(
"userinfo returned non-success: {text}" "userinfo returned non-success: {text}"
))); )));
@ -202,12 +185,9 @@ async fn auth_callback(
.await .await
.map_err(|e| ApiError::internal(&format!("failed to persist user: {e}")))?; .map_err(|e| ApiError::internal(&format!("failed to persist user: {e}")))?;
let session_cookie = auth::new_session_cookie( let session_cookie =
user.id, auth::new_session_cookie(user.id, &state.settings.session_secret, state.settings.cookie_secure)
&state.settings.session_secret, .map_err(|e| ApiError::internal(&e.to_string()))?;
state.settings.cookie_secure,
)
.map_err(|e| ApiError::internal(&e.to_string()))?;
let mut headers = HeaderMap::new(); let mut headers = HeaderMap::new();
headers.append( headers.append(
@ -252,10 +232,7 @@ struct RtcIceServer {
credential: Option<String>, credential: Option<String>,
} }
async fn rtc_config( async fn rtc_config(State(state): State<AppState>, _user: AuthUser) -> Result<impl IntoResponse, ApiError> {
State(state): State<AppState>,
_user: AuthUser,
) -> Result<impl IntoResponse, ApiError> {
let mut ice_servers = Vec::new(); let mut ice_servers = Vec::new();
if !state.settings.stun_urls.is_empty() { if !state.settings.stun_urls.is_empty() {
@ -294,14 +271,6 @@ async fn me(State(state): State<AppState>, user: AuthUser) -> Result<impl IntoRe
Ok(Json(me)) Ok(Json(me))
} }
async fn presence_list(
State(state): State<AppState>,
_user: AuthUser,
) -> Result<impl IntoResponse, ApiError> {
let users = state.chat.get_online_users().await;
Ok(Json(users))
}
async fn list_dm_conversations( async fn list_dm_conversations(
State(state): State<AppState>, State(state): State<AppState>,
user: AuthUser, user: AuthUser,
@ -472,13 +441,9 @@ async fn create_channel(
return Err(ApiError::bad_request("channel name must be 1..64 chars")); return Err(ApiError::bad_request("channel name must be 1..64 chars"));
} }
let kind = body let kind = body.kind.unwrap_or_else(|| db::CHANNEL_KIND_TEXT.to_string());
.kind
.unwrap_or_else(|| db::CHANNEL_KIND_TEXT.to_string());
if kind != db::CHANNEL_KIND_TEXT && kind != db::CHANNEL_KIND_VOICE { if kind != db::CHANNEL_KIND_TEXT && kind != db::CHANNEL_KIND_VOICE {
return Err(ApiError::bad_request( return Err(ApiError::bad_request("channel kind must be 'text' or 'voice'"));
"channel kind must be 'text' or 'voice'",
));
} }
let channel = db::create_channel(&state.db, body.guild_id, trimmed, &kind) let channel = db::create_channel(&state.db, body.guild_id, trimmed, &kind)
@ -532,31 +497,10 @@ async fn send_message(
return Err(ApiError::bad_request("message body must be 1..4000 chars")); return Err(ApiError::bad_request("message body must be 1..4000 chars"));
} }
let message = db::create_message(&state.db, channel_id, user.id, content) db::create_message(&state.db, channel_id, user.id, content)
.await .await
.map_err(|e| ApiError::internal(&format!("failed to create message: {e}")))?; .map_err(|e| ApiError::internal(&format!("failed to create message: {e}")))?;
// Broadcast to all guild members
let guild_id = db::guild_id_for_channel(&state.db, channel_id)
.await
.map_err(|e| ApiError::internal(&format!("channel lookup failed: {e}")))?
.ok_or_else(|| ApiError::internal("channel not found after creation"))?;
let members = db::list_guild_member_ids(&state.db, guild_id)
.await
.map_err(|e| ApiError::internal(&format!("failed to list guild members: {e}")))?;
state
.chat
.broadcast_to_many(
members,
chat::ServerEvent::MessageCreated {
channel_id,
message: serde_json::to_value(&message).unwrap_or_default(),
},
)
.await;
Ok((StatusCode::CREATED, Json(SendMessageResponse { ok: true }))) Ok((StatusCode::CREATED, Json(SendMessageResponse { ok: true })))
} }
@ -613,32 +557,10 @@ async fn send_dm_message(
return Err(ApiError::bad_request("message body must be 1..4000 chars")); return Err(ApiError::bad_request("message body must be 1..4000 chars"));
} }
let message = db::create_direct_message(&state.db, user.id, other_user_id, content) db::create_direct_message(&state.db, user.id, other_user_id, content)
.await .await
.map_err(|e| ApiError::internal(&format!("failed to create dm message: {e}")))?; .map_err(|e| ApiError::internal(&format!("failed to create dm message: {e}")))?;
// Broadcast to both users
state
.chat
.broadcast_to_user(
user.id,
chat::ServerEvent::DmCreated {
other_user_id,
message: serde_json::to_value(&message).unwrap_or_default(),
},
)
.await;
state
.chat
.broadcast_to_user(
other_user_id,
chat::ServerEvent::DmCreated {
other_user_id: user.id,
message: serde_json::to_value(&message).unwrap_or_default(),
},
)
.await;
Ok((StatusCode::CREATED, Json(SendMessageResponse { ok: true }))) Ok((StatusCode::CREATED, Json(SendMessageResponse { ok: true })))
} }
@ -659,27 +581,15 @@ async fn voice_ws(
})?; })?;
if channel.kind != db::CHANNEL_KIND_VOICE { if channel.kind != db::CHANNEL_KIND_VOICE {
return Err(ApiError::bad_request( return Err(ApiError::bad_request("voice websocket requires a voice channel"));
"voice websocket requires a voice channel",
));
} }
Ok(ws.on_upgrade(move |socket| voice::handle_socket(state, socket, channel_id, user.id))) Ok(ws.on_upgrade(move |socket| {
voice::handle_socket(state, socket, channel_id, user.id)
}))
} }
async fn chat_ws( async fn ensure_guild_member(state: &AppState, guild_id: Uuid, user_id: Uuid) -> Result<(), ApiError> {
ws: WebSocketUpgrade,
State(state): State<AppState>,
user: AuthUser,
) -> Result<impl IntoResponse, ApiError> {
Ok(ws.on_upgrade(move |socket| chat::handle_socket(state, socket, user.id)))
}
async fn ensure_guild_member(
state: &AppState,
guild_id: Uuid,
user_id: Uuid,
) -> Result<(), ApiError> {
let is_member = db::is_member_of_guild(&state.db, guild_id, user_id) let is_member = db::is_member_of_guild(&state.db, guild_id, user_id)
.await .await
.map_err(|e| ApiError::internal(&format!("membership check failed: {e}")))?; .map_err(|e| ApiError::internal(&format!("membership check failed: {e}")))?;
@ -694,11 +604,7 @@ async fn ensure_guild_member(
Ok(()) Ok(())
} }
async fn ensure_channel_member( async fn ensure_channel_member(state: &AppState, channel_id: Uuid, user_id: Uuid) -> Result<(), ApiError> {
state: &AppState,
channel_id: Uuid,
user_id: Uuid,
) -> Result<(), ApiError> {
let guild_id = db::guild_id_for_channel(&state.db, channel_id) let guild_id = db::guild_id_for_channel(&state.db, channel_id)
.await .await
.map_err(|e| ApiError::internal(&format!("channel lookup failed: {e}")))? .map_err(|e| ApiError::internal(&format!("channel lookup failed: {e}")))?

View file

@ -1,5 +1,4 @@
mod auth; mod auth;
mod chat;
mod config; mod config;
mod db; mod db;
mod entity; mod entity;
@ -25,7 +24,6 @@ pub struct AppState {
pub settings: Arc<Settings>, pub settings: Arc<Settings>,
pub http: reqwest::Client, pub http: reqwest::Client,
pub voice: Arc<VoiceHub>, pub voice: Arc<VoiceHub>,
pub chat: Arc<chat::ChatHub>,
} }
#[tokio::main] #[tokio::main]
@ -48,7 +46,6 @@ async fn main() -> anyhow::Result<()> {
settings, settings,
http: reqwest::Client::new(), http: reqwest::Client::new(),
voice: Arc::new(VoiceHub::default()), voice: Arc::new(VoiceHub::default()),
chat: Arc::new(chat::ChatHub::default()),
}; };
let port = state.settings.port; let port = state.settings.port;

View file

@ -16,14 +16,13 @@ const state = {
localStream: null, localStream: null,
rawStream: null, rawStream: null,
audioContext: null, audioContext: null,
denoiserNode: null,
deepFilterCore: null,
peerConnections: new Map(), peerConnections: new Map(),
muted: false, muted: false,
iceServers: [{ urls: "stun:stun.l.google.com:19302" }], iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
}, },
voicePresencePollId: null, voicePresencePollId: null,
chatWs: null,
lastMessageId: null,
onlineUsers: new Set(),
}; };
const el = { const el = {
@ -141,55 +140,10 @@ function formatDate(isoString) {
return d.toLocaleDateString(); return d.toLocaleDateString();
} }
let audioCtx = null; const DEEPFILTERNET_LIB_PATH = "/static/vendor/deepfilternet3/index.esm.js";
const NSNET2_COMPAT_SUPPRESSION = 56;
// Global interaction listener to unlock AudioContext (autoplay policy) let deepFilterLibPromise = null;
window.addEventListener('click', () => {
if (audioCtx && audioCtx.state === 'suspended') {
audioCtx.resume();
}
}, { once: true });
function playSound(type) {
try {
if (!audioCtx) audioCtx = new (window.AudioContext || window.webkitAudioContext)();
if (audioCtx.state === 'suspended') audioCtx.resume();
const sounds = {
message: { freq: 880, type: 'sine', duration: 0.1, volume: 0.1 },
dm: { freq: [660, 880], type: 'sine', duration: 0.15, volume: 0.1 },
join: { freq: [440, 880], type: 'sine', duration: 0.2, volume: 0.1 },
leave: { freq: [880, 440], type: 'sine', duration: 0.2, volume: 0.1 },
'peer-join': { freq: [660, 990], type: 'sine', duration: 0.15, volume: 0.05 },
'peer-leave': { freq: [990, 660], type: 'sine', duration: 0.15, volume: 0.05 },
};
const s = sounds[type];
if (!s) return;
const osc = audioCtx.createOscillator();
const gain = audioCtx.createGain();
osc.type = s.type;
if (Array.isArray(s.freq)) {
osc.frequency.setValueAtTime(s.freq[0], audioCtx.currentTime);
osc.frequency.exponentialRampToValueAtTime(s.freq[1], audioCtx.currentTime + s.duration);
} else {
osc.frequency.setValueAtTime(s.freq, audioCtx.currentTime);
}
gain.gain.setValueAtTime(s.volume, audioCtx.currentTime);
gain.gain.exponentialRampToValueAtTime(0.01, audioCtx.currentTime + s.duration);
osc.connect(gain);
gain.connect(audioCtx.destination);
osc.start();
osc.stop(audioCtx.currentTime + s.duration);
} catch (err) {
console.warn("playSound failed", err);
}
}
const LAST_GUILD_STORAGE_KEY = "chattz:lastGuildId"; const LAST_GUILD_STORAGE_KEY = "chattz:lastGuildId";
// --- Renderers --- // --- Renderers ---
@ -229,7 +183,7 @@ function renderChannels() {
for (const channel of state.channels) { for (const channel of state.channels) {
const row = document.createElement("button"); const row = document.createElement("button");
row.className = `channel-row ${(channel.kind === 'text' && state.selectedTextChannelId === channel.id) || row.className = `channel-row ${(channel.kind === 'text' && state.selectedTextChannelId === channel.id) ||
(channel.kind === 'voice' && state.selectedVoiceChannelId === channel.id) ? "active" : "" (channel.kind === 'voice' && state.selectedVoiceChannelId === channel.id) ? "active" : ""
}`; }`;
const iconName = channel.kind === 'text' ? 'hash' : 'volume-2'; const iconName = channel.kind === 'text' ? 'hash' : 'volume-2';
@ -283,16 +237,9 @@ function renderChannels() {
function renderDMs() { function renderDMs() {
el.dmList.innerHTML = ""; el.dmList.innerHTML = "";
for (const dm of state.dmConversations) { for (const dm of state.dmConversations) {
const isOnline = state.onlineUsers.has(dm.user_id);
const row = document.createElement("button"); const row = document.createElement("button");
row.className = `channel-row ${state.selectedDmUserId === dm.user_id ? "active" : ""}`; row.className = `channel-row ${state.selectedDmUserId === dm.user_id ? "active" : ""}`;
row.innerHTML = ` row.innerHTML = `<i data-lucide="message-circle"></i> <span>${escapeHtml(dm.display_name)}</span>`;
<div class="avatar-wrapper">
<i data-lucide="message-circle"></i>
<div class="status-dot ${isOnline ? "online" : ""}"></div>
</div>
<span>${escapeHtml(dm.display_name)}</span>
`;
row.onclick = async () => { row.onclick = async () => {
state.selectedDmUserId = dm.user_id; state.selectedDmUserId = dm.user_id;
state.selectedDmDisplayName = dm.display_name; state.selectedDmDisplayName = dm.display_name;
@ -344,24 +291,16 @@ function renderMessages(messages) {
lastTime = mDate; lastTime = mDate;
} }
if (messages.length > 0) {
state.lastMessageId = messages[0].id;
}
el.messageList.scrollTop = el.messageList.scrollHeight; el.messageList.scrollTop = el.messageList.scrollHeight;
} }
function renderMembers() { function renderMembers() {
el.memberList.innerHTML = ""; el.memberList.innerHTML = "";
for (const m of state.members) { for (const m of state.members) {
const isOnline = state.onlineUsers.has(m.id);
const row = document.createElement("div"); const row = document.createElement("div");
row.className = "member-row"; row.className = "member-row";
row.innerHTML = ` row.innerHTML = `
<div class="member-avatar"> <div class="member-avatar">${shortName(m.display_name)}</div>
${shortName(m.display_name)}
<div class="status-dot ${isOnline ? "online" : ""}"></div>
</div>
<div class="member-name">${escapeHtml(m.display_name)}</div> <div class="member-name">${escapeHtml(m.display_name)}</div>
`; `;
row.style.cursor = "pointer"; row.style.cursor = "pointer";
@ -483,49 +422,6 @@ function startVoicePresencePolling() {
}, 3000); }, 3000);
} }
function initChatWs() {
if (state.chatWs) state.chatWs.close();
const protocol = location.protocol === "https:" ? "wss:" : "ws:";
const wsUrl = `${protocol}//${location.host}/ws`;
const ws = new WebSocket(wsUrl);
state.chatWs = ws;
ws.onmessage = (event) => {
const msg = JSON.parse(event.data);
const authorId = msg.message?.author_user_id;
const isFromMe = authorId && state.me && authorId === state.me.id;
if (msg.type === "message_created") {
if (!isFromMe) playSound('message');
if (state.selectedTextChannelId === msg.channel_id) {
api(`/channels/${state.selectedTextChannelId}/messages?limit=100`).then(renderMessages);
}
} else if (msg.type === "dm_created") {
if (!isFromMe) playSound('dm');
if (state.selectedDmUserId === msg.other_user_id) {
api(`/dms/${state.selectedDmUserId}/messages?limit=100`).then(renderMessages);
playSound('dm');
loadDMConversations().then(renderDMs);
} else {
loadDMConversations().then(renderDMs);
}
} else if (msg.type === "user_presence") {
if (msg.online) {
state.onlineUsers.add(msg.user_id);
} else {
state.onlineUsers.delete(msg.user_id);
}
renderMembers();
renderDMs();
}
};
ws.onclose = () => {
console.log("Chat WS closed, reconnecting...");
setTimeout(initChatWs, 3000);
};
}
// --- Voice --- // --- Voice ---
function getVoiceWsUrl(channelId) { function getVoiceWsUrl(channelId) {
@ -538,7 +434,40 @@ function shouldInitiateOffer(peerId) {
return state.me.id > peerId; return state.me.id > peerId;
} }
async function loadDeepFilterLib() {
if (!deepFilterLibPromise) {
deepFilterLibPromise = import(DEEPFILTERNET_LIB_PATH);
}
return deepFilterLibPromise;
}
async function buildDenoiserNode(audioContext) {
if (!audioContext.audioWorklet) {
throw new Error("AudioWorklet is not supported in this browser");
}
const df = await loadDeepFilterLib();
const core = new df.DeepFilterNet3Core({
sampleRate: 48000,
noiseReductionLevel: NSNET2_COMPAT_SUPPRESSION,
assetConfig: {
cdnUrl: "/static/vendor/deepfilternet3",
},
});
await core.initialize();
const workletNode = await core.createAudioWorkletNode(audioContext);
state.voice.deepFilterCore = core;
return workletNode;
}
function stopAndClearAudioPipeline() { function stopAndClearAudioPipeline() {
if (state.voice.deepFilterCore) {
state.voice.deepFilterCore.destroy();
state.voice.deepFilterCore = null;
}
if (state.voice.denoiserNode && typeof state.voice.denoiserNode.destroy === "function") {
state.voice.denoiserNode.destroy();
}
if (state.voice.localStream) { if (state.voice.localStream) {
for (const track of state.voice.localStream.getTracks()) track.stop(); for (const track of state.voice.localStream.getTracks()) track.stop();
} }
@ -551,6 +480,8 @@ function stopAndClearAudioPipeline() {
state.voice.localStream = null; state.voice.localStream = null;
state.voice.rawStream = null; state.voice.rawStream = null;
state.voice.audioContext = null; state.voice.audioContext = null;
state.voice.denoiserNode = null;
state.voice.deepFilterCore = null;
} }
async function buildAudioPipeline(rawStream) { async function buildAudioPipeline(rawStream) {
@ -561,8 +492,14 @@ async function buildAudioPipeline(rawStream) {
let head = source; let head = source;
const denoiserNode = await buildDenoiserNode(audioContext);
if (denoiserNode) {
head.connect(denoiserNode);
head = denoiserNode;
}
head.connect(destination); head.connect(destination);
state.voice.denoiserNode = denoiserNode;
return destination.stream; return destination.stream;
} }
@ -684,7 +621,6 @@ async function joinVoice() {
const channel = state.channels.find(c => c.id === state.selectedVoiceChannelId); const channel = state.channels.find(c => c.id === state.selectedVoiceChannelId);
el.vcChannelName.textContent = channel ? channel.name : "Voice"; el.vcChannelName.textContent = channel ? channel.name : "Voice";
el.voiceConnection.classList.remove("hidden"); el.voiceConnection.classList.remove("hidden");
playSound('join');
refreshVoicePresence().catch(() => { }); refreshVoicePresence().catch(() => { });
}; };
@ -695,10 +631,8 @@ async function joinVoice() {
if (shouldInitiateOffer(peer.user_id)) await sendOffer(peer.user_id); if (shouldInitiateOffer(peer.user_id)) await sendOffer(peer.user_id);
} }
} else if (msg.type === "peer_joined") { } else if (msg.type === "peer_joined") {
playSound('peer-join');
if (shouldInitiateOffer(msg.user_id)) await sendOffer(msg.user_id); if (shouldInitiateOffer(msg.user_id)) await sendOffer(msg.user_id);
} else if (msg.type === "peer_left") { } else if (msg.type === "peer_left") {
playSound('peer-leave');
const pc = state.voice.peerConnections.get(msg.user_id); const pc = state.voice.peerConnections.get(msg.user_id);
if (pc) { if (pc) {
pc.close(); pc.close();
@ -718,7 +652,6 @@ async function joinVoice() {
stopAndClearAudioPipeline(); stopAndClearAudioPipeline();
state.voice.joinedChannelId = null; state.voice.joinedChannelId = null;
state.voice.ws = null; state.voice.ws = null;
playSound('leave');
refreshVoicePresence().catch(() => { }); refreshVoicePresence().catch(() => { });
}; };
} }
@ -944,11 +877,6 @@ async function init() {
await loadGuilds(); await loadGuilds();
await loadDMConversations(); await loadDMConversations();
try {
const online = await api("/presence");
state.onlineUsers = new Set(online);
} catch (err) { console.warn("presence sync failed", err); }
if (state.guilds.length > 0) { if (state.guilds.length > 0) {
const lastGuildId = localStorage.getItem(LAST_GUILD_STORAGE_KEY); const lastGuildId = localStorage.getItem(LAST_GUILD_STORAGE_KEY);
const guild = state.guilds.find((g) => g.id === lastGuildId) || state.guilds[0]; const guild = state.guilds.find((g) => g.id === lastGuildId) || state.guilds[0];
@ -965,7 +893,6 @@ async function init() {
updateHeaderLabels(); updateHeaderLabels();
} }
initChatWs();
startVoicePresencePolling(); startVoicePresencePolling();
lucide.createIcons(); lucide.createIcons();
} catch (err) { } catch (err) {

View file

@ -7,24 +7,22 @@
--bg-modifier-selected: rgba(78, 80, 88, 0.6); --bg-modifier-selected: rgba(78, 80, 88, 0.6);
--bg-modifier-hover: rgba(78, 80, 88, 0.3); --bg-modifier-hover: rgba(78, 80, 88, 0.3);
--bg-input: #383a40; --bg-input: #383a40;
--text-normal: #dbdee1; --text-normal: #dbdee1;
--text-muted: #949ba4; --text-muted: #949ba4;
--text-strong: #f2f3f5; --text-strong: #f2f3f5;
--text-link: #00a8fc; --text-link: #00a8fc;
--brand: #5865f2; --brand: #5865f2;
--brand-hover: #4752c4; --brand-hover: #4752c4;
--green: #23a559; --green: #23a559;
--danger: #f23f43; --danger: #f23f43;
--yellow: #f0b232; --yellow: #f0b232;
--font-main: "gg sans", "Inter", "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; --font-main: "gg sans", "Inter", "Noto Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
} }
* { * { box-sizing: border-box; }
box-sizing: border-box;
}
body { body {
margin: 0; margin: 0;
@ -36,46 +34,15 @@ body {
} }
/* Scrollbars */ /* Scrollbars */
::-webkit-scrollbar { ::-webkit-scrollbar { width: 8px; height: 8px; }
width: 8px; ::-webkit-scrollbar-track { background: transparent; }
height: 8px; ::-webkit-scrollbar-thumb { background: var(--bg-tertiary); border-radius: 4px; }
} ::-webkit-scrollbar-thumb:hover { background: #242529; }
::-webkit-scrollbar-track { button { border: 0; cursor: pointer; transition: all 150ms ease; background: none; color: inherit; font: inherit; padding: 0; }
background: transparent; input, select { border: 0; outline: none; background: var(--bg-input); color: var(--text-normal); font: inherit; }
}
::-webkit-scrollbar-thumb { .hidden { display: none !important; }
background: var(--bg-tertiary);
border-radius: 4px;
}
::-webkit-scrollbar-thumb:hover {
background: #242529;
}
button {
border: 0;
cursor: pointer;
transition: all 150ms ease;
background: none;
color: inherit;
font: inherit;
padding: 0;
}
input,
select {
border: 0;
outline: none;
background: var(--bg-input);
color: var(--text-normal);
font: inherit;
}
.hidden {
display: none !important;
}
/* Auth Screen */ /* Auth Screen */
.auth-screen { .auth-screen {
@ -85,16 +52,14 @@ select {
background-image: url("https://discord.com/assets/f9a15998e94589d343f7.png"); background-image: url("https://discord.com/assets/f9a15998e94589d343f7.png");
background-size: cover; background-size: cover;
} }
.auth-card { .auth-card {
width: min(480px, 92vw); width: min(480px, 92vw);
background: var(--bg-sidebar); background: var(--bg-sidebar);
border-radius: 8px; border-radius: 8px;
padding: 32px; padding: 32px;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 2px 10px rgba(0,0,0,0.2);
text-align: center; text-align: center;
} }
.brand-large { .brand-large {
width: 80px; width: 80px;
height: 80px; height: 80px;
@ -107,17 +72,8 @@ select {
font-weight: 800; font-weight: 800;
margin: 0 auto 20px; margin: 0 auto 20px;
} }
.auth-card h1 { margin: 0 0 8px; color: var(--text-strong); }
.auth-card h1 { .auth-card p { margin: 0 0 24px; color: var(--text-muted); }
margin: 0 0 8px;
color: var(--text-strong);
}
.auth-card p {
margin: 0 0 24px;
color: var(--text-muted);
}
#login-btn { #login-btn {
width: 100%; width: 100%;
background: var(--brand); background: var(--brand);
@ -127,10 +83,7 @@ select {
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
} }
#login-btn:hover { background: var(--brand-hover); }
#login-btn:hover {
background: var(--brand-hover);
}
/* Main Layout */ /* Main Layout */
.shell { .shell {
@ -151,11 +104,7 @@ select {
overflow-y: auto; overflow-y: auto;
scrollbar-width: none; scrollbar-width: none;
} }
.server-rail::-webkit-scrollbar { display: none; }
.server-rail::-webkit-scrollbar {
display: none;
}
.guild-list { .guild-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -163,8 +112,7 @@ select {
padding: 6px 0; padding: 6px 0;
} }
.brand, .brand, .guild-pill {
.guild-pill {
width: 48px; width: 48px;
height: 48px; height: 48px;
border-radius: 50%; border-radius: 50%;
@ -176,16 +124,8 @@ select {
background: var(--bg-sidebar); background: var(--bg-sidebar);
} }
.brand { .brand { background: var(--brand); color: #fff; border-radius: 16px; margin-bottom: 2px; }
background: var(--brand); .brand:hover { border-radius: 16px; }
color: #fff;
border-radius: 16px;
margin-bottom: 2px;
}
.brand:hover {
border-radius: 16px;
}
.separator { .separator {
width: 32px; width: 32px;
@ -195,8 +135,7 @@ select {
border-radius: 1px; border-radius: 1px;
} }
.guild-pill:hover, .guild-pill:hover, .guild-pill.active {
.guild-pill.active {
border-radius: 16px; border-radius: 16px;
background: var(--brand); background: var(--brand);
color: #fff; color: #fff;
@ -212,23 +151,11 @@ select {
border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0;
transition: all 0.2s ease; transition: all 0.2s ease;
} }
.guild-pill:hover::before { height: 20px; }
.guild-pill.active::before { height: 40px; }
.guild-pill:hover::before { .action-pill { color: var(--green); }
height: 20px; .action-pill:hover { background: var(--green); color: #fff; }
}
.guild-pill.active::before {
height: 40px;
}
.action-pill {
color: var(--green);
}
.action-pill:hover {
background: var(--green);
color: #fff;
}
/* Channel Sidebar */ /* Channel Sidebar */
.channel-sidebar { .channel-sidebar {
@ -244,15 +171,11 @@ select {
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
border-bottom: 1px solid var(--bg-darker); border-bottom: 1px solid var(--bg-darker);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(0,0,0,0.1);
cursor: pointer; cursor: pointer;
transition: background-color 0.1s; transition: background-color 0.1s;
} }
.sidebar-header:hover { background: var(--bg-modifier-hover); }
.sidebar-header:hover {
background: var(--bg-modifier-hover);
}
.sidebar-header h2 { .sidebar-header h2 {
margin: 0; margin: 0;
font-size: 15px; font-size: 15px;
@ -262,13 +185,11 @@ select {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.sidebar-header-actions { .sidebar-header-actions {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
} }
.header-action-btn { .header-action-btn {
width: 24px; width: 24px;
height: 24px; height: 24px;
@ -277,27 +198,18 @@ select {
place-items: center; place-items: center;
color: var(--text-muted); color: var(--text-muted);
} }
.header-action-btn:hover { .header-action-btn:hover {
background: var(--bg-modifier-hover); background: var(--bg-modifier-hover);
color: var(--text-normal); color: var(--text-normal);
} }
.header-action-btn i { .header-action-btn i {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
.sidebar-scroll { .sidebar-scroll { flex: 1; overflow-y: auto; padding-top: 12px; }
flex: 1;
overflow-y: auto;
padding-top: 12px;
}
.sidebar-group {
margin-bottom: 20px;
}
.sidebar-group { margin-bottom: 20px; }
.group-title { .group-title {
padding: 0 8px 0 2px; padding: 0 8px 0 2px;
display: flex; display: flex;
@ -309,21 +221,9 @@ select {
letter-spacing: 0.24px; letter-spacing: 0.24px;
cursor: pointer; cursor: pointer;
} }
.group-title:hover { color: var(--text-normal); }
.group-title:hover { .group-toggle { width: 12px; height: 12px; margin-right: 2px; }
color: var(--text-normal); .group-title span { flex: 1; }
}
.group-toggle {
width: 12px;
height: 12px;
margin-right: 2px;
}
.group-title span {
flex: 1;
}
.add-btn { .add-btn {
width: 20px; width: 20px;
height: 20px; height: 20px;
@ -333,24 +233,13 @@ select {
display: grid; display: grid;
place-items: center; place-items: center;
} }
.add-btn:hover { .add-btn:hover {
opacity: 1; opacity: 1;
background: var(--bg-modifier-hover); background: var(--bg-modifier-hover);
} }
.add-btn i { width: 16px; height: 16px; }
.add-btn i { .channel-list { padding: 0 8px; display: flex; flex-direction: column; gap: 2px; }
width: 16px;
height: 16px;
}
.channel-list {
padding: 0 8px;
display: flex;
flex-direction: column;
gap: 2px;
}
.channel-row { .channel-row {
display: flex; display: flex;
align-items: center; align-items: center;
@ -360,28 +249,12 @@ select {
font-weight: 500; font-weight: 500;
gap: 6px; gap: 6px;
} }
.channel-row:hover { background: var(--bg-modifier-hover); color: var(--text-normal); }
.channel-row:hover { .channel-row.active { background: var(--bg-modifier-selected); color: var(--text-strong); }
background: var(--bg-modifier-hover); .channel-row i { width: 20px; height: 20px; opacity: 0.6; }
color: var(--text-normal);
}
.channel-row.active {
background: var(--bg-modifier-selected);
color: var(--text-strong);
}
.channel-row i {
width: 20px;
height: 20px;
opacity: 0.6;
}
/* Sidebar Footer */ /* Sidebar Footer */
.sidebar-footer { .sidebar-footer { background: var(--bg-secondary); padding: 0; }
background: var(--bg-secondary);
padding: 0;
}
.user-panel { .user-panel {
padding: 8px; padding: 8px;
@ -390,15 +263,9 @@ select {
gap: 8px; gap: 8px;
height: 52px; height: 52px;
} }
.user-panel:hover { background: var(--bg-modifier-hover); }
.user-panel:hover { .avatar-wrapper { position: relative; }
background: var(--bg-modifier-hover);
}
.avatar-wrapper {
position: relative;
}
.avatar { .avatar {
width: 32px; width: 32px;
height: 32px; height: 32px;
@ -410,7 +277,6 @@ select {
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }
.status-dot { .status-dot {
position: absolute; position: absolute;
bottom: -2px; bottom: -2px;
@ -420,16 +286,9 @@ select {
border-radius: 50%; border-radius: 50%;
border: 3px solid var(--bg-secondary); border: 3px solid var(--bg-secondary);
} }
.status-dot.online { background: var(--green); }
.status-dot.online { .user-info { flex: 1; min-width: 0; }
background: var(--green);
}
.user-info {
flex: 1;
min-width: 0;
}
.display-name { .display-name {
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
@ -438,17 +297,9 @@ select {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.user-status { font-size: 12px; color: var(--text-muted); }
.user-status { .user-actions { display: flex; gap: 2px; }
font-size: 12px;
color: var(--text-muted);
}
.user-actions {
display: flex;
gap: 2px;
}
.user-actions button { .user-actions button {
width: 32px; width: 32px;
height: 32px; height: 32px;
@ -457,57 +308,21 @@ select {
place-items: center; place-items: center;
color: var(--text-muted); color: var(--text-muted);
} }
.user-actions button:hover { background: var(--bg-modifier-hover); color: var(--text-normal); }
.user-actions button:hover { .user-actions i { width: 20px; height: 20px; }
background: var(--bg-modifier-hover);
color: var(--text-normal);
}
.user-actions i {
width: 20px;
height: 20px;
}
/* Voice Connection */ /* Voice Connection */
.voice-connection { .voice-connection {
padding: 8px; padding: 8px;
background: var(--bg-secondary); background: var(--bg-secondary);
border-bottom: 1px solid rgba(255, 255, 255, 0.05); border-bottom: 1px solid rgba(255,255,255,0.05);
} }
.vc-info { display: flex; align-items: center; gap: 8px; }
.vc-info { .vc-icon { color: var(--green); width: 20px; }
display: flex; .vc-text { flex: 1; display: flex; flex-direction: column; }
align-items: center; .vc-status { color: var(--green); font-size: 14px; font-weight: 700; }
gap: 8px; .vc-name { color: var(--text-muted); font-size: 12px; }
} .vc-actions { display: flex; gap: 4px; }
.vc-icon {
color: var(--green);
width: 20px;
}
.vc-text {
flex: 1;
display: flex;
flex-direction: column;
}
.vc-status {
color: var(--green);
font-size: 14px;
font-weight: 700;
}
.vc-name {
color: var(--text-muted);
font-size: 12px;
}
.vc-actions {
display: flex;
gap: 4px;
}
.vc-actions button { .vc-actions button {
width: 32px; width: 32px;
height: 32px; height: 32px;
@ -516,11 +331,7 @@ select {
display: grid; display: grid;
place-items: center; place-items: center;
} }
.vc-actions button:hover { background: var(--bg-modifier-hover); color: var(--text-normal); }
.vc-actions button:hover {
background: var(--bg-modifier-hover);
color: var(--text-normal);
}
/* Chat Pane */ /* Chat Pane */
.chat-pane { .chat-pane {
@ -536,21 +347,11 @@ select {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 8px; gap: 8px;
border-bottom: 1px solid rgba(0, 0, 0, 0.2); border-bottom: 1px solid rgba(0,0,0,0.2);
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 1px 0 rgba(0,0,0,0.1);
}
.header-icon {
color: var(--text-muted);
width: 24px;
}
.chat-header h3 {
margin: 0;
font-size: 16px;
font-weight: 700;
color: var(--text-strong);
} }
.header-icon { color: var(--text-muted); width: 24px; }
.chat-header h3 { margin: 0; font-size: 16px; font-weight: 700; color: var(--text-strong); }
.message-list { .message-list {
flex: 1; flex: 1;
@ -564,10 +365,7 @@ select {
gap: 16px; gap: 16px;
margin-top: 1.0625rem; margin-top: 1.0625rem;
} }
.msg:hover { background: rgba(0,0,0,0.05); }
.msg:hover {
background: rgba(0, 0, 0, 0.05);
}
.msg-avatar { .msg-avatar {
width: 40px; width: 40px;
@ -581,77 +379,36 @@ select {
font-weight: 600; font-weight: 600;
} }
.msg-content { .msg-content { flex: 1; min-width: 0; }
flex: 1; .msg-header { display: flex; align-items: baseline; gap: 8px; margin-bottom: 4px; }
min-width: 0;
}
.msg-header {
display: flex;
align-items: baseline;
gap: 8px;
margin-bottom: 4px;
}
.msg-author { .msg-author {
font-weight: 600; font-weight: 600;
color: var(--text-strong); color: var(--text-strong);
cursor: pointer; cursor: pointer;
font-size: 1rem; font-size: 1rem;
} }
.msg-author:hover { text-decoration: underline; }
.msg-time { font-size: 12px; color: var(--text-muted); }
.msg-body { color: var(--text-normal); line-height: 1.375rem; white-space: pre-wrap; word-wrap: break-word; }
.msg-author:hover { .msg-grouped { margin-top: 0; padding-top: 0; padding-bottom: 0; }
text-decoration: underline; .msg-grouped .msg-avatar, .msg-grouped .msg-header { display: none; }
} .msg-grouped .msg-content { padding-left: 56px; }
.msg-time {
font-size: 12px;
color: var(--text-muted);
}
.msg-body {
color: var(--text-normal);
line-height: 1.375rem;
white-space: pre-wrap;
word-wrap: break-word;
}
.msg-grouped {
margin-top: 0;
padding-top: 0;
padding-bottom: 0;
}
.msg-grouped .msg-avatar,
.msg-grouped .msg-header {
display: none;
}
.msg-grouped .msg-content {
padding-left: 56px;
}
/* Chat Input */ /* Chat Input */
.chat-input-wrapper { .chat-input-wrapper { padding: 0 16px 24px; }
padding: 0 16px 24px;
}
.message-form { .message-form {
background: var(--bg-input); background: var(--bg-input);
border-radius: 8px; border-radius: 8px;
padding: 11px 16px; padding: 11px 16px;
} }
.message-form input { .message-form input {
width: 100%; width: 100%;
background: transparent; background: transparent;
color: var(--text-normal); color: var(--text-normal);
font-size: 16px; font-size: 16px;
} }
.message-form input::placeholder { color: var(--text-muted); }
.message-form input::placeholder {
color: var(--text-muted);
}
/* Member List */ /* Member List */
.utility-sidebar { .utility-sidebar {
@ -659,13 +416,7 @@ select {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.member-list-wrapper { flex: 1; overflow-y: auto; padding: 12px 8px; }
.member-list-wrapper {
flex: 1;
overflow-y: auto;
padding: 12px 8px;
}
.member-row { .member-row {
display: flex; display: flex;
align-items: center; align-items: center;
@ -675,12 +426,7 @@ select {
color: var(--text-muted); color: var(--text-muted);
cursor: pointer; cursor: pointer;
} }
.member-row:hover { background: var(--bg-modifier-hover); color: var(--text-normal); }
.member-row:hover {
background: var(--bg-modifier-hover);
color: var(--text-normal);
}
.member-avatar { .member-avatar {
width: 32px; width: 32px;
height: 32px; height: 32px;
@ -693,67 +439,23 @@ select {
font-weight: 600; font-weight: 600;
flex-shrink: 0; flex-shrink: 0;
} }
.member-name { .member-name {
font-weight: 500;
font-size: 15px;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* Presence Badges */
.avatar-wrapper {
position: relative;
display: inline-block;
}
.status-badge {
position: absolute;
bottom: -2px;
right: -2px;
width: 12px;
height: 12px;
border-radius: 50%;
border: 2px solid var(--bg-sidebar);
background: #747f8d;
/* Gray for offline */
}
.status-badge.online {
background: var(--green);
}
.member-avatar,
.msg-avatar {
position: relative;
}
.status-dot {
position: absolute;
bottom: 0;
right: 0;
width: 10px;
height: 10px;
border-radius: 50%;
border: 2px solid var(--bg-sidebar);
background: #747f8d;
}
.status-dot.online {
background: var(--green);
}
/* Modals */ /* Modals */
.modal-container { .modal-container {
position: fixed; position: fixed;
top: 0; top: 0; left: 0; right: 0; bottom: 0;
left: 0; background: rgba(0,0,0,0.85);
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.85);
display: grid; display: grid;
place-items: center; place-items: center;
z-index: 1000; z-index: 1000;
} }
.modal { .modal {
background: var(--bg-sidebar); background: var(--bg-sidebar);
width: min(440px, 95vw); width: min(440px, 95vw);
@ -761,17 +463,8 @@ select {
padding: 24px; padding: 24px;
color: var(--text-normal); color: var(--text-normal);
} }
.modal h2 { margin: 0 0 16px; text-align: center; color: var(--text-strong); }
.modal h2 { .form-item { margin-bottom: 20px; }
margin: 0 0 16px;
text-align: center;
color: var(--text-strong);
}
.form-item {
margin-bottom: 20px;
}
.form-item label { .form-item label {
display: block; display: block;
font-size: 12px; font-size: 12px;
@ -779,7 +472,6 @@ select {
color: var(--text-muted); color: var(--text-muted);
margin-bottom: 8px; margin-bottom: 8px;
} }
.form-item input { .form-item input {
width: 100%; width: 100%;
padding: 10px; padding: 10px;
@ -793,17 +485,8 @@ select {
justify-content: flex-end; justify-content: flex-end;
gap: 16px; gap: 16px;
} }
.cancel-btn { padding: 10px 20px; color: var(--text-strong); font-weight: 500; }
.cancel-btn { .cancel-btn:hover { text-decoration: underline; }
padding: 10px 20px;
color: var(--text-strong);
font-weight: 500;
}
.cancel-btn:hover {
text-decoration: underline;
}
.submit-btn { .submit-btn {
background: var(--brand); background: var(--brand);
color: #fff; color: #fff;
@ -811,28 +494,12 @@ select {
border-radius: 3px; border-radius: 3px;
font-weight: 600; font-weight: 600;
} }
.submit-btn:hover { background: var(--brand-hover); }
.submit-btn:hover {
background: var(--brand-hover);
}
/* Radio Group for Channel Type */ /* Radio Group for Channel Type */
.radio-group { .radio-group { display: flex; flex-direction: column; gap: 8px; }
display: flex; .radio-item { cursor: pointer; position: relative; }
flex-direction: column; .radio-item input { position: absolute; opacity: 0; }
gap: 8px;
}
.radio-item {
cursor: pointer;
position: relative;
}
.radio-item input {
position: absolute;
opacity: 0;
}
.radio-box { .radio-box {
display: flex; display: flex;
align-items: center; align-items: center;
@ -842,45 +509,21 @@ select {
border-radius: 4px; border-radius: 4px;
transition: all 0.1s; transition: all 0.1s;
} }
.radio-item input:checked + .radio-box { background: var(--bg-modifier-selected); color: var(--text-strong); }
.radio-item input:checked+.radio-box { .radio-box i { width: 24px; height: 24px; color: var(--text-muted); }
background: var(--bg-modifier-selected); .radio-text { display: flex; flex-direction: column; }
color: var(--text-strong); .radio-text strong { font-size: 16px; }
} .radio-text span { font-size: 12px; color: var(--text-muted); }
.radio-box i {
width: 24px;
height: 24px;
color: var(--text-muted);
}
.radio-text {
display: flex;
flex-direction: column;
}
.radio-text strong {
font-size: 16px;
}
.radio-text span {
font-size: 12px;
color: var(--text-muted);
}
/* Mobile Overlay */ /* Mobile Overlay */
.overlay { .overlay {
position: fixed; position: fixed;
top: 0; top: 0; left: 0; right: 0; bottom: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.7); background: rgba(0, 0, 0, 0.7);
z-index: 90; z-index: 90;
opacity: 1; opacity: 1;
transition: opacity 0.2s ease; transition: opacity 0.2s ease;
} }
.overlay.hidden { .overlay.hidden {
opacity: 0; opacity: 0;
pointer-events: none; pointer-events: none;
@ -898,50 +541,39 @@ select {
background: transparent; background: transparent;
margin-right: 8px; margin-right: 8px;
} }
.mobile-toggle-btn:hover { .mobile-toggle-btn:hover {
background: var(--bg-modifier-hover); background: var(--bg-modifier-hover);
border-radius: 4px; border-radius: 4px;
} }
@media (max-width: 1100px) { @media (max-width: 1100px) {
.shell { .shell { grid-template-columns: 72px 240px 1fr; }
grid-template-columns: 72px 240px 1fr;
}
.utility-sidebar { .utility-sidebar {
position: fixed; position: fixed;
top: 0; top: 0; bottom: 0; right: 0;
bottom: 0;
right: 0;
width: 240px; width: 240px;
z-index: 100; z-index: 100;
box-shadow: -2px 0 10px rgba(0, 0, 0, 0.5); box-shadow: -2px 0 10px rgba(0,0,0,0.5);
transform: translateX(100%); transform: translateX(100%);
transition: transform 0.2s ease; transition: transform 0.2s ease;
} }
.utility-sidebar.active { .utility-sidebar.active {
transform: translateX(0); transform: translateX(0);
display: flex; display: flex;
} }
.chat-header .mobile-toggle-btn { .chat-header .mobile-toggle-btn { display: flex; }
display: flex;
}
} }
@media (max-width: 768px) { @media (max-width: 768px) {
.shell { .shell {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
/* Hide sidebars by default on mobile */ /* Hide sidebars by default on mobile */
.server-rail, .server-rail, .channel-sidebar {
.channel-sidebar {
position: fixed; position: fixed;
top: 0; top: 0; bottom: 0;
bottom: 0;
z-index: 100; z-index: 100;
transition: transform 0.2s ease; transition: transform 0.2s ease;
} }
@ -951,28 +583,25 @@ select {
width: 72px; width: 72px;
transform: translateX(-100%); transform: translateX(-100%);
} }
.channel-sidebar { .channel-sidebar {
left: 72px; left: 72px;
width: 240px; width: 240px;
transform: translateX(-312px); transform: translateX(-312px); /* 72 + 240 */
/* 72 + 240 */ box-shadow: 2px 0 10px rgba(0,0,0,0.5);
box-shadow: 2px 0 10px rgba(0, 0, 0, 0.5);
} }
/* When menu is active */ /* When menu is active */
.shell.menu-open .server-rail { .shell.menu-open .server-rail {
transform: translateX(0); transform: translateX(0);
} }
.shell.menu-open .channel-sidebar { .shell.menu-open .channel-sidebar {
transform: translateX(0); transform: translateX(0);
display: flex; display: flex; /* Override display: none from previous rule */
/* Override display: none from previous rule */
} }
/* Adjust chat header for mobile */ /* Adjust chat header for mobile */
.chat-header { .chat-header {
padding: 0 8px; padding: 0 8px;
} }
} }

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.