rzerres/conduit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/next' into command-refactor

Browse Source
This commit is contained in:
Andrei Vasiliu
2022-01-21 10:19:17 +02:00
parent e378bc4a2c ab4f3bd06c
commit f244c0e2ce
26 changed files with 278 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database/admin.rs
View File

@@ -127,7 +127,7 @@ impl Admin {
if let Ok(response) = guard._db.memory_usage() {
send_message(RoomMessageEventContent::text_plain(response), guard, &state_lock);
} else {
send_message(RoomMessageEventContent::text_plain("Failed to get database memory usage.".to_string()), guard, &state_lock);
send_message(RoomMessageEventContent::text_plain("Failed to get database memory usage.".to_owned()), guard, &state_lock);
}
}
AdminCommand::SendMessage(message) => {