make a big huge mess implementing these settings.

Author: capslock

crates/stable-diffusion-bot/src/bot/handlers/image.rs

@@ -193,6 +193,10 @@ impl MessageText {
             .join("\n")
         ))
     }
+
+    pub fn new(prompt: &str) -> Self {
+        Self(format!("`{}`", prompt))
+    }
 }
 
 impl<T> TryFrom<ImgResponse<T>> for MessageText {
@@ -318,6 +322,16 @@ async fn handle_prompt(
     msg: Message,
     text: String,
 ) -> anyhow::Result<()> {
+    if text.is_empty() {
+        bot.send_message(
+            msg.chat.id,
+            teloxide::utils::markdown::escape("A prompt is required to run txt2img."),
+        )
+        .parse_mode(teloxide::types::ParseMode::MarkdownV2)
+        .await?;
+        return Ok(());
+    }
+
     bot.send_chat_action(msg.chat.id, ChatAction::UploadPhoto)
         .await?;
 

crates/stable-diffusion-bot/src/bot/handlers/mod.rs

@@ -19,12 +19,12 @@ pub(crate) use settings::*;
 #[derive(BotCommands, Clone)]
 #[command(rename_rule = "lowercase", description = "Simple commands")]
 pub(crate) enum UnauthenticatedCommands {
-    #[command(description = "show help message.")]
-    Help,
     #[command(description = "start the bot.")]
     Start,
     #[command(description = "change settings.")]
     Settings,
+    #[command(description = "show help message.")]
+    Help,
 }
 
 pub(crate) async fn unauthenticated_commands_handler(
@@ -35,17 +35,25 @@ pub(crate) async fn unauthenticated_commands_handler(
     cmd: UnauthenticatedCommands,
     dialogue: DiffusionDialogue,
 ) -> anyhow::Result<()> {
+    let chat = msg.chat.id;
+    let user = msg.from().unwrap().id;
     let text = match cmd {
         UnauthenticatedCommands::Help => {
-            if cfg.chat_is_allowed(&msg.chat.id)
-                || cfg.chat_is_allowed(&msg.from().unwrap().id.into())
-            {
-                format!(
-                    "{}\n\n{}\n\n{}",
-                    UnauthenticatedCommands::descriptions(),
-                    SettingsCommands::descriptions(),
-                    GenCommands::descriptions()
-                )
+            if cfg.chat_is_allowed(&chat) || cfg.chat_is_allowed(&user.into()) {
+                let unauth = vec![UnauthenticatedCommands::descriptions()];
+                let settings =
+                    if !cfg.settings.disable_user_settings || cfg.user_is_admin(&user.into()) {
+                        vec![SettingsCommands::descriptions()]
+                    } else {
+                        vec![]
+                    };
+                let gen = vec![GenCommands::descriptions()];
+                [unauth, settings, gen]
+                    .iter()
+                    .flatten()
+                    .map(ToString::to_string)
+                    .collect::<Vec<_>>()
+                    .join("\n\n")
             } else if msg.chat.is_group() || msg.chat.is_supergroup() {
                 UnauthenticatedCommands::descriptions()
                     .username_from_me(&me)
@@ -92,14 +100,6 @@ pub(crate) fn filter_map_settings() -> UpdateHandler<anyhow::Error> {
     })
 }
 
-pub(crate) fn admin_filter() -> UpdateHandler<anyhow::Error> {
-    dptree::filter(|cfg: ConfigParameters, upd: Update| {
-        upd.user()
-            .map(|user| cfg.user_is_admin(&user.id.into()))
-            .unwrap_or_default()
-    })
-}
-
 pub(crate) fn auth_filter() -> UpdateHandler<anyhow::Error> {
     dptree::filter(|cfg: ConfigParameters, upd: Update| {
         upd.chat()

crates/stable-diffusion-bot/src/bot/handlers/settings.rs

@@ -12,7 +12,7 @@ use tracing::error;
 
 use crate::{bot::ConfigParameters, BotState};
 
-use super::{admin_filter, filter_map_bot_state, filter_map_settings, DiffusionDialogue, State};
+use super::{filter_map_bot_state, filter_map_settings, DiffusionDialogue, State};
 
 /// BotCommands for settings.
 #[derive(BotCommands, Clone)]
@@ -652,10 +652,13 @@ pub(crate) fn settings_schema() -> UpdateHandler<anyhow::Error> {
         .branch(filter_settings_state().endpoint(handle_invalid_setting_value));
 
     dptree::entry()
-        .branch(
-            dptree::filter(|cfg: ConfigParameters| cfg.settings.disable_user_settings)
-                .chain(admin_filter()),
-        )
+        .chain(dptree::filter(|cfg: ConfigParameters, upd: Update| {
+            !cfg.settings.disable_user_settings
+                || upd
+                    .user()
+                    .map(|user| cfg.user_is_admin(&user.id.into()))
+                    .unwrap_or_default()
+        }))
         .branch(settings_command_handler())
         .branch(message_handler)
         .branch(callback_handler)

crates/stable-diffusion-bot/src/bot/mod.rs

@@ -109,6 +109,7 @@ impl StableDiffusionBot {
     /// Creates an UpdateHandler for the bot
     fn schema() -> UpdateHandler<anyhow::Error> {
         Self::enter::<Update, ErasedStorage<State>, _>()
+            .chain(dptree::filter_async(Self::set_my_commands))
             .branch(unauth_command_handler())
             .branch(authenticated_command_handler())
     }
@@ -153,6 +154,32 @@ impl StableDiffusionBot {
         )
     }
 
+    async fn set_my_commands(bot: Bot, cfg: ConfigParameters, upd: Update) -> bool {
+        let (chat, user) = match (upd.chat(), upd.user()) {
+            (Some(c), Some(u)) => (c, u),
+            _ => return true,
+        };
+        let mut commands = UnauthenticatedCommands::bot_commands();
+        if !cfg.settings.disable_user_settings || cfg.user_is_admin(&user.id.into()) {
+            commands.extend(SettingsCommands::bot_commands());
+        }
+        commands.extend(GenCommands::bot_commands());
+        let scope = if chat.id == user.id.into() {
+            teloxide::types::BotCommandScope::Chat {
+                chat_id: teloxide::types::Recipient::Id(chat.id),
+            }
+        } else {
+            teloxide::types::BotCommandScope::ChatMember {
+                chat_id: teloxide::types::Recipient::Id(chat.id),
+                user_id: user.id,
+            }
+        };
+        if let Err(e) = bot.set_my_commands(commands).scope(scope).await {
+            error!("Failed to set commands: {e:?}");
+        }
+        true
+    }
+
     /// Runs the StableDiffusionBot
     pub async fn run(self) -> anyhow::Result<()> {
         let StableDiffusionBot {
@@ -162,7 +189,6 @@ impl StableDiffusionBot {
         } = self;
 
         let mut commands = UnauthenticatedCommands::bot_commands();
-        commands.extend(SettingsCommands::bot_commands());
         commands.extend(GenCommands::bot_commands());
         bot.set_my_commands(commands)
             .scope(teloxide::types::BotCommandScope::Default)