TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix handling of empty admin command lines

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-23 04:33:50 +00:00 • committed by strawberry
parent 7a71012589
commit d875e0c1c0
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/admin/handler.rs
View file

@ -9,7 +9,7 @@ extern crate conduit_service as service;
use conduit::Result;
pub(crate) use service::admin::{Command, Service};
use service::admin::{CommandResult, HandlerResult};
use service::admin::{CommandOutput, CommandResult, HandlerResult};
use self::{fsck::FsckCommand, tester::TesterCommands};
use crate::{
@ -68,7 +68,10 @@ pub fn handle(command: Command) -> HandlerResult { Box::pin(handle_command(comma
#[tracing::instrument(skip_all, name = "admin")]
async fn handle_command(command: Command) -> CommandResult {
let mut content = process_admin_message(command.command).await;
let Some(mut content) = process_admin_message(command.command).await else {
return Ok(None);
};
content.relates_to = command.reply_id.map(|event_id| Reply {
in_reply_to: InReplyTo {
event_id,
@ -79,7 +82,7 @@ async fn handle_command(command: Command) -> CommandResult {
}
// Parse and process a message from the admin room
async fn process_admin_message(msg: String) -> RoomMessageEventContent {
async fn process_admin_message(msg: String) -> CommandOutput {
let mut lines = msg.lines().filter(|l| !l.trim().is_empty());
let command_line = lines.next().expect("each string has at least one line");
let body = lines.collect::<Vec<_>>();
@ -89,15 +92,15 @@ async fn process_admin_message(msg: String) -> RoomMessageEventContent {
Err(error) => {
let server_name = services().globals.server_name();
let message = error.replace("server.name", server_name.as_str());
return RoomMessageEventContent::notice_markdown(message);
return Some(RoomMessageEventContent::notice_markdown(message));
},
};
match process_admin_command(admin_command, body).await {
Ok(reply_message) => reply_message,
Ok(reply_message) => Some(reply_message),
Err(error) => {
let markdown_message = format!("Encountered an error while handling the command:\n```\n{error}\n```",);
RoomMessageEventContent::notice_markdown(markdown_message)
Some(RoomMessageEventContent::notice_markdown(markdown_message))
},
}
}

2
src/service/admin/console.rs
View file

@ -138,7 +138,7 @@ impl Console {
#[allow(clippy::let_underscore_must_use)]
async fn handle(self: Arc<Self>, line: String) {
if line.is_empty() {
if line.trim().is_empty() {
return;
}