feat(client): finish node menu, categories, node settings and forum client wiring

This commit is contained in:
Loki 2026-11-01 16:25:25 +01:00
parent f04691c3cd
commit c2fc5529b7
Signed by: boba
GPG key ID: 253067914055423B
20 changed files with 1374 additions and 446 deletions

View file

@ -4,22 +4,34 @@ use tokio::io::AsyncWrite;
use tokio::sync::mpsc;
pub fn is_mutation(request: &wire::ForumRequest) -> bool {
matches!(wire::ForumOperation::try_from(request.operation), Ok(wire::ForumOperation::Create | wire::ForumOperation::Reply))
matches!(
wire::ForumOperation::try_from(request.operation),
Ok(wire::ForumOperation::Create | wire::ForumOperation::Reply)
)
}
pub async fn unsupported(request: &wire::ForumRequest, events: &mpsc::Sender<NetEvent>) {
error(request, "This server does not support forums yet.", events).await;
}
pub async fn error(request: &wire::ForumRequest, message: &str, events: &mpsc::Sender<NetEvent>) {
let _ = events.send(NetEvent::ForumResult(wire::ForumResult {
request_id: request.request_id.clone(), operation: request.operation,
channel_id: request.channel_id.clone(), topic_id: request.topic_id.clone(),
error_code: u32::MAX, error: message.into(),
..Default::default()
})).await;
let _ = events
.send(NetEvent::ForumResult(Box::new(wire::ForumResult {
request_id: request.request_id.clone(),
operation: request.operation,
channel_id: request.channel_id.clone(),
topic_id: request.topic_id.clone(),
error_code: u32::MAX,
error: message.into(),
..Default::default()
})))
.await;
}
pub async fn write(stream: &mut (impl AsyncWrite + Unpin), seq: &mut u32, request: &wire::ForumRequest) -> anyhow::Result<()> {
pub async fn write(
stream: &mut (impl AsyncWrite + Unpin),
seq: &mut u32,
request: &wire::ForumRequest,
) -> anyhow::Result<()> {
framing::write(stream, PID_FORUM_REQUEST, seq, &wire::encode(request)?).await
}
@ -29,19 +41,41 @@ mod tests {
#[tokio::test]
async fn unsupported_server_returns_correlated_forum_error_without_join_error() {
let (tx, mut rx) = mpsc::channel(1);
let request = wire::ForumRequest { request_id: "request".into(), channel_id: "forum".into(), topic_id: "topic".into(), operation: wire::ForumOperation::Open as i32, ..Default::default() };
let request = wire::ForumRequest {
request_id: "request".into(),
channel_id: "forum".into(),
topic_id: "topic".into(),
operation: wire::ForumOperation::Open as i32,
..Default::default()
};
unsupported(&request, &tx).await;
let NetEvent::ForumResult(result) = rx.recv().await.unwrap() else { panic!("forum errors must stay separate from join errors") };
assert_eq!(result.request_id, "request"); assert_eq!(result.channel_id, "forum"); assert_eq!(result.topic_id, "topic"); assert_ne!(result.error_code, 0);
let NetEvent::ForumResult(result) = rx.recv().await.unwrap() else {
panic!("forum errors must stay separate from join errors")
};
assert_eq!(result.request_id, "request");
assert_eq!(result.channel_id, "forum");
assert_eq!(result.topic_id, "topic");
assert_ne!(result.error_code, 0);
}
#[tokio::test]
async fn request_wire_keeps_topic_message_and_pagination_fields() {
let request = wire::ForumRequest { request_id: "request".into(), operation: wire::ForumOperation::Create as i32, channel_id: "forum".into(), topic_id: "topic".into(), message_id: "message".into(), title: "Title".into(), content: "First post".into(), offset: 12, limit: 20 };
let request = wire::ForumRequest {
request_id: "request".into(),
operation: wire::ForumOperation::Create as i32,
channel_id: "forum".into(),
topic_id: "topic".into(),
message_id: "message".into(),
title: "Title".into(),
content: "First post".into(),
offset: 12,
limit: 20,
};
let (mut sender, mut receiver) = tokio::io::duplex(4096);
write(&mut sender, &mut 0, &request).await.unwrap();
let packet = framing::read(&mut receiver).await.unwrap();
assert_eq!(packet.packet_id, PID_FORUM_REQUEST);
let decoded: wire::ForumRequest = wire::decode(&packet.payload).unwrap();
assert_eq!(decoded, request); assert!(is_mutation(&decoded));
assert_eq!(decoded, request);
assert!(is_mutation(&decoded));
}
}

View file

@ -261,6 +261,9 @@ mod tests {
expires_at: 0,
node_admin: false,
live_profiles: false,
node_settings: false,
channel_structure: false,
forums: false,
};
framing::write(
&mut stream,

View file

@ -57,7 +57,8 @@ pub async fn handle(pid: u16, payload: &[u8], tx: &mpsc::Sender<NetEvent>) -> Re
.send(NetEvent::ChannelEdited {
channel_id: p.channel_id,
channel_name: p.channel_name,
parent_id: p.parent_id, position: p.position,
parent_id: p.parent_id,
position: p.position,
})
.await;
}
@ -81,7 +82,8 @@ pub async fn handle(pid: u16, payload: &[u8], tx: &mpsc::Sender<NetEvent>) -> Re
channel_name: c.channel_name,
kind: c.kind,
guild_id: c.guild_id,
parent_id: c.parent_id, position: c.position,
parent_id: c.parent_id,
position: c.position,
})
.collect(),
})
@ -230,13 +232,15 @@ mod channel_edit_tests {
let bytes = wire::encode(&ChannelEditPayload {
channel_id: "global".into(),
channel_name: "Renamed".into(),
parent_id: None,
position: None,
})
.unwrap();
super::super::incoming(PID_CHANNEL_EDIT, &bytes, &tx)
.await
.unwrap();
assert!(
matches!(rx.recv().await.unwrap(),NetEvent::ChannelEdited{channel_id,channel_name} if channel_id=="global" && channel_name=="Renamed")
matches!(rx.recv().await.unwrap(),NetEvent::ChannelEdited{channel_id,channel_name,..} if channel_id=="global" && channel_name=="Renamed")
);
}
}

