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

Fixed conflict with commit 78502aa6b1
2022-02-03 13:07:15 +02:00 · 2022-02-03 13:07:15 +02:00 · 4bbff69a24
commit 4bbff69a24
parent 87225e70c3 b4755ba15b
23 changed files with 340 additions and 186 deletions
--- a/src/database/admin.rs
+++ b/src/database/admin.rs
@ -262,7 +262,10 @@ fn process_admin_command(
                let parsed_config = serde_yaml::from_str::<serde_yaml::Value>(&appservice_config);
                match parsed_config {
                    Ok(yaml) => match db.appservice.register_appservice(yaml) {
-                        Ok(()) => RoomMessageEventContent::text_plain("Appservice registered."),
+                        Ok(id) => RoomMessageEventContent::text_plain(format!(
+                            "Appservice registered with ID: {}.",
+                            id
+                        )),
                        Err(e) => RoomMessageEventContent::text_plain(format!(
                            "Failed to register appservice: {}",
                            e