View file

@ -11,8 +11,20 @@ mod social;
pub async fn incoming(pid: u16, payload: &[u8], tx: &mpsc::Sender<NetEvent>) -> Result<()> {
match pid {
PID_FORUM_RESULT => { let _ = tx.send(NetEvent::ForumResult(crate::net::wire::decode(payload)?)).await; }
PID_FORUM_CHANGED => { let _ = tx.send(NetEvent::ForumChanged(crate::net::wire::decode(payload)?)).await; }
PID_FORUM_RESULT => {
let _ = tx
.send(NetEvent::ForumResult(Box::new(crate::net::wire::decode(
payload,
)?)))
.await;
}
PID_FORUM_CHANGED => {
let _ = tx
.send(NetEvent::ForumChanged(Box::new(crate::net::wire::decode(
payload,
)?)))
.await;
}
PID_PROFILE_UPDATED => {
let _ = tx
.send(NetEvent::ProfileUpdated(crate::net::wire::decode(payload)?))

View file

@ -76,9 +76,17 @@ pub async fn session_loop(
.await;
if outcome.node_settings || outcome.channel_structure || outcome.forums {
framing::write(&mut stream, PID_CLIENT_FEATURES, &mut seq, &wire::encode(&wire::ClientFeatures {
node_settings: outcome.node_settings, channel_structure: outcome.channel_structure, forums: outcome.forums,
})?).await?;
framing::write(
&mut stream,
PID_CLIENT_FEATURES,
&mut seq,
&wire::encode(&wire::ClientFeatures {
node_settings: outcome.node_settings,
channel_structure: outcome.channel_structure,
forums: outcome.forums,
})?,
)
.await?;
}
let node_settings = outcome.node_settings;
let mut profile_updates = crate::net::account::subscribe_profiles();
@ -362,10 +370,14 @@ mod session_fence_tests {
channel_name: "Global".into(),
kind: "text".into(),
guild_id: None,
parent_id: None,
position: 0,
},
NetCommand::ChannelEdit {
channel_id: "global".into(),
channel_name: "Renamed".into(),
parent_id: None,
position: None,
},
NetCommand::ChannelDelete {
channel_id: "global".into(),

View file

@ -41,7 +41,14 @@ fn bytes(command: &NetCommand) -> usize {
reply_to,
} => content.len() + channel_id.len() + reply_to.as_ref().map_or(0, String::len),
NetCommand::JoinChannel { channel_id } => channel_id.len(),
NetCommand::ForumRequest(request) => request.request_id.len() + request.channel_id.len() + request.topic_id.len() + request.message_id.len() + request.title.len() + request.content.len(),
NetCommand::ForumRequest(request) => {
request.request_id.len()
+ request.channel_id.len()
+ request.topic_id.len()
+ request.message_id.len()
+ request.title.len()
+ request.content.len()
}
_ => 0,
}
}
@ -106,7 +113,9 @@ pub(super) async fn actions(
) -> Result<()> {
while let Some(action) = pending.pop_front() {
match action {
NetCommand::ForumRequest(request) => { crate::net::forum::write(stream, seq, &request).await?; }
NetCommand::ForumRequest(request) => {
crate::net::forum::write(stream, seq, &request).await?;
}
NetCommand::JoinChannel { channel_id } => {
super::core::track_channel(channels, &channel_id);
framing::write(
@ -150,7 +159,9 @@ pub(super) async fn actions(
)
.await?;
}
_ => unreachable!("only chat, image, forum mutation and join commands can wait for profile refresh"),
_ => unreachable!(
"only chat, image, forum mutation and join commands can wait for profile refresh"
),
}
}
stream.flush().await?;

View file

@ -3,8 +3,8 @@ use std::net::SocketAddr;
#[derive(Debug, Clone)]
pub enum NetEvent {
ForumResult(crate::net::wire::ForumResult),
ForumChanged(crate::net::wire::ForumChanged),
ForumResult(Box<crate::net::wire::ForumResult>),
ForumChanged(Box<crate::net::wire::ForumChanged>),
/// A local profile refresh/activity warning; it is not a gateway join refusal.
ProfileWarning {
message: String,
@ -21,7 +21,10 @@ pub enum NetEvent {
WebhookResult(WebhookManagementResult),
WebhookList(crate::net::wire::WebhookListResult),
WebhookError(crate::net::wire::WebhookErrorResult),
NodeSettingsResult { session_id: String, result: crate::net::wire::NodeSettingsResult },
NodeSettingsResult {
session_id: String,
result: crate::net::wire::NodeSettingsResult,
},
Connected {
session_id: String,
node_name: String